diff options
| author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-14 09:35:54 +0000 |
|---|---|---|
| committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-14 09:35:54 +0000 |
| commit | a4db38fd615f1734f9f9e471269b26c7d767711b (patch) | |
| tree | c745a63fe4e579717f372068eb982a292ffc09ed /src | |
| parent | 375da40ba172fe6836ca0c70abda8146861e87a5 (diff) | |
another try to fix it on osx
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2351 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 975486207cf5d63921e0153b61352034cc4b279e
Diffstat (limited to 'src')
| -rw-r--r-- | src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h | 11 |
1 files changed, 9 insertions, 2 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 aafc4b9b..2e1fb56d 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 @@ -10,6 +10,7 @@ * 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 @@ -48,6 +49,11 @@ namespace Gudhi namespace Gudhi_stat { +//predeclaration +class Persistence_landscape_on_grid; +template < typename operation > +Persistence_landscape_on_grid operation_on_pair_of_landscapes_on_grid( const Persistence_landscape_on_grid& land1 , const Persistence_landscape_on_grid& land2 ); + /** * A clas implementing persistence landascpes by approximating them on a collection of grid points. * Persistence landscapes on grid allow vertorization, computations of distances, computations * of projections to Real, computations of averages and scalar products. Therefore they implement suitable interfaces. @@ -281,6 +287,9 @@ public: } return out; } + + 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 ); /** @@ -344,8 +353,6 @@ public: 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: /** |