# HG changeset patch # User Dmitriy Morozov <dmitriy@mrzv.org> # Date 1259456512 28800 # Node ID 6a649c2bea0e7c0df9bc6f11e7a81874bfd7c3de # Parent 3f1034dca432e06035cc630d5bce7a422e56b8f2 Fixed DynamicPersistenceTrails::PairingTrailsVisitor to match the changes in StaticPersistence::PairVisitor diff -r 3f1034dca432 -r 6a649c2bea0e include/topology/dynamic-persistence.h --- a/include/topology/dynamic-persistence.h Sat Nov 28 16:45:42 2009 -0800 +++ b/include/topology/dynamic-persistence.h Sat Nov 28 17:01:52 2009 -0800 @@ -135,11 +135,12 @@ struct PairingTrailsVisitor: public Parent::PairVisitor { // TODO: this is specialized for std::vector - PairingTrailsVisitor(OrderIndex bg, ConsistencyComparison ccmp): - bg_(bg), ccmp_(ccmp) {} + PairingTrailsVisitor(OrderIndex bg, ConsistencyComparison ccmp, unsigned size): + Parent::PairVisitor(size), bg_(bg), ccmp_(ccmp) {} void init(OrderIndex i) const { i->consistency = i - bg_; i->trail.append(i, ccmp_); Count(cTrailLength); } void update(OrderIndex j, OrderIndex i) const { i->pair->trail.append(j, ccmp_); Count(cTrailLength); } + void finished(OrderIndex i) const { Parent::PairVisitor::finished(i); } OrderIndex bg_; ConsistencyComparison ccmp_; diff -r 3f1034dca432 -r 6a649c2bea0e include/topology/dynamic-persistence.hpp --- a/include/topology/dynamic-persistence.hpp Sat Nov 28 16:45:42 2009 -0800 +++ b/include/topology/dynamic-persistence.hpp Sat Nov 28 17:01:52 2009 -0800 @@ -34,7 +34,7 @@ DynamicPersistenceTrails<D,CT,Cmp,OT,CI,CC,E>:: pair_simplices() { - Parent::pair_simplices(begin(), end(), PairingTrailsVisitor(begin(), ccmp_)); + Parent::pair_simplices(begin(), end(), PairingTrailsVisitor(begin(), ccmp_, size())); } template<class D, class CT, class Cmp, class OT, class CI, class CC, class E>