summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-01-20 10:43:59 +0000
committerskachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-01-20 10:43:59 +0000
commitd13a8867ca368b1f56be3ba151d2042728fb4754 (patch)
treee51fcea7c1d4fc53cd23b5dd91c1d61074928d1f /src
parent9bb012812fe7789fe5cc8cb5cd0aa4212e0af221 (diff)
Almost all Vincent's remarks
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@982 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 32564e3521e0807e26bd2c07d682751a3d47e6da
Diffstat (limited to 'src')
-rw-r--r--src/Witness_complex/example/witness_complex_sphere.cpp34
-rw-r--r--src/Witness_complex/test/simple_witness_complex.cpp4
-rw-r--r--src/Witness_complex/test/witness_complex_points.cpp4
3 files changed, 7 insertions, 35 deletions
diff --git a/src/Witness_complex/example/witness_complex_sphere.cpp b/src/Witness_complex/example/witness_complex_sphere.cpp
index d73445b9..9dc458d4 100644
--- a/src/Witness_complex/example/witness_complex_sphere.cpp
+++ b/src/Witness_complex/example/witness_complex_sphere.cpp
@@ -41,36 +41,9 @@ using namespace Gudhi;
using namespace Gudhi::witness_complex;
typedef std::vector< Vertex_handle > typeVectorVertex;
-//typedef std::vector< std::vector <double> > Point_Vector;
typedef Witness_complex< Simplex_tree<> > WitnessComplex;
-/**
- * \brief Customized version of read_points
- * which takes into account a possible nbP first line
- *
- */
-inline void
-read_points_cust ( std::string file_name , std::vector< std::vector< double > > & points)
-{
- std::ifstream in_file (file_name.c_str(),std::ios::in);
- if(!in_file.is_open())
- {
- std::cerr << "Unable to open file " << file_name << std::endl;
- return;
- }
- std::string line;
- double x;
- while( getline ( in_file , line ) )
- {
- std::vector< double > point;
- std::istringstream iss( line );
- while(iss >> x) { point.push_back(x); }
- if (point.size() != 1)
- points.push_back(point);
- }
- in_file.close();
-}
/** Write a gnuplot readable file.
* Data range is a random access range of pairs (arg, value)
@@ -86,15 +59,14 @@ void write_data( Data_range & data, std::string filename )
int main (int argc, char * const argv[])
{
- if (argc != 3)
+ if (argc != 2)
{
std::cerr << "Usage: " << argv[0]
- << " path_to_point_file nbL \n";
+ << " nbL \n";
return 0;
}
- std::string file_name = argv[1];
- int nbL = atoi(argv[2]);
+ int nbL = atoi(argv[1]);
clock_t start, end;
// Construct the Simplex Tree
diff --git a/src/Witness_complex/test/simple_witness_complex.cpp b/src/Witness_complex/test/simple_witness_complex.cpp
index 86f5bcd1..7735ca6f 100644
--- a/src/Witness_complex/test/simple_witness_complex.cpp
+++ b/src/Witness_complex/test/simple_witness_complex.cpp
@@ -2,9 +2,9 @@
* (Geometric Understanding in Higher Dimensions) is a generic C++
* library for computational topology.
*
- * Author(s): Vincent Rouvreau
+ * Author(s): Siargey Kachanovich
*
- * Copyright (C) 2014 INRIA Sophia Antipolis-Méditerranée (France)
+ * Copyright (C) 2016 INRIA Sophia Antipolis-Méditerranée (France)
*
* 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
diff --git a/src/Witness_complex/test/witness_complex_points.cpp b/src/Witness_complex/test/witness_complex_points.cpp
index e9fac9b8..3850bd82 100644
--- a/src/Witness_complex/test/witness_complex_points.cpp
+++ b/src/Witness_complex/test/witness_complex_points.cpp
@@ -2,9 +2,9 @@
* (Geometric Understanding in Higher Dimensions) is a generic C++
* library for computational topology.
*
- * Author(s): Vincent Rouvreau
+ * Author(s): Siargey Kachanovich
*
- * Copyright (C) 2014 INRIA Sophia Antipolis-Méditerranée (France)
+ * Copyright (C) 2016 INRIA Sophia Antipolis-Méditerranée (France)
*
* 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