Merged in Aravind's changes dev
authorDmitriy Morozov <dmitriy@mrzv.org>
Wed, 25 Aug 2010 14:29:54 -0700
branchdev
changeset 222 fdfde7291a0f
parent 214 ee0dca73ea47 (diff)
parent 221 9ea8d4630907 (current diff)
child 224 8f6fb2ad57f7
Merged in Aravind's changes
--- a/doc/examples/index.rst	Wed Aug 18 15:35:48 2010 -0700
+++ b/doc/examples/index.rst	Wed Aug 25 14:29:54 2010 -0700
@@ -44,7 +44,7 @@
     cohomology
 
 A simple example of computing persistence of a lower-star filtration is in
-:sfile:`examples/lsfiltration.py`.
+:sfile:`examples/pl-functions/lsfiltration.py`.
 
 A C++-only, but useful example is computation of a vineyard of piecewise
 straight-line homotopy of piecewise-linear functions.
--- a/doc/get-build-install.rst	Wed Aug 18 15:35:48 2010 -0700
+++ b/doc/get-build-install.rst	Wed Aug 25 14:29:54 2010 -0700
@@ -37,19 +37,6 @@
   :Boost_:              C++ utilities (version :math:`\geq` 1.36; including Boost.Python used to create
                         Python bindings)
 
-.. warning::
-
-    There also seems to be a dependence on the version of GCC, although I don't
-    entirely understand it. GCC 4.3 and above definitely work, but some versions
-    below that seem not to.
-
-    One particular catch is that the default compiler on many current Mac OS X
-    is GCC 4.0 that has a well-known bug making Dionysus unusable. Fortunately
-    the problem is easy to solve by using GCC 4.2 that is often available on a
-    Mac under the name ``gcc-4.2``.
-
-    One can check the compiler version with ``g++ --version`` command.
-
 Optional dependencies:
 
   :CGAL_:               for alpha shapes and vineyards   (version :math:`\geq` 3.4)
--- a/doc/python/rips.rst	Wed Aug 18 15:35:48 2010 -0700
+++ b/doc/python/rips.rst	Wed Aug 25 14:29:54 2010 -0700
@@ -74,7 +74,7 @@
         def __len__(self):
             return len(self.points)
 
-        def __call__(self, x, y):
+        def __call__(self, p1, p2):
             return self.norm([x - y for (x,y) in zip(self.points[p1], self.points[p2])])
 
 Another distances class is available that speeds up the computation of the Rips
@@ -87,7 +87,7 @@
     distances = ExplicitDistances(distances)
 
 With :class:`PairwiseDistances` being a C++ class, and
-:class:`ExplicitDistances` being pure Python, the speead-up seems minor.
+:class:`ExplicitDistances` being pure Python, the speed-up seems minor.
 
 
 Example
--- a/doc/python/simplex.rst	Wed Aug 18 15:35:48 2010 -0700
+++ b/doc/python/simplex.rst	Wed Aug 25 14:29:54 2010 -0700
@@ -60,7 +60,7 @@
 
 The first function :func:`vertex_cmp` is a Python interface to a C++ function.
 The rest are pure Python functions defined in
-:sfile:`bindings/python/dionysis/__init__.py`.
+:sfile:`bindings/python/dionysus/__init__.py`.
 
 .. function:: vertex_cmp(s1, s2)
     
--- a/doc/tutorial.rst	Wed Aug 18 15:35:48 2010 -0700
+++ b/doc/tutorial.rst	Wed Aug 25 14:29:54 2010 -0700
@@ -55,7 +55,7 @@
 restricted to a :math:`k`-skeleton of the complex and some maximal parameter
 :math:`max`. In the following example :math:`k = 3` and :math:`max = 50`::
 
-    simplices = []
+    simplices = Filtration()
     rips.generate(3, 50, simplices.append)
 
 :meth:`Rips.generate` takes a skeleton and a maximum distance cutoffs, and a