Add Windows and CGAL_HEADER_ONLY cythonization support

Add OFF reader interfaces (required by Euclidean witness complex)
Add Euclidean_witness_complex



git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2186 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 4d780f05c3409bea47a81e4377dbaf509b9e718c

2 files changed, 68 insertions, 22 deletions

diff --git a/src/cython/test/test_euclidean_witness_complex.py b/src/cython/test/test_euclidean_witness_complex.py
new file mode 100755
index 00000000..cb150b7e
--- /dev/null
+++ b/src/cython/test/test_euclidean_witness_complex.py
@@ -0,0 +1,39 @@
+import gudhi
+
+"""This file is part of the Gudhi Library. The Gudhi library
+   (Geometric Understanding in Higher Dimensions) is a generic C++
+   library for computational topology.
+
+   Author(s):       Vincent Rouvreau
+
+   Copyright (C) 2016 INRIA
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+__author__ = "Vincent Rouvreau"
+__copyright__ = "Copyright (C) 2016 INRIA"
+__license__ = "GPL v3"
+
+
+def test_empty_euclidean_witness_complex():
+    euclidean_witness = gudhi.EuclideanWitnessComplex()
+    assert euclidean_witness.__is_defined() == False
+
+def test_witness_complex():
+    point_cloud = [[1.0, 1.0], [7.0, 0.0], [4.0, 6.0], [9.0, 6.0],
+        [0.0, 14.0], [2.0, 19.0], [9.0, 17.0]]
+    landmarks = gudhi.pick_n_random_points(points=point_cloud,nb_points=3)
+    euclidean_witness_complex = gudhi.EuclideanWitnessComplex(landmarks=landmarks, witnesses = point_cloud)
+    simplex_tree = euclidean_witness_complex.create_simplex_tree(max_alpha_square=4.1)
diff --git a/src/cython/test/test_witness_complex.py b/src/cython/test/test_witness_complex.py
index a55e80d7..7d1fb6be 100755
--- a/src/cython/test/test_witness_complex.py
+++ b/src/cython/test/test_witness_complex.py
@@ -1,4 +1,4 @@
-from gudhi import WitnessComplex
+from gudhi import WitnessComplex, StrongWitnessComplex, SimplexTree
 
 """This file is part of the Gudhi Library. The Gudhi library
    (Geometric Understanding in Higher Dimensions) is a generic C++
@@ -32,24 +32,31 @@ def test_empty_witness_complex():
     assert witness.__is_defined() == False
 
 def test_witness_complex():
-    point_list = [[0, 0], [1, 0], [0, 1], [1, 1]]
-    witness = WitnessComplex(points=point_list, number_of_landmarks=10)
-    assert witness.__is_defined() == True
-
-    # FIXME: Remove this line
-    witness.set_dimension(2)
-
-    assert witness.num_simplices() == 13
-    assert witness.num_vertices() == 10
-    witness.initialize_filtration()
-"""
-    assert witness.get_filtered_tree() == \
-        [([0], 0.0), ([1], 0.0), ([0, 1], 0.0), ([2], 0.0), ([1, 2], 0.0),
-         ([3], 0.0), ([2, 3], 0.0), ([4], 0.0), ([5], 0.0), ([6], 0.0),
-         ([7], 0.0), ([8], 0.0), ([9], 0.0)]
-
-
-    assert witness.get_coface_tree([2], 1) == [([1, 2], 0.0), ([2, 3], 0.0)]
-    assert witness.get_star_tree([2]) == \
-        [([1, 2], 0.0), ([2], 0.0), ([2, 3], 0.0)]
-"""
+    nearest_landmark_table = [[[0, 0], [1, 1], [2, 2], [3, 3], [4, 4]],
+                              [[1, 0], [2, 1], [3, 2], [4, 3], [0, 4]],
+                              [[2, 0], [3, 1], [4, 2], [0, 3], [1, 4]],
+                              [[3, 0], [4, 1], [0, 2], [1, 3], [2, 4]],
+                              [[4, 0], [0, 1], [1, 2], [2, 3], [3, 4]]]
+
+    witness_complex = WitnessComplex(nearest_landmark_table=nearest_landmark_table)
+    simplex_tree = witness_complex.create_simplex_tree(max_alpha_square=4.1)
+    assert simplex_tree.num_vertices() == 5
+    assert simplex_tree.num_simplices() == 31
+    simplex_tree = witness_complex.create_simplex_tree(max_alpha_square=4.1, limit_dimension=2)
+    assert simplex_tree.num_vertices() == 5
+    assert simplex_tree.num_simplices() == 25
+
+def test_strong_witness_complex():
+    nearest_landmark_table = [[[0, 0], [1, 1], [2, 2], [3, 3], [4, 4]],
+                              [[1, 0], [2, 1], [3, 2], [4, 3], [0, 4]],
+                              [[2, 0], [3, 1], [4, 2], [0, 3], [1, 4]],
+                              [[3, 0], [4, 1], [0, 2], [1, 3], [2, 4]],
+                              [[4, 0], [0, 1], [1, 2], [2, 3], [3, 4]]]
+
+    strong_witness_complex = StrongWitnessComplex(nearest_landmark_table=nearest_landmark_table)
+    simplex_tree = strong_witness_complex.create_simplex_tree(max_alpha_square=4.1)
+    assert simplex_tree.num_vertices() == 5
+    assert simplex_tree.num_simplices() == 31
+    simplex_tree = strong_witness_complex.create_simplex_tree(max_alpha_square=4.1, limit_dimension=2)
+    assert simplex_tree.num_vertices() == 5
+    assert simplex_tree.num_simplices() == 25