Fix #include and remove use of deprecated functions

DGtal-team · Mar 4, 2025 · 9cf757f · 9cf757f
1 parent d5fbc79
commit 9cf757f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/examples/geometry/curves/estimation/exampleCurvature.cpp b/examples/geometry/curves/estimation/exampleCurvature.cpp
@@ -99,7 +99,7 @@ estimatorOnShapeDigitization( const string& name,
       Surfaces<KSpace>::track2DBoundaryPoints( points, K, SAdj, dig, bel );
       // Create GridCurve
       GridCurve<KSpace> gridcurve( K );
-      gridcurve.initFromVector( points );
+      gridcurve.initFromPointsVector( points );
       // Create range of incident points
       typedef GridCurve<KSpace>::IncidentPointsRange Range;
       typedef Range::ConstIterator ClassicIterator;

diff --git a/examples/geometry/volumes/fullConvexityAnalysis3D.cpp b/examples/geometry/volumes/fullConvexityAnalysis3D.cpp
@@ -123,7 +123,7 @@ struct Analyzer {
   template < typename ImagePtr >
   static
   std::vector<int>
-  run( const KSpace& aK, std::vector<Point> pts, ImagePtr bimage )
+  run( const KSpace& aK, const std::vector<Point>& pts, ImagePtr bimage )
   {
     NCA nca( aK.lowerBound(), aK.upperBound(), 0 );
     // KSpace::dimension <= 2 ? 0 : 10000*KSpace::dimension*N );
@@ -161,7 +161,7 @@ struct Analyzer {
   static
   void
   run( std::vector<int> & to_update,
-       const KSpace& aK, std::vector<Point> pts, ImagePtr bimage )
+       const KSpace& aK, const std::vector<Point>& pts, ImagePtr bimage )
   {
     NCA nca( aK.lowerBound(), aK.upperBound() );
     // KSpace::dimension <= 2 ? 0 : 10000*KSpace::dimension*N );
@@ -202,11 +202,11 @@ struct MultiScaleAnalyzer {
   static
   std::vector< Geometry >
   multiscale_run( const KSpace& aK,
-                  std::vector<Point> pts,
+                  const std::vector<Point>& pts,
                   ImagePtr bimage )
   {
     auto prev_geometry
-      = MultiScaleAnalyzer< KSpace, N-1>::multiscale_run( ak, pts, bimage );
+      = MultiScaleAnalyzer< KSpace, N-1>::multiscale_run( aK, pts, bimage );
     trace.info() << "------- Analyzing scale " << N << " --------" << std::endl;
     std::vector< int > geom( prev_geometry.size() );
     for ( int i = 0; i < geom.size(); i++ )
@@ -231,7 +231,7 @@ struct MultiScaleAnalyzer< KSpace, 0 > {
   static
   std::vector< Geometry >
   multiscale_run( const KSpace& aK,
-                  std::vector<Point> pts,
+                  const std::vector<Point>& pts,
                   ImagePtr bimage )
   {
     ((void) aK);

diff --git a/examples/tutorial-examples/shapeGridCurveEstimator.cpp b/examples/tutorial-examples/shapeGridCurveEstimator.cpp
@@ -102,7 +102,7 @@ int main()
 
   //! [shapeGridCurveEstimator-instantiation]
   Z2i::Curve c;
-  c.initFromVector( boundaryPoints );  
+  c.initFromPointsVector( boundaryPoints );  
   //! [shapeGridCurveEstimator-instantiation]
 
   DGtal::Board2D aBoard;
@@ -147,7 +147,7 @@ int main()
   Surfaces<Z2i::KSpace>
     ::track2DBoundaryPoints( boundaryPoints, ks, sAdj, dig, bel );
   //reset grid curve and its points range
-  c.initFromVector( boundaryPoints );
+  c.initFromPointsVector( boundaryPoints );
   Range r2 = c.getPointsRange(); 
   //estimate length
   double length2 = DSSlength.eval(r2.c(), r2.c(), h);

diff --git a/tests/graph/testExpander-benchmark.cpp b/tests/graph/testExpander-benchmark.cpp
@@ -37,7 +37,6 @@
 #include "DGtal/kernel/sets/DigitalSetSelector.h"
 #include "DGtal/kernel/sets/DigitalSetConverter.h"
 #include "DGtal/topology/MetricAdjacency.h"
-#include "DGtal/topology/DomainMetricAdjacency.h"
 #include "DGtal/topology/DomainAdjacency.h"
 #include "DGtal/topology/DigitalTopology.h"
 #include "DGtal/topology/Object.h"

diff --git a/tests/topology/testObject-benchmark.cpp b/tests/topology/testObject-benchmark.cpp
@@ -38,7 +38,6 @@
 #include "DGtal/kernel/sets/DigitalSetSelector.h"
 #include "DGtal/kernel/sets/DigitalSetConverter.h"
 #include "DGtal/topology/MetricAdjacency.h"
-#include "DGtal/topology/DomainMetricAdjacency.h"
 #include "DGtal/topology/DomainAdjacency.h"
 #include "DGtal/topology/DigitalTopology.h"
 #include "DGtal/topology/Object.h"

diff --git a/tests/topology/testObject.cpp b/tests/topology/testObject.cpp
@@ -39,7 +39,6 @@
 #include "DGtal/kernel/sets/DigitalSetSelector.h"
 #include "DGtal/kernel/sets/DigitalSetConverter.h"
 #include "DGtal/topology/MetricAdjacency.h"
-#include "DGtal/topology/DomainMetricAdjacency.h"
 #include "DGtal/topology/DomainAdjacency.h"
 #include "DGtal/topology/DigitalTopology.h"
 #include "DGtal/topology/Object.h"

diff --git a/tests/topology/testObjectBorder.cpp b/tests/topology/testObjectBorder.cpp
@@ -37,7 +37,6 @@
 #include "DGtal/kernel/sets/DigitalSetSelector.h"
 #include "DGtal/kernel/sets/DigitalSetConverter.h"
 #include "DGtal/topology/MetricAdjacency.h"
-#include "DGtal/topology/DomainMetricAdjacency.h"
 #include "DGtal/topology/DomainAdjacency.h"
 #include "DGtal/topology/DigitalTopology.h"
 #include "DGtal/topology/Object.h"

diff --git a/tests/topology/testSimpleExpander.cpp b/tests/topology/testSimpleExpander.cpp
@@ -36,7 +36,6 @@
 #include "DGtal/kernel/sets/DigitalSetSelector.h"
 #include "DGtal/kernel/sets/DigitalSetConverter.h"
 #include "DGtal/topology/MetricAdjacency.h"
-#include "DGtal/topology/DomainMetricAdjacency.h"
 #include "DGtal/topology/DomainAdjacency.h"
 #include "DGtal/topology/DigitalTopology.h"
 #include "DGtal/topology/Object.h"