mirror of https://github.com/CGAL/cgal
update
This commit is contained in:
Efi Fogel
parent
3a2c1da42e
commit
0a018d8910
|
|
@ -26,8 +26,17 @@ public:
|
|||
typedef typename Curved_k::Linear_kernel Linear_k;
|
||||
typedef typename Curved_k::Circle_2 Circle_2;
|
||||
typedef typename Curved_k::Point_2 Point_2;
|
||||
typedef int CfNT;
|
||||
|
||||
#if BENCH_NT == LAZY_CGAL_GMPQ_NT
|
||||
typedef CGAL::Gmpq CfNT;
|
||||
#else
|
||||
typedef typename Linear_k::FT CfNT;
|
||||
#endif
|
||||
#if 0
|
||||
typedef typename Linear_k::RT CfRT;
|
||||
#else
|
||||
typedef RT CfRT;
|
||||
#endif
|
||||
|
||||
#if BENCH_TRAITS == CK_CONIC_TRAITS
|
||||
typedef typename Curved_k::Conic_2 Conic_2;
|
||||
#endif
|
||||
|
|
@ -37,10 +46,16 @@ public:
|
|||
|
||||
#if BENCH_TRAITS == CORE_CONIC_TRAITS
|
||||
typedef typename Traits::CfNT CfNT;
|
||||
typedef typename Traits::CfNT CfRT;
|
||||
#elif BENCH_TRAITS != EXACUS_CONIC_TRAITS
|
||||
typedef typename Traits::Circle_2 Circle_2;
|
||||
typedef typename Traits::Segment_2 Segment_2;
|
||||
typedef typename Traits::NT CfNT;
|
||||
#if 0
|
||||
typedef typename Traits::RT CfRT;
|
||||
#else
|
||||
typedef typename Traits::NT CfRT;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -88,17 +103,12 @@ public:
|
|||
for (int i = 0; i < count; i++) {
|
||||
if (read_curve(inp, cv)) {
|
||||
++curves_out = cv;
|
||||
#if BENCH_TRAITS != CK_CIRCLE_TRAITS
|
||||
CGAL::Bbox_2 curve_bbox = cv.bbox();
|
||||
if (i == 0) bbox = curve_bbox;
|
||||
else bbox = bbox + curve_bbox;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
inp.close();
|
||||
#if BENCH_TRAITS == CK_CIRCLE_TRAITS
|
||||
bbox = CGAL::Bbox_2(-10, -10, 10, 10);
|
||||
#endif
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -143,15 +153,19 @@ public:
|
|||
// ( -------- ) + ( -------- ) = 1
|
||||
// a b
|
||||
//
|
||||
str_line >> a >> b >> x0 >> y0;
|
||||
CfRT a_in, b_in, x0_in, y0_in;
|
||||
str_line >> a_in >> b_in >> x0_in >> y0_in;
|
||||
a = a_in;
|
||||
b = b_in;
|
||||
x0 = x0_in;
|
||||
y0 = y0_in;
|
||||
|
||||
if (a == b)
|
||||
{
|
||||
is_circle = true;
|
||||
#if BENCH_TRAITS == CONIC_TRAITS || BENCH_TRAITS == CK_CONIC_TRAITS
|
||||
#if BENCH_TRAITS == CONIC_TRAITS || BENCH_TRAITS == CK_CONIC_TRAITS || \
|
||||
BENCH_TRAITS == CK_CIRCLE_TRAITS
|
||||
circle = Circle_2 (Point_2 (x0, y0), a*b, CGAL::CLOCKWISE);
|
||||
#elif BENCH_TRAITS == CK_CIRCLE_TRAITS
|
||||
circle = Circle_2 (Point_2 (x0, y0), a*b);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
|
|
@ -213,7 +227,12 @@ public:
|
|||
// a b
|
||||
//
|
||||
CfNT a, b, x0, y0;
|
||||
str_line >> a >> b >> x0 >> y0;
|
||||
CfRT a_in, b_in, x0_in, y0_in;
|
||||
str_line >> a_in >> b_in >> x0_in >> y0_in;
|
||||
a = a_in;
|
||||
b = b_in;
|
||||
x0 = x0_in;
|
||||
y0 = y0_in;
|
||||
|
||||
CfNT a_sq = a*a;
|
||||
CfNT b_sq = b*b;
|
||||
|
|
@ -239,7 +258,11 @@ public:
|
|||
// 4c*(y - y0) = (x - x0)
|
||||
//
|
||||
CfNT c, x0, y0;
|
||||
str_line >> c >> x0 >> y0;
|
||||
CfRT c_in, x0_in, y0_in;
|
||||
str_line >> c_in >> x0_in >> y0_in;
|
||||
c = c_in;
|
||||
x0 = x0_in;
|
||||
y0 = y0_in;
|
||||
|
||||
r = 1;
|
||||
s = 0;
|
||||
|
|
@ -257,7 +280,14 @@ public:
|
|||
#else
|
||||
|
||||
// Read a general conic, given by its coefficients <r,s,t,u,v,w>.
|
||||
str_line >> r >> s >> t >> u >> v >> w;
|
||||
CfRT r_in, s_in, t_in, u_in, v_in, w_in;
|
||||
str_line >> r_in >> s_in >> t_in >> u_in >> v_in >> w_in;
|
||||
r = r_in;
|
||||
s = s_in;
|
||||
t = t_in;
|
||||
u = u_in;
|
||||
v = v_in;
|
||||
w = w_in;
|
||||
|
||||
if (type == 'c' || type == 'C')
|
||||
{
|
||||
|
|
@ -286,8 +316,13 @@ public:
|
|||
|
||||
// Read a segment, given by its endpoints (x1,y1) and (x2,y2);
|
||||
CfNT x1, y1, x2, y2;
|
||||
str_line >> x1 >> y1 >> x2 >> y2;
|
||||
|
||||
CfRT x1_in, y1_in, x2_in, y2_in;
|
||||
str_line >> x1_in >> y1_in >> x2_in >> y2_in;
|
||||
x1 = x1_in;
|
||||
y1 = y1_in;
|
||||
x2 = x2_in;
|
||||
y2 = y2_in;
|
||||
|
||||
// Create the segment.
|
||||
#if BENCH_TRAITS == CORE_CONIC_TRAITS
|
||||
cv = Curve_2(x1, y1, x2, y2);
|
||||
|
|
@ -308,7 +343,14 @@ public:
|
|||
#else
|
||||
|
||||
// Read a general conic, given by its coefficients <r,s,t,u,v,w>.
|
||||
str_line >> r >> s >> t >> u >> v >> w;
|
||||
CfRT r_in, s_in, t_in, u_in, v_in, w_in;
|
||||
str_line >> r_in >> s_in >> t_in >> u_in >> v_in >> w_in;
|
||||
r = r_in;
|
||||
s = s_in;
|
||||
t = t_in;
|
||||
u = u_in;
|
||||
v = v_in;
|
||||
w = w_in;
|
||||
|
||||
// Read the approximated source, along with a general conic
|
||||
// <r_1,s_1,t_1,u_1,v_1,w_1> whose intersection with <r,s,t,u,v,w>
|
||||
|
|
@ -316,8 +358,19 @@ public:
|
|||
CfNT r1, s1, t1, u1, v1, w1;
|
||||
CfNT x1, y1;
|
||||
|
||||
str_line >> x1 >> y1;
|
||||
str_line >> r1 >> s1 >> t1 >> u1 >> v1 >> w1;
|
||||
CfRT x1_in, y1_in;
|
||||
str_line >> x1_in >> y1_in;
|
||||
x1 = x1_in;
|
||||
y1 = y1_in;
|
||||
|
||||
CfRT r1_in, s1_in, t1_in, u1_in, v1_in, w1_in;
|
||||
str_line >> r1_in >> s1_in >> t1_in >> u1_in >> v1_in >> w1_in;
|
||||
r1 = r1_in;
|
||||
s1 = s1_in;
|
||||
t1 = t1_in;
|
||||
u1 = u1_in;
|
||||
v1 = v1_in;
|
||||
w1 = w1_in;
|
||||
|
||||
// Read the approximated target, along with a general conic
|
||||
// <r_2,s_2,t_2,u_2,v_2,w_2> whose intersection with <r,s,t,u,v,w>
|
||||
|
|
@ -325,9 +378,20 @@ public:
|
|||
CfNT r2, s2, t2, u2, v2, w2;
|
||||
CfNT x2, y2;
|
||||
|
||||
str_line >> x2 >> y2;
|
||||
str_line >> r2 >> s2 >> t2 >> u2 >> v2 >> w2;
|
||||
|
||||
CfRT x2_in, y2_in;
|
||||
str_line >> x2_in >> y2_in;
|
||||
x2 = x2_in;
|
||||
y2 = y2_in;
|
||||
|
||||
CfRT r2_in, s2_in, t2_in, u2_in, v2_in, w2_in;
|
||||
str_line >> r2_in >> s2_in >> t2_in >> u2_in >> v2_in >> w2_in;
|
||||
r2 = r2_in;
|
||||
s2 = s2_in;
|
||||
t2 = t2_in;
|
||||
u2 = u2_in;
|
||||
v2 = v2_in;
|
||||
w2 = w2_in;
|
||||
|
||||
// Create the conic arc.
|
||||
#if BENCH_TRAITS == CORE_CONIC_TRAITS
|
||||
std::cerr << "Not implemented!" << std::endl;
|
||||
|
|
@ -349,14 +413,14 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
#if BENCH_TRAITS == CK_CIRCLE_TRAITS
|
||||
std::cerr << "Skipping End Points!" << std::endl;
|
||||
return false;
|
||||
#else
|
||||
|
||||
// Read the end points of the arc and create it.
|
||||
CfNT x1, y1, x2, y2;
|
||||
str_line >> x1 >> y1 >> x2 >> y2;
|
||||
CfRT x1_in, y1_in, x2_in, y2_in;
|
||||
str_line >> x1_in >> y1_in >> x2_in >> y2_in;
|
||||
x1 = x1_in;
|
||||
y1 = y1_in;
|
||||
x2 = x2_in;
|
||||
y2 = y2_in;
|
||||
|
||||
Point_2 source (x1, y1);
|
||||
Point_2 target (x2, y2);
|
||||
|
|
@ -364,8 +428,9 @@ public:
|
|||
// Create the conic (or circular) arc.
|
||||
if (is_circle)
|
||||
{
|
||||
#if BENCH_TRAITS != CK_CIRCLE_TRAITS
|
||||
#if BENCH_TRAITS == CORE_CONIC_TRAITS
|
||||
cv = Curve_2 (x0, y0, a*b, CGAL::CLOCKWISE, source, target);
|
||||
cv = Curve_2 (x0, y0, a, CGAL::CLOCKWISE, source, target);
|
||||
#else
|
||||
cv = Curve_2 (circle, source, target);
|
||||
#endif
|
||||
|
|
@ -378,11 +443,11 @@ public:
|
|||
cv = Curve_2 (r, s, t, u, v, w, CGAL::CLOCKWISE, source, target);
|
||||
#else
|
||||
cv = Curve_2 (r, s, t, u, v, w, source, target);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*! */
|
||||
|
|
|
|||
|
|
@ -20,18 +20,20 @@ CORE_CONIC_TRAITS = 8
|
|||
CK_CIRCLE_TRAITS = 9
|
||||
|
||||
DOUBLE_NT = 0
|
||||
GMPZ_NT = 1
|
||||
LEDA_RAT_NT = 2
|
||||
QUOTIENT_MP_FLOAT_NT = 3
|
||||
QUOTIENT_GMPZ_NT = 4
|
||||
GMPQ_NT = 5
|
||||
LAZY_LEDA_RAT_NT = 6
|
||||
LAZY_GMPQ_NT = 7
|
||||
LAZY_QUOTIENT_MP_FLOAT_NT = 8
|
||||
LEDA_REAL_NT = 9
|
||||
CORE_EXPR_NT = 10
|
||||
NIX_LEDA_FIELD_WITH_SQRT_NT = 11
|
||||
NIX_CORE_FIELD_WITH_SQRT_NT = 12
|
||||
MP_FLOAT_NT = 1
|
||||
GMPZ_NT = 2
|
||||
LEDA_RAT_NT = 3
|
||||
QUOTIENT_MP_FLOAT_NT = 4
|
||||
QUOTIENT_CGAL_GMPZ_NT = 5
|
||||
GMPQ_NT = 6
|
||||
CGAL_GMPQ_NT = 7
|
||||
LAZY_LEDA_RAT_NT = 8
|
||||
LAZY_CGAL_GMPQ_NT = 9
|
||||
LAZY_QUOTIENT_MP_FLOAT_NT = 10
|
||||
LEDA_REAL_NT = 11
|
||||
CORE_EXPR_NT = 12
|
||||
NIX_LEDA_FIELD_WITH_SQRT_NT = 13
|
||||
NIX_CORE_FIELD_WITH_SQRT_NT = 14
|
||||
|
||||
# Force values:
|
||||
ifeq ($(BENCH_KERNEL), $(LEDA_KERNEL))
|
||||
|
|
@ -115,8 +117,10 @@ LCPPDEFS+= -DCGAL_NO_PM_DEFAULT_POINT_LOCATION
|
|||
|
||||
LOBJDIR =
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
GCPPOPTS = -g
|
||||
else
|
||||
GCPPOPTS = -O3
|
||||
# GCPPOPTS = -g
|
||||
|
||||
ifeq ($(BENCH_TRAITS), $(CORE_CONIC_TRAITS))
|
||||
GCPPOPTS = -O
|
||||
|
|
@ -128,6 +132,14 @@ GCPPOPTS = -O
|
|||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BENCH_TRAITS), $(CK_CIRCLE_TRAITS))
|
||||
ifeq ($(BENCH_NT), $(CORE_EXPR_NT))
|
||||
GCPPOPTS = -O
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(USE_CGAL_WINDOW), 1)
|
||||
LCPPDEFS+= -DUSE_CGAL_WINDOW
|
||||
TARGET0 := $(TARGET0)CgalWindow
|
||||
|
|
@ -141,6 +153,10 @@ ifeq ($(BENCH_NT), $(DOUBLE_NT))
|
|||
TARGET0 := $(TARGET0)Double
|
||||
LOBJDIR :=$(LOBJDIR)_double
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(MP_FLOAT_NT))
|
||||
TARGET0 := $(TARGET0)MPFloat
|
||||
LOBJDIR :=$(LOBJDIR)_mp_float
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(GMPZ_NT))
|
||||
TARGET0 := $(TARGET0)Gmpz
|
||||
LOBJDIR :=$(LOBJDIR)_gmpz
|
||||
|
|
@ -153,21 +169,25 @@ ifeq ($(BENCH_NT), $(QUOTIENT_MP_FLOAT_NT))
|
|||
TARGET0 := $(TARGET0)Quotient
|
||||
LOBJDIR :=$(LOBJDIR)_quotient
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(QUOTIENT_GMPZ_NT))
|
||||
TARGET0 := $(TARGET0)QuotientGmpz
|
||||
LOBJDIR :=$(LOBJDIR)_quotient_gmpz
|
||||
ifeq ($(BENCH_NT), $(QUOTIENT_CGAL_GMPZ_NT))
|
||||
TARGET0 := $(TARGET0)QuotientCgalGmpz
|
||||
LOBJDIR :=$(LOBJDIR)_quotient_cgal_gmpz
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(GMPQ_NT))
|
||||
TARGET0 := $(TARGET0)Gmpq
|
||||
LOBJDIR :=$(LOBJDIR)_gmpq
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(CGAL_GMPQ_NT))
|
||||
TARGET0 := $(TARGET0)CgalGmpq
|
||||
LOBJDIR :=$(LOBJDIR)_cgal_gmpq
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(LAZY_LEDA_RAT_NT))
|
||||
TARGET0 := $(TARGET0)LazyRat
|
||||
LOBJDIR :=$(LOBJDIR)_lazy_rat
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(LAZY_GMPQ_NT))
|
||||
TARGET0 := $(TARGET0)LazyGmpq
|
||||
LOBJDIR :=$(LOBJDIR)_lazy_gmpq
|
||||
ifeq ($(BENCH_NT), $(LAZY_CGAL_GMPQ_NT))
|
||||
TARGET0 := $(TARGET0)LazyCgalGmpq
|
||||
LOBJDIR :=$(LOBJDIR)_lazy_cgal_gmpq
|
||||
else
|
||||
ifeq ($(BENCH_NT), $(LAZY_QUOTIENT_MP_FLOAT_NT))
|
||||
TARGET0 := $(TARGET0)LazyQuotient
|
||||
|
|
@ -201,6 +221,8 @@ endif
|
|||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Kernel:
|
||||
LCPPDEFS+= -DBENCH_KERNEL=$(BENCH_KERNEL)
|
||||
|
|
@ -296,9 +318,9 @@ LCPPINCS+= -I$(BASEDIR)/../../../Arrangement/include
|
|||
LCPPINCS+= -I$(BASEDIR)/../../../Trapezoidal_decomposition/include
|
||||
LCPPINCS+= -I$(BASEDIR)/../../../Sweep_line_2/include
|
||||
|
||||
ifneq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
# ifneq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
LCPPINCS+= -I$(COREROOT)/inc
|
||||
endif
|
||||
# endif
|
||||
|
||||
ifeq ($(BENCH_KERNEL), $(LEDA_KERNEL))
|
||||
LCPPINCS+= -I$(BASEDIR)/../../../Leda_rat_kernel/include
|
||||
|
|
@ -322,19 +344,20 @@ LCPPINCS+= -I$(CURVED_KERNEL_ROOT)/include
|
|||
endif
|
||||
LCPPINCS+= $(CGALINCS)
|
||||
|
||||
ifneq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
# ifneq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
LLDOPTS = -L$(CORE_LIB_DIR)
|
||||
LLDLIBS = -lcore
|
||||
else
|
||||
LLDLIBS = $(EXACUS_ROOT)/ConiX/src/.libs/libCnX.so
|
||||
# else
|
||||
ifeq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
LLDLIBS+= $(EXACUS_ROOT)/ConiX/src/.libs/libCnX.so
|
||||
LLDLIBS+= $(EXACUS_ROOT)/SweepX/src/.libs/libSoX.so
|
||||
LLDLIBS+= $(EXACUS_ROOT)/NumeriX/src/.libs/libNiX.so
|
||||
LLDLIBS+= $(EXACUS_ROOT)/Support/src/.libs/libLiS.so
|
||||
endif
|
||||
LLDLIBS+= $(CGALLIB) $(LEDALIBS) $(CGALQTLIB) $(QTLIB)
|
||||
ifeq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
LLDLIBS+= $(CGALCORELIB)
|
||||
endif
|
||||
# ifeq ($(BENCH_TRAITS), $(EXACUS_CONIC_TRAITS))
|
||||
# LLDLIBS+= $(CGALCORELIB)
|
||||
# endif
|
||||
LLDLIBS+= $(GMPLIBS)
|
||||
LLDLIBS+= -lX11 -lm
|
||||
LLDOPTS+= $(CGALLIBDIRS)
|
||||
|
|
@ -362,17 +385,17 @@ lazy_rat_seg:
|
|||
quotient_mp_float_seg:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
||||
quotient_qmpz:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
quotient_cgal_qmpz:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_CGAL_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
||||
lazy_quotient_mp_float_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
||||
gmpq_seg:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
cgal_gmpq_seg:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
||||
lazy_gmpq_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
lazy_cgal_gmpq_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
||||
double_seg:
|
||||
$(MAKEF) "BENCH_NT=$(DOUBLE_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)"
|
||||
|
|
@ -394,17 +417,17 @@ lazy_rat_cached_seg:
|
|||
quotient_mp_float_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
||||
quotient_gmpz_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
quotient_cgal_gmpz_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_CGAL_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
||||
lazy_quotient_mp_float_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
||||
gmpq_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
cgal_gmpq_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
||||
lazy_gmpq_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
lazy_cgal_gmpq_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
||||
double_cached_seg:
|
||||
$(MAKEF) "BENCH_NT=$(DOUBLE_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)"
|
||||
|
|
@ -415,8 +438,8 @@ all_non_cached: leda_rat_cartesian_seg \
|
|||
lazy_rat_seg \
|
||||
quotient_mp_float_seg \
|
||||
lazy_quotient_mp_float_seg \
|
||||
gmpq_seg \
|
||||
lazy_gmpq_seg \
|
||||
cgal_gmpq_seg \
|
||||
lazy_cgal_gmpq_seg \
|
||||
double_seg
|
||||
|
||||
all_cached: leda_rat_cartesian_cached_seg \
|
||||
|
|
@ -424,8 +447,8 @@ all_cached: leda_rat_cartesian_cached_seg \
|
|||
quotient_mp_float_cached_seg \
|
||||
lazy_rat_cached_seg \
|
||||
lazy_quotient_mp_float_cached_seg \
|
||||
gmpq_cached_seg \
|
||||
lazy_gmpq_cached_seg \
|
||||
cgal_gmpq_cached_seg \
|
||||
lazy_cgal_gmpq_cached_seg \
|
||||
double_cached_seg
|
||||
|
||||
# install:
|
||||
|
|
@ -448,17 +471,17 @@ lazy_rat_seg_inst:
|
|||
quotient_mp_float_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
||||
quotient_gmpz_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
quotient_cgal_gmpz_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_CGAL_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
||||
lazy_quotient_mp_float_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
||||
gmpq_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
cgal_gmpq_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
||||
lazy_gmpq_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
lazy_cgal_gmpq_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
||||
double_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(DOUBLE_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_TRAITS)" install
|
||||
|
|
@ -480,17 +503,17 @@ lazy_rat_cached_seg_inst:
|
|||
quotient_mp_float_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
||||
quotient_gmpz_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
quotient_cgal_gmpz_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_CGAL_GMPZ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
||||
lazy_quotient_mp_float_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_QUOTIENT_MP_FLOAT_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
||||
gmpq_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
cgal_gmpq_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
||||
lazy_gmpq_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
lazy_cgal_gmpq_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
||||
double_cached_seg_inst:
|
||||
$(MAKEF) "BENCH_NT=$(DOUBLE_NT)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" "BENCH_TRAITS=$(SEGMENT_CACHED_TRAITS)" install
|
||||
|
|
@ -499,11 +522,11 @@ double_cached_seg_inst:
|
|||
seg_std_inst: leda_rat_cartesian_seg_inst \
|
||||
leda_rat_simple_cartesian_seg_inst \
|
||||
quotient_mp_float_seg_inst \
|
||||
quotient_gmpz_seg_inst \
|
||||
quotient_cgal_gmpz_seg_inst \
|
||||
lazy_rat_seg_inst \
|
||||
lazy_quotient_mp_float_seg_inst \
|
||||
gmpq_seg_inst \
|
||||
lazy_gmpq_seg_inst \
|
||||
cgal_gmpq_seg_inst \
|
||||
lazy_cgal_gmpq_seg_inst \
|
||||
double_seg_inst
|
||||
|
||||
# leda_kernel_seg_inst \
|
||||
|
|
@ -511,11 +534,11 @@ seg_std_inst: leda_rat_cartesian_seg_inst \
|
|||
seg_cached_inst: leda_rat_cartesian_cached_seg_inst \
|
||||
leda_rat_simple_cartesian_cached_seg_inst \
|
||||
quotient_mp_float_cached_seg_inst \
|
||||
quotient_gmpz_cached_seg_inst \
|
||||
quotient_cgal_gmpz_cached_seg_inst \
|
||||
lazy_rat_cached_seg_inst \
|
||||
lazy_quotient_mp_float_cached_seg_inst \
|
||||
gmpq_cached_seg_inst \
|
||||
lazy_gmpq_cached_seg_inst \
|
||||
cgal_gmpq_cached_seg_inst \
|
||||
lazy_cgal_gmpq_cached_seg_inst \
|
||||
double_cached_seg_inst
|
||||
|
||||
# cached_seg_leda_kernel_inst \
|
||||
|
|
@ -542,11 +565,11 @@ leda_kernel_cached_pol_inst:
|
|||
pol_std_inst: leda_rat_cartesian_pol_inst \
|
||||
leda_rat_simple_cartesian_pol_inst \
|
||||
quotient_mp_float_pol_inst \
|
||||
quotient_gmpz_pol_inst \
|
||||
quotient_cgal_gmpz_pol_inst \
|
||||
lazy_rat_pol_inst \
|
||||
lazy_quotient_mp_float_pol_inst \
|
||||
gmpq_pol_inst \
|
||||
lazy_gmpq_pol_inst \
|
||||
cgal_gmpq_pol_inst \
|
||||
lazy_cgal_gmpq_pol_inst \
|
||||
double_pol_inst
|
||||
|
||||
# leda_kernel_pol_inst \
|
||||
|
|
@ -554,11 +577,11 @@ pol_std_inst: leda_rat_cartesian_pol_inst \
|
|||
pol_cached_inst: leda_rat_cartesian_cached_pol_inst \
|
||||
leda_rat_simple_cartesian_cached_pol_inst \
|
||||
quotient_mp_float_cached_pol_inst \
|
||||
quotient_gmpz_cached_pol_inst \
|
||||
quotient_cgal_gmpz_cached_pol_inst \
|
||||
lazy_rat_cached_pol_inst \
|
||||
lazy_quotient_mp_float_cached_pol_inst \
|
||||
gmpq_cached_pol_inst \
|
||||
lazy_gmpq_cached_pol_inst \
|
||||
cgal_gmpq_cached_pol_inst \
|
||||
lazy_cgal_gmpq_cached_pol_inst \
|
||||
double_cached_pol_inst
|
||||
|
||||
# leda_kernel_cached_pol_inst \
|
||||
|
|
@ -582,26 +605,26 @@ leda_exacus_conic:
|
|||
core_exacus_conic:
|
||||
$(MAKEF) "BENCH_NT=$(NIX_CORE_FIELD_WITH_SQRT_NT)" "BENCH_TRAITS=$(EXACUS_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)"
|
||||
|
||||
lazy_mpq_cartesian_ck_circle:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)"
|
||||
lazy_cgal_gmpq_cartesian_ck_circle:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)"
|
||||
|
||||
lazy_mpq_simple_cartesian_ck_circle:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)"
|
||||
lazy_cgal_gmpq_simple_cartesian_ck_circle:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)"
|
||||
|
||||
mpz_cartesian_ck_conic:
|
||||
$(MAKEF) "BENCH_NT=$(GMPZ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)"
|
||||
gmpq_cartesian_ck_conic:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)"
|
||||
|
||||
mpz_simple_cartesian_ck_conic:
|
||||
$(MAKEF) "BENCH_NT=$(GMPZ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)"
|
||||
gmpq_simple_cartesian_ck_conic:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)"
|
||||
|
||||
conics: cartesian_leda_conic \
|
||||
simple_cartesian_leda_conic \
|
||||
cartesian_core_conic \
|
||||
simple_cartesian_core_conic \
|
||||
lazy_mpq_cartesian_ck_circle \
|
||||
lazy_mpq_simple_cartesian_ck_circle \
|
||||
mpz_cartesian_ck_conic \
|
||||
mpz_simple_cartesian_ck_conic
|
||||
lazy_cgal_gmpq_cartesian_ck_circle \
|
||||
lazy_cgal_gmpq_simple_cartesian_ck_circle \
|
||||
gmpq_cartesian_ck_conic \
|
||||
gmpq_simple_cartesian_ck_conic
|
||||
|
||||
# With install:
|
||||
cartesian_leda_conic_inst:
|
||||
|
|
@ -616,45 +639,86 @@ cartesian_core_conic_inst:
|
|||
simple_cartesian_core_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CORE_EXPR_NT)" "BENCH_TRAITS=$(CORE_CONIC_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" "USE_CGAL_WINDOW=1" install
|
||||
|
||||
cgal_conics_int: cartesian_leda_conic_inst \
|
||||
simple_cartesian_leda_conic_inst \
|
||||
cartesian_core_conic_inst \
|
||||
simple_cartesian_core_conic_inst \
|
||||
|
||||
leda_exacus_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(NIX_LEDA_FIELD_WITH_SQRT_NT)" "BENCH_TRAITS=$(EXACUS_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
core_exacus_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(NIX_CORE_FIELD_WITH_SQRT_NT)" "BENCH_TRAITS=$(EXACUS_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
lazy_mpq_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
lazy_mpq_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
mpq_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
mpq_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
mpz_cartesian_ck_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPZ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
mpz_simple_cartesian_ck_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPZ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
cgal_conics_int: cartesian_leda_conic_inst \
|
||||
simple_cartesian_leda_conic_inst \
|
||||
cartesian_core_conic_inst \
|
||||
simple_cartesian_core_conic_inst \
|
||||
|
||||
exacus_conics_inst: leda_exacus_conic_inst \
|
||||
core_exacus_conic_inst
|
||||
|
||||
ck_circles_inst: mpq_cartesian_ck_circle_inst \
|
||||
mpq_simple_cartesian_ck_circle_inst \
|
||||
lazy_mpq_cartesian_ck_circle_inst \
|
||||
lazy_mpq_simple_cartesian_ck_circle_inst
|
||||
lazy_cgal_gmpq_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
ck_conics_inst: mpz_cartesian_ck_conic_inst \
|
||||
mpz_simple_cartesian_ck_conic_inst
|
||||
lazy_cgal_gmpq_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LAZY_CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
cgal_gmpq_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
cgal_gmpq_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CGAL_GMPQ_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
leda_real_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LEDA_REAL_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
leda_real_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LEDA_REAL_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
leda_rat_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LEDA_RAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
leda_rat_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(LEDA_RAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
quotient_mp_float_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
quotient_mp_float_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(QUOTIENT_MP_FLOAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
mp_float_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(MP_FLOAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
mp_float_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(MP_FLOAT_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
core_expr_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CORE_EXPR_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
core_expr_simple_cartesian_ck_circle_inst:
|
||||
$(MAKEF) "BENCH_NT=$(CORE_EXPR_NT)" "BENCH_TRAITS=$(CK_CIRCLE_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
ck_circles_inst: mp_float_cartesian_ck_circle_inst \
|
||||
mp_float_simple_cartesian_ck_circle_inst \
|
||||
cgal_gmpq_cartesian_ck_circle_inst \
|
||||
cgal_gmpq_simple_cartesian_ck_circle_inst \
|
||||
lazy_cgal_gmpq_cartesian_ck_circle_inst \
|
||||
lazy_cgal_gmpq_simple_cartesian_ck_circle_inst \
|
||||
quotient_mp_float_cartesian_ck_circle_inst \
|
||||
quotient_mp_float_simple_cartesian_ck_circle_inst \
|
||||
leda_real_cartesian_ck_circle_inst \
|
||||
leda_real_simple_cartesian_ck_circle_inst \
|
||||
core_expr_cartesian_ck_circle_inst \
|
||||
core_expr_simple_cartesian_ck_circle_inst
|
||||
|
||||
# leda_rat_cartesian_ck_circle_inst
|
||||
# leda_rat_simple_cartesian_ck_circle_inst
|
||||
|
||||
gmpq_cartesian_ck_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(CARTESIAN_KERNEL)" install
|
||||
|
||||
gmpq_simple_cartesian_ck_conic_inst:
|
||||
$(MAKEF) "BENCH_NT=$(GMPQ_NT)" "BENCH_TRAITS=$(CK_CONIC_TRAITS)" "BENCH_KERNEL=$(SIMPLE_CARTESIAN_KERNEL)" install
|
||||
|
||||
ck_conics_inst: gmpq_cartesian_ck_conic_inst \
|
||||
gmpq_simple_cartesian_ck_conic_inst
|
||||
|
||||
conic_inst: cgal_conics_int \
|
||||
exacus_conics_inst \
|
||||
|
|
|
|||
|
|
@ -80,16 +80,32 @@
|
|||
|
||||
// Curved-kernel Conics:
|
||||
#elif BENCH_TRAITS == CK_CIRCLE_TRAITS
|
||||
|
||||
// This does not belong here
|
||||
#ifdef CGAL_USE_GMP
|
||||
#include <ECG/Root_of/CGAL_Gmpq.h>
|
||||
#endif
|
||||
#ifdef CGAL_USE_GMPXX
|
||||
#include <ECG/Root_of/gmpxx.h>
|
||||
#endif
|
||||
#ifdef CGAL_USE_LEDA
|
||||
#if BENCH_NT == DOUBLE_NT
|
||||
#include <ECG/Root_of/double.h>
|
||||
#elif BENCH_NT == LEDA_REAL_NT
|
||||
#include <ECG/Root_of/leda_real.h>
|
||||
#elif BENCH_NT == QUOTIENT_MP_FLOAT_NT
|
||||
#include <ECG/Root_of/CGAL_Quotient.h>
|
||||
#elif BENCH_NT == GMPZ_NT
|
||||
#include <ECG/Root_of/gmpxx.h>
|
||||
#elif BENCH_NT == GMPQ_NT
|
||||
#include <ECG/Root_of/gmpxx.h>
|
||||
#elif BENCH_NT == CGAL_GMPQ_NT
|
||||
#include <ECG/Root_of/CGAL_Gmpq.h>
|
||||
#elif BENCH_NT == LAZY_LEDA_RAT_NT
|
||||
#include <ECG/Root_of/CGAL_Lazy_exact_nt.h>
|
||||
#elif BENCH_NT == LAZY_CGAL_GMPQ_NT
|
||||
#include <ECG/Root_of/CGAL_Lazy_exact_nt.h>
|
||||
#include <ECG/Root_of/gmpxx.h>
|
||||
#elif BENCH_NT == LAZY_QUOTIENT_MP_FLOAT_NT
|
||||
#include <ECG/Root_of/CGAL_Lazy_exact_nt.h>
|
||||
#include <ECG/Root_of/CGAL_Quotient.h>
|
||||
#elif BENCH_NT == CORE_EXPR_NT
|
||||
#include <ECG/Root_of/CORE_Expr.h>
|
||||
#endif
|
||||
|
||||
#include <ECG/Root_of/Root_of_2.h>
|
||||
|
||||
#include <ECG/Circular_kernel.h>
|
||||
|
|
|
|||
|
|
@ -18,18 +18,20 @@
|
|||
#define CK_CIRCLE_TRAITS 9
|
||||
|
||||
#define DOUBLE_NT 0
|
||||
#define GMPZ_NT 1
|
||||
#define LEDA_RAT_NT 2
|
||||
#define QUOTIENT_MP_FLOAT_NT 3
|
||||
#define QUOTIENT_GMPZ_NT 4
|
||||
#define GMPQ_NT 5
|
||||
#define LAZY_LEDA_RAT_NT 6
|
||||
#define LAZY_GMPQ_NT 7
|
||||
#define LAZY_QUOTIENT_MP_FLOAT_NT 8
|
||||
#define LEDA_REAL_NT 9
|
||||
#define CORE_EXPR_NT 10
|
||||
#define NIX_LEDA_FIELD_WITH_SQRT_NT 11
|
||||
#define NIX_CORE_FIELD_WITH_SQRT_NT 12
|
||||
#define MP_FLOAT_NT 1
|
||||
#define GMPZ_NT 2
|
||||
#define LEDA_RAT_NT 3
|
||||
#define QUOTIENT_MP_FLOAT_NT 4
|
||||
#define QUOTIENT_CGAL_GMPZ_NT 5
|
||||
#define GMPQ_NT 6
|
||||
#define CGAL_GMPQ_NT 7
|
||||
#define LAZY_LEDA_RAT_NT 8
|
||||
#define LAZY_CGAL_GMPQ_NT 9
|
||||
#define LAZY_QUOTIENT_MP_FLOAT_NT 10
|
||||
#define LEDA_REAL_NT 11
|
||||
#define CORE_EXPR_NT 12
|
||||
#define NIX_LEDA_FIELD_WITH_SQRT_NT 13
|
||||
#define NIX_CORE_FIELD_WITH_SQRT_NT 14
|
||||
|
||||
// Default value based on dependencies:
|
||||
#if BENCH_KERNEL == LEDA_KERNEL
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
#if BENCH_NT == DOUBLE_NT
|
||||
#include "Double.h"
|
||||
|
||||
#elif BENCH_NT == MP_FLOAT_NT
|
||||
#include <CGAL/MP_Float.h>
|
||||
|
||||
#elif BENCH_NT == GMPZ_NT
|
||||
#include <CGAL/gmpxx.h>
|
||||
|
||||
|
|
@ -20,17 +23,22 @@
|
|||
#include <CGAL/Lazy_exact_nt.h>
|
||||
|
||||
#elif BENCH_NT == GMPQ_NT
|
||||
#include <CGAL/Gmpq.h>
|
||||
#include <gmpxx.h>
|
||||
|
||||
#elif BENCH_NT == LAZY_GMPQ_NT
|
||||
#elif BENCH_NT == CGAL_GMPQ_NT
|
||||
#include <CGAL/Gmpq.h>
|
||||
#include <CGAL/Gmpz.h>
|
||||
|
||||
#elif BENCH_NT == LAZY_CGAL_GMPQ_NT
|
||||
#include <CGAL/Gmpq.h>
|
||||
#include <CGAL/Gmpz.h>
|
||||
#include <CGAL/Lazy_exact_nt.h>
|
||||
|
||||
#elif BENCH_NT == QUOTIENT_MP_FLOAT_NT
|
||||
#include <CGAL/MP_Float.h>
|
||||
#include <CGAL/Quotient.h>
|
||||
|
||||
#elif BENCH_NT == QUOTIENT_GMPZ_NT
|
||||
#elif BENCH_NT == QUOTIENT_CGAL_GMPZ_NT
|
||||
#include <CGAL/Gmpz.h>
|
||||
#include <CGAL/Quotient.h>
|
||||
|
||||
|
|
@ -70,58 +78,82 @@
|
|||
#if BENCH_NT == DOUBLE_NT
|
||||
typedef CGAL::Double NT;
|
||||
typedef NT WNT;
|
||||
typedef NT RT;
|
||||
#define NUMBER_TYPE "Double"
|
||||
|
||||
#elif BENCH_NT == MP_FLOAT_NT
|
||||
typedef CGAL::MP_Float NT;
|
||||
typedef NT WNT;
|
||||
typedef NT RT;
|
||||
#define NUMBER_TYPE "MP Float"
|
||||
|
||||
#elif BENCH_NT == GMPZ_NT
|
||||
typedef ::mpz_class NT;
|
||||
typedef NT WNT;
|
||||
typedef ::mpz_class RT;
|
||||
typedef ::mpq_class FT;
|
||||
typedef NT RT;
|
||||
#define NUMBER_TYPE "Gmpz"
|
||||
|
||||
#elif BENCH_NT == LEDA_RAT_NT
|
||||
typedef leda_rational NT;
|
||||
typedef NT WNT;
|
||||
typedef leda_int RT;
|
||||
#define NUMBER_TYPE "Leda Rat"
|
||||
|
||||
#elif BENCH_NT == LAZY_LEDA_RAT_NT
|
||||
typedef leda_rational NT;
|
||||
typedef CGAL::Lazy_exact_nt<NT> WNT;
|
||||
typedef leda_int RT;
|
||||
#define NUMBER_TYPE "Lazy Leda Rat"
|
||||
|
||||
#elif BENCH_NT == GMPQ_NT
|
||||
typedef CGAL::Gmpq NT;
|
||||
typedef ::mpq_class NT;
|
||||
typedef NT WNT;
|
||||
typedef ::mpz_class RT;
|
||||
typedef ::mpq_class FT;
|
||||
#define NUMBER_TYPE "Gmpq"
|
||||
|
||||
#elif BENCH_NT == LAZY_GMPQ_NT
|
||||
#elif BENCH_NT == CGAL_GMPQ_NT
|
||||
typedef CGAL::Gmpq NT;
|
||||
typedef NT WNT;
|
||||
typedef CGAL::Gmpz RT;
|
||||
typedef CGAL::Gmpq FT;
|
||||
#define NUMBER_TYPE "Cgal Gmpq"
|
||||
|
||||
#elif BENCH_NT == LAZY_CGAL_GMPQ_NT
|
||||
typedef CGAL::Gmpq NT;
|
||||
typedef CGAL::Lazy_exact_nt<NT> WNT;
|
||||
#define NUMBER_TYPE "Lazy Gmpq"
|
||||
typedef CGAL::Gmpz RT;
|
||||
typedef CGAL::Gmpq FT;
|
||||
#define NUMBER_TYPE "Lazy CGAL Gmpq"
|
||||
|
||||
#elif BENCH_NT == QUOTIENT_MP_FLOAT_NT
|
||||
typedef CGAL::Quotient<CGAL::MP_Float> NT;
|
||||
typedef NT WNT;
|
||||
typedef CGAL::MP_Float RT;
|
||||
#define NUMBER_TYPE "Quotient MP Float"
|
||||
|
||||
#elif BENCH_NT == QUOTIENT_GMPZ_NT
|
||||
#elif BENCH_NT == QUOTIENT_CGAL_GMPZ_NT
|
||||
typedef CGAL::Quotient<CGAL::Gmpz> NT;
|
||||
typedef NT WNT;
|
||||
typedef CGAL::Gmpz RT;
|
||||
#define NUMBER_TYPE "Quotient Gmpz"
|
||||
|
||||
#elif BENCH_NT == LAZY_QUOTIENT_MP_FLOAT_NT
|
||||
typedef CGAL::Quotient<CGAL::MP_Float> NT;
|
||||
typedef CGAL::Lazy_exact_nt<NT> WNT;
|
||||
typedef CGAL::MP_Float RT;
|
||||
#define NUMBER_TYPE "Lazy Quotient MP Float"
|
||||
|
||||
#elif BENCH_NT == LEDA_REAL_NT
|
||||
typedef leda_real NT;
|
||||
typedef NT WNT;
|
||||
typedef NT RT;
|
||||
#define NUMBER_TYPE "Leda Real"
|
||||
|
||||
#elif BENCH_NT == CORE_EXPR_NT
|
||||
typedef CORE::Expr NT;
|
||||
typedef NT WNT;
|
||||
typedef NT RT;
|
||||
#define NUMBER_TYPE "Core Expr"
|
||||
|
||||
// #elif BENCH_NT == NIX_ARITHMETIC_TRAITS_NT
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<class name="cls121" key="aggregate dummy PMWX Conics Cartesian Core Expr"/>
|
||||
<class name="cls122" key="aggregate dummy PMWX Conics Simple Cartesian Core Expr"/>
|
||||
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Gmpq"/>
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Cgal Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Cgal Gmpq"/>
|
||||
|
||||
<class name="cls221" key="aggregate dummy PMWX Curved Kernel Conics Cartesian Gmpz"/>
|
||||
<class name="cls222" key="aggregate dummy PMWX Curved Kernel Conics Simple Cartesian Gmpz"/>
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
<benchPmwxLedaRealSimpleCartesianConic/>
|
||||
<benchPmwxCgalWindowCoreExprCartesianCoreConic/>
|
||||
<benchPmwxCgalWindowCoreExprSimpleCartesianCoreConic/>
|
||||
<benchPmwxLazyGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpqCartesianCkCircle/>
|
||||
<benchPmwxGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpzCartesianCkConic/>
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
<benchPmwxLedaRealSimpleCartesianConic/>
|
||||
<benchPmwxCgalWindowCoreExprCartesianCoreConic/>
|
||||
<benchPmwxCgalWindowCoreExprSimpleCartesianCoreConic/>
|
||||
<benchPmwxLazyGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpqCartesianCkCircle/>
|
||||
<benchPmwxGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpzCartesianCkConic/>
|
||||
|
|
@ -113,8 +113,8 @@
|
|||
<benchPmwxLedaRealSimpleCartesianConic/>
|
||||
<benchPmwxCgalWindowCoreExprCartesianCoreConic/>
|
||||
<benchPmwxCgalWindowCoreExprSimpleCartesianCoreConic/>
|
||||
<benchPmwxLazyGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpqCartesianCkCircle/>
|
||||
<benchPmwxGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpzCartesianCkConic/>
|
||||
|
|
@ -127,8 +127,8 @@
|
|||
<benchPmwxLedaRealSimpleCartesianConic/>
|
||||
<benchPmwxCgalWindowCoreExprCartesianCoreConic/>
|
||||
<benchPmwxCgalWindowCoreExprSimpleCartesianCoreConic/>
|
||||
<benchPmwxLazyGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpqCartesianCkCircle/>
|
||||
<benchPmwxGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpzCartesianCkConic/>
|
||||
|
|
@ -207,8 +207,8 @@
|
|||
<benchPmwxLedaRealSimpleCartesianConic/>
|
||||
<benchPmwxCgalWindowCoreExprCartesianCoreConic/>
|
||||
<benchPmwxCgalWindowCoreExprSimpleCartesianCoreConic/>
|
||||
<benchPmwxLazyGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqCartesianCkCircle/>
|
||||
<benchPmwxLazyCgalGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpqCartesianCkCircle/>
|
||||
<benchPmwxGmpqSimpleCartesianCkCircle/>
|
||||
<benchPmwxGmpzCartesianCkConic/>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<class name="cls121" key="aggregate dummy PMWX Conics Cartesian Core Expr"/>
|
||||
<class name="cls122" key="aggregate dummy PMWX Conics Simple Cartesian Core Expr"/>
|
||||
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Gmpq"/>
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Cgal Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Cgal Gmpq"/>
|
||||
|
||||
<class name="cls221" key="aggregate dummy PMWX Curved Kernel Conics Cartesian Gmpz"/>
|
||||
<class name="cls222" key="aggregate dummy PMWX Curved Kernel Conics Simple Cartesian Gmpz"/>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<clo name="strategy_mask" string="-bsm="/>
|
||||
|
||||
<file name="deg_ellipses30.cnx" format="dat" curves="30"
|
||||
vertices="1300" halfedges="5080" faces="1242"></file>
|
||||
vertices="1023" halfedges="4052" faces="1005"></file>
|
||||
<file name="deg_ellipses60.cnx" format="dat" curves="60"
|
||||
vertices="4934" halfedges="19496" faces="4816"></file>
|
||||
<file name="deg_ellipses90.cnx" format="dat" curves="90"
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<class name="cls121" key="aggregate dummy PMWX Conics Cartesian Core Expr"/>
|
||||
<class name="cls122" key="aggregate dummy PMWX Conics Simple Cartesian Core Expr"/>
|
||||
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Gmpq"/>
|
||||
<class name="cls211" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls212" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Lazy Cgal Gmpq"/>
|
||||
<class name="cls213" key="aggregate dummy PMWX Curved Kernel Circles Cartesian Cgal Gmpq"/>
|
||||
<class name="cls214" key="aggregate dummy PMWX Curved Kernel Circles Simple Cartesian Cgal Gmpq"/>
|
||||
|
||||
<class name="cls221" key="aggregate dummy PMWX Curved Kernel Conics Cartesian Gmpz"/>
|
||||
<class name="cls222" key="aggregate dummy PMWX Curved Kernel Conics Simple Cartesian Gmpz"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
include $(ROOT)/include/make/comdef.mak
|
||||
FILES = benchPmwxDb.xml
|
||||
FILES+= benchPmwxConics.xml
|
||||
FILES+= benchPmwxConics2.xml
|
||||
FILES+= benchPmwxConics3.xml
|
||||
FILES+= benchPmwxSegments.xml
|
||||
FILES+= benchCompareSweep.xml
|
||||
FILES+= benchCompareSweepConics.xml
|
||||
|
|
|
|||
Loading…
Reference in New Issue