5 files changed, 14 insertions, 85 deletions
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 3e7e9369..d66954d7 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -40,9 +40,9 @@ if(TARGET Boost::program_options)
     target_link_libraries(persistence_from_file ${TBB_LIBRARIES})
   endif()
   add_test(NAME Persistent_cohomology_example_from_file_3_2_0 COMMAND $<TARGET_FILE:persistence_from_file>
-      "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "2" "-m" "0")
+      "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/Klein_bottle_complex.fsc" "-p" "2" "-m" "0")
   add_test(NAME Persistent_cohomology_example_from_file_3_3_100 COMMAND $<TARGET_FILE:persistence_from_file>
-      "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "3" "-m" "100")
+      "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/Klein_bottle_complex.fsc" "-p" "3" "-m" "100")
 endif()
 
 if(GMP_FOUND)
diff --git a/src/Simplex_tree/example/CMakeLists.txt b/src/Simplex_tree/example/CMakeLists.txt
index 73b2c6f9..81d352fc 100644
--- a/src/Simplex_tree/example/CMakeLists.txt
+++ b/src/Simplex_tree/example/CMakeLists.txt
@@ -29,7 +29,7 @@ if(GMP_FOUND AND NOT CGAL_VERSION VERSION_LESS 4.11.0)
     target_link_libraries(Simplex_tree_example_alpha_shapes_3_from_off ${TBB_LIBRARIES})
   endif()
   add_test(NAME Simplex_tree_example_alpha_shapes_3_from_off COMMAND $<TARGET_FILE:Simplex_tree_example_alpha_shapes_3_from_off>
-      "${CMAKE_SOURCE_DIR}/data/points/bunny_5000.off")
+      "${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off")
 
 endif()
 
diff --git a/src/Simplex_tree/example/README b/src/Simplex_tree/example/README
deleted file mode 100644
index a9498173..00000000
--- a/src/Simplex_tree/example/README
+++ /dev/null
@@ -1,73 +0,0 @@
-To build the example, run in a Terminal:
-
-cd /path-to-gudhi/
-cmake .
-cd /path-to-example/
-make
-
-
-Example of use :
-
-*** Simple simplex tree construction
-
-./Simplex_tree_example_simple_simplex_tree
-
-********************************************************************
-EXAMPLE OF SIMPLE INSERTION
-   * INSERT 0
-   + 0 INSERTED
-   * INSERT 1
-   + 1 INSERTED
-   * INSERT (0,1)
-   + (0,1) INSERTED
-   * INSERT 2
-   + 2 INSERTED
-   * INSERT (2,0)
-   + (2,0) INSERTED
-   * INSERT (2,1)
-   + (2,1) INSERTED
-   * INSERT (2,1,0)
-   + (2,1,0) INSERTED
-   * INSERT 3
-   + 3 INSERTED
-   * INSERT (3,0)
-   + (3,0) INSERTED
-   * INSERT 0 (already inserted)
-   - 0 NOT INSERTED
-   * INSERT (2,1,0) (already inserted)
-   - (2,1,0) NOT INSERTED
-********************************************************************
-* The complex contains 9 simplices
-   - dimension 2   - filtration 0.4
-* Iterator on Simplices in the filtration, with [filtration value]:
-   [0.1] 0 
-   [0.1] 1 
-   [0.1] 2 
-   [0.1] 3 
-   [0.2] 1 0 
-   [0.2] 2 0 
-   [0.2] 2 1 
-   [0.2] 3 0 
-   [0.3] 2 1 0 
-
-*** Simplex tree construction with Z/2Z coefficients on weighted graph Klein bottle file:
-
-./Simplex_tree_example_from_cliques_of_graph ../../../data/points/Klein_bottle_complex.txt 2
-Insert the 1-skeleton in the simplex tree in 0 s. 
-Expand the simplex tree in 0 s. 
-Information of the Simplex Tree: 
-  Number of vertices = 10   Number of simplices = 82
-
-with Z/3Z coefficients:
-
-./Simplex_tree_example_from_cliques_of_graph ../../../data/points/Klein_bottle_complex.txt 3
-
-Insert the 1-skeleton in the simplex tree in 0 s.
-Expand the simplex tree in 0 s.
-Information of the Simplex Tree:
-  Number of vertices = 10   Number of simplices = 106
-
-*** Simplex_tree computed and displayed from a 3D alpha complex:
-    [ Requires CGAL, GMP and GMPXX to be installed]
-
-./Simplex_tree_example_alpha_shapes_3_from_off ../../../data/points/bunny_5000
diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h
index 0938f5c1..a1b104e2 100644
--- a/src/common/include/gudhi/reader_utils.h
+++ b/src/common/include/gudhi/reader_utils.h
@@ -14,7 +14,11 @@
 #include <gudhi/graph_simplicial_complex.h>
 #include <gudhi/Debug_utils.h>
 
-#include <boost/function_output_iterator.hpp>
+#if BOOST_VERSION < 106600
+# include <boost/function_output_iterator.hpp>
+#else
+# include <boost/iterator/function_output_iterator.hpp>
+#endif
 #include <boost/graph/adjacency_list.hpp>
 
 #include <iostream>
diff --git a/src/python/test/test_dtm.py b/src/python/test/test_dtm.py
index c29471cf..e46d616c 100755
--- a/src/python/test/test_dtm.py
+++ b/src/python/test/test_dtm.py
@@ -91,13 +91,11 @@ def test_density():
 
 def test_dtm_overflow_warnings():
     pts = numpy.array([[10., 100000000000000000000000000000.], [1000., 100000000000000000000000000.]])
-    impl_warn = ["keops", "hnsw"]
 
     with warnings.catch_warnings(record=True) as w:
-        for impl in impl_warn:
-            dtm = DistanceToMeasure(2, q=10000, implementation=impl)
-            r = dtm.fit_transform(pts)
-        assert len(w) == 2
-        for i in range(len(w)):
-            assert issubclass(w[i].category, RuntimeWarning)
-            assert "Overflow" in str(w[i].message)
+        # TODO Test "keops" implementation as well when next version of pykeops (current is 1.5) is released (should fix the problem (cf. issue #543))
+        dtm = DistanceToMeasure(2, implementation="hnsw")
+        r = dtm.fit_transform(pts)
+        assert len(w) == 1
+        assert issubclass(w[0].category, RuntimeWarning)
+        assert "Overflow" in str(w[0].message)