mirror of https://github.com/CGAL/cgal
removing warning and some unused code
This commit is contained in:
parent
2ca0e52a85
commit
f6d2a275d8
|
|
@ -40,7 +40,7 @@ int main(int argc, char** argv)
|
|||
// Initialization of Kinetic_space_partition_3 object.
|
||||
// 'debug' set to true exports intermediate results into files in the working directory.
|
||||
// The resulting volumes are exported into a volumes folder, if the folder already exists.
|
||||
KSP ksp(CGAL::parameters::verbose(true).debug(true));
|
||||
KSP ksp(CGAL::parameters::verbose(true).debug(false));
|
||||
|
||||
// Providing input polygons.
|
||||
ksp.insert(input_vertices, input_faces);
|
||||
|
|
|
|||
|
|
@ -572,9 +572,6 @@ public:
|
|||
m_support_planes[sp_idx].get_border(m_intersection_graph, border);
|
||||
|
||||
for (IEdge edge : border) {
|
||||
if (m_intersection_graph.has_crossed(edge, sp_idx))
|
||||
continue;
|
||||
|
||||
Face_event fe;
|
||||
IkFT t = calculate_edge_intersection_time(sp_idx, edge, fe);
|
||||
if (t > 0) {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ public:
|
|||
std::size_t order;
|
||||
std::map<std::size_t, std::pair<std::size_t, std::size_t> > faces; // For each intersecting support plane there is one pair of adjacent faces (or less if the edge is on the bbox)
|
||||
std::set<std::size_t> planes;
|
||||
std::set<std::size_t> crossed;
|
||||
std::map<std::size_t, Kinetic_interval> intervals; // Maps support plane index to the kinetic interval. std::pair<FT, FT> is the barycentric coordinate and intersection time.
|
||||
Edge_property() : line(std::size_t(-1)), order(edge_counter++) { }
|
||||
|
||||
|
|
@ -67,10 +66,8 @@ public:
|
|||
|
||||
const Edge_property& operator=(const Edge_property& other) {
|
||||
line = other.line;
|
||||
// order = other.order;
|
||||
faces = other.faces;
|
||||
planes = other.planes;
|
||||
crossed = other.crossed;
|
||||
intervals = other.intervals;
|
||||
|
||||
return *this;
|
||||
|
|
@ -137,7 +134,6 @@ private:
|
|||
|
||||
std::vector<bool> m_initial_part_of_partition;
|
||||
std::vector<std::map<std::size_t, Kinetic_interval> > m_initial_intervals;
|
||||
std::vector<std::set<std::size_t> > m_initial_crossed;
|
||||
|
||||
public:
|
||||
Intersection_graph() :
|
||||
|
|
@ -290,13 +286,11 @@ public:
|
|||
|
||||
void initialization_done() {
|
||||
auto e = edges();
|
||||
m_initial_crossed.resize(e.size());
|
||||
m_initial_intervals.resize(e.size());
|
||||
|
||||
std::size_t idx = 0;
|
||||
for (const auto& edge : e) {
|
||||
m_initial_intervals[idx] = m_graph[edge].intervals;
|
||||
m_initial_crossed[idx++] = m_graph[edge].crossed;
|
||||
m_initial_intervals[idx++] = m_graph[edge].intervals;
|
||||
}
|
||||
|
||||
m_initial_part_of_partition.resize(m_ifaces.size());
|
||||
|
|
@ -306,13 +300,11 @@ public:
|
|||
|
||||
void reset_to_initialization() {
|
||||
auto e = edges();
|
||||
CGAL_assertion(e.size() == m_initial_crossed.size());
|
||||
CGAL_assertion(e.size() == m_initial_intervals.size());
|
||||
std::size_t idx = 0;
|
||||
|
||||
for (auto edge : e) {
|
||||
m_graph[edge].intervals = m_initial_intervals[idx];
|
||||
m_graph[edge].crossed = m_initial_crossed[idx++];
|
||||
}
|
||||
|
||||
CGAL_assertion(m_ifaces.size() == m_initial_part_of_partition.size());
|
||||
|
|
@ -414,15 +406,6 @@ public:
|
|||
m_graph[boost::source(edge, m_graph)].point,
|
||||
m_graph[boost::target(edge, m_graph)].point);
|
||||
}
|
||||
|
||||
bool has_crossed(const Edge_descriptor& edge, std::size_t sp_idx) {
|
||||
return m_graph[edge].crossed.count(sp_idx) == 1;
|
||||
}
|
||||
|
||||
void set_crossed(const Edge_descriptor& edge, std::size_t sp_idx) {
|
||||
CGAL_assertion(false);
|
||||
m_graph[edge].crossed.insert(sp_idx);
|
||||
}
|
||||
};
|
||||
|
||||
template<typename GeomTraits, typename IntersectionKernel> std::size_t Intersection_graph<GeomTraits, IntersectionKernel>::Edge_property::edge_counter = 0;
|
||||
|
|
|
|||
|
|
@ -2054,11 +2054,7 @@ private:
|
|||
return std::make_pair(-1, -1);
|
||||
}
|
||||
|
||||
void adapt_internal_edges(const CDTplus& cdtC, const std::vector<Index> &faces_node, std::vector<std::vector<Constraint_info> >& c) {
|
||||
assert(faces_node.size() == c.size());
|
||||
|
||||
//std::size_t not_skipped = 0;
|
||||
|
||||
void adapt_internal_edges(const CDTplus& cdtC, std::vector<std::vector<Constraint_info> >& c) {
|
||||
for (std::size_t f = 0; f < c.size(); f++) {
|
||||
std::vector<Index> faces_of_volume;
|
||||
// The face index is probably no longer valid and the full face has been replaced by a smaller face using merged indices
|
||||
|
|
@ -2222,13 +2218,13 @@ private:
|
|||
|
||||
idx = 0;
|
||||
for (auto& p : a_sets) {
|
||||
adapt_internal_edges(cdtC, p.second, a_constraints[idx]);
|
||||
adapt_internal_edges(cdtC, a_constraints[idx]);
|
||||
idx++;
|
||||
}
|
||||
|
||||
idx = 0;
|
||||
for (auto& p : b_sets) {
|
||||
adapt_internal_edges(cdtC, p.second, b_constraints[idx]);
|
||||
adapt_internal_edges(cdtC, b_constraints[idx]);
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue