Merge pull request #1287 from sgiraudot/OTR-Some_bugfixes-GF

OT Reconstruction: some bugfixes in the demo

Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/scene.h

@@ -95,7 +95,7 @@ public:
     srand(0); // for sake of repeatability
     m_ignore = 0;
     m_init_done = false;
-    m_percentage = 100.;
+    m_percentage = 1.;
     m_bbox_x = 0.0;
     m_bbox_y = 0.0;
     m_bbox_size = 1.0;
@@ -104,11 +104,12 @@ public:
   }
 
   ~Scene() {
-    clear();
+    delete m_pwsrec;
   }
 
   void clear() {
-    m_pwsrec->clear();
+    delete m_pwsrec;
+    m_pwsrec = new Optimal_transportation_reconstruction_kerneled_2();
     m_samples.clear();
   }
 
@@ -395,17 +396,18 @@ public:
 
   void set_options(const int verbose, const int mchoice,
     const bool use_flip, const unsigned int relocation,
-    const double ghost) {
+    const double ghost, const double percentage) {
 
     m_pwsrec->set_verbose(verbose);
     m_pwsrec->set_random_sample_size(mchoice);
     m_pwsrec->set_use_flip(use_flip);
     m_pwsrec->set_relocation(relocation);
     m_pwsrec->set_relevance(ghost);
+    m_percentage = percentage;
   }
 
   bool init_reconstruction(const double percentage) {
-    std::cout << " init_reconstruction " << std::endl;
+    std::cout << " init_reconstruction with " << (unsigned int)(100.*percentage) << "% of points" << std::endl;
 
     if (m_samples.empty()) {
       std::cerr << "initialization failed (empty point set)" << std::endl;
@@ -415,10 +417,15 @@ public:
     Sample_vector vertices, samples;
     select_samples(percentage, vertices, samples);
 
-    PointMassList point_mass_list;
+    PointMassList vertices_mass_list;
     Sample_vector_const_iterator it;
     for (it = vertices.begin(); it != vertices.end(); it++) {
-      point_mass_list.push_back(
+      vertices_mass_list.push_back(
+        std::make_pair((*it)->point(), (*it)->mass()));
+    }
+    PointMassList samples_mass_list;
+    for (it = samples.begin(); it != samples.end(); it++) {
+      samples_mass_list.push_back(
         std::make_pair((*it)->point(), (*it)->mass()));
     }
 
@@ -426,8 +433,10 @@ public:
     Mass_property_map mass_pmap;
     MassPoint mp;
 
-    m_pwsrec->initialize(point_mass_list.begin(), point_mass_list.end(),
+    m_pwsrec->initialize_with_custom_vertices
-      point_pmap, mass_pmap);
+      (samples_mass_list.begin(), samples_mass_list.end(),
+       vertices_mass_list.begin(), vertices_mass_list.end(),
+       point_pmap, mass_pmap);
 
     m_init_done = true;
 

Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/window.cpp

@@ -463,7 +463,7 @@ void MainWindow::on_actionDecimate_triggered()
 void MainWindow::set_scene_options()
 {
   m_scene->set_options(m_verbose, m_mchoice, m_use_flip,
-      m_relocation, m_relevance);
+      m_relocation, m_relevance, percentage());
 }
 
 void MainWindow::on_actionReconstruction_reinit_triggered()

Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h

@@ -380,6 +380,40 @@ public:
     assign_samples(m_samples.begin(), m_samples.end());
   }
 
+  template <class InputIterator>
+  void initialize_with_custom_vertices(InputIterator samples_start,
+                                       InputIterator samples_beyond,
+                                       InputIterator vertices_start,
+                                       InputIterator vertices_beyond,
+                                       PointPMap point_map,
+                                       MassPMap  mass_map) {
+    point_pmap = point_map;
+    mass_pmap  = mass_map;
+    clear();
+    Property_map_to_unary_function<PointPMap> get_point(point_pmap);
+
+    Bbox_2 bbox = bbox_2(
+      boost::make_transform_iterator(samples_start,get_point),
+      boost::make_transform_iterator(samples_beyond,get_point));
+
+    insert_loose_bbox(bbox);
+    init(vertices_start, vertices_beyond);
+
+    std::vector<Sample_*> m_samples;
+    for (InputIterator it = samples_start; it != samples_beyond; it++) {
+#ifdef CGAL_USE_PROPERTY_MAPS_API_V1
+      Point point = get(point_pmap, it);
+      FT    mass  = get( mass_pmap, it);
+#else
+      Point point = get(point_pmap, *it);
+      FT    mass  = get( mass_pmap, *it);
+#endif
+      Sample_* s = new Sample_(point, mass);
+      m_samples.push_back(s);
+    }
+    assign_samples(m_samples.begin(), m_samples.end());
+  }
+
 
   template <class Vector>
   Vector random_vec(const FT scale) const