diff --git a/.gitattributes b/.gitattributes index 12b6234189f..44c499f309d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -758,6 +758,8 @@ Kinetic_data_structures/doc_tex/Kinetic_framework/architecture_pct.gif -text svn Kinetic_data_structures/doc_tex/Kinetic_framework/architecture_pct.pdf -text svneol=unset#application/pdf Kinetic_data_structures/doc_tex/Kinetic_framework/sort_usage_pct.gif -text svneol=unset#image/gif Kinetic_data_structures/doc_tex/Kinetic_framework_ref/#Time.tex# -text +Kinetic_data_structures/examples/Kinetic_framework/data/points_2 -text +Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 -text Kinetic_data_structures/include/CGAL/Kinetic/Exact_simulation_traits.h -text Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h -text Kinetic_data_structures/src/CGALQt/Kinetic_print.xpm -text diff --git a/Kinetic_data_structures/changes.txt b/Kinetic_data_structures/changes.txt index a3547685c56..52c48ee79fd 100644 --- a/Kinetic_data_structures/changes.txt +++ b/Kinetic_data_structures/changes.txt @@ -29,5 +29,6 @@ September 2006 Daniel Russel - changed Sign_above to Sign_after - computation of the sign after the current time is now exposed through the kinetic predicates - traits classes are now dimension independent - +- Kinetic_kernel now called Kinetic::Cartesian to be consistent with the + static one diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework/adding_certificate.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework/adding_certificate.tex index 3c569dfba36..2c749ba695a 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework/adding_certificate.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework/adding_certificate.tex @@ -29,8 +29,8 @@ object. \begin{ccExampleCode} template class My_kinetic_kernel: - public CGAL::Kinetic::Cartesian_kinetic_kernel { - typedef CGAL::Kinetic::Cartesian_kinetic_kernel P; + public CGAL::Kinetic::Cartesian { + typedef CGAL::Kinetic::Cartesian P; typedef My_kinetic_kernel This; public: typedef CGAL::Kinetic::internal::Certificate_generator > Positive_x_2; @@ -45,42 +45,69 @@ Now we have the unfortunately rather messy part of assembling a new \ccc{Kinetic::SimulationTraits} model. This is done in two steps for convenience. \begin{ccExampleCode} -struct My_st_types: public CGAL::Kinetic::Suggested_exact_simulation_traits_types { - typedef CGAL::Kinetic::Suggested_exact_simulation_traits_types P; - typedef My_kinetic_kernel::Point_2 Active_object; - typedef CGAL::Kinetic::Active_objects_vector Active_objects_table; - typedef CGAL::Kinetic::Instantaneous_kernel< My_st_types> Instantaneous_kernel; -}; +struct My_simulation_traits { + typedef My_simulation_traits This; -struct My_simulation_traits: - public CGAL::Kinetic::Simulation_traits -{ - typedef CGAL::Kinetic::Simulation_traits P; - My_simulation_traits(const P::Time &lb= P::Time(0), - const P::Time &ub=std::numeric_limits::infinity()): - P(lb,ub), - ap_(new Active_points_2_table()) {} + typedef CGAL::Exact_predicates_exact_constructions_kernel Static_kernel; + //typedef CGAL::Regular_triangulation_euclidean_traits_3 Static_kernel; + typedef CGAL::POLYNOMIAL::Polynomial Function; + typedef CGAL::POLYNOMIAL::Sturm_root_stack_traits Root_stack_traits; + typedef CGAL::POLYNOMIAL::Sturm_root_stack Root_stack; + typedef CGAL::POLYNOMIAL::Kernel Function_kernel; - typedef My_st_types::Active_objects_table Active_points_2_table; - Active_points_2_table* active_points_2_table_handle() { - return ap_.get(); - } - const Active_points_2_table* active_points_2_table_handle() const { - return ap_.get(); + typedef CGAL::Kinetic::Handle_degeneracy_function_kernel Simulator_function_kernel_base; + struct Simulator_function_kernel: public Simulator_function_kernel_base{}; + + typedef My_kinetic_kernel Kinetic_kernel; + typedef CGAL::Kinetic::Two_list_pointer_event_queue Event_queue; + typedef CGAL::Kinetic::Default_simulator Simulator; + + typedef CGAL::Kinetic::Active_objects_vector Active_points_1_table; + typedef CGAL::Kinetic::Active_objects_vector Active_points_2_table; + typedef CGAL::Kinetic::Active_objects_vector Active_points_3_table; + // typedef Active_objects_vector Active_weighted_points_3_table; + + typedef CGAL::Kinetic::Instantaneous_kernel Instantaneous_kernel; + + Active_points_1_table* active_points_1_table_handle() const { return ap1_.get();} + Active_points_2_table* active_points_2_table_handle() const {return ap2_.get();} + Active_points_3_table* active_points_3_table_handle() const {return ap3_.get();} + //Active_weighted_points_3_table* active_weighted_points_3_table_handle() const {return awp3_.get();} + + Simulator* simulator_handle() const { return sim_.get();} + const Static_kernel& static_kernel_object() const {return k_;} + const Kinetic_kernel& kinetic_kernel_object() const {return kk_;} + + Instantaneous_kernel instantaneous_kernel_object() const { + return Instantaneous_kernel(*this); } - typedef My_st_types::Instantaneous_kernel Instantaneous_kernel; - Instantaneous_kernel instantaneous_kernel_object() const - { - return Instantaneous_kernel(ap_, static_kernel_object()); + My_simulation_traits(const Simulator::Time &lb, + const Simulator::Time &ub): sim_(new Simulator(lb, ub)), + ap1_(new Active_points_1_table()), + ap2_(new Active_points_2_table()), + ap3_(new Active_points_3_table()) + {} + + + bool is_exact() const { + return true; } protected: - Active_points_2_table::Handle ap_; + Simulator::Handle sim_; + Active_points_1_table::Handle ap1_; + Active_points_2_table::Handle ap2_; + Active_points_3_table::Handle ap3_; + //Active_weighted_points_3_table::Handle awp3_; + Static_kernel k_; + Kinetic_kernel kk_; + Function_kernel fk_; }; + \end{ccExampleCode} Now the simulation traits can be used by a kinetic data structure. +Note that we define active point table for all dimensions. This is +needed by the \ccc{Kinetic::InstantaneousKernel}, even if they are not +used. + diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex index c10f01c3ed4..1422181b96c 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex @@ -1,5 +1,5 @@ % +------------------------------------------------------------------------+ -% | Reference manual page: Cartesian_kinetic_kernel.tex +% | Reference manual page: Cartesian.tex % +------------------------------------------------------------------------+ % | 20.03.2005 Author % | Package: Kinetic_data_structures @@ -11,7 +11,7 @@ % +------------------------------------------------------------------------+ -\begin{ccRefClass}{Kinetic::Cartesian_kinetic_kernel} %% add template arg's if necessary +\begin{ccRefClass}{Kinetic::Cartesian} %% add template arg's if necessary %% \ccHtmlCrossLink{} %% add further rules for cross referencing links %% \ccHtmlIndexC[class]{} %% add further index entries @@ -20,7 +20,7 @@ This class provides a model of \ccc{Kinetic::Kernel} for use with general Cartesian geometry. -\ccInclude{CGAL/Kinetic/Cartesian_kinetic_kernel.h} +\ccInclude{CGAL/Kinetic/Cartesian.h} \ccTypes diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex index 160ac015526..52ee2717745 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex @@ -49,7 +49,7 @@ instantaneous predicates. \ccHasModels -\ccc{Kinetic::Cartesian_kinetic_kernel}. +\ccc{Kinetic::Cartesian}. diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/SimulationTraits.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/SimulationTraits.tex index 27f718306e5..4bdbbd42786 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/SimulationTraits.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/SimulationTraits.tex @@ -109,7 +109,7 @@ The simulation traits class is simply there for convenience in order to bundle a #include #include #include -#include +#include #include #include #include @@ -130,7 +130,7 @@ struct My_simulation_traits { typedef CGAL::Kinetic::Handle_degeneracy_function_kernel Simulator_function_kernel_base; struct Simulator_function_kernel: public Simulator_function_kernel_base{}; - typedef Cartesian_kinetic_kernel Kinetic_kernel; + typedef Cartesian Kinetic_kernel; typedef Two_list_pointer_event_queue Event_queue; typedef Default_simulator Simulator; diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/intro.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/intro.tex index 0ebb890763c..e10bc499b51 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/intro.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/intro.tex @@ -23,7 +23,7 @@ Here we list the main classes and concepts provided by the framework to support \ccRefIdfierPage{Kinetic::Active_objects_vector} -\ccRefIdfierPage{Kinetic::Cartesian_kinetic_kernel} +\ccRefIdfierPage{Kinetic::Cartesian} \ccRefConceptPage{Kinetic::FunctionKernel} diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_2.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_2.cpp index 8f41e2b45d8..19b5a9cbaa2 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_2.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_2.cpp @@ -1,10 +1,10 @@ -#include +#include #include int main(int, char *[]) { - typedef CGAL::Kinetic::Exact_simulation_traits_2 Simulation_traits; + typedef CGAL::Kinetic::Exact_simulation_traits Simulation_traits; typedef Simulation_traits::Kinetic_kernel::Point_2 Moving_point_2; typedef CGAL::Kinetic::Delaunay_triangulation_2 KDel; diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_3.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_3.cpp index ea8f894108c..7a0c4c571f2 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_3.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/Delaunay_triangulation_3.cpp @@ -1,11 +1,11 @@ -#include +#include #include #include int main(int , char *[]) { - typedef CGAL::Kinetic::Exact_simulation_traits_3 Traits; + typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef CGAL::Kinetic::Delaunay_triangulation_3 KDel; diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/regular_triangulation_3.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/regular_triangulation_3.cpp index 59b419710fb..bf95ab39d6e 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/regular_triangulation_3.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/regular_triangulation_3.cpp @@ -1,11 +1,11 @@ -#include +#include #include int main(int, char *[]) { - typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits_3 Traits; + typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits Traits; typedef CGAL::Kinetic::Regular_triangulation_3 KDel; - Traits tr; + Traits tr(0,100000.0); KDel kdel(tr); Traits::Simulator::Handle sp= tr.simulator_handle(); diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/sort.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/sort.cpp index 7f55f974373..cdd0e552a4d 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/sort.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/sort.cpp @@ -1,13 +1,13 @@ #include -#include +#include #include #include int main(int, char *[]) { - typedef CGAL::Kinetic::Exact_simulation_traits_1 Traits; + typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef CGAL::Kinetic::Insert_event Insert_event; typedef Traits::Active_points_1_table::Data Moving_point; diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/sweepline.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/sweepline.cpp index 01967bf13b4..a17180860ec 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/sweepline.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/sweepline.cpp @@ -1,8 +1,7 @@ #include -#include #include #include -#include +#include #include #include #include @@ -117,17 +116,17 @@ double snap(NT v) { int main(int, char *[]) { - typedef CGAL::Kinetic::Inexact_simulation_traits_1 Traits; + typedef CGAL::Kinetic::Inexact_simulation_traits Traits; typedef Traits::Kinetic_kernel::Point_1 Point; typedef Traits::Simulator::Time Time; typedef CGAL::Kinetic::Insert_event Insert_event; typedef CGAL::Kinetic::Erase_event Erase_event; typedef Planar_arrangement Arrangement; - Traits tr; + Traits tr(0,1000000.0); Arrangement sort(tr); - typedef Traits::NT NT; + typedef Traits::Kinetic_kernel::Function_kernel::FT NT; Traits::Simulator::Handle sp= tr.simulator_handle(); diff --git a/Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp b/Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp index 6227959fffd..b01ff07cebe 100644 --- a/Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp +++ b/Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp @@ -1,8 +1,22 @@ -#include -#include +#define CGAL_CHECK_EXPENSIVE +#define CGAL_CHECK_EXACTNESS + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include + template struct Positive_x_f_2 { typedef typename KineticKernel::Certificate_function result_type; @@ -14,8 +28,8 @@ struct Positive_x_f_2 { template class My_kinetic_kernel: - public CGAL::Kinetic::Cartesian_kinetic_kernel { - typedef CGAL::Kinetic::Cartesian_kinetic_kernel P; + public CGAL::Kinetic::Cartesian { + typedef CGAL::Kinetic::Cartesian P; typedef My_kinetic_kernel This; public: typedef CGAL::Kinetic::Certificate_generator > Positive_x_2; @@ -26,53 +40,76 @@ public: }; -struct My_st_types: public CGAL::Kinetic::Suggested_exact_simulation_traits_types { - typedef CGAL::Kinetic::Suggested_exact_simulation_traits_types P; - typedef My_kinetic_kernel::Point_2 Active_object; - typedef CGAL::Kinetic::Active_objects_vector Active_objects_table; - typedef CGAL::Kinetic::Cartesian_instantaneous_kernel< Active_objects_table, - Static_kernel> Instantaneous_kernel; -}; +//#include -struct My_simulation_traits: - public CGAL::Kinetic::Simulation_traits -{ - typedef CGAL::Kinetic::Simulation_traits P; - My_simulation_traits(const P::Time &lb= P::Time(0), - const P::Time &ub=std::numeric_limits::infinity()): - P(lb,ub), - ap_(new Active_points_2_table()) {} +struct My_simulation_traits { + typedef My_simulation_traits This; - typedef My_st_types::Active_objects_table Active_points_2_table; - Active_points_2_table* active_points_2_table_handle() { - return ap_.get(); + typedef CGAL::Exact_predicates_exact_constructions_kernel Static_kernel; + //typedef CGAL::Regular_triangulation_euclidean_traits_3 Static_kernel; + typedef CGAL::POLYNOMIAL::Polynomial Function; + typedef CGAL::POLYNOMIAL::Sturm_root_stack_traits Root_stack_traits; + typedef CGAL::POLYNOMIAL::Sturm_root_stack Root_stack; + typedef CGAL::POLYNOMIAL::Kernel Function_kernel; + + typedef CGAL::Kinetic::Handle_degeneracy_function_kernel Simulator_function_kernel_base; + struct Simulator_function_kernel: public Simulator_function_kernel_base{}; + + typedef My_kinetic_kernel Kinetic_kernel; + typedef CGAL::Kinetic::Two_list_pointer_event_queue Event_queue; + typedef CGAL::Kinetic::Default_simulator Simulator; + + typedef CGAL::Kinetic::Active_objects_vector Active_points_1_table; + typedef CGAL::Kinetic::Active_objects_vector Active_points_2_table; + typedef CGAL::Kinetic::Active_objects_vector Active_points_3_table; + // typedef Active_objects_vector Active_weighted_points_3_table; + + typedef CGAL::Kinetic::Instantaneous_kernel Instantaneous_kernel; + + Active_points_1_table* active_points_1_table_handle() const { return ap1_.get();} + Active_points_2_table* active_points_2_table_handle() const {return ap2_.get();} + Active_points_3_table* active_points_3_table_handle() const {return ap3_.get();} + //Active_weighted_points_3_table* active_weighted_points_3_table_handle() const {return awp3_.get();} + + Simulator* simulator_handle() const { return sim_.get();} + const Static_kernel& static_kernel_object() const {return k_;} + const Kinetic_kernel& kinetic_kernel_object() const {return kk_;} + + Instantaneous_kernel instantaneous_kernel_object() const { + return Instantaneous_kernel(*this); } - const Active_points_2_table* active_points_2_table_handle() const { - return ap_.get(); - } - typedef My_st_types::Instantaneous_kernel Instantaneous_kernel; - Instantaneous_kernel instantaneous_kernel_object() const - { - return Instantaneous_kernel(ap_, static_kernel_object()); - } - bool is_exact() const{ + + My_simulation_traits(const Simulator::Time &lb, + const Simulator::Time &ub): sim_(new Simulator(lb, ub)), + ap1_(new Active_points_1_table()), + ap2_(new Active_points_2_table()), + ap3_(new Active_points_3_table()) + {} + + + bool is_exact() const { return true; } protected: - Active_points_2_table::Handle ap_; + Simulator::Handle sim_; + Active_points_1_table::Handle ap1_; + Active_points_2_table::Handle ap2_; + Active_points_3_table::Handle ap3_; + //Active_weighted_points_3_table::Handle awp3_; + Static_kernel k_; + Kinetic_kernel kk_; + Function_kernel fk_; }; + + int main(int, char *[]) { typedef My_simulation_traits Traits; typedef CGAL::Kinetic::Delaunay_triangulation_2 KDel; - Traits tr; + Traits tr(0,100000.0); KDel kdel(tr); std::ifstream in("data/points_2"); diff --git a/Kinetic_data_structures/examples/Kinetic_framework/data/points_2 b/Kinetic_data_structures/examples/Kinetic_framework/data/points_2 new file mode 100644 index 00000000000..a99c5c14a2d --- /dev/null +++ b/Kinetic_data_structures/examples/Kinetic_framework/data/points_2 @@ -0,0 +1,12 @@ +2208883755/536870912-1677070665/1073741824*t+5148250427009707/4503599627370496*t^2+4751527515/4294967296*t^3+780095151/1073741824*t^4 , -829888135/536870912+164779815/1073741824*t+259991255/1073741824*t^2-2576154935/2147483648*t^3+15092183/33554432*t^4 +4498589005/1073741824+324220135/536870912*t+4569583443421867/4503599627370496*t^2+504042375/2147483648*t^3-716102193/1073741824*t^4 , 1037828795/268435456+90106075/268435456*t+1396669645/1073741824*t^2-1691391645/4294967296*t^3+95703895/134217728*t^4 +1773426365/536870912-200074285/2147483648*t+7889864010410667/9007199254740992*t^2+1395869395/2147483648*t^3-330950153/536870912*t^4 , -273007785/67108864-1438634115/2147483648*t+188600935/268435456*t^2+921403485/2147483648*t^3+933238269/1073741824*t^4 +-494610465/268435456-295286755/268435456*t+8040903609767253/18014398509481984*t^2-1138152355/1073741824*t^3-766457651/1073741824*t^4 , -1065110785/268435456+36125935/2147483648*t-5660475398990507/4503599627370496*t^2+410322005/2147483648*t^3+943315091/1073741824*t^4 +-1066657915/536870912+3499181515/2147483648*t+7757501451031893/18014398509481984*t^2+1676786825/2147483648*t^3+507621065/536870912*t^4 , -4702408365/1073741824+4532273835/2147483648*t+7823177624671573/18014398509481984*t^2-2973475015/4294967296*t^3+1028354361/1073741824*t^4 +-2257014165/536870912-2297530935/1073741824*t-4967438623266133/4503599627370496*t^2-2450891395/4294967296*t^3+13876071/1073741824*t^4 , 813588565/268435456+654606505/2147483648*t+299606875/268435456*t^2+4607458935/4294967296*t^3-78336761/1073741824*t^4 +3904941165/1073741824+716582175/2147483648*t-5237107435328853/9007199254740992*t^2-626510095/1073741824*t^3+595010359/1073741824*t^4 , 3459647615/1073741824-3826061995/2147483648*t-8987837964397227/9007199254740992*t^2-528417935/2147483648*t^3-193923903/1073741824*t^4 +-854484765/536870912-37914845/268435456*t-7498588484184747/4503599627370496*t^2+398638145/536870912*t^3-377928883/1073741824*t^4 , -2263486575/536870912-3578497135/2147483648*t-178536605/134217728*t^2+3358874335/4294967296*t^3+289660669/536870912*t^4 +3131937025/1073741824+391125915/1073741824*t+3247625/2097152*t^2+2132157655/4294967296*t^3+367344359/1073741824*t^4 , -1034963625/1073741824+3905584275/2147483648*t+216497665/268435456*t^2-2831248515/4294967296*t^3-316717111/536870912*t^4 +67055525/33554432-2538116305/1073741824*t+638533655/1073741824*t^2-351942355/4294967296*t^3+546282839/1073741824*t^4 , 23309615/67108864-2506350145/2147483648*t-8838567676258987/18014398509481984*t^2+4778269705/4294967296*t^3-8579999/16777216*t^4 +-1560058925/1073741824-951931855/1073741824*t-426008745/536870912*t^2+4589162035/4294967296*t^3-781679561/1073741824*t^4 , -4346264455/1073741824+3505331435/2147483648*t-5308766993339733/9007199254740992*t^2-2367828215/2147483648*t^3-533838299/1073741824*t^4 + diff --git a/Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 b/Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 new file mode 100644 index 00000000000..b7881c6564d --- /dev/null +++ b/Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 @@ -0,0 +1,12 @@ +2208883755/536870912-1677070665/1073741824*t+5148250427009707/4503599627370496*t^2+4751527515/4294967296*t^3+780095151/1073741824*t^4 , -829888135/536870912+164779815/1073741824*t+259991255/1073741824*t^2-2576154935/2147483648*t^3+15092183/33554432*t^4 , 1 +4498589005/1073741824+324220135/536870912*t+4569583443421867/4503599627370496*t^2+504042375/2147483648*t^3-716102193/1073741824*t^4 , 1037828795/268435456+90106075/268435456*t+1396669645/1073741824*t^2-1691391645/4294967296*t^3+95703895/134217728*t^4 , 2 +1773426365/536870912-200074285/2147483648*t+7889864010410667/9007199254740992*t^2+1395869395/2147483648*t^3-330950153/536870912*t^4 , -273007785/67108864-1438634115/2147483648*t+188600935/268435456*t^2+921403485/2147483648*t^3+933238269/1073741824*t^4 , 3 +-494610465/268435456-295286755/268435456*t+8040903609767253/18014398509481984*t^2-1138152355/1073741824*t^3-766457651/1073741824*t^4 , -1065110785/268435456+36125935/2147483648*t-5660475398990507/4503599627370496*t^2+410322005/2147483648*t^3+943315091/1073741824*t^4 , 4 +-1066657915/536870912+3499181515/2147483648*t+7757501451031893/18014398509481984*t^2+1676786825/2147483648*t^3+507621065/536870912*t^4 , -4702408365/1073741824+4532273835/2147483648*t+7823177624671573/18014398509481984*t^2-2973475015/4294967296*t^3+1028354361/1073741824*t^4 , 5 +-2257014165/536870912-2297530935/1073741824*t-4967438623266133/4503599627370496*t^2-2450891395/4294967296*t^3+13876071/1073741824*t^4 , 813588565/268435456+654606505/2147483648*t+299606875/268435456*t^2+4607458935/4294967296*t^3-78336761/1073741824*t^4 , 6 +3904941165/1073741824+716582175/2147483648*t-5237107435328853/9007199254740992*t^2-626510095/1073741824*t^3+595010359/1073741824*t^4 , 3459647615/1073741824-3826061995/2147483648*t-8987837964397227/9007199254740992*t^2-528417935/2147483648*t^3-193923903/1073741824*t^4 , 7 +-854484765/536870912-37914845/268435456*t-7498588484184747/4503599627370496*t^2+398638145/536870912*t^3-377928883/1073741824*t^4 , -2263486575/536870912-3578497135/2147483648*t-178536605/134217728*t^2+3358874335/4294967296*t^3+289660669/536870912*t^4 , 8 +3131937025/1073741824+391125915/1073741824*t+3247625/2097152*t^2+2132157655/4294967296*t^3+367344359/1073741824*t^4 , -1034963625/1073741824+3905584275/2147483648*t+216497665/268435456*t^2-2831248515/4294967296*t^3-316717111/536870912*t^4 , 9 +67055525/33554432-2538116305/1073741824*t+638533655/1073741824*t^2-351942355/4294967296*t^3+546282839/1073741824*t^4 , 23309615/67108864-2506350145/2147483648*t-8838567676258987/18014398509481984*t^2+4778269705/4294967296*t^3-8579999/16777216*t^4 , 10 +-1560058925/1073741824-951931855/1073741824*t-426008745/536870912*t^2+4589162035/4294967296*t^3-781679561/1073741824*t^4 , -4346264455/1073741824+3505331435/2147483648*t-5308766993339733/9007199254740992*t^2-2367828215/2147483648*t^3-533838299/1073741824*t^4 , 11 + diff --git a/Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp b/Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp index 9e4a887b03e..278ca7f2792 100644 --- a/Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp +++ b/Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -40,7 +40,7 @@ std::ostream &operator<<(std::ostream &out, Event e) int main(int, char *[]) { - typedef CGAL::Kinetic::Inexact_simulation_traits_1::Kinetic_kernel::Function_kernel FK; + typedef CGAL::Kinetic::Inexact_simulation_traits::Kinetic_kernel::Function_kernel FK; typedef CGAL::Kinetic::Heap_pointer_event_queue Q; Q pq(0, 10000, FK()); typedef Q::Key Key; diff --git a/Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp b/Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp index 803abfbb83a..610bf7c662d 100644 --- a/Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp +++ b/Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -159,7 +159,7 @@ protected: int main(int, char *[]) { - typedef CGAL::Kinetic::Exact_simulation_traits_1 Traits; + typedef CGAL::Kinetic::Exact_simulation_traits Traits; typedef Trivial_kds TKDS; Traits tr(1,100);