From 6c17494e02721ca826750155bac14c7f91a173fa Mon Sep 17 00:00:00 2001
From: yuichi-ike <yuichi.ike.1990@gmail.com>
Date: Tue, 12 May 2020 09:37:32 +0900
Subject: reference and comments added

---
 biblio/bibliography.bib                   | 26 ++++++++++++++++++++++++++
 src/python/CMakeLists.txt                 |  4 +++-
 src/python/doc/rips_complex_ref.rst       |  4 +++-
 src/python/gudhi/weighted_rips_complex.py |  6 +++---
 src/python/test/test_weighted_rips.py     |  4 ++--
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/biblio/bibliography.bib b/biblio/bibliography.bib
index 99a15c5e..f405b9bb 100644
--- a/biblio/bibliography.bib
+++ b/biblio/bibliography.bib
@@ -1247,3 +1247,29 @@ year = "2011"
   year={2014},
   publisher={Springer}
 }
+
+@inproceedings{dtmfiltrations,
+  author    = {Hirokazu Anai and
+               Fr{\'{e}}d{\'{e}}ric Chazal and
+               Marc Glisse and
+               Yuichi Ike and
+               Hiroya Inakoshi and
+               Rapha{\"{e}}l Tinarrage and
+               Yuhei Umeda},
+  editor    = {Gill Barequet and
+               Yusu Wang},
+  title     = {DTM-Based Filtrations},
+  booktitle = {35th International Symposium on Computational Geometry, SoCG 2019,
+               June 18-21, 2019, Portland, Oregon, {USA}},
+  series    = {LIPIcs},
+  volume    = {129},
+  pages     = {58:1--58:15},
+  publisher = {Schloss Dagstuhl - Leibniz-Zentrum f{\"{u}}r Informatik},
+  year      = {2019},
+  url       = {https://doi.org/10.4230/LIPIcs.SoCG.2019.58},
+  doi       = {10.4230/LIPIcs.SoCG.2019.58},
+  timestamp = {Tue, 11 Feb 2020 15:52:14 +0100},
+  biburl    = {https://dblp.org/rec/conf/compgeom/AnaiCGIITU19.bib},
+  bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index adf4923b..0aa55467 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -487,7 +487,9 @@ if(PYTHONINTERP_FOUND)
     endif()
 
     # Weighted Rips
-    add_gudhi_py_test(test_weighted_rips)
+    if(SCIPY_FOUND)
+      add_gudhi_py_test(test_weighted_rips)
+    endif()
 
     # Set missing or not modules
     set(GUDHI_MODULES ${GUDHI_MODULES} "python" CACHE INTERNAL "GUDHI_MODULES")
diff --git a/src/python/doc/rips_complex_ref.rst b/src/python/doc/rips_complex_ref.rst
index 8fc7e1b0..3c25564a 100644
--- a/src/python/doc/rips_complex_ref.rst
+++ b/src/python/doc/rips_complex_ref.rst
@@ -25,7 +25,7 @@ Weighted Rips complex reference manual
    .. automethod:: gudhi.WeightedRipsComplex.__init__
 
 Basic examples
--------------
+--------------
 
 The following example computes the weighted Rips filtration associated with a distance matrix and weights on vertices.
 
@@ -60,6 +60,8 @@ Combining with DistanceToMeasure, one can compute the DTM-filtration of a point
     st = w_rips.create_simplex_tree(max_dimension=2)
     print(st.persistence())
 
+The output is:
+
 .. testoutput::
 
     [(0, (3.1622776601683795, inf)), (0, (3.1622776601683795, 5.39834563766817)), (0, (3.1622776601683795, 5.39834563766817))]
diff --git a/src/python/gudhi/weighted_rips_complex.py b/src/python/gudhi/weighted_rips_complex.py
index 7401c428..bccac1ff 100644
--- a/src/python/gudhi/weighted_rips_complex.py
+++ b/src/python/gudhi/weighted_rips_complex.py
@@ -12,9 +12,9 @@ from gudhi import SimplexTree
 class WeightedRipsComplex:
     """
     Class to generate a weighted Rips complex from a distance matrix and weights on vertices, 
-    in the way described in the paper 'DTM-based filtrations' https://arxiv.org/abs/1811.04757.
-    Remark that the filtration value of a vertex is twice of its weight for the consistency with 
-    RipsComplex, which is different from the definition in the paper.
+    in the way described in :cite:`dtmfiltrations`.
+    Remark that all the filtration values of vertices are twice of the given weights for the consistency 
+    with RipsComplex, which is different from the definition in the paper.
     """
     def __init__(self, 
                 distance_matrix, 
diff --git a/src/python/test/test_weighted_rips.py b/src/python/test/test_weighted_rips.py
index 59ec022a..7ef48333 100644
--- a/src/python/test/test_weighted_rips.py
+++ b/src/python/test/test_weighted_rips.py
@@ -35,8 +35,8 @@ def test_compatibility_with_rips():
         ([0, 2], 1.0),
         ([1, 3], 1.0),
         ([2, 3], 1.0),
-        ([1, 2], 1.4142135623730951),
-        ([0, 3], 1.4142135623730951),
+        ([1, 2], sqrt(2)),
+        ([0, 3], sqrt(2)),
     ]
 
 def test_compatibility_with_filtered_rips():
-- 
cgit v1.2.3