demo L2 switch to class interface

CGAL · Aug 16, 2017 · a3a799a · a3a799a
1 parent 279459c
commit a3a799a
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 16 deletions.
diff --git a/Surface_mesh_approximation/demo/Surface_mesh_approximation/Scene.cpp b/Surface_mesh_approximation/demo/Surface_mesh_approximation/Scene.cpp
@@ -140,6 +140,25 @@ int Scene::open(QString filename)
   }
   m_point_pmap = get(boost::vertex_point, const_cast<Polyhedron_3 &>(*m_pmesh));
 
+  if (m_pl21_metric)
+    delete m_pl21_metric;
+  if (m_pl21_proxy_fitting)
+    delete m_pl21_proxy_fitting;
+  if (m_pl2_metric)
+    delete m_pl2_metric;
+  if (m_pl2_proxy_fitting)
+    delete m_pl2_proxy_fitting;
+
+  m_pl21_metric = new L21Metric(m_normal_pmap, m_area_pmap);
+  m_pl21_proxy_fitting = new L21ProxyFitting(m_normal_pmap, m_area_pmap);
+  m_pl2_metric = new L2Metric(*m_pmesh, m_area_pmap);
+  m_pl2_proxy_fitting = new L2ProxyFitting(*m_pmesh);
+
+  m_vsa_l21.set_error_metric(*m_pl21_metric);
+  m_vsa_l21.set_proxy_fitting(*m_pl21_proxy_fitting);
+  m_vsa_l2.set_error_metric(*m_pl2_metric);
+  m_vsa_l2.set_proxy_fitting(*m_pl2_proxy_fitting);
+
   m_view_polyhedron = true;
 
   QApplication::restoreOverrideCursor();
@@ -256,23 +275,36 @@ void Scene::l2_approximation(
   if(!m_pmesh)
     return;
 
-  std::cout << "L2 VSA..." << std::endl;
+  std::cout << "L2 VSA class interface..." << std::endl;
 
   m_tris.clear();
   m_anchor_pos.clear();
   m_anchor_vtx.clear();
-  CGAL::vsa_mesh_approximation(init, *m_pmesh,
-    num_proxies,
-    num_iterations,
-    m_fidx_pmap,
-    m_point_pmap,
-    m_tris,
-    m_anchor_pos,
-    m_anchor_vtx,
-    m_bdrs,
-    PCAPlaneFitting(*m_pmesh),
-    L2Metric(*m_pmesh, m_area_pmap),
-    L2ProxyFitting(*m_pmesh));
+
+  m_vsa_l2.set_mesh(*m_pmesh);
+
+  if (static_cast<VSAL2::Initialization>(init) == VSAL2::IncrementalInit) {
+    // for comparision
+    m_vsa_l2.init_proxies(num_proxies / 2, VSAL2::RandomInit);
+    for (std::size_t i = 0; i < num_iterations; ++i)
+      m_vsa_l2.run_one_step();
+    m_vsa_l2.add_proxies(VSAL2::IncrementalInit, num_proxies - num_proxies / 2, num_iterations);
+    for (std::size_t i = 0; i < num_iterations; ++i)
+      m_vsa_l2.run_one_step();
+  }
+  else {
+    m_vsa_l2.init_proxies(num_proxies, static_cast<VSAL2::Initialization>(init));
+    for (std::size_t i = 0; i < num_iterations; ++i)
+      m_vsa_l2.run_one_step();
+  }
+
+  Polyhedron_3 out_mesh;
+  m_vsa_l2.meshing(out_mesh);
+  m_vsa_l2.get_proxy_map(m_fidx_pmap);
+  m_tris = m_vsa_l2.get_indexed_triangles();
+  m_anchor_pos = m_vsa_l2.get_anchor_points();
+  m_anchor_vtx = m_vsa_l2.get_anchor_vertices();
+  m_bdrs = m_vsa_l2.get_indexed_boundary_polygons();
 
   m_px_num = num_proxies;
   m_view_seg_boundary = true;

diff --git a/Surface_mesh_approximation/demo/Surface_mesh_approximation/Scene.h b/Surface_mesh_approximation/demo/Surface_mesh_approximation/Scene.h
@@ -39,7 +39,7 @@ typedef CGAL::VSA_approximation<Polyhedron_3, PlaneProxy, L21Metric, L21ProxyFit
 typedef CGAL::L2Metric<Polyhedron_3, FacetAreaMap> L2Metric;
 typedef CGAL::L2ProxyFitting<Polyhedron_3> L2ProxyFitting;
 typedef CGAL::PCAPlaneFitting<Polyhedron_3> PCAPlaneFitting;
-typedef CGAL::VSA_approximation<Polyhedron_3, PCAPlaneFitting, L21Metric, L2ProxyFitting> VSAL2;
+typedef CGAL::VSA_approximation<Polyhedron_3, PlaneProxy, L2Metric, L2ProxyFitting> VSAL2;
 
 class Scene
 {
@@ -50,14 +50,28 @@ class Scene
     m_normal_pmap(m_facet_normals),
     m_center_pmap(m_facet_centers),
     m_area_pmap(m_facet_areas),
-    m_vsa_l21(L21Metric(m_normal_pmap, m_area_pmap), L21ProxyFitting(m_normal_pmap, m_area_pmap)),
+    m_pl21_metric(NULL),
+    m_pl21_proxy_fitting(NULL),
+    m_pl2_metric(NULL),
+    m_pl2_proxy_fitting(NULL),
+    // m_vsa_l21(L21Metric(m_normal_pmap, m_area_pmap), L21ProxyFitting(m_normal_pmap, m_area_pmap)),
     m_px_num(0),
     m_view_polyhedron(false),
     m_view_wireframe(false),
     m_view_seg_boundary(false),
     m_view_anchors(false) {}
 
-  ~Scene() { delete m_pmesh; }
+  ~Scene() {
+    delete m_pmesh;
+    if (m_pl21_metric)
+      delete m_pl21_metric;
+    if (m_pl21_proxy_fitting)
+      delete m_pl21_proxy_fitting;
+    if (m_pl2_metric)
+      delete m_pl2_metric;
+    if (m_pl2_proxy_fitting)
+      delete m_pl2_proxy_fitting;
+  }
 
   void update_bbox();
   Bbox_3 bbox() { return m_bbox; }
@@ -126,7 +140,12 @@ class Scene
   VertexPointMap m_point_pmap;
 
   // algorithm instance
+  L21Metric *m_pl21_metric;
+  L21ProxyFitting *m_pl21_proxy_fitting;
+  L2Metric *m_pl2_metric;
+  L2ProxyFitting *m_pl2_proxy_fitting;
   VSAL21 m_vsa_l21;
+  VSAL2 m_vsa_l2;
 
   std::vector<Point_3> m_anchor_pos;
   std::vector<Polyhedron_3::Vertex_handle> m_anchor_vtx;