summaryrefslogtreecommitdiff
path: root/src/Gudhi_stat/include
diff options
context:
space:
mode:
authorpdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-04-07 09:10:52 +0000
committerpdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-04-07 09:10:52 +0000
commitca2ad986b9925ab7006597f0f7045f7be47a42b2 (patch)
tree83ac514bafc26903ab8d677c1221edfc72a0d991 /src/Gudhi_stat/include
parent00c36cb49bc55d93edadad6b865ffc42118ea148 (diff)
Answers to Marc's comments
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2317 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f941a6b20210282408d0ef95b84daa973add2513
Diffstat (limited to 'src/Gudhi_stat/include')
-rw-r--r--src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h
index 422699ef..b70ef1d9 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h
+++ b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h
@@ -313,8 +313,11 @@ public:
//compute the value of the linear function parametrized by line on a point x:
return line.first*x+line.second;
}
+
+ protected:
+ template < typename oper > friend Persistence_landscape_on_grid operation_on_pair_of_landscapes_on_grid( const Persistence_landscape_on_grid& land1 , const Persistence_landscape_on_grid& land2 );
-
+ public:
/**
*\private A function that compute sum of two landscapes.
**/
@@ -1024,8 +1027,7 @@ protected:
this->number_of_functions_for_projections_to_reals = this->values_of_landscapes.size();
}
- void set_up_values_of_landscapes( const std::vector< std::pair< double , double > >& p , double grid_min_ , double grid_max_ , size_t number_of_points_ );
- template < typename oper > friend Persistence_landscape_on_grid operation_on_pair_of_landscapes_on_grid( const Persistence_landscape_on_grid& land1 , const Persistence_landscape_on_grid& land2 );
+ void set_up_values_of_landscapes( const std::vector< std::pair< double , double > >& p , double grid_min_ , double grid_max_ , size_t number_of_points_ );
Persistence_landscape_on_grid multiply_lanscape_by_real_number_not_overwrite( double x )const;
};