Added extra functionality to Point class( an iterator ) and PersistenceDiagram( dimension property and __len__ func ).
persistence-diagram.h:
Added a new read-only dimension member and member function to access it.
With a new constructor that that takes in an int type to initialize dimension.
persistence-diagram.cpp:
Added new bp::init constructor. Takes in an integer type to initialize the dimension. Exposed the dimension property. Exposed the size property via a __len__ method.
__init__.py:
Added an iterator for Point objects. This iterates over the coords and then the data( if present ).
#include <iostream>
#include <vector>
#include <algorithm>
#include "avida-population-detail.h"
#include <topology/filtration.h>
#include <topology/rips.h>
#include <topology/static-persistence.h>
#include <geometry/distances.h> // for ExplicitDistances
typedef ExplicitDistances<AvidaPopulationDetail> ExplicitDist;
typedef Rips<ExplicitDist> RipsGen;
typedef RipsGen::Simplex Smplx;
typedef Filtration<Smplx> Fltr;
typedef StaticPersistence<> Persistence;
int main(int argc, char** argv)
{
#ifdef LOGGING
rlog::RLogInit(argc, argv);
stdoutLog.subscribeTo(RLOG_CHANNEL("info"));
//stdoutLog.subscribeTo(RLOG_CHANNEL("rips/info"));
#endif
if (argc < 2)
{
std::cout << "USAGE: avida FILENAME" << std::endl;
return 0;
}
AvidaPopulationDetail population(argv[1]);
ExplicitDist distances(population);
RipsGen rips(distances);
RipsGen::Evaluator evaluator(rips.distances());
rInfo("Max distance: %f", rips.max_distance());
const AvidaPopulationDetail::OrganismVector& organisms = population.get_organisms();
rInfo("Number of organisms: %d", organisms.size());
/*
for (int i = 0; i < population.get_organisms().size(); ++i)
rInfo("%d (%s) %f %d %d", organisms[i].id(),
organisms[i].genome().c_str(),
organisms[i].fitness(),
organisms[i].length(),
organisms[i].genome().size());
*/
rInfo("Starting to generate rips complex");
Fltr f;
rips.generate(1, rips.max_distance()/2, make_push_back_functor(f));
rInfo("Generated Rips complex, filling filtration");
f.sort(RipsGen::Comparison(rips.distances()));
Persistence p(f);
p.pair_simplices();
std::cout << "Outputting histogram of death values" << std::endl;
typedef std::vector<RealType> DeathVector;
DeathVector deaths;
Persistence::SimplexMap<Fltr> m = p.make_simplex_map(f);
for (Persistence::iterator i = p.begin(); i != p.end(); ++i)
{
if (i->unpaired()) continue;
if (i->sign())
{
const Smplx& s = m[i];
const Smplx& t = m[i->pair];
AssertMsg(s.dimension() == 0, "Expecting only 0-dimensional diagram");
AssertMsg(evaluator(s) == 0, "Expecting only 0 birth values in 0-D diagram ");
deaths.push_back(evaluator(t));
}
}
// Produce histogram
std::sort(deaths.begin(), deaths.end());
for (DeathVector::iterator cur = deaths.begin(); cur != deaths.end(); )
{
DeathVector::iterator nw = std::find_if(cur, deaths.end(),
std::bind2nd(std::greater<RealType>(), *cur));
std::cout << *cur << "\t" << (nw - cur) << std::endl;
cur = nw;
}
std::cout << "Total: " << deaths.size() + 1; // +1 for the unpaired
}