Commit Graph

60612 Commits

Author SHA1 Message Date
Panagiotis Cheilaris 188f7bdfa8 f_i and g_i warning fixes (also with assertions)
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris 112983a440 corrected is_nop, is_pon, etc. assertions
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris af246ba5d8 put some assertion code into debug code
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris 624a3d071e put first_found_f2 in assertions
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris 1bbc871009 fix typo fi -> g_i
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris dc8c6cf0f1 remove unused type definition
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris f6741c6a04 change some CGAL_SDG_DEBUG to CGAL_assertion_code
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:31 +02:00
Panagiotis Cheilaris 3329b73e13 put some bool computations in debug mode only
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris 17ba6e5507 remove site computation warnings
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris 75f53e7007 put is_q_ssrc etc. in assertion code
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris fd1f51e987 remove warning for have_common_qr
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris fb53c58677 remove warnings with num counters
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris ac34b778de removed unused sv1 and sv2
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris 33061ecee2 use sitev only in verbose mode
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris 1db79df71c remove unused but set variable sss1
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris 87027f2125 g2 and esym put in assertions to suppress warnings
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:30 +02:00
Panagiotis Cheilaris e5247dda4c removed too-strong assertions in infinite edge cf
This fixes an assertion failure for the input vbc1a.cin:
s 60  20 60 220
p 40 160
p 30  50
p 40  50

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris c14f3cd711 CGAL_SDG_VERY_VERBOSE used in printing diagram
Print the SDG Linf diagram if CGAL_SDG_VERY_VERBOSE is defined.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris 5e66a3f262 access outgoing direction through function
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris cc3c33d569 use the line optimization for parallel segments
Use the line optimization when computing the bisector of two
parallel segments.

This also fixes a bug for inputs of the following form:

s 100 20 0 20
s 0 80 100 80
s 30 40 30 60

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris cc2c3e69d0 support line optimization in first intersection
Addition of is_line_optimization boolean member variable in object
of class Polychainline_2. Suppose this variable of an obect is set
to true. If this object is tried for an intersection with another
Polychainline object pcl, using the function
first_intersection_point_with, then instead the function
line_first_intersection_point_with is used.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris ff949fd5f7 show debug message for compute_sss in vring
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris cbf199c252 bug fix in debug message for a bisector
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris 38330bc91f show in debug message hom. point ip
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:29 +02:00
Panagiotis Cheilaris 71f4e6f9e7 oscandidate fix in vertex conflict pss predicate
The oscandidate fix was not in the incircle_pss predicate, but it was
in the incircle_sps predicate.

This fixes a bug for the following input (br60parplus.cin):

p 50 0
s 0 0 200 -30
s 0 0 -50 150

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris 47b229322c sdg-voronoi-edges-exact example in CMakeLists.txt
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris dfe343b15c example with exact computation for SDG Linf
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris 8a344da8ea assertion tests in sdg-voronoi-edges example
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris e47b40bcfe vring PPS case fix from vsqr code
This fixes exact computation for inputs like parpar2.cin:

s -250 50 -50 -150
p -100 -50
p -60 -50
p -150 50

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris cd550e1609 check for candidates in SSS in vring
This corrects exact computations for inputs like br61.cin:

s 0 0 200 -30
s 0 100 100 100
s 0 100 0 0
s 0 0 50 0

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris eb9d901ebb prepare refinement for incircle_p SSS
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris a103ffaef9 test in vring for LARGER point retval
Now, exact computation is correct with input like br80pt.cin:

s	10	120	60	20
s	30	110	100	40
p	60	40

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris 50ad76dcd2 adapt part of pss vsqr code to vring
This fixes exact computation for input br61vpqr.cin:

s 0 0 200 -30
s 0 100 0 0
p 50 0

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:28 +02:00
Panagiotis Cheilaris 5ec2694760 adapt some PPS vsqr code to vring
This fixes input 2a1badaless3noint.cin for exact number types:

s 0 0 200 -30
s 0 0 -50 150
p 0 100
p 100 100

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 8ad9d9a709 comment out too-strong assertion from vsqr
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 86326fd03e count and show number of neighbors
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 761f6f720b removal of too-strong assertion in iecf
This is a fix for the following input (r2minpt.cin):

s -91 36 36 87
p -23 4
p -17 37
p -17 40

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 14c220e670 fix of debug message (q->r)
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 65fdf43fd1 in vsqr check for same_slope_at_corner
Avoid computing a predicate for the support line of a query segment,
if that segment has a common endpoint with another segment and this
endpoint also defines the vertex and also the two segments have the
same slope. In that case, the sl value should be ZERO.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 4d8b3c020f show sl value in debug message
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 6132650bd6 have_same_slope predicate
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:27 +02:00
Panagiotis Cheilaris 287612533d choose segment direction with distance
Use the most distant point to choose segment direction in
the bisector of two segments computation.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris 9208ebfbd7 return SMALLER in linf_refine, only for h/v lines
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris b65c265d51 set on oriented boundary, when endpoint
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris b086dfd879 show cmplabsxy value in debug
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris 9ff68f92ce show sl in a debug message
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris 926f5ec0ca change type of numpts_in_pqr to unsigned int
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris ef23e1a490 validity test simplification
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris 1f5df0aad8 if endpoint of segment, then ON_ORIENTED_BOUNDARY
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00
Panagiotis Cheilaris 2d852f3e31 SDG Linf insertion function from SDG L2
These new insert functions are from the SDG L2 code and will be
useful for the test_sdg_new_range_api test for the SDG Linf code.

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:26 +02:00