Commit Graph

366 Commits

Author SHA1 Message Date
Eric Berberich aafbba2bc6 dos2unix 2008-01-30 23:40:02 +00:00
Eric Berberich 61b6138e2b removed _m_ckva 2008-01-30 23:37:55 +00:00
Eric Berberich ce912c99e5 fix in rebind 2008-01-30 23:37:33 +00:00
Eric Berberich 4aeb217d93 use &Self::instance() 2008-01-30 23:37:16 +00:00
Eric Berberich 78215d92af updated version 2008-01-30 23:25:38 +00:00
Eric Berberich d4d542acad removed arc_rep from point and extended private constructors 2008-01-30 22:27:20 +00:00
Eric Berberich 72bb50c46d compile fix 2008-01-29 18:45:36 +00:00
Pavel Emeliyanenko 192fa460ab resolved merge conflicts 2008-01-29 18:23:58 +00:00
Eric Berberich ccc6a7c4d9 functors are constructed from &Self::instance() 2008-01-29 18:22:27 +00:00
Pavel Emeliyanenko 3a261c7274 changed Functor(this -> &CKvA::instance()) in macros and minor things 2008-01-29 17:43:09 +00:00
Eric Berberich 59314b190b NiX::to_double 2008-01-29 16:56:16 +00:00
Michael Kerber 1e0a5ea7cb Filtered intersection uses trimmed arcs 2008-01-29 16:19:44 +00:00
Michael Kerber 9ec27b44d8 replaced trim-method 2008-01-29 16:18:40 +00:00
Michael Kerber 4628cec216 New methods _trim and _trim_by_arc 2008-01-29 16:17:57 +00:00
Eric Berberich d455b06924 cosmetics 2008-01-29 15:26:38 +00:00
Eric Berberich a03ca9cbd7 added assertions 2008-01-29 14:20:02 +00:00
Eric Berberich d742b53413 bugfix: asympotic arc was wrongly constructed 2008-01-29 09:06:27 +00:00
Eric Berberich f5d0d21899 fixed output 2008-01-29 09:06:05 +00:00
Eric Berberich 34bb882be1 compute y-coordinate 2008-01-28 20:12:10 +00:00
Eric Berberich ffce5f1ad2 added cout to equal 2008-01-28 14:19:31 +00:00
Eric Berberich a5d7f71800 fixed a cout problem 2008-01-28 12:43:40 +00:00
Eric Berberich 4a5a176dda make use of asymptotic_value_of_arc 2008-01-28 08:25:14 +00:00
Eric Berberich e9ead84887 removed couts 2008-01-27 10:27:36 +00:00
Eric Berberich 7265ca260b added gfx point
fixes in intersect
2008-01-27 10:26:47 +00:00
Pavel Emeliyanenko 26569cbec8 removed _m_is_finite 2008-01-26 11:08:55 +00:00
Pavel Emeliyanenko 0b20550347 removed NiX::total_degree 2008-01-24 17:54:12 +00:00
Eric Berberich ce5ee020f1 correct type 2008-01-24 17:22:49 +00:00
Eric Berberich b081906407 correct include 2008-01-24 17:22:37 +00:00
Eric Berberich 178002e4c0 removed debug code 2008-01-24 17:22:25 +00:00
Eric Berberich 30d0c748db make use of Curve_analysis_2 2008-01-24 17:22:14 +00:00
Pavel Emeliyanenko 73dde4f8c9 fixed preconditions 2008-01-24 13:07:35 +00:00
Eric Berberich ee1376ccc8 reference surface of instance()
lifting of arcs

make use of cache

returned objects through oi
2008-01-24 12:28:22 +00:00
Eric Berberich 910805daab cosmetics 2008-01-24 12:27:30 +00:00
Pavel Emeliyanenko 949056f983 Curve_2 -> Curve_analysis_2 2008-01-24 11:39:02 +00:00
Eric Berberich 73118fe3de added quadric_pair
made constructors public, removed kernel

introduced instance()
2008-01-24 10:24:29 +00:00
Eric Berberich 752f60e8d1 cosmetics 2008-01-24 10:10:40 +00:00
Eric Berberich 0794fa46c8 finite in rebind
cosmetics
2008-01-24 10:10:26 +00:00
Eric Berberich 523c2d93fd used instance 2008-01-24 10:09:55 +00:00
Eric Berberich 1015b17a1c cosmetics 2008-01-24 09:10:33 +00:00
Eric Berberich 620a777d09 removed kernel from constructors
used instance()
2008-01-24 09:08:13 +00:00
Eric Berberich 1accabade2 removed kernel from ctors 2008-01-24 09:06:42 +00:00
Eric Berberich 81d9c06c45 added instance() 2008-01-24 09:05:47 +00:00
Eric Berberich d493d2b35c removed debug code 2008-01-24 09:02:43 +00:00
Pavel Emeliyanenko e557f990ac small bugfix 2008-01-23 17:27:27 +00:00
Eric Berberich e3ec9449ce clean up 2008-01-22 19:10:41 +00:00
Eric Berberich 98d6f3fe3b compile fix 2008-01-22 19:10:26 +00:00
Eric Berberich 83da20ebc7 added precondition 2008-01-22 19:10:14 +00:00
Eric Berberich a73cec546c bugfix for Is_bounded_2 2008-01-22 18:55:40 +00:00
Eric Berberich 763852242f is_finite instead of location 2008-01-22 18:52:23 +00:00
Eric Berberich 259e268a59 use CK-functors instead of ak-functors 2008-01-22 17:52:47 +00:00
Eric Berberich 6ae600e561 reuse same_arc_compare_xy 2008-01-22 17:34:38 +00:00
Eric Berberich b06259fcbb pring surface/sheet only if point is finte
simplified a predicate

added trim/split/merge
2008-01-22 16:36:35 +00:00
Eric Berberich 4ca3a20e70 rebind filled 2008-01-22 16:35:16 +00:00
Eric Berberich dc5abbcb8b cosmetics 2008-01-22 16:32:49 +00:00
Eric Berberich 72d698ed89 small changes 2008-01-22 16:32:12 +00:00
Eric Berberich 57ef1e2d6c added preconditions 2008-01-22 16:31:41 +00:00
Eric Berberich a48d69a56f added friends to rep
correct is_finite test
2008-01-22 16:31:21 +00:00
Eric Berberich 04eed19ebd don't ask location for access to arc_rep 2008-01-22 09:50:49 +00:00
Eric Berberich fed4356daf missed Do_overlap -> fixed now
implem. intersect
2008-01-21 19:29:27 +00:00
Eric Berberich 088deb2440 filled in rebind 2008-01-21 19:28:53 +00:00
Eric Berberich 15de278023 cosmetics 2008-01-21 19:27:26 +00:00
Pavel Emeliyanenko 635a146e07 small changes 2008-01-19 15:33:52 +00:00
Michael Kerber d8620dc23e Continued on Filtered_curve_kernel_via_analysis_2 and Filtered_algebraic_curve_kernel_2 2008-01-16 16:05:52 +00:00
Eric Berberich 156d7012a3 added filtered versions of
Compare_xy_2 
Compare_y_near_boundary_2
Compare_y_at_x
Compare_y_at_left_2
Compare_y_at_right_2
Is_on_2
2008-01-14 22:29:41 +00:00
Eric Berberich d771dc43d8 derived all functors for Base_functor class 2008-01-14 21:53:59 +00:00
Eric Berberich a96a1b11ff removed Kernel_point_2 typedef 2008-01-14 21:53:29 +00:00
Eric Berberich 374c752c65 better includes
better documentation

rebinding-friends

fixed Base::operator() calls

added functors to QK_2

intproduced projected kernel

added TODOs + cosmetics
2008-01-14 21:03:01 +00:00
Eric Berberich d666dee82d added projected_arc and -point to rep
introduced rebinding

fixed some preconditions

added TODOs




cosmetics
2008-01-14 21:00:06 +00:00
Eric Berberich 29a1567011 cosmetics 2008-01-14 20:58:40 +00:00
Eric Berberich 836c22a800 added Kernel_point_2
added Rebound_point_2



cosmetics
2008-01-14 20:57:47 +00:00
Eric Berberich 799435ce41 added Rebound_arc_2 ;-) 2008-01-14 20:57:01 +00:00
Pavel Emeliyanenko e78f699424 added TODOs 2008-01-14 16:39:14 +00:00
Eric Berberich f0c8ff80e1 functors are using base now 2008-01-14 14:35:36 +00:00
Eric Berberich 7094250dd1 COnstruct_point_on_arc_2 also uses base functor now 2008-01-14 14:19:21 +00:00
Eric Berberich 94ca5af11e Construct_point/arc_2 use now base functor 2008-01-14 14:12:26 +00:00
Eric Berberich 0a7eaaa954 moved functors to own file 2008-01-14 14:11:44 +00:00
Michael Kerber eec8e41d4d Implemented filtered intersection predicates 2008-01-14 14:08:37 +00:00
Eric Berberich cd2d760fb7 modified TODO 2008-01-14 13:55:38 +00:00
Eric Berberich 915bcf0bcf modified TODO 2008-01-14 13:47:29 +00:00
Eric Berberich a33a734abc modified TODOs 2008-01-14 13:46:46 +00:00
Eric Berberich 85c6fc7356 modified TODOs 2008-01-14 13:45:56 +00:00
Eric Berberich 39df2274a2 modified TODOs 2008-01-14 13:45:00 +00:00
Eric Berberich 124f8ca113 introduced base functor 2008-01-14 13:44:36 +00:00
Eric Berberich 7566e2a44e combined 2008-01-14 12:48:39 +00:00
Eric Berberich 9b70b1b978 removed template parameters from operators 2008-01-14 12:47:51 +00:00
Eric Berberich 27c28bb710 Curve_kernel_2 types! 2008-01-14 12:46:02 +00:00
Eric Berberich 09087871a1 Curve_kernel_2 types 2008-01-14 12:45:19 +00:00
Eric Berberich 11af6e6ecd removed arc_base
Curve_kernel_2 types!
2008-01-14 12:44:59 +00:00
Eric Berberich b396607dba cleaned types 2008-01-14 12:44:07 +00:00
Eric Berberich 7ad071db3f cosmetics 2008-01-14 09:30:07 +00:00
Eric Berberich a2688a8702 using finiteness 2008-01-14 08:39:28 +00:00
Eric Berberich 9578eb7c96 cosmetics 2008-01-14 08:38:37 +00:00
Eric Berberich 95980ccc58 new friend technique 2008-01-14 08:38:14 +00:00
Eric Berberich 8fda9fba10 added task 2008-01-14 08:22:27 +00:00
Eric Berberich 0c98827f0f cosmetics 2008-01-14 08:22:04 +00:00
Eric Berberich 5c3d478abe cosmetics 2008-01-14 08:20:11 +00:00
Eric Berberich d72c25a30f added rebinding
sorting wrt location

made some members inline
2008-01-14 08:19:15 +00:00
Eric Berberich 640c1da58d using projected kernel and use rebinding
made some members inline
2008-01-14 08:18:21 +00:00
Eric Berberich 3f1dbc03d7 curve_end is accessible for finite
functor calls fixed
2008-01-13 21:34:14 +00:00
Eric Berberich bd7f4c9bf0 fixed constructors
fixed return type
2008-01-13 21:33:08 +00:00
Eric Berberich d04dec7981 made setLocation public 2008-01-13 21:31:52 +00:00
Eric Berberich 61b0c09745 minor changes 2008-01-13 21:12:11 +00:00
Eric Berberich ca65e38999 fixed compile bug 2008-01-13 21:11:49 +00:00
Eric Berberich b99c647549 set_location! 2008-01-11 18:30:10 +00:00
Eric Berberich 6d4f1f7cea added construct_projected_arc_2 2008-01-11 17:39:29 +00:00
Eric Berberich 5c2efe128a removed friend
made descructor public
2008-01-11 17:39:10 +00:00
Eric Berberich 3577b6f659 added missing functors 2008-01-11 13:59:33 +00:00
Eric Berberich 1a774857b7 made some members inline
added is_finite
2008-01-11 13:58:36 +00:00
Eric Berberich 4b47a5d2fa added compare_y_at_x 2008-01-11 00:38:11 +00:00
Eric Berberich 077c0d67d2 added Compare_y_near_boundary_2 2008-01-11 00:01:54 +00:00
Eric Berberich 976b647ce2 delayed a task 2008-01-11 00:01:21 +00:00
Eric Berberich ba0208b4b0 added Intersect_2 and Make_x_monotone_2 functors
added reference surface
2008-01-10 16:59:02 +00:00
Eric Berberich 57eb5fc9f3 read Curve_2 from Curve_kernel_2 2008-01-10 16:58:10 +00:00
Eric Berberich 21a2a887e0 details with befriending
new write for arcs

cosmetics
2008-01-10 16:02:41 +00:00
Eric Berberich c8cc2c1ec1 new order of predicates
new technique for befriending
2008-01-10 13:50:44 +00:00
Eric Berberich f5e033e2c4 added initial version of Filtered_CKvA_2 2008-01-10 13:18:44 +00:00
Eric Berberich ffd9207261 added friend 2008-01-10 13:18:14 +00:00
Eric Berberich d0ce088cd5 made private data protected 2008-01-10 13:18:03 +00:00
Eric Berberich 01b2780489 added missing ctors 2008-01-09 23:42:53 +00:00
Eric Berberich 4a28fd87cb missing publig 2008-01-09 23:42:36 +00:00
Eric Berberich dd7d2e980f added missing operators to Construct_arc_2l 2008-01-09 23:19:00 +00:00
Eric Berberich 33dec7794d added ckva to arc ctors 2008-01-09 23:02:49 +00:00
Eric Berberich 178a23d104 new class name 2008-01-09 22:40:49 +00:00
Eric Berberich dcb8acb392 new name 2008-01-09 22:25:06 +00:00
Eric Berberich a92375356c added projected_point() 2008-01-09 22:21:50 +00:00
Eric Berberich 4ff3582753 introduced stub for Construct_arc_2l
implemented ckva* for Surface_point_2l
2008-01-09 22:05:22 +00:00
Eric Berberich ef1dabaaf4 Added CKvA_2* to Point_2 ctor + code cosmetics 2008-01-09 21:43:38 +00:00
Eric Berberich a50c901a94 removed Curve_kernel_2 2008-01-09 21:07:41 +00:00
Eric Berberich fcc72dd02f added ckva* to ctors 2008-01-09 21:03:50 +00:00
Eric Berberich 5f8ea1f580 moved remaining impl of predicates to functors 2008-01-09 19:50:28 +00:00
Eric Berberich a27983456b order or members + code cosmetics 2008-01-09 19:15:36 +00:00
Eric Berberich acf90a5153 added Coonstruct_arc_2
made some ctors of arcs protected

most members call functors
2008-01-09 17:10:57 +00:00
Eric Berberich f191818356 added tasks 2008-01-08 17:33:15 +00:00
Eric Berberich 7592bf8f96 QP_2l_rep:
added ctors

QP_2l: 
made some ctors protected
removed construct_point_2
added operator<<

QA_2l: 
correct friend
added types
added ctor
added intersect (will be removed)

added Compare_xy_2


QCK_2l:
correct Point_2 type

added functors
2008-01-07 15:44:27 +00:00
Eric Berberich ed7321e90c added Construct_point_2l
added Construct_point_on_arc_2

added Is_on_2
2008-01-07 15:40:32 +00:00
Eric Berberich 06130d6638 Planar -> Projected
made ctor protected

removed construct_point_on_arc to CK_2l
2008-01-07 15:39:36 +00:00
Eric Berberich 8318bddf3f Planar -> Projected 2008-01-07 15:38:56 +00:00
Eric Berberich 94c0328e9f new filename 2008-01-07 15:30:09 +00:00
Eric Berberich 13390be2e1 cosmetic change 2008-01-07 15:29:41 +00:00
Eric Berberich eb0fd2a00d new friend 2008-01-07 15:29:18 +00:00
Eric Berberich 020d7a27fe new name 2008-01-07 15:20:11 +00:00
Eric Berberich 7bf0ef1ec0 use construction functors of CK 2008-01-07 15:13:33 +00:00
Eric Berberich d028fb9ca0 added fix_reps to rep
use construction functors of ck
2008-01-07 15:13:06 +00:00
Eric Berberich 297f200881 added include
added Construct_point_2

some cosmetics

Compare_x_2/Compare_xy_2 operator became templated

added Is_on_2

added Construct_point_on_arc_2
2008-01-07 15:12:29 +00:00
Eric Berberich b6d38fb5a7 made compare_x virtual
operators without const ints
2008-01-07 15:10:32 +00:00
Eric Berberich a11ab701b5 added include
added ckva rep

made constructors protected
-> or "removed" some

removed construct_point_on_arc to CK

is_on, compare_x and compare_xy use functors

new friends
2008-01-07 14:58:17 +00:00
Eric Berberich 4ddcb0dba5 added construct point and construct point on arc 2008-01-07 14:55:41 +00:00
Eric Berberich e3846a5684 added .x() member for vertical arcs 2008-01-03 16:06:01 +00:00
Eric Berberich d302695628 bugfix: did not report all vertical arcs 2008-01-03 12:58:40 +00:00
Eric Berberich 11c7ec3362 code cosmetics 2008-01-03 12:54:20 +00:00
Eric Berberich 50767e1399 implemented Construct_point_on_arc_2 2008-01-02 10:59:07 +00:00
Eric Berberich 4da8705eb6 fixes in iostream 2008-01-02 10:58:20 +00:00
Eric Berberich 55ac00815d fixed assertion 2008-01-02 10:50:33 +00:00
Eric Berberich d405b2f2cd added correct call of intersect 2007-12-30 20:19:48 +00:00
Eric Berberich 3c61ef4523 rep needs arc_rep pointer
missing calls for add_ref fixed

inew version of intersect coprime

fix for boundary_in_x_interval
2007-12-30 20:19:01 +00:00
Eric Berberich a2802bc977 correct name for Construct_on_point_2 2007-12-30 20:17:24 +00:00
Eric Berberich 74941a7776 wrong variable name fixed 2007-12-30 20:14:00 +00:00
Eric Berberich 0bfea46eb1 switch signature 2007-12-22 23:57:15 +00:00
Eric Berberich 221e0d3970 crazy derivation! 2007-12-22 23:56:33 +00:00
Eric Berberich 388ac7bb0a wrong type 2007-12-22 23:34:17 +00:00
Eric Berberich 2f4ae2981c added constructors and access functions 2007-12-22 10:22:19 +00:00
Eric Berberich 63c9a3ecd4 moved Surface_arc_2l to its own file and added constructors 2007-12-22 08:35:36 +00:00
Eric Berberich 389b9533e3 cosmetics 2007-12-22 08:34:59 +00:00
Eric Berberich 4e5f44e110 added default c'tor for rep 2007-12-21 18:54:48 +00:00
Eric Berberich a16155c266 moved SLP_2l to own file and extended by constructors 2007-12-21 18:50:23 +00:00
Eric Berberich a7cd1db119 added is_on test 2007-12-20 14:25:00 +00:00
Eric Berberich 7b9ee82a61 fixed private problem 2007-12-20 13:45:43 +00:00
Eric Berberich 5e30e2ddb4 redesign wrt to reuse of functors and derivation of Point_2 + Arc_2 by extending
with surface
2007-12-20 13:23:16 +00:00
Eric Berberich c18e47c4a5 removed unnec typedefs 2007-12-20 13:22:04 +00:00
Eric Berberich 0ef46a7ff9 private 2007-12-20 13:21:25 +00:00
Eric Berberich b2258f5d2d added boundary_in_x_range_interior 2007-12-19 21:23:27 +00:00
Eric Berberich 8d16a7516a tricks to get private access 2007-12-19 21:22:49 +00:00
Eric Berberich 33ddabd914 added Boundary 2007-12-19 21:22:10 +00:00
Eric Berberich 622cb7ec37 forward constructors only 2007-12-19 20:10:15 +00:00
Eric Berberich 55ae9d07ea removed get_ prefix 2007-12-19 16:25:35 +00:00
Eric Berberich 1cc25cff11 mv'ed functors to new file 2007-12-19 13:50:38 +00:00
Eric Berberich badd7526ee added Compare_x_on_identification 2007-12-19 13:45:05 +00:00
Eric Berberich 630e18a36e new macro names + new namespace 2007-12-19 13:44:17 +00:00
Eric Berberich 3c7981d143 compare_end(s)_x -> compare_x_near_boundary
compare_y_at_x -> compare_y_near_boundary
2007-12-19 11:18:48 +00:00
Eric Berberich e416b65966 added first version of Quadrical_kernel_via_analysis_2l 2007-12-19 11:04:59 +00:00
Eric Berberich 73364cf814 added Rep to templates 2007-12-19 11:04:08 +00:00
Eric Berberich e98161e431 cosmetics
added .write
2007-12-19 10:59:15 +00:00
Eric Berberich beca967bb1 rep members are public
added .write
2007-12-19 10:58:47 +00:00
Eric Berberich 962b885444 added lifted version of CKvA 2007-12-18 23:53:42 +00:00
Eric Berberich f12e097372 added template parameters (templates itself) 2007-12-18 23:53:11 +00:00
Eric Berberich c39729fbca adapdted this + base 2007-12-18 23:51:15 +00:00
Eric Berberich 58dde59770 replaced Arc_2 -> Arc_2_base and some Self -> Arc_2
use Construct_point_2 in intersect
2007-12-18 23:49:07 +00:00
Eric Berberich e693f02434 added enums-include
arc_2_base_rep

added Construct_point_2
2007-12-18 23:43:42 +00:00
Eric Berberich d7345bbe5d initial version 2007-12-18 23:42:07 +00:00
Eric Berberich 6e739b1c5f cosmetics 2007-12-18 19:57:58 +00:00
Eric Berberich 4a7b28b69c make protected 2007-12-18 13:50:52 +00:00
Eric Berberich 2a905c5c61 added tags 2007-12-18 08:23:38 +00:00
Eric Berberich 917501ef6e added DUPIN_CYCLIDE
improved output
2007-12-17 23:26:49 +00:00
Eric Berberich 9141a1c2b0 added TODO 2007-12-17 11:14:50 +00:00
Eric Berberich 98b24e6fcb improved operator<< 2007-12-17 10:51:55 +00:00
Pavel Emeliyanenko 762157e5be Bugfix & some modifications 2007-12-15 13:28:15 +00:00
Eric Berberich 1eb76ae312 fixed output error 2007-12-14 15:47:25 +00:00
Eric Berberich aa8f60eecc improved outputiterator 2007-12-14 15:05:52 +00:00
Pavel Emeliyanenko 1c246b7f1e Blah 2007-12-14 10:35:45 +00:00
Eric Berberich 2106824afa added incldue 2007-12-13 17:05:39 +00:00