Added link to CVXOPT in get-build-install documentation + progress bar to rips-pairwise-cohomology
--- a/doc/get-build-install.rst Tue Oct 20 22:05:23 2009 -0700
+++ b/doc/get-build-install.rst Fri Oct 23 09:36:55 2009 -0700
@@ -53,6 +53,7 @@
Optional dependencies:
:CGAL_: for alpha shapes (version :math:`\geq` 3.4)
+ :CVXOPT_: for :ref:`circle-valued parametrization <cohomology-parametrization>` using LSQR
:rlog_: used for logging only (not needed by default)
.. :dsrpdb_: for reading PDB files
@@ -62,6 +63,7 @@
.. _CMake: http://www.cmake.org
.. _Boost: http://www.boost.org
.. _CGAL: http://www.cgal.org
+.. _CVXOPT: http://abel.ee.ucla.edu/cvxopt/
.. _rlog: http://www.arg0.net/rlog
.. _dsrpdb: http://www.salilab.org/~drussel/pdb/
.. _SYNAPS: http://www-sop.inria.fr/galaad/synaps/
--- a/doc/index.rst Tue Oct 20 22:05:23 2009 -0700
+++ b/doc/index.rst Fri Oct 23 09:36:55 2009 -0700
@@ -24,7 +24,7 @@
* :ref:`Alpha shape construction <alpha-shape-example>` in 2D and 3D
* :ref:`Rips complex construction <rips-example>`
* Cech complex construction |cpp-only|
- * :ref:`Circle-valued parametrization using persistent cohomology <cohomology-parametrization>`
+ * :ref:`Circle-valued parametrization <cohomology-parametrization>`
.. todo::
Document more examples.
--- a/examples/cohomology/rips-pairwise-cohomology.cpp Tue Oct 20 22:05:23 2009 -0700
+++ b/examples/cohomology/rips-pairwise-cohomology.cpp Fri Oct 23 09:36:55 2009 -0700
@@ -13,6 +13,7 @@
#include <boost/tuple/tuple.hpp>
#include <boost/program_options.hpp>
+#include <boost/progress.hpp>
#include "wrappers.h"
@@ -88,6 +89,7 @@
Timer persistence_timer; persistence_timer.start();
ZpField zp(prime);
Persistence p(zp);
+ boost::progress_display show_progress(v.size());
for (unsigned j = 0; j < index_in_v.size(); ++j)
{
SimplexVector::const_iterator cur = v.begin() + index_in_v[j];
@@ -108,6 +110,7 @@
AssertMsg(d->get<0>() == cur->dimension() - 1, "Dimensions must match");
diagram_out << (cur->dimension() - 1) << " " << d->get<1>() << " " << size(*cur) << std::endl;
}
+ ++show_progress;
}
// output infinte persistence pairs
for (Persistence::CocycleIndex cur = p.begin(); cur != p.end(); ++cur)