cleanup of unused code:

methods in FacePropagation
files Propagation.h and Polygon_splitter.h
This commit is contained in:
Sven Oesau 2022-11-08 12:42:14 +01:00
parent b6082e2bc5
commit 27765e9186
6 changed files with 17 additions and 6241 deletions

View File

@ -3018,8 +3018,8 @@ public:
bool check_integrity( bool check_integrity(
const bool is_initialized = true, const bool is_initialized = true,
const bool check_simplicity = false, const bool check_simplicity = true,
const bool check_convexity = false) const { const bool check_convexity = true) const {
for (std::size_t i = 0; i < number_of_support_planes(); ++i) { for (std::size_t i = 0; i < number_of_support_planes(); ++i) {
if (!is_mesh_valid(check_simplicity, check_convexity, i)) { if (!is_mesh_valid(check_simplicity, check_convexity, i)) {
@ -3028,6 +3028,8 @@ public:
return false; return false;
} }
continue;
if (is_initialized) { if (is_initialized) {
const auto& iedges = this->iedges(i); const auto& iedges = this->iedges(i);
CGAL_assertion(iedges.size() > 0); CGAL_assertion(iedges.size() > 0);

View File

@ -30,7 +30,6 @@
#include <CGAL/KSR/conversions.h> #include <CGAL/KSR/conversions.h>
#include <CGAL/KSR_3/Data_structure.h> #include <CGAL/KSR_3/Data_structure.h>
#include <CGAL/KSR_3/Polygon_splitter.h>
namespace CGAL { namespace CGAL {
namespace KSR_3 { namespace KSR_3 {
@ -55,7 +54,6 @@ private:
using Data_structure = KSR_3::Data_structure<Kernel>; using Data_structure = KSR_3::Data_structure<Kernel>;
using Support_plane = typename Data_structure::Support_plane; using Support_plane = typename Data_structure::Support_plane;
using Polygon_splitter = KSR_3::Polygon_splitter<Data_structure, Kernel>;
using IEdge = typename Data_structure::IEdge; using IEdge = typename Data_structure::IEdge;
using IFace = typename Data_structure::IFace; using IFace = typename Data_structure::IFace;
using Face_property = typename Data_structure::Intersection_graph::Face_property; using Face_property = typename Data_structure::Intersection_graph::Face_property;
@ -114,7 +112,7 @@ public:
if (m_parameters.verbose) std::cout << "* intersecting input polygons ... "; if (m_parameters.verbose) std::cout << "* intersecting input polygons ... ";
if (m_parameters.debug) { if (m_parameters.debug) {
KSR_3::dump(m_data, "init"); //KSR_3::dump(m_data, "init");
// KSR_3::dump_segmented_edges(m_data, "init"); // KSR_3::dump_segmented_edges(m_data, "init");
} }
@ -139,7 +137,7 @@ public:
if (m_parameters.verbose) std::cout << "done" << std::endl; if (m_parameters.verbose) std::cout << "done" << std::endl;
if (m_parameters.debug) { if (m_parameters.debug) {
KSR_3::dump(m_data, "intersected"); //KSR_3::dump(m_data, "intersected");
// KSR_3::dump_segmented_edges(m_data, "intersected"); // KSR_3::dump_segmented_edges(m_data, "intersected");
} }
@ -1163,15 +1161,6 @@ void initial_polygon_iedge_intersections() {
} }
// Refine polygons. // Refine polygons.
return; return;
for (std::size_t i = 0; i < m_data.number_of_support_planes(); ++i) {
Polygon_splitter splitter(m_data, m_parameters);
splitter.split_support_plane(i);
// if (i >= 6 && m_parameters.export_all) {
//KSR_3::dump(m_data, "intersected-iter-" + std::to_string(i));
// }
}
// exit(EXIT_SUCCESS);
} }
void map_polygon_to_ifaces() { void map_polygon_to_ifaces() {

File diff suppressed because it is too large Load Diff

View File

@ -35,7 +35,6 @@
#include <CGAL/KSR_3/Reconstruction.h> #include <CGAL/KSR_3/Reconstruction.h>
#include <CGAL/KSR_3/Initializer.h> #include <CGAL/KSR_3/Initializer.h>
#include <CGAL/KSR_3/FacePropagation.h> #include <CGAL/KSR_3/FacePropagation.h>
#include <CGAL/KSR_3/Propagation.h>
#include <CGAL/KSR_3/Finalizer.h> #include <CGAL/KSR_3/Finalizer.h>
namespace CGAL { namespace CGAL {