issue4 --max-iterations heremaps#66

Author: qGYdXbY2

include/tntn/TerraMesh.h

@@ -29,7 +29,7 @@ class TerraMesh : public TerraBaseMesh
                             const double no_data_value);
 
   public:
-    void greedy_insert(double max_error);
+    void greedy_insert(double max_error, int max_iterations);
     void scan_triangle(dt_ptr t) override;
     std::unique_ptr<Mesh> convert_to_mesh();
 };

include/tntn/terra_meshing.h

@@ -8,10 +8,10 @@
 
 namespace tntn {
 
-std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<RasterDouble> raster, double max_error);
+std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<RasterDouble> raster, double max_error, int max_iterations=0);
 
 std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<SurfacePoints> surface_points,
-                                         double max_error);
-std::unique_ptr<Mesh> generate_tin_terra(const SurfacePoints& surface_points, double max_error);
+                                         double max_error, int max_iterations=0);
+std::unique_ptr<Mesh> generate_tin_terra(const SurfacePoints& surface_points, double max_error, int max_iterations=0);
 
 } //namespace tntn

src/TerraMesh.cpp

@@ -13,7 +13,7 @@
 namespace tntn {
 namespace terra {
 
-void TerraMesh::greedy_insert(double max_error)
+void TerraMesh::greedy_insert(double max_error, int max_iterations)
 {
     m_max_error = max_error;
     m_counter = 0;
@@ -56,12 +56,14 @@ void TerraMesh::greedy_insert(double max_error)
         t = t->getLink();
     }
 
+    int iterations_count = 0;
     // Iterate until the error threshold is met
     while(!m_candidates.empty())
     {
         Candidate candidate = m_candidates.grab_greatest();
 
         if(candidate.importance < m_max_error) continue;
+        if(max_iterations && iterations_count >= max_iterations) continue;
 
         // Skip if the candidate is not the latest
         if(m_token.value(candidate.y, candidate.x) != candidate.token) continue;
@@ -70,6 +72,7 @@ void TerraMesh::greedy_insert(double max_error)
 
         //TNTN_LOG_DEBUG("inserting point: ({}, {}, {})", candidate.x, candidate.y, candidate.z);
         this->insert(glm::dvec2(candidate.x, candidate.y), candidate.triangle);
+        iterations_count++;
     }
 
     TNTN_LOG_INFO("finished greedy insertion");

src/cmd.cpp

@@ -287,6 +287,7 @@ static int subcommand_dem2tin(bool need_help,
         ("output", po::value<std::string>(), "output filename")
         ("output-format", po::value<std::string>()->default_value("auto"), "output file format, can be any of: auto, obj, off, terrain (quantized mesh), json/geojson")
         ("max-error", po::value<double>(), "max error parameter when using terra or zemlya method")
+        ("max-iterations", po::value<int>()->default_value(0), "max add point iterations when using terra or zemlya method")
         ("step", po::value<int>(), "grid spacing in pixels when using dense method")
 #if defined(TNTN_USE_ADDONS) && TNTN_USE_ADDONS
         ("threshold", po::value<double>(), "threshold when using curvature method")
@@ -363,6 +364,11 @@ static int subcommand_dem2tin(bool need_help,
 
     const auto t_start = std::chrono::high_resolution_clock::now();
 
+    if(method != "terra" && local_varmap.count("max-iterations"))
+    {
+        throw po::error("parameter --max-iterations implemented for terra method only");
+    }
+
     if(method == "terra" || method == "zemlya")
     {
         double max_error = raster->get_cell_size();
@@ -374,7 +380,7 @@ static int subcommand_dem2tin(bool need_help,
         if("terra" == method)
         {
             TNTN_LOG_INFO("performing terra meshing...");
-            mesh = generate_tin_terra(std::move(raster), max_error);
+            mesh = generate_tin_terra(std::move(raster), max_error, local_varmap["max-iterations"].as<int>());
         }
         else if("zemlya" == method)
         {

src/terra_meshing.cpp

@@ -5,34 +5,34 @@
 
 namespace tntn {
 
-std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<RasterDouble> raster, double max_error)
+std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<RasterDouble> raster, double max_error, int max_iterations)
 {
     TNTN_ASSERT(raster != nullptr);
     terra::TerraMesh g;
     g.load_raster(std::move(raster));
-    g.greedy_insert(max_error);
+    g.greedy_insert(max_error, max_iterations);
     return g.convert_to_mesh();
 }
 
 std::unique_ptr<Mesh> generate_tin_terra(std::unique_ptr<SurfacePoints> surface_points,
-                                         double max_error)
+                                         double max_error, int max_iterations)
 {
     auto raster = surface_points->to_raster();
     surface_points.reset();
 
     terra::TerraMesh g;
     g.load_raster(std::move(raster));
-    g.greedy_insert(max_error);
+    g.greedy_insert(max_error, max_iterations);
     return g.convert_to_mesh();
 }
 
-std::unique_ptr<Mesh> generate_tin_terra(const SurfacePoints& surface_points, double max_error)
+std::unique_ptr<Mesh> generate_tin_terra(const SurfacePoints& surface_points, double max_error, int max_iterations)
 {
     auto raster = surface_points.to_raster();
 
     terra::TerraMesh g;
     g.load_raster(std::move(raster));
-    g.greedy_insert(max_error);
+    g.greedy_insert(max_error, max_iterations);
     return g.convert_to_mesh();
 }