adding cmakefile + a few changes into .h files of thelibrary.

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

Former-commit-id: 97c6cfeb7e11e7ab4a02db022b11c909ce47307a

2 files changed, 24 insertions, 10 deletions

diff --git a/src/Gudhi_stat/example/CMakeLists.txt b/src/Gudhi_stat/example/CMakeLists.txt
index b0c3b15f..d963259c 100644
--- a/src/Gudhi_stat/example/CMakeLists.txt
+++ b/src/Gudhi_stat/example/CMakeLists.txt
@@ -86,6 +86,19 @@ target_link_libraries(utilities/persistence_heat_maps/compute_distance_of_persis
 add_executable ( utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp )
 target_link_libraries(utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
 
+add_executable ( utilities/persistence_heat_maps/create_pssk utilities/persistence_heat_maps/create_pssk.cpp )
+target_link_libraries(utilities/persistence_heat_maps/create_pssk ${Boost_SYSTEM_LIBRARY})
+
+add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp )
+target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+
+add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp )
+target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+
+add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp )
+target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY})
+
+
 #persitence vectors
 add_executable ( utilities/persistence_vectors/average_persistence_vectors utilities/persistence_vectors/average_persistence_vectors.cpp )
 target_link_libraries(utilities/persistence_vectors/average_persistence_vectors ${Boost_SYSTEM_LIBRARY})
@@ -104,17 +117,18 @@ target_link_libraries(utilities/persistence_vectors/plot_persistence_vectors ${B
 
 
 #PSSK
-add_executable ( utilities/PSSK/average_pssk utilities/PSSK/average_pssk.cpp )
-target_link_libraries(utilities/PSSK/average_pssk ${Boost_SYSTEM_LIBRARY})
+#seems that this is not needed, since the only difference is the creation. The rest works the same as in the persitence heat maps. So, I have moved the creation of PSSK into the persitence heat maps folder, and use the methos from over there.
+#add_executable ( utilities/PSSK/average_pssk utilities/PSSK/average_pssk.cpp )
+#target_link_libraries(utilities/PSSK/average_pssk ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( utilities/PSSK/create_pssk utilities/PSSK/create_pssk.cpp )
-target_link_libraries(utilities/PSSK/create_pssk ${Boost_SYSTEM_LIBRARY})
+#add_executable ( utilities/PSSK/create_pssk utilities/PSSK/create_pssk.cpp )
+#target_link_libraries(utilities/PSSK/create_pssk ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( utilities/PSSK/plot_pssk utilities/PSSK/plot_pssk.cpp )
-target_link_libraries(utilities/PSSK/plot_pssk ${Boost_SYSTEM_LIBRARY})
+#add_executable ( utilities/PSSK/plot_pssk utilities/PSSK/plot_pssk.cpp )
+#target_link_libraries(utilities/PSSK/plot_pssk ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( utilities/PSSK/compute_distance_of_pssk utilities/PSSK/compute_distance_of_pssk.cpp )
-target_link_libraries(utilities/PSSK/compute_distance_of_pssk ${Boost_SYSTEM_LIBRARY})
+#add_executable ( utilities/PSSK/compute_distance_of_pssk utilities/PSSK/compute_distance_of_pssk.cpp )
+#target_link_libraries(utilities/PSSK/compute_distance_of_pssk ${Boost_SYSTEM_LIBRARY})
 
 add_executable ( utilities/PSSK/compute_scalar_product_of_pssk utilities/PSSK/compute_scalar_product_of_pssk.cpp )
 target_link_libraries(utilities/PSSK/compute_scalar_product_of_pssk ${Boost_SYSTEM_LIBRARY})
diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h
index 9d00a221..afb0da87 100644
--- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h
+++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h
@@ -459,7 +459,7 @@ Persistence_heat_maps::Persistence_heat_maps( const std::vector< std::pair< doub
 											  double (*scalling_function_with_respect_to_distance_from_diagonal)( const std::pair< double , double >& point_in_diagram ), 
 											  bool erase_below_diagonal , size_t number_of_pixels , double min_ , double max_ )
 {
-    this->construct( interval ,  filter ,  constant_function, erase_below_diagonal , number_of_pixels , min_ , max_ );
+    this->construct( interval ,  filter ,  scalling_function_with_respect_to_distance_from_diagonal, erase_below_diagonal , number_of_pixels , min_ , max_ );
     this->set_up_parameters_for_basic_classes();
 }
 
@@ -470,7 +470,7 @@ Persistence_heat_maps::Persistence_heat_maps( const char* filename ,
 											  bool erase_below_diagonal , size_t number_of_pixels  , double min_ , double max_ )
 {    
     std::vector< std::pair< double , double > > intervals_ = read_standard_file( filename );           
-    this->construct( intervals_ ,  filter ,  constant_function, erase_below_diagonal , number_of_pixels , min_ , max_ );
+    this->construct( intervals_ ,  filter ,  scalling_function_with_respect_to_distance_from_diagonal, erase_below_diagonal , number_of_pixels , min_ , max_ );
     this->set_up_parameters_for_basic_classes();
 }