mirror of https://github.com/CGAL/cgal
dont > don't
This commit is contained in:
parent
7970fb99e7
commit
e38e29f279
|
|
@ -46,7 +46,7 @@ class Root_for_circles_2_2 {
|
||||||
Root_for_circles_2_2(const Root_of_2& r1, const Root_of_2& r2)
|
Root_for_circles_2_2(const Root_of_2& r1, const Root_of_2& r2)
|
||||||
: x_(r1), y_(r2)
|
: x_(r1), y_(r2)
|
||||||
{
|
{
|
||||||
// When it is an interval this assertion dont compile
|
// When it is an interval this assertion doesn't compile
|
||||||
//CGAL_assertion((r1.is_rational() || r2.is_rational()) ||
|
//CGAL_assertion((r1.is_rational() || r2.is_rational()) ||
|
||||||
// (r1.gamma() == r2.gamma()));
|
// (r1.gamma() == r2.gamma()));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1999,7 +1999,7 @@ operates in two-dimensional surfaces (not restricted to the plane),
|
||||||
(ii) accepts various families of \f$x\f$-monotone curves (not only
|
(ii) accepts various families of \f$x\f$-monotone curves (not only
|
||||||
line segments), and (iii) handles overlaps. (Observe that the original
|
line segments), and (iii) handles overlaps. (Observe that the original
|
||||||
algorithm did not handle overlaps. Handling overlaps is difficult,
|
algorithm did not handle overlaps. Handling overlaps is difficult,
|
||||||
especially for polyline, as two polylines may overlap in more then one
|
especially for polyline, as two polylines may overlap in more than one
|
||||||
connected component.) The generic implementation serves as the
|
connected component.) The generic implementation serves as the
|
||||||
foundation of a family of concrete operations described in the rest of
|
foundation of a family of concrete operations described in the rest of
|
||||||
this section, such as aggregately constructing an arrangement induced
|
this section, such as aggregately constructing an arrangement induced
|
||||||
|
|
|
||||||
|
|
@ -1992,10 +1992,10 @@ public:
|
||||||
determines according to pre defined conditions whether the
|
determines according to pre defined conditions whether the
|
||||||
current Trapezoidal_decomposition_2<Traits> needs update
|
current Trapezoidal_decomposition_2<Traits> needs update
|
||||||
Postconditions:
|
Postconditions:
|
||||||
The output is true iff the depth of the Trapezoidal Tree is more then
|
The output is true iff the depth of the Trapezoidal Tree is more than
|
||||||
DepthThreshold times log of the X_curve count or the Trapezoidal Tree's
|
DepthThreshold times log of the X_curve count or the Trapezoidal Tree's
|
||||||
size
|
size
|
||||||
is more then SizeThreshold times the log of the last count.
|
is more than SizeThreshold times the log of the last count.
|
||||||
*/
|
*/
|
||||||
bool set_with_guarantees(bool u)
|
bool set_with_guarantees(bool u)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ is_in_face(const Face* f, const Point_2& p, const Vertex* v) const
|
||||||
// -----------
|
// -----------
|
||||||
// cv1 coincide with the identification curve. In this case we
|
// cv1 coincide with the identification curve. In this case we
|
||||||
// consider the identification to be on the right. All (interior)
|
// consider the identification to be on the right. All (interior)
|
||||||
// points are smaller then the right boundary.
|
// points are smaller than the right boundary.
|
||||||
rc1 = SMALLER;
|
rc1 = SMALLER;
|
||||||
rc2 = cmp_x_pt_ce(p, cv2, ARR_MAX_END);
|
rc2 = cmp_x_pt_ce(p, cv2, ARR_MAX_END);
|
||||||
}
|
}
|
||||||
|
|
@ -294,7 +294,7 @@ is_in_face(const Face* f, const Point_2& p, const Vertex* v) const
|
||||||
// -----------
|
// -----------
|
||||||
// cv2 coincide with the identification curve. In this case we
|
// cv2 coincide with the identification curve. In this case we
|
||||||
// consider the identification to be on the left. All (interior)
|
// consider the identification to be on the left. All (interior)
|
||||||
// points are larger then the left boundary.
|
// points are larger than the left boundary.
|
||||||
rc1 = cmp_x_pt_ce(p, cv1, ARR_MAX_END);
|
rc1 = cmp_x_pt_ce(p, cv1, ARR_MAX_END);
|
||||||
rc2 = LARGER;
|
rc2 = LARGER;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -563,7 +563,7 @@ template <typename InputStream_>
|
||||||
bool IO_base_test<Base_geom_traits>::read_segment(InputStream_& is,
|
bool IO_base_test<Base_geom_traits>::read_segment(InputStream_& is,
|
||||||
Subcurve_2& seg)
|
Subcurve_2& seg)
|
||||||
{
|
{
|
||||||
//we dont need to check this type as it has already been checked in the
|
//we don't need to check this type as it has already been checked in the
|
||||||
//IO_test.h
|
//IO_test.h
|
||||||
char type;
|
char type;
|
||||||
is >> type;
|
is >> type;
|
||||||
|
|
@ -600,7 +600,7 @@ template <typename InputStream_>
|
||||||
bool IO_base_test<Base_geom_traits>::read_xsegment(InputStream_& is,
|
bool IO_base_test<Base_geom_traits>::read_xsegment(InputStream_& is,
|
||||||
X_monotone_subcurve_2& xseg)
|
X_monotone_subcurve_2& xseg)
|
||||||
{
|
{
|
||||||
//we dont need to check this type as it has already been checked in the
|
//we don't need to check this type as it has already been checked in the
|
||||||
//IO_test.h
|
//IO_test.h
|
||||||
char type;
|
char type;
|
||||||
is >> type;
|
is >> type;
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ int main(int argc, char* argv[])
|
||||||
|
|
||||||
std::cout << argv[2]
|
std::cout << argv[2]
|
||||||
<< " was generated successfully"
|
<< " was generated successfully"
|
||||||
<< ", dont forget to add it to test_construction.cmd"
|
<< ", don't forget to add it to test_construction.cmd"
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -540,7 +540,7 @@ template <class Traits_, class TopTraits_, class ValidationPolicy>
|
||||||
}
|
}
|
||||||
|
|
||||||
//insert non-sipmle poloygons with holes (non incident edges may have
|
//insert non-sipmle poloygons with holes (non incident edges may have
|
||||||
// common vertex, but they dont intersect at their interior
|
// common vertex, but they don't intersect at their interior
|
||||||
template <class Traits_, class TopTraits_, class ValidationPolicy>
|
template <class Traits_, class TopTraits_, class ValidationPolicy>
|
||||||
void Gps_on_surface_base_2<Traits_, TopTraits_, ValidationPolicy>::
|
void Gps_on_surface_base_2<Traits_, TopTraits_, ValidationPolicy>::
|
||||||
_insert(const Polygon_with_holes_2 & pgn, Arrangement_on_surface_2 & arr)
|
_insert(const Polygon_with_holes_2 & pgn, Arrangement_on_surface_2 & arr)
|
||||||
|
|
|
||||||
|
|
@ -227,7 +227,7 @@ int main(int argc, char *argv[])
|
||||||
write_complement_to_file(out, p1);
|
write_complement_to_file(out, p1);
|
||||||
write_complement_to_file(out, p2);
|
write_complement_to_file(out, p2);
|
||||||
std::cout<<argv[3] <<
|
std::cout<<argv[3] <<
|
||||||
" was generated successfully, dont forget to add it to test_bop.cmd"
|
" was generated successfully, don't forget to add it to test_bop.cmd"
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
|
|
@ -239,7 +239,7 @@ int main(int argc, char *argv[])
|
||||||
write_complement_to_file(out, p1);
|
write_complement_to_file(out, p1);
|
||||||
write_complement_to_file(out, pwh2);
|
write_complement_to_file(out, pwh2);
|
||||||
std::cout<<argv[3] <<
|
std::cout<<argv[3] <<
|
||||||
" was generated successfully, dont forget to add it to test_bop.cmd"
|
" was generated successfully, don't forget to add it to test_bop.cmd"
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
|
|
@ -251,7 +251,7 @@ int main(int argc, char *argv[])
|
||||||
write_complement_to_file(out, pwh1);
|
write_complement_to_file(out, pwh1);
|
||||||
write_complement_to_file(out, p2);
|
write_complement_to_file(out, p2);
|
||||||
std::cout<<argv[3] <<
|
std::cout<<argv[3] <<
|
||||||
" was generated successfully, dont forget to add it to test_bop.cmd"
|
" was generated successfully, don't forget to add it to test_bop.cmd"
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
|
|
@ -263,7 +263,7 @@ int main(int argc, char *argv[])
|
||||||
write_complement_to_file(out, pwh1);
|
write_complement_to_file(out, pwh1);
|
||||||
write_complement_to_file(out, pwh2);
|
write_complement_to_file(out, pwh2);
|
||||||
std::cout<<argv[3] <<
|
std::cout<<argv[3] <<
|
||||||
" was generated successfully, dont forget to add it to test_bop.cmd"
|
" was generated successfully, don't forget to add it to test_bop.cmd"
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ In std::cerr :
|
||||||
Only the time needed to compute it. (it is useful to benchmark a lot of cases and redirect it on a .txt)
|
Only the time needed to compute it. (it is useful to benchmark a lot of cases and redirect it on a .txt)
|
||||||
|
|
||||||
ATTENTION:
|
ATTENTION:
|
||||||
1) dont use ./example a b
|
1) don't use ./example a b
|
||||||
with 5 <= a <= 8 and 0 <= b <= 8, we cannot use the Circulartraits to handle the files
|
with 5 <= a <= 8 and 0 <= b <= 8, we cannot use the Circulartraits to handle the files
|
||||||
2) The files have to be put on a folder name DXF where the program is located
|
2) The files have to be put on a folder name DXF where the program is located
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -656,7 +656,7 @@ public:
|
||||||
return CGAL::CircularFunctors::circular_arc_bbox<CK>(*this);
|
return CGAL::CircularFunctors::circular_arc_bbox<CK>(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dont use this function, it is only for internal use
|
// Don't use this function, it is only for internal use
|
||||||
void _setx_info(unsigned short int v_is_x_monotone,
|
void _setx_info(unsigned short int v_is_x_monotone,
|
||||||
unsigned short int v_two_end_points_on_upper_part,
|
unsigned short int v_two_end_points_on_upper_part,
|
||||||
unsigned short int v_is_complementary_x_monotone) const {
|
unsigned short int v_is_complementary_x_monotone) const {
|
||||||
|
|
|
||||||
|
|
@ -155,13 +155,13 @@ template < class SK > \
|
||||||
const Circular_arc_point_3 &c1) const
|
const Circular_arc_point_3 &c1) const
|
||||||
{ return SphericalFunctors::equal<SK>(Circular_arc_point_3(c0), c1); }
|
{ return SphericalFunctors::equal<SK>(Circular_arc_point_3(c0), c1); }
|
||||||
|
|
||||||
// Our Line_arc_3 dont have orientation
|
// Our Line_arc_3 doesn't have orientation
|
||||||
result_type
|
result_type
|
||||||
operator() (const Line_arc_3 &l0,
|
operator() (const Line_arc_3 &l0,
|
||||||
const Line_arc_3 &l1) const
|
const Line_arc_3 &l1) const
|
||||||
{ return SphericalFunctors::equal<SK>(l0, l1); }
|
{ return SphericalFunctors::equal<SK>(l0, l1); }
|
||||||
|
|
||||||
// Our Circular_arc_3 dont have orientation (as parameter)
|
// Our Circular_arc_3 doesn't have orientation (as parameter)
|
||||||
result_type
|
result_type
|
||||||
operator() (const Circular_arc_3 &c0,
|
operator() (const Circular_arc_3 &c0,
|
||||||
const Circular_arc_3 &c1) const
|
const Circular_arc_3 &c1) const
|
||||||
|
|
|
||||||
|
|
@ -471,7 +471,7 @@ namespace CGAL {
|
||||||
return std::transform(solutions.begin(), solutions.end(), res, internal::pair_transform<SK>());
|
return std::transform(solutions.begin(), solutions.end(), res, internal::pair_transform<SK>());
|
||||||
}
|
}
|
||||||
|
|
||||||
// At the moment we dont need those functions
|
// At the moment we don't need those functions
|
||||||
// But in the future maybe (some make_x_monotone? etc..)
|
// But in the future maybe (some make_x_monotone? etc..)
|
||||||
template <class SK>
|
template <class SK>
|
||||||
typename SK::Circular_arc_point_3
|
typename SK::Circular_arc_point_3
|
||||||
|
|
|
||||||
|
|
@ -654,7 +654,7 @@ void _test_bounded_side(SK sk) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// we dont need to test bounded_side(Circle, Circular_arc_point) because
|
// we don't need to test bounded_side(Circle, Circular_arc_point) because
|
||||||
// bounded_side(Circle, Circular_arc_point) = bounded_side(Sphere, Circular_arc_point) +
|
// bounded_side(Circle, Circular_arc_point) = bounded_side(Sphere, Circular_arc_point) +
|
||||||
// has_on_3(supporting_plane, circular_arc_point) which has already been tested
|
// has_on_3(supporting_plane, circular_arc_point) which has already been tested
|
||||||
std::cout << "Testing bounded_side(Circle, Circular_arc_point)..." << std::endl;
|
std::cout << "Testing bounded_side(Circle, Circular_arc_point)..." << std::endl;
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QDoubleSpinBox" name="oversampling">
|
<widget class="QDoubleSpinBox" name="oversampling">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Antialiases image (when larger then 1.0)</string>
|
<string>Antialiases image (when larger than 1.0)</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="prefix">
|
<property name="prefix">
|
||||||
<string>x </string>
|
<string>x </string>
|
||||||
|
|
|
||||||
|
|
@ -369,7 +369,7 @@ void _test_bounded_side(const K &k) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// we dont need to test bounded_side(Circle, Circular_arc_point) because
|
// we don't need to test bounded_side(Circle, Circular_arc_point) because
|
||||||
// bounded_side(Circle, Circular_arc_point) = bounded_side(Sphere, Circular_arc_point) +
|
// bounded_side(Circle, Circular_arc_point) = bounded_side(Sphere, Circular_arc_point) +
|
||||||
// has_on_3(supporting_plane, circular_arc_point) which has already been tested
|
// has_on_3(supporting_plane, circular_arc_point) which has already been tested
|
||||||
std::cout << "Testing bounded_side(Circle, Point)..." << std::endl;
|
std::cout << "Testing bounded_side(Circle, Point)..." << std::endl;
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ bool CGAL_Lab_polyhedron_slicer_plugin::on_Update_plane_button_clicked() {
|
||||||
{ print_message("Error: center coordinates not convertible to double."); return false; }
|
{ print_message("Error: center coordinates not convertible to double."); return false; }
|
||||||
|
|
||||||
// set center
|
// set center
|
||||||
bool oldState = mf->blockSignals(true); // dont let it signal, it will invoke plane_manipulated_frame_modified otherwise
|
bool oldState = mf->blockSignals(true); // don't let it signal, it will invoke plane_manipulated_frame_modified otherwise
|
||||||
mf->setPosition(center_x, center_y, center_z);
|
mf->setPosition(center_x, center_y, center_z);
|
||||||
mf->blockSignals(oldState);
|
mf->blockSignals(oldState);
|
||||||
|
|
||||||
|
|
@ -206,7 +206,7 @@ bool CGAL_Lab_polyhedron_slicer_plugin::on_Update_plane_button_clicked() {
|
||||||
CGAL::qglviewer::Quaternion orientation_from_bases;
|
CGAL::qglviewer::Quaternion orientation_from_bases;
|
||||||
orientation_from_bases.setFromRotatedBasis(base_1, base_2, other);
|
orientation_from_bases.setFromRotatedBasis(base_1, base_2, other);
|
||||||
|
|
||||||
oldState = mf->blockSignals(true); // dont let it signal, it will invoke plane_manipulated_frame_modified otherwise
|
oldState = mf->blockSignals(true); // don't let it signal, it will invoke plane_manipulated_frame_modified otherwise
|
||||||
mf->setOrientation(orientation_from_bases);
|
mf->setOrientation(orientation_from_bases);
|
||||||
mf->blockSignals(oldState);
|
mf->blockSignals(oldState);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3756,7 +3756,7 @@ fill_modified_vertices(InputIterator cells_begin,
|
||||||
OutputIterator out) const
|
OutputIterator out) const
|
||||||
{
|
{
|
||||||
Vertex_set already_inserted_vertices;
|
Vertex_set already_inserted_vertices;
|
||||||
// Dont insert vertex in out
|
// Don't insert vertex in out
|
||||||
already_inserted_vertices.insert(vertex);
|
already_inserted_vertices.insert(vertex);
|
||||||
|
|
||||||
for ( InputIterator it = cells_begin ; it != cells_end ; ++it )
|
for ( InputIterator it = cells_begin ; it != cells_end ; ++it )
|
||||||
|
|
|
||||||
|
|
@ -997,7 +997,7 @@ private:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (o1 * o2 * o3 == 0){
|
if (o1 * o2 * o3 == 0){
|
||||||
return 2; // means we dont know
|
return 2; // means we don't know
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
@ -1235,7 +1235,7 @@ private:
|
||||||
}
|
}
|
||||||
// this was for a fast float check
|
// this was for a fast float check
|
||||||
if (inter == 2)
|
if (inter == 2)
|
||||||
{ //we dont know if point exist or if inside of triangle
|
{ //we don't know if point exist or if inside of triangle
|
||||||
cut[cutp[i]] = true;
|
cut[cutp[i]] = true;
|
||||||
cut[cutp[j]] = true;
|
cut[cutp[j]] = true;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ public:
|
||||||
const int orient)
|
const int orient)
|
||||||
{
|
{
|
||||||
if (s == 1) {
|
if (s == 1) {
|
||||||
// Dont multiply by (1-s) as this will zero the equation
|
// Don't multiply by (1-s) as this will zero the equation
|
||||||
Q[1] = Q[3] = Q[4] = 0;
|
Q[1] = Q[3] = Q[4] = 0;
|
||||||
Q[0] = Q[2] = Q[5] = orient;
|
Q[0] = Q[2] = Q[5] = orient;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@ typedef IO_rep_is_not_specialized_aux<void> IO_rep_is_not_specialized;
|
||||||
|
|
||||||
The purpose of `Output_rep` is to provide a way to control output formatting that works independently of the object's stream output operator.
|
The purpose of `Output_rep` is to provide a way to control output formatting that works independently of the object's stream output operator.
|
||||||
|
|
||||||
If you dont specialize `Output_rep` for `T`, `T`'s stream output operator is called from within `Output_rep`, by default. If you want another behavior for your type `T`, you have to provide a specialization for that type. Furthermore, you can provide specializations with a second template parameter (a formatting tag). The second template parameter defaults to `Null_tag` and means *default behavior*.
|
If you don't specialize `Output_rep` for `T`, `T`'s stream output operator is called from within `Output_rep`, by default. If you want another behavior for your type `T`, you have to provide a specialization for that type. Furthermore, you can provide specializations with a second template parameter (a formatting tag). The second template parameter defaults to `Null_tag` and means *default behavior*.
|
||||||
|
|
||||||
Specializations of `Output_rep` should provide the following features:
|
Specializations of `Output_rep` should provide the following features:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1280,7 +1280,7 @@ protected:
|
||||||
else
|
else
|
||||||
{// there is at least a hole around the vertex
|
{// there is at least a hole around the vertex
|
||||||
// we set the 0-th dart just after a hole
|
// we set the 0-th dart just after a hole
|
||||||
// then we add 1 to the next dart if we dont cross a hole
|
// then we add 1 to the next dart if we don't cross a hole
|
||||||
// and we add deg(v)+1 if we cross a hole
|
// and we add deg(v)+1 if we cross a hole
|
||||||
dh=it;
|
dh=it;
|
||||||
while(!get_local_map().is_marked(dh, m_mark_perforated))
|
while(!get_local_map().is_marked(dh, m_mark_perforated))
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ namespace Surface_sweep_2 {
|
||||||
*
|
*
|
||||||
* The algorithm is also extended to support the following degenerate cases:
|
* The algorithm is also extended to support the following degenerate cases:
|
||||||
* - vertical segments
|
* - vertical segments
|
||||||
* - multiple (more then two) curves intersecting at one point
|
* - multiple (more than two) curves intersecting at one point
|
||||||
* - curves beginning and ending on other curves.
|
* - curves beginning and ending on other curves.
|
||||||
* - overlapping curves
|
* - overlapping curves
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -480,7 +480,7 @@ void Surface_sweep_2<Vis>::_remove_curve_from_status_line(Subcurve* leftCurve,
|
||||||
leftCurve->set_hint(this->m_statusLine.end());
|
leftCurve->set_hint(this->m_statusLine.end());
|
||||||
|
|
||||||
if (! remove_for_good) {
|
if (! remove_for_good) {
|
||||||
// the subcurve is not removed for good, so we dont need to intersect
|
// the subcurve is not removed for good, so we don't need to intersect
|
||||||
// its neighbors after its removal.
|
// its neighbors after its removal.
|
||||||
CGAL_SS_PRINT_ERASE(*sliter);
|
CGAL_SS_PRINT_ERASE(*sliter);
|
||||||
this->m_statusLine.erase(sliter);
|
this->m_statusLine.erase(sliter);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue