Commit to remove one file.

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

Former-commit-id: 5795ef0322c1ba328e8bee068009a27f18b7224c

2 files changed, 168 insertions, 9 deletions

diff --git a/src/common/include/gudhi/file_writer.h b/src/common/include/gudhi/file_writer.h
index 1b59ae46..53c83533 100644
--- a/src/common/include/gudhi/file_writer.h
+++ b/src/common/include/gudhi/file_writer.h
@@ -41,24 +41,24 @@ class Persistence_interval_common
 public:	
 	Persistence_interval_common( Filtration_type birth , Filtration_type death ):
 	birth_(birth),death_(death),dimension_(std::numeric_limits<unsigned>::max),
-	Arith_element_(std::numeric_limits<Coefficient_field>::max() ){} 
+	arith_element_(std::numeric_limits<Coefficient_field>::max() ){} 
 	
 	Persistence_interval_common( Filtration_type birth , Filtration_type death,
 	unsigned dim ):
 	birth_(birth),death_(death),dimension_(dim),
-	Arith_element_(std::numeric_limits<Coefficient_field>::max()){}
+	arith_element_(std::numeric_limits<Coefficient_field>::max()){}
 	
 	Persistence_interval_common( Filtration_type birth , Filtration_type death,
 	unsigned dim , Coefficient_field field ):
 	birth_(birth),death_(death),dimension_(dim),
-	Arith_element_(field){}
+	arith_element_(field){}
 	
 	
 	inline bool operator == ( const Persistence_interval_common &i2)
 	{
 		return ( 
 		        (this->birth_ == i2.birth_) && (this->death_ == i2.death_) && 
-		        (this->dimension_ == i2.dimension_) && (this->Arith_element_ == i2.Arith_element_)
+		        (this->dimension_ == i2.dimension_) && (this->arith_element_ == i2.arith_element_)
 		       );
 	}
 	
@@ -116,9 +116,9 @@ public:
 	
 	friend std::ostream& operator<<(std::ostream& out, const Persistence_interval_common& it)
 	{
-		if ( it.Arith_element_ != std::numeric_limits<Coefficient_field>::max() ) 
+		if ( it.arith_element_ != std::numeric_limits<Coefficient_field>::max() ) 
 		{
-			out << it.Arith_element_ << "  ";	
+			out << it.arith_element_ << "  ";	
 		}		
 		if ( it.dimension_ != std::numeric_limits<unsigned>::max() )
 		{
@@ -132,7 +132,7 @@ private:
 	Filtration_type birth_;
 	Filtration_type death_;
 	unsigned dimension_;
-	Coefficient_field Arith_element_;
+	Coefficient_field arith_element_;
 };//Persistence_interval_common
 
 
@@ -141,12 +141,13 @@ private:
 **/ 
 template <typename Filtration_type , typename Coefficient_field>
 void write_persistence_intervals_to_stream( 
-const std::vector< Persistence_interval_common<Filtration_type,Coefficient_field> >& intervals,
+//const std::vector< Persistence_interval_common<Filtration_type,Coefficient_field> >& intervals,
+
                                           std::ostream& out = std::cout )
 {
 	for ( auto interval : intervals )
 	{
-		out << interval << std::endl;
+		out << interval << "\n";
 	}
 }//write_persistence_intervals_to_stream
 
diff --git a/src/common/include/gudhi/writing_persistence_to_file.h b/src/common/include/gudhi/writing_persistence_to_file.h
new file mode 100644
index 00000000..53c83533
--- /dev/null
+++ b/src/common/include/gudhi/writing_persistence_to_file.h
@@ -0,0 +1,158 @@
+/*    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):       Pawel Dlotko
+ *
+ *    Copyright (C) 2017  Swansea University, UK
+ *
+ *    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/>.
+ */
+
+#ifndef FILE_WRITER_
+#define FILE_WRITER_
+
+#include <iostream>
+#include <string>
+#include <limits>
+
+namespace Gudhi {
+
+
+/**
+* This is a class to store persistence intervals. Its main purpose is to 
+* exchange data in between different packages and provide unified way
+* of writing a collection of persistence intervals to file. 
+**/
+template <typename Filtration_type , typename Coefficient_field>
+class Persistence_interval_common
+{
+public:	
+	Persistence_interval_common( Filtration_type birth , Filtration_type death ):
+	birth_(birth),death_(death),dimension_(std::numeric_limits<unsigned>::max),
+	arith_element_(std::numeric_limits<Coefficient_field>::max() ){} 
+	
+	Persistence_interval_common( Filtration_type birth , Filtration_type death,
+	unsigned dim ):
+	birth_(birth),death_(death),dimension_(dim),
+	arith_element_(std::numeric_limits<Coefficient_field>::max()){}
+	
+	Persistence_interval_common( Filtration_type birth , Filtration_type death,
+	unsigned dim , Coefficient_field field ):
+	birth_(birth),death_(death),dimension_(dim),
+	arith_element_(field){}
+	
+	
+	inline bool operator == ( const Persistence_interval_common &i2)
+	{
+		return ( 
+		        (this->birth_ == i2.birth_) && (this->death_ == i2.death_) && 
+		        (this->dimension_ == i2.dimension_) && (this->arith_element_ == i2.arith_element_)
+		       );
+	}
+	
+	inline bool operator != ( const Persistence_interval_common &i2)
+	{
+		return (!((*this)==i2));
+	}
+	
+	
+	/**
+	 * Note that this operator do not take Arith_element into account when doing comparisions.
+	**/ 
+	inline bool operator < ( const Persistence_interval_common &i2)
+	{				
+		if ( this->birth_ < i2.birth_ )
+		{
+			return true;
+		}
+		else
+		{
+			if ( this->birth_ > i2.birth_ )
+			{
+				return false;
+			}
+			else
+			{
+				//in this case this->birth_ == i2.birth_
+				if ( this->death_ > i2.death_ )
+				{
+					return true;
+				}
+				else
+				{
+					if ( this->death_ < i2.death_ )
+					{
+						return false;
+					}
+					else
+					{
+						//in this case this->death_ == i2.death_
+						if ( this->dimension_ < i2.dimension_ )
+						{
+							return true;
+						}
+						else
+						{
+							//in this case this->dimension >= i2.dimension
+							return false;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	friend std::ostream& operator<<(std::ostream& out, const Persistence_interval_common& it)
+	{
+		if ( it.arith_element_ != std::numeric_limits<Coefficient_field>::max() ) 
+		{
+			out << it.arith_element_ << "  ";	
+		}		
+		if ( it.dimension_ != std::numeric_limits<unsigned>::max() )
+		{
+			out << it.dimension_ << " ";
+		}				
+		out << it.birth_ << " " << it.death_ << " ";				
+		return out;
+	}
+	
+private:
+	Filtration_type birth_;
+	Filtration_type death_;
+	unsigned dimension_;
+	Coefficient_field arith_element_;
+};//Persistence_interval_common
+
+
+/**
+ * This function write a vector<Persistence_interval_common> to a stream
+**/ 
+template <typename Filtration_type , typename Coefficient_field>
+void write_persistence_intervals_to_stream( 
+//const std::vector< Persistence_interval_common<Filtration_type,Coefficient_field> >& intervals,
+
+                                          std::ostream& out = std::cout )
+{
+	for ( auto interval : intervals )
+	{
+		out << interval << "\n";
+	}
+}//write_persistence_intervals_to_stream
+
+
+
+}
+
+#endif //FILE_WRITER_