1 files changed, 55 insertions, 72 deletions

diff --git a/src/Persistence_representations/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp b/src/Persistence_representations/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
index 27a7836f..cfa209d1 100644
--- a/src/Persistence_representations/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
+++ b/src/Persistence_representations/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
@@ -20,89 +20,72 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <gudhi/Persistence_heat_maps.h>
 
-
-
 using namespace Gudhi;
 using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
 
+int main(int argc, char** argv) {
+  std::cout << "This program compute distance of persistence heat maps stored in a file (the file needs to be created "
+               "beforehand). \n";
+  std::cout << "The first parameter of a program is an integer p. The program compute L^p distance of the two heat "
+               "maps. For L^infty distance choose p = -1. \n";
+  std::cout << "The remaining parameters of this programs are names of files with persistence heat maps.\n";
 
-int main( int argc , char** argv )
-{
-	std::cout << "This program compute distance of persistence heat maps stored in a file (the file needs to be created beforehand). \n";	
-	std::cout << "The first parameter of a program is an integer p. The program compute L^p distance of the two heat maps. For L^infty distance choose p = -1. \n";
-	std::cout << "The remaining parameters of this programs are names of files with persistence heat maps.\n";
-	
-	if ( argc < 3 )
-	{
-		std::cout << "Wrong number of parameters, the program will now terminate \n";
-		return 1;
-	}
-	
-	int pp = atoi( argv[1] );
-	double p = std::numeric_limits<double>::max();
-	if ( pp != -1 )
-	{
-		p = pp;
-	}
-	
+  if (argc < 3) {
+    std::cout << "Wrong number of parameters, the program will now terminate \n";
+    return 1;
+  }
 
-	std::vector< const char* > filenames;
-	for ( int i = 2 ; i < argc ; ++i )
-	{
-		filenames.push_back( argv[i] );
-	}
-	std::vector< Persistence_heat_maps<constant_scaling_function> > maps;
-	maps.reserve( filenames.size() );
-	for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no )
-	{
-		Persistence_heat_maps<constant_scaling_function> l;
-		l.load_from_file( filenames[file_no] );
-		maps.push_back( l );
-	}
-		
-	//and now we will compute the scalar product of landscapes.
-	
-	//first we prepare an array:
-	std::vector< std::vector< double > > distance( filenames.size() );
-	for ( size_t i = 0 ; i != filenames.size() ; ++i )
-	{
-		std::vector< double > v( filenames.size() , 0 );
-		distance[i] = v;
-	}
-	
-	//and now we can compute the distances:
-	for ( size_t i = 0 ; i != filenames.size() ; ++i )
-	{
-		for ( size_t j = i ; j != filenames.size() ; ++j )
-		{
-			distance[i][j] = distance[j][i] = maps[i].distance( maps[j] , p ) ;
-		}
-	}
-	
-	//and now output the result to the screen and a file:
-	std::ofstream out;
-	out.open( "distance" );
-	for ( size_t i = 0 ; i != distance.size() ; ++i )
-	{
-		for ( size_t j = 0 ; j != distance.size() ; ++j )
-		{
-			std::cout << distance[i][j] << " ";
-			out << distance[i][j] << " ";
-		}
-		std::cout << std::endl;
-		out << std::endl;
-	}
-	out.close();
-		
-	return 0;
-}
+  int pp = atoi(argv[1]);
+  double p = std::numeric_limits<double>::max();
+  if (pp != -1) {
+    p = pp;
+  }
 
+  std::vector<const char*> filenames;
+  for (int i = 2; i < argc; ++i) {
+    filenames.push_back(argv[i]);
+  }
+  std::vector<Persistence_heat_maps<constant_scaling_function> > maps;
+  maps.reserve(filenames.size());
+  for (size_t file_no = 0; file_no != filenames.size(); ++file_no) {
+    Persistence_heat_maps<constant_scaling_function> l;
+    l.load_from_file(filenames[file_no]);
+    maps.push_back(l);
+  }
 
+  // and now we will compute the scalar product of landscapes.
 
+  // first we prepare an array:
+  std::vector<std::vector<double> > distance(filenames.size());
+  for (size_t i = 0; i != filenames.size(); ++i) {
+    std::vector<double> v(filenames.size(), 0);
+    distance[i] = v;
+  }
 
+  // and now we can compute the distances:
+  for (size_t i = 0; i != filenames.size(); ++i) {
+    for (size_t j = i; j != filenames.size(); ++j) {
+      distance[i][j] = distance[j][i] = maps[i].distance(maps[j], p);
+    }
+  }
+
+  // and now output the result to the screen and a file:
+  std::ofstream out;
+  out.open("distance");
+  for (size_t i = 0; i != distance.size(); ++i) {
+    for (size_t j = 0; j != distance.size(); ++j) {
+      std::cout << distance[i][j] << " ";
+      out << distance[i][j] << " ";
+    }
+    std::cout << std::endl;
+    out << std::endl;
+  }
+  out.close();
+
+  return 0;
+}