From 87b5938f411856e42ead118d4b6121174c77aad5 Mon Sep 17 00:00:00 2001
From: mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 23 Oct 2017 21:53:30 +0000
Subject: git-svn-id:
 svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2801
 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: a1cfabdf6c0eb9cfbbcdc4445438bdcd0b83df8f
---
 src/Nerve_GIC/include/gudhi/GIC.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/Nerve_GIC/include/gudhi/GIC.h')

diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h
index 0197f46f..e506cd9d 100644
--- a/src/Nerve_GIC/include/gudhi/GIC.h
+++ b/src/Nerve_GIC/include/gudhi/GIC.h
@@ -87,14 +87,17 @@ class Graph_induced_complex {
    std::map<Cover_t,int> cover_fct; // integer-valued function that allows to state if two elements of the cover are consecutive or not.
    std::map<Cover_t,std::pair<int,double> > cover_color; // size and coloring of the vertices of the output simplicial complex.
    Simplex_tree st;
+
    std::map<int,std::vector<int> > adjacency_matrix;
    std::vector<std::vector<double> > distances;
+
    int resolution_int = -1;
    double resolution_double = -1;
    double gain = -1;
    double rate_constant = 10; // Constant in the subsampling.
    double rate_power = 0.001; // Power in the subsampling.
    int mask = 0; // Ignore nodes containing less than mask points.
+
    std::map<int, double> func;
    std::map<int, double> func_color;
    std::vector<int> voronoi_subsamples;
@@ -238,7 +241,7 @@ class Graph_induced_complex {
  // *******************************************************************************************************************
 
  public: // Set graph from file.
-   /** \brief Creates the graph G from a file containing the edges.
+   /** \brief Creates a graph G from a file containing the edges.
     *
     * @param[in] graph_file_name name of the input graph file.
     * The graph file contains one edge per line,
@@ -258,8 +261,9 @@ class Graph_induced_complex {
 
    }
 
+
  public: // Set graph from OFF file.
-   /** \brief Creates the graph G from the triangulation given by the input .OFF file.
+   /** \brief Creates a graph G from the triangulation given by the input .OFF file.
     *
     */
    void set_graph_from_OFF(){
@@ -274,7 +278,7 @@ class Graph_induced_complex {
    }
 
  public: // Set graph from Rips complex.
-   /** \brief Creates the graph G from a Rips complex.
+   /** \brief Creates a graph G from a Rips complex.
     *
     * @param[in] threshold threshold value for the Rips complex.
     * @param[in] distance distance used to compute the Rips complex.
@@ -288,6 +292,8 @@ class Graph_induced_complex {
 
    }
 
+
+
  public: // Pairwise distances.
    /** \private \brief Computes all pairwise distances.
     */
@@ -325,7 +331,7 @@ class Graph_induced_complex {
    }
 
  public: // Automatic tuning of Rips complex.
-   /** \brief Creates the graph G from a Rips complex whose threshold value is automatically tuned with subsampling---see \cite Carriere17c.
+   /** \brief Creates a graph G from a Rips complex whose threshold value is automatically tuned with subsampling---see \cite Carriere17c.
     *
     * @param[in] distance distance between data points.
     * @param[in]  N number of subsampling iteration (the default reasonable value is 100, but there is no guarantee on how to choose it).
-- 
cgit v1.2.3