diff --git a/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex b/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex index f9e42a366de..e13bd570217 100644 --- a/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex +++ b/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex @@ -459,7 +459,11 @@ typedef Triangulation_3 Tr; ... \end{ccExampleCode} -While now, what must be written is: +While now, there are two possibilities. The simplest one is to use the +class \ccc{Triangulation_vertex_base_with_info_3}, and this approach is +illustrated in a following subsection~\ref{Triangulation3-sec-examples-color}. +But when the user needs to access some type which depends on the triangulation +data structure (typically handles), then he must write: \begin{ccExampleCode} ... template < class GT, class Vb = Triangulation_vertex_base > @@ -510,6 +514,7 @@ The following two examples show how the user can plug his own vertex base in a triangulation. Changing the cell base is similar. \subsubsection{Adding a color} +\label{Triangulation3-sec-examples-color} When the user doesn't need to add a type in a vertex which depends on the \ccc{TriangulationDataStructure_3} (e.g. a \ccc{Vertex_handle} or \ccc{Cell_handle}), then he can use the diff --git a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.eps b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.eps index 0368aeea70d..2eb94169e01 100644 --- a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.eps +++ b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.eps @@ -1,9 +1,9 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: design.eps %%Creator: fig2dev Version 3.2 Patchlevel 3d -%%CreationDate: Wed Jun 11 04:20:05 2003 +%%CreationDate: Wed Sep 3 14:25:36 2003 %%For: spion@mpino1212 (Sylvain Pion,328,128,) -%%BoundingBox: 0 0 684 542 +%%BoundingBox: 0 0 684 514 %%Magnification: 1.0000 %%EndComments /$F2psDict 200 dict def @@ -45,7 +45,7 @@ $F2psDict /mtrx matrix put end save -newpath 0 542 moveto 0 0 lineto 684 0 lineto 684 542 lineto closepath clip newpath +newpath 0 514 moveto 0 0 lineto 684 0 lineto 684 514 lineto closepath clip newpath 171.5 398.2 translate 1 -1 scale @@ -145,17 +145,6 @@ n -329 946 m -449 466 l -569 946 l -329 946 l cp gs 0.00 setgray ef gr col0 s n -1800 -1800 m -1800 900 l gs col0 s gr % Polyline -15.000 slw -gs clippath -720 -2265 m 630 -2265 l 630 -2053 l 675 -2233 l 720 -2053 l cp -eoclip -n 675 -855 m - 675 -2250 l gs col0 s gr gr - -% arrowhead -7.500 slw -n 720 -2053 m 675 -2233 l 630 -2053 l 720 -2053 l cp gs 0.00 setgray ef gr col0 s -% Polyline 30.000 slw gs clippath 3270 3135 m 3030 3135 l 3030 3646 l 3150 3166 l 3270 3646 l cp @@ -268,25 +257,25 @@ n 5400 1350 m 7200 1350 l 7200 1800 l 5400 1800 l cp gs col0 s gr % Polyline gs clippath -3195 -2265 m 3105 -2265 l 3105 -2053 l 3150 -2233 l 3195 -2053 l cp +3195 -1365 m 3105 -1365 l 3105 -1153 l 3150 -1333 l 3195 -1153 l cp eoclip n 3150 1350 m - 3150 -2250 l gs col0 s gr gr + 3150 -1350 l gs col0 s gr gr % arrowhead 7.500 slw -n 3195 -2053 m 3150 -2233 l 3105 -2053 l 3195 -2053 l cp gs 0.00 setgray ef gr col0 s +n 3195 -1153 m 3150 -1333 l 3105 -1153 l 3195 -1153 l cp gs 0.00 setgray ef gr col0 s % Polyline 15.000 slw gs clippath -6345 -2220 m 6255 -2220 l 6255 -2008 l 6300 -2188 l 6345 -2008 l cp +6345 -1365 m 6255 -1365 l 6255 -1153 l 6300 -1333 l 6345 -1153 l cp eoclip n 6300 1350 m - 6300 -2205 l gs col0 s gr gr + 6300 -1350 l gs col0 s gr gr % arrowhead 7.500 slw -n 6345 -2008 m 6300 -2188 l 6255 -2008 l 6345 -2008 l cp gs 0.00 setgray ef gr col0 s +n 6345 -1153 m 6300 -1333 l 6255 -1153 l 6345 -1153 l cp gs 0.00 setgray ef gr col0 s % Polyline 30.000 slw gs clippath @@ -310,45 +299,18 @@ n 450 5625 m 7.500 slw n 1754 5745 m 2234 5625 l 1754 5505 l 1754 5745 l cp gs 0.00 setgray ef gr col0 s % Polyline -2 slj - [60] 0 sd -gs clippath -3209 -1993 m 3247 -1947 l 3363 -2042 l 3252 -1989 l 3325 -2088 l cp -eoclip -n 4098 -2052 m 4097 -2053 l 4094 -2056 l 4088 -2060 l 4080 -2067 l 4069 -2076 l - 4055 -2087 l 4039 -2099 l 4020 -2112 l 4000 -2126 l 3978 -2139 l - 3955 -2152 l 3930 -2165 l 3903 -2176 l 3875 -2186 l 3844 -2194 l - 3810 -2201 l 3772 -2205 l 3732 -2207 l 3690 -2205 l 3651 -2200 l - 3613 -2193 l 3578 -2184 l 3544 -2173 l 3513 -2161 l 3483 -2148 l - 3455 -2133 l 3429 -2119 l 3403 -2103 l 3379 -2088 l 3356 -2072 l - 3335 -2056 l 3315 -2041 l 3297 -2027 l 3281 -2014 l 3267 -2003 l - 3257 -1994 l - 3240 -1980 l gs col0 s gr gr - [] 0 sd -% arrowhead -0 slj -n 3325 -2088 m 3252 -1989 l 3363 -2042 l 3325 -2088 l cp gs 0.00 setgray ef gr col0 s -% Polyline -2 slj - [60] 0 sd -gs clippath -6158 -1947 m 6195 -1994 l 6075 -2086 l 6152 -1989 l 6038 -2038 l cp -eoclip -n 5355 -2070 m 5356 -2071 l 5359 -2073 l 5363 -2078 l 5370 -2084 l 5379 -2092 l - 5390 -2102 l 5404 -2113 l 5419 -2125 l 5437 -2138 l 5455 -2150 l - 5475 -2162 l 5497 -2173 l 5520 -2183 l 5545 -2192 l 5573 -2199 l - 5604 -2204 l 5638 -2207 l 5675 -2208 l 5715 -2205 l 5752 -2200 l - 5788 -2192 l 5823 -2182 l 5856 -2171 l 5887 -2158 l 5916 -2145 l - 5944 -2131 l 5970 -2116 l 5996 -2101 l 6021 -2086 l 6044 -2070 l - 6066 -2055 l 6087 -2040 l 6106 -2026 l 6122 -2013 l 6136 -2003 l - 6147 -1994 l - 6165 -1980 l gs col0 s gr gr - [] 0 sd -% arrowhead -0 slj -n 6038 -2038 m 6152 -1989 l 6075 -2086 l 6038 -2038 l cp gs 0.00 setgray ef gr col0 s +15.000 slw +n 2250 -1800 m 4050 -1800 l 4050 -1350 l 2250 -1350 l + cp gs col0 s gr +% Polyline +n 5400 -1800 m 7200 -1800 l 7200 -1350 l 5400 -1350 l + cp gs col0 s gr +% Polyline +n -900 -1800 m 1125 -1800 l 1125 -1350 l -900 -1350 l + cp gs col0 s gr % Polyline 2 slj +7.500 slw [60] 0 sd gs clippath 3256 5022 m 3288 5073 l 3416 4992 l 3299 5031 l 3384 4941 l cp @@ -389,40 +351,80 @@ n 5994 4978 m 6107 5030 l 6032 4931 l 5994 4978 l cp gs 0.00 setgray ef gr col 2 slj [60] 0 sd gs clippath -1229 5503 m 1289 5506 l 1296 5355 l 1261 5474 l 1236 5352 l cp +1233 5510 m 1292 5499 l 1263 5350 l 1257 5474 l 1204 5361 l cp eoclip -n 855 4815 m 857 4816 l 860 4818 l 866 4822 l 874 4829 l 886 4837 l - 900 4848 l 917 4860 l 935 4874 l 955 4890 l 975 4906 l - 996 4924 l 1017 4943 l 1039 4964 l 1060 4986 l 1082 5010 l - 1104 5036 l 1127 5065 l 1149 5097 l 1170 5130 l 1191 5167 l - 1208 5203 l 1223 5237 l 1234 5268 l 1242 5297 l 1249 5324 l - 1253 5349 l 1256 5373 l 1259 5396 l 1260 5417 l 1261 5436 l - 1261 5453 l 1261 5467 l +n 1170 5040 m 1170 5042 l 1171 5047 l 1173 5055 l 1175 5066 l 1178 5080 l + 1181 5096 l 1185 5114 l 1189 5134 l 1193 5155 l 1198 5178 l + 1203 5204 l 1209 5233 l 1215 5265 l 1221 5297 l 1227 5326 l + 1232 5352 l 1237 5375 l 1241 5396 l 1245 5416 l 1249 5434 l + 1252 5450 l 1255 5464 l 1260 5490 l gs col0 s gr gr [] 0 sd % arrowhead 0 slj -n 1236 5352 m 1261 5474 l 1296 5355 l 1236 5352 l cp gs 0.00 setgray ef gr col0 s +n 1204 5361 m 1257 5474 l 1263 5350 l 1204 5361 l cp gs 0.00 setgray ef gr col0 s % Polyline 2 slj [60] 0 sd gs clippath --386 4209 m -360 4263 l -224 4196 l -345 4223 l -251 4142 l cp +-382 4205 m -366 4262 l -219 4222 l -343 4226 l -235 4164 l cp eoclip -n 675 4455 m 674 4454 l 672 4452 l 668 4447 l 662 4441 l 653 4432 l - 642 4420 l 628 4407 l 613 4392 l 595 4375 l 576 4357 l - 555 4338 l 533 4319 l 510 4300 l 486 4281 l 460 4263 l - 432 4245 l 403 4227 l 372 4210 l 339 4193 l 302 4178 l - 264 4163 l 223 4151 l 180 4140 l 133 4131 l 88 4126 l - 45 4124 l 4 4124 l -34 4126 l -69 4130 l -103 4136 l - -134 4143 l -165 4151 l -193 4160 l -221 4170 l -247 4179 l - -271 4189 l -292 4198 l -311 4207 l -327 4214 l -340 4220 l - +n 945 4500 m 944 4499 l 941 4497 l 937 4493 l 930 4486 l 921 4478 l + 908 4467 l 893 4454 l 876 4439 l 856 4423 l 835 4406 l + 811 4387 l 786 4369 l 760 4350 l 731 4332 l 701 4314 l + 669 4295 l 634 4278 l 597 4260 l 556 4243 l 512 4227 l + 465 4212 l 414 4197 l 360 4185 l 310 4176 l 260 4169 l + 212 4163 l 166 4160 l 122 4159 l 81 4158 l 41 4160 l + 3 4162 l -34 4165 l -69 4169 l -103 4174 l -136 4179 l + -167 4185 l -198 4191 l -226 4197 l -252 4203 l -276 4208 l + -298 4214 l -316 4218 l -331 4222 l -342 4225 l -360 4230 l gs col0 s gr gr [] 0 sd % arrowhead 0 slj -n -251 4142 m -345 4223 l -224 4196 l -251 4142 l cp gs 0.00 setgray ef gr col0 s +n -235 4164 m -343 4226 l -219 4222 l -235 4164 l cp gs 0.00 setgray ef gr col0 s +% Polyline +2 slj + [60] 0 sd +gs clippath +2986 3764 m 2983 3704 l 2832 3713 l 2954 3736 l 2836 3773 l cp +eoclip +n 1305 4500 m 1306 4499 l 1307 4498 l 1310 4494 l 1314 4489 l 1321 4483 l + 1329 4473 l 1339 4462 l 1352 4449 l 1366 4434 l 1382 4417 l + 1400 4398 l 1420 4378 l 1441 4357 l 1464 4335 l 1488 4313 l + 1513 4290 l 1540 4267 l 1568 4243 l 1598 4219 l 1629 4195 l + 1662 4170 l 1698 4145 l 1736 4119 l 1777 4093 l 1821 4067 l + 1868 4040 l 1917 4013 l 1970 3986 l 2025 3960 l 2081 3935 l + 2136 3912 l 2190 3891 l 2243 3873 l 2294 3856 l 2342 3841 l + 2389 3827 l 2434 3815 l 2478 3805 l 2520 3795 l 2560 3787 l + 2600 3779 l 2639 3773 l 2676 3767 l 2713 3762 l 2748 3757 l + 2781 3753 l 2812 3749 l 2841 3746 l 2868 3744 l 2892 3741 l + 2912 3740 l 2929 3738 l 2943 3737 l 2954 3736 l + 2970 3735 l gs col0 s gr gr + [] 0 sd +% arrowhead +0 slj +n 2836 3773 m 2954 3736 l 2832 3713 l 2836 3773 l cp gs 0.00 setgray ef gr col0 s +% Polyline +2 slj + [60] 0 sd +gs clippath +2941 5159 m 2938 5099 l 2787 5107 l 2909 5131 l 2790 5166 l cp +eoclip +n 1665 5040 m 1666 5040 l 1669 5041 l 1673 5042 l 1680 5044 l 1690 5046 l + 1703 5049 l 1718 5053 l 1736 5057 l 1757 5061 l 1779 5066 l + 1803 5071 l 1828 5076 l 1856 5081 l 1884 5086 l 1915 5092 l + 1947 5097 l 1981 5102 l 2018 5107 l 2059 5112 l 2102 5117 l + 2148 5122 l 2198 5126 l 2250 5130 l 2302 5133 l 2354 5136 l + 2403 5138 l 2450 5140 l 2494 5141 l 2535 5141 l 2575 5142 l + 2612 5141 l 2648 5141 l 2683 5140 l 2716 5139 l 2748 5138 l + 2778 5137 l 2806 5136 l 2832 5135 l 2855 5134 l 2875 5133 l + 2892 5132 l 2905 5131 l + 2925 5130 l gs col0 s gr gr + [] 0 sd +% arrowhead +0 slj +n 2790 5166 m 2909 5131 l 2787 5107 l 2790 5166 l cp gs 0.00 setgray ef gr col0 s /Times-Roman ff 300.00 scf sf 1665 3375 m gs 1 -1 sc 90.0 rot (Data Structure) col0 sh gr @@ -432,15 +434,6 @@ gs 1 -1 sc 90.0 rot (Triangulation) col0 sh gr /Times-Roman ff 360.00 scf sf -2115 540 m gs 1 -1 sc 90.0 rot (Triangulation) col0 sh gr -/Times-Roman ff 240.00 scf sf -4185 -2025 m -gs 1 -1 sc (Final types) col0 sh gr -/Times-Roman ff 270.00 scf sf -45 -585 m -gs 1 -1 sc (Geometric) col0 sh gr -/Times-Roman ff 270.00 scf sf --90 -225 m -gs 1 -1 sc (Functionality) col0 sh gr /Times-Roman ff 270.00 scf sf 2520 5715 m gs 1 -1 sc (VertexBase) col0 sh gr @@ -463,7 +456,28 @@ gs 1 -1 sc (Cell) col0 sh gr 4230 5130 m gs 1 -1 sc (Derivation) col0 sh gr /Times-Roman ff 240.00 scf sf --270 4725 m -gs 1 -1 sc (Template parameters) col0 sh gr +630 4725 m +gs 1 -1 sc (Template) col0 sh gr +/Times-Roman ff 240.00 scf sf +585 4950 m +gs 1 -1 sc (Parameters) col0 sh gr +/Times-Roman ff 300.00 scf sf +2745 -1485 m +gs 1 -1 sc (Vertex) col0 sh gr +/Times-Roman ff 300.00 scf sf +6030 -1485 m +gs 1 -1 sc (Cell) col0 sh gr +/Times-Roman ff 270.00 scf sf +-585 -585 m +gs 1 -1 sc (Functionality) col0 sh gr +/Times-Roman ff 270.00 scf sf +-450 -900 m +gs 1 -1 sc (Geometric) col0 sh gr +/Times-Roman ff 210.00 scf sf +-585 -1530 m +gs 1 -1 sc (locate\(\), insert\(\)...) col0 sh gr +/Times-Roman ff 240.00 scf sf +4500 -1440 m +gs 1 -1 sc (Types) col0 sh gr $F2psEnd rs diff --git a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.fig b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.fig index e84e069a4fa..c756ef85eb1 100644 --- a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.fig +++ b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.fig @@ -39,9 +39,6 @@ Single -450 5400 -450 450 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 -1800 -1800 -1800 900 -2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 90.00 180.00 - 675 -855 675 -2250 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 240.00 480.00 3150 4050 3150 3150 @@ -81,24 +78,22 @@ Single 5400 1350 7200 1350 7200 1800 5400 1800 5400 1350 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 90.00 180.00 - 3150 1350 3150 -2250 + 3150 1350 3150 -1350 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 90.00 180.00 - 6300 1350 6300 -2205 + 6300 1350 6300 -1350 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 4 1 1 1.00 240.00 480.00 450 6075 4500 6075 4500 5580 5400 5580 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 240.00 480.00 450 5625 2250 5625 -3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 - 1 1 1.00 60.00 120.00 - 4098 -2052 3690 -2205 3240 -1980 - 0.000 -1.000 0.000 -3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 - 1 1 1.00 60.00 120.00 - 5355 -2070 5715 -2205 6165 -1980 - 0.000 -1.000 0.000 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 2250 -1800 4050 -1800 4050 -1350 2250 -1350 2250 -1800 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 5400 -1800 7200 -1800 7200 -1350 5400 -1350 5400 -1800 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + -900 -1800 1125 -1800 1125 -1350 -900 -1350 -900 -1800 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 4185 5040 3780 4860 3285 5040 @@ -109,18 +104,23 @@ Single 0.000 -1.000 0.000 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 - 855 4815 1170 5130 1260 5490 + 1170 5040 1215 5265 1260 5490 0.000 -1.000 0.000 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 - 675 4455 180 4140 -360 4230 + 945 4500 360 4185 -360 4230 + 0.000 -1.000 0.000 +3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 + 1 1 1.00 60.00 120.00 + 1305 4500 2025 3960 2970 3735 + 0.000 -1.000 0.000 +3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 + 1 1 1.00 60.00 120.00 + 1665 5040 2250 5130 2925 5130 0.000 -1.000 0.000 4 0 0 50 0 0 20 1.5708 4 195 1740 1665 3375 Data Structure\001 4 0 0 50 0 0 20 1.5708 4 255 1590 1260 3285 Triangulation\001 4 0 0 50 0 0 24 1.5708 4 330 2010 -2115 540 Triangulation\001 -4 0 0 50 0 0 16 0.0000 4 225 1080 4185 -2025 Final types\001 -4 0 0 50 0 0 18 0.0000 4 195 1200 45 -585 Geometric\001 -4 0 0 50 0 0 18 0.0000 4 255 1500 -90 -225 Functionality\001 4 0 0 50 0 0 18 0.0000 4 195 1290 2520 5715 VertexBase\001 4 0 0 50 0 0 18 0.0000 4 195 975 5850 5715 CellBase\001 4 0 0 50 0 0 18 0.0000 4 195 900 2655 4365 UserVB\001 @@ -128,4 +128,11 @@ Single 4 0 0 50 0 0 20 0.0000 4 195 780 2745 1665 Vertex\001 4 0 0 50 0 0 20 0.0000 4 195 465 6075 1665 Cell\001 4 0 0 50 0 0 12 0.0000 4 135 795 4230 5130 Derivation\001 -4 0 0 50 0 0 16 0.0000 4 225 2070 -270 4725 Template parameters\001 +4 0 0 50 0 0 16 0.0000 4 225 930 630 4725 Template\001 +4 0 0 50 0 0 16 0.0000 4 165 1095 585 4950 Parameters\001 +4 0 0 50 0 0 20 0.0000 4 195 780 2745 -1485 Vertex\001 +4 0 0 50 0 0 20 0.0000 4 195 465 6030 -1485 Cell\001 +4 0 0 50 0 0 18 0.0000 4 255 1500 -585 -585 Functionality\001 +4 0 0 50 0 0 18 0.0000 4 195 1200 -450 -900 Geometric\001 +4 0 0 50 0 0 14 0.0000 4 195 1530 -585 -1530 locate(), insert()...\001 +4 0 0 50 0 0 16 0.0000 4 225 585 4500 -1440 Types\001 diff --git a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.gif b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.gif index 38f51a27e58..51748390214 100644 Binary files a/Packages/Triangulation_3/doc_tex/Triangulation_3/design.gif and b/Packages/Triangulation_3/doc_tex/Triangulation_3/design.gif differ diff --git a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex index f9e42a366de..e13bd570217 100644 --- a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex +++ b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex @@ -459,7 +459,11 @@ typedef Triangulation_3 Tr; ... \end{ccExampleCode} -While now, what must be written is: +While now, there are two possibilities. The simplest one is to use the +class \ccc{Triangulation_vertex_base_with_info_3}, and this approach is +illustrated in a following subsection~\ref{Triangulation3-sec-examples-color}. +But when the user needs to access some type which depends on the triangulation +data structure (typically handles), then he must write: \begin{ccExampleCode} ... template < class GT, class Vb = Triangulation_vertex_base > @@ -510,6 +514,7 @@ The following two examples show how the user can plug his own vertex base in a triangulation. Changing the cell base is similar. \subsubsection{Adding a color} +\label{Triangulation3-sec-examples-color} When the user doesn't need to add a type in a vertex which depends on the \ccc{TriangulationDataStructure_3} (e.g. a \ccc{Vertex_handle} or \ccc{Cell_handle}), then he can use the diff --git a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.eps b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.eps index 0368aeea70d..2eb94169e01 100644 --- a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.eps +++ b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.eps @@ -1,9 +1,9 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: design.eps %%Creator: fig2dev Version 3.2 Patchlevel 3d -%%CreationDate: Wed Jun 11 04:20:05 2003 +%%CreationDate: Wed Sep 3 14:25:36 2003 %%For: spion@mpino1212 (Sylvain Pion,328,128,) -%%BoundingBox: 0 0 684 542 +%%BoundingBox: 0 0 684 514 %%Magnification: 1.0000 %%EndComments /$F2psDict 200 dict def @@ -45,7 +45,7 @@ $F2psDict /mtrx matrix put end save -newpath 0 542 moveto 0 0 lineto 684 0 lineto 684 542 lineto closepath clip newpath +newpath 0 514 moveto 0 0 lineto 684 0 lineto 684 514 lineto closepath clip newpath 171.5 398.2 translate 1 -1 scale @@ -145,17 +145,6 @@ n -329 946 m -449 466 l -569 946 l -329 946 l cp gs 0.00 setgray ef gr col0 s n -1800 -1800 m -1800 900 l gs col0 s gr % Polyline -15.000 slw -gs clippath -720 -2265 m 630 -2265 l 630 -2053 l 675 -2233 l 720 -2053 l cp -eoclip -n 675 -855 m - 675 -2250 l gs col0 s gr gr - -% arrowhead -7.500 slw -n 720 -2053 m 675 -2233 l 630 -2053 l 720 -2053 l cp gs 0.00 setgray ef gr col0 s -% Polyline 30.000 slw gs clippath 3270 3135 m 3030 3135 l 3030 3646 l 3150 3166 l 3270 3646 l cp @@ -268,25 +257,25 @@ n 5400 1350 m 7200 1350 l 7200 1800 l 5400 1800 l cp gs col0 s gr % Polyline gs clippath -3195 -2265 m 3105 -2265 l 3105 -2053 l 3150 -2233 l 3195 -2053 l cp +3195 -1365 m 3105 -1365 l 3105 -1153 l 3150 -1333 l 3195 -1153 l cp eoclip n 3150 1350 m - 3150 -2250 l gs col0 s gr gr + 3150 -1350 l gs col0 s gr gr % arrowhead 7.500 slw -n 3195 -2053 m 3150 -2233 l 3105 -2053 l 3195 -2053 l cp gs 0.00 setgray ef gr col0 s +n 3195 -1153 m 3150 -1333 l 3105 -1153 l 3195 -1153 l cp gs 0.00 setgray ef gr col0 s % Polyline 15.000 slw gs clippath -6345 -2220 m 6255 -2220 l 6255 -2008 l 6300 -2188 l 6345 -2008 l cp +6345 -1365 m 6255 -1365 l 6255 -1153 l 6300 -1333 l 6345 -1153 l cp eoclip n 6300 1350 m - 6300 -2205 l gs col0 s gr gr + 6300 -1350 l gs col0 s gr gr % arrowhead 7.500 slw -n 6345 -2008 m 6300 -2188 l 6255 -2008 l 6345 -2008 l cp gs 0.00 setgray ef gr col0 s +n 6345 -1153 m 6300 -1333 l 6255 -1153 l 6345 -1153 l cp gs 0.00 setgray ef gr col0 s % Polyline 30.000 slw gs clippath @@ -310,45 +299,18 @@ n 450 5625 m 7.500 slw n 1754 5745 m 2234 5625 l 1754 5505 l 1754 5745 l cp gs 0.00 setgray ef gr col0 s % Polyline -2 slj - [60] 0 sd -gs clippath -3209 -1993 m 3247 -1947 l 3363 -2042 l 3252 -1989 l 3325 -2088 l cp -eoclip -n 4098 -2052 m 4097 -2053 l 4094 -2056 l 4088 -2060 l 4080 -2067 l 4069 -2076 l - 4055 -2087 l 4039 -2099 l 4020 -2112 l 4000 -2126 l 3978 -2139 l - 3955 -2152 l 3930 -2165 l 3903 -2176 l 3875 -2186 l 3844 -2194 l - 3810 -2201 l 3772 -2205 l 3732 -2207 l 3690 -2205 l 3651 -2200 l - 3613 -2193 l 3578 -2184 l 3544 -2173 l 3513 -2161 l 3483 -2148 l - 3455 -2133 l 3429 -2119 l 3403 -2103 l 3379 -2088 l 3356 -2072 l - 3335 -2056 l 3315 -2041 l 3297 -2027 l 3281 -2014 l 3267 -2003 l - 3257 -1994 l - 3240 -1980 l gs col0 s gr gr - [] 0 sd -% arrowhead -0 slj -n 3325 -2088 m 3252 -1989 l 3363 -2042 l 3325 -2088 l cp gs 0.00 setgray ef gr col0 s -% Polyline -2 slj - [60] 0 sd -gs clippath -6158 -1947 m 6195 -1994 l 6075 -2086 l 6152 -1989 l 6038 -2038 l cp -eoclip -n 5355 -2070 m 5356 -2071 l 5359 -2073 l 5363 -2078 l 5370 -2084 l 5379 -2092 l - 5390 -2102 l 5404 -2113 l 5419 -2125 l 5437 -2138 l 5455 -2150 l - 5475 -2162 l 5497 -2173 l 5520 -2183 l 5545 -2192 l 5573 -2199 l - 5604 -2204 l 5638 -2207 l 5675 -2208 l 5715 -2205 l 5752 -2200 l - 5788 -2192 l 5823 -2182 l 5856 -2171 l 5887 -2158 l 5916 -2145 l - 5944 -2131 l 5970 -2116 l 5996 -2101 l 6021 -2086 l 6044 -2070 l - 6066 -2055 l 6087 -2040 l 6106 -2026 l 6122 -2013 l 6136 -2003 l - 6147 -1994 l - 6165 -1980 l gs col0 s gr gr - [] 0 sd -% arrowhead -0 slj -n 6038 -2038 m 6152 -1989 l 6075 -2086 l 6038 -2038 l cp gs 0.00 setgray ef gr col0 s +15.000 slw +n 2250 -1800 m 4050 -1800 l 4050 -1350 l 2250 -1350 l + cp gs col0 s gr +% Polyline +n 5400 -1800 m 7200 -1800 l 7200 -1350 l 5400 -1350 l + cp gs col0 s gr +% Polyline +n -900 -1800 m 1125 -1800 l 1125 -1350 l -900 -1350 l + cp gs col0 s gr % Polyline 2 slj +7.500 slw [60] 0 sd gs clippath 3256 5022 m 3288 5073 l 3416 4992 l 3299 5031 l 3384 4941 l cp @@ -389,40 +351,80 @@ n 5994 4978 m 6107 5030 l 6032 4931 l 5994 4978 l cp gs 0.00 setgray ef gr col 2 slj [60] 0 sd gs clippath -1229 5503 m 1289 5506 l 1296 5355 l 1261 5474 l 1236 5352 l cp +1233 5510 m 1292 5499 l 1263 5350 l 1257 5474 l 1204 5361 l cp eoclip -n 855 4815 m 857 4816 l 860 4818 l 866 4822 l 874 4829 l 886 4837 l - 900 4848 l 917 4860 l 935 4874 l 955 4890 l 975 4906 l - 996 4924 l 1017 4943 l 1039 4964 l 1060 4986 l 1082 5010 l - 1104 5036 l 1127 5065 l 1149 5097 l 1170 5130 l 1191 5167 l - 1208 5203 l 1223 5237 l 1234 5268 l 1242 5297 l 1249 5324 l - 1253 5349 l 1256 5373 l 1259 5396 l 1260 5417 l 1261 5436 l - 1261 5453 l 1261 5467 l +n 1170 5040 m 1170 5042 l 1171 5047 l 1173 5055 l 1175 5066 l 1178 5080 l + 1181 5096 l 1185 5114 l 1189 5134 l 1193 5155 l 1198 5178 l + 1203 5204 l 1209 5233 l 1215 5265 l 1221 5297 l 1227 5326 l + 1232 5352 l 1237 5375 l 1241 5396 l 1245 5416 l 1249 5434 l + 1252 5450 l 1255 5464 l 1260 5490 l gs col0 s gr gr [] 0 sd % arrowhead 0 slj -n 1236 5352 m 1261 5474 l 1296 5355 l 1236 5352 l cp gs 0.00 setgray ef gr col0 s +n 1204 5361 m 1257 5474 l 1263 5350 l 1204 5361 l cp gs 0.00 setgray ef gr col0 s % Polyline 2 slj [60] 0 sd gs clippath --386 4209 m -360 4263 l -224 4196 l -345 4223 l -251 4142 l cp +-382 4205 m -366 4262 l -219 4222 l -343 4226 l -235 4164 l cp eoclip -n 675 4455 m 674 4454 l 672 4452 l 668 4447 l 662 4441 l 653 4432 l - 642 4420 l 628 4407 l 613 4392 l 595 4375 l 576 4357 l - 555 4338 l 533 4319 l 510 4300 l 486 4281 l 460 4263 l - 432 4245 l 403 4227 l 372 4210 l 339 4193 l 302 4178 l - 264 4163 l 223 4151 l 180 4140 l 133 4131 l 88 4126 l - 45 4124 l 4 4124 l -34 4126 l -69 4130 l -103 4136 l - -134 4143 l -165 4151 l -193 4160 l -221 4170 l -247 4179 l - -271 4189 l -292 4198 l -311 4207 l -327 4214 l -340 4220 l - +n 945 4500 m 944 4499 l 941 4497 l 937 4493 l 930 4486 l 921 4478 l + 908 4467 l 893 4454 l 876 4439 l 856 4423 l 835 4406 l + 811 4387 l 786 4369 l 760 4350 l 731 4332 l 701 4314 l + 669 4295 l 634 4278 l 597 4260 l 556 4243 l 512 4227 l + 465 4212 l 414 4197 l 360 4185 l 310 4176 l 260 4169 l + 212 4163 l 166 4160 l 122 4159 l 81 4158 l 41 4160 l + 3 4162 l -34 4165 l -69 4169 l -103 4174 l -136 4179 l + -167 4185 l -198 4191 l -226 4197 l -252 4203 l -276 4208 l + -298 4214 l -316 4218 l -331 4222 l -342 4225 l -360 4230 l gs col0 s gr gr [] 0 sd % arrowhead 0 slj -n -251 4142 m -345 4223 l -224 4196 l -251 4142 l cp gs 0.00 setgray ef gr col0 s +n -235 4164 m -343 4226 l -219 4222 l -235 4164 l cp gs 0.00 setgray ef gr col0 s +% Polyline +2 slj + [60] 0 sd +gs clippath +2986 3764 m 2983 3704 l 2832 3713 l 2954 3736 l 2836 3773 l cp +eoclip +n 1305 4500 m 1306 4499 l 1307 4498 l 1310 4494 l 1314 4489 l 1321 4483 l + 1329 4473 l 1339 4462 l 1352 4449 l 1366 4434 l 1382 4417 l + 1400 4398 l 1420 4378 l 1441 4357 l 1464 4335 l 1488 4313 l + 1513 4290 l 1540 4267 l 1568 4243 l 1598 4219 l 1629 4195 l + 1662 4170 l 1698 4145 l 1736 4119 l 1777 4093 l 1821 4067 l + 1868 4040 l 1917 4013 l 1970 3986 l 2025 3960 l 2081 3935 l + 2136 3912 l 2190 3891 l 2243 3873 l 2294 3856 l 2342 3841 l + 2389 3827 l 2434 3815 l 2478 3805 l 2520 3795 l 2560 3787 l + 2600 3779 l 2639 3773 l 2676 3767 l 2713 3762 l 2748 3757 l + 2781 3753 l 2812 3749 l 2841 3746 l 2868 3744 l 2892 3741 l + 2912 3740 l 2929 3738 l 2943 3737 l 2954 3736 l + 2970 3735 l gs col0 s gr gr + [] 0 sd +% arrowhead +0 slj +n 2836 3773 m 2954 3736 l 2832 3713 l 2836 3773 l cp gs 0.00 setgray ef gr col0 s +% Polyline +2 slj + [60] 0 sd +gs clippath +2941 5159 m 2938 5099 l 2787 5107 l 2909 5131 l 2790 5166 l cp +eoclip +n 1665 5040 m 1666 5040 l 1669 5041 l 1673 5042 l 1680 5044 l 1690 5046 l + 1703 5049 l 1718 5053 l 1736 5057 l 1757 5061 l 1779 5066 l + 1803 5071 l 1828 5076 l 1856 5081 l 1884 5086 l 1915 5092 l + 1947 5097 l 1981 5102 l 2018 5107 l 2059 5112 l 2102 5117 l + 2148 5122 l 2198 5126 l 2250 5130 l 2302 5133 l 2354 5136 l + 2403 5138 l 2450 5140 l 2494 5141 l 2535 5141 l 2575 5142 l + 2612 5141 l 2648 5141 l 2683 5140 l 2716 5139 l 2748 5138 l + 2778 5137 l 2806 5136 l 2832 5135 l 2855 5134 l 2875 5133 l + 2892 5132 l 2905 5131 l + 2925 5130 l gs col0 s gr gr + [] 0 sd +% arrowhead +0 slj +n 2790 5166 m 2909 5131 l 2787 5107 l 2790 5166 l cp gs 0.00 setgray ef gr col0 s /Times-Roman ff 300.00 scf sf 1665 3375 m gs 1 -1 sc 90.0 rot (Data Structure) col0 sh gr @@ -432,15 +434,6 @@ gs 1 -1 sc 90.0 rot (Triangulation) col0 sh gr /Times-Roman ff 360.00 scf sf -2115 540 m gs 1 -1 sc 90.0 rot (Triangulation) col0 sh gr -/Times-Roman ff 240.00 scf sf -4185 -2025 m -gs 1 -1 sc (Final types) col0 sh gr -/Times-Roman ff 270.00 scf sf -45 -585 m -gs 1 -1 sc (Geometric) col0 sh gr -/Times-Roman ff 270.00 scf sf --90 -225 m -gs 1 -1 sc (Functionality) col0 sh gr /Times-Roman ff 270.00 scf sf 2520 5715 m gs 1 -1 sc (VertexBase) col0 sh gr @@ -463,7 +456,28 @@ gs 1 -1 sc (Cell) col0 sh gr 4230 5130 m gs 1 -1 sc (Derivation) col0 sh gr /Times-Roman ff 240.00 scf sf --270 4725 m -gs 1 -1 sc (Template parameters) col0 sh gr +630 4725 m +gs 1 -1 sc (Template) col0 sh gr +/Times-Roman ff 240.00 scf sf +585 4950 m +gs 1 -1 sc (Parameters) col0 sh gr +/Times-Roman ff 300.00 scf sf +2745 -1485 m +gs 1 -1 sc (Vertex) col0 sh gr +/Times-Roman ff 300.00 scf sf +6030 -1485 m +gs 1 -1 sc (Cell) col0 sh gr +/Times-Roman ff 270.00 scf sf +-585 -585 m +gs 1 -1 sc (Functionality) col0 sh gr +/Times-Roman ff 270.00 scf sf +-450 -900 m +gs 1 -1 sc (Geometric) col0 sh gr +/Times-Roman ff 210.00 scf sf +-585 -1530 m +gs 1 -1 sc (locate\(\), insert\(\)...) col0 sh gr +/Times-Roman ff 240.00 scf sf +4500 -1440 m +gs 1 -1 sc (Types) col0 sh gr $F2psEnd rs diff --git a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.fig b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.fig index e84e069a4fa..c756ef85eb1 100644 --- a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.fig +++ b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.fig @@ -39,9 +39,6 @@ Single -450 5400 -450 450 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2 -1800 -1800 -1800 900 -2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 90.00 180.00 - 675 -855 675 -2250 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 240.00 480.00 3150 4050 3150 3150 @@ -81,24 +78,22 @@ Single 5400 1350 7200 1350 7200 1800 5400 1800 5400 1350 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 90.00 180.00 - 3150 1350 3150 -2250 + 3150 1350 3150 -1350 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 90.00 180.00 - 6300 1350 6300 -2205 + 6300 1350 6300 -1350 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 4 1 1 1.00 240.00 480.00 450 6075 4500 6075 4500 5580 5400 5580 2 1 0 3 0 7 50 0 -1 0.000 0 0 -1 1 0 2 1 1 1.00 240.00 480.00 450 5625 2250 5625 -3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 - 1 1 1.00 60.00 120.00 - 4098 -2052 3690 -2205 3240 -1980 - 0.000 -1.000 0.000 -3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 - 1 1 1.00 60.00 120.00 - 5355 -2070 5715 -2205 6165 -1980 - 0.000 -1.000 0.000 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 2250 -1800 4050 -1800 4050 -1350 2250 -1350 2250 -1800 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + 5400 -1800 7200 -1800 7200 -1350 5400 -1350 5400 -1800 +2 2 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 5 + -900 -1800 1125 -1800 1125 -1350 -900 -1350 -900 -1800 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 4185 5040 3780 4860 3285 5040 @@ -109,18 +104,23 @@ Single 0.000 -1.000 0.000 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 - 855 4815 1170 5130 1260 5490 + 1170 5040 1215 5265 1260 5490 0.000 -1.000 0.000 3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 1 1 1.00 60.00 120.00 - 675 4455 180 4140 -360 4230 + 945 4500 360 4185 -360 4230 + 0.000 -1.000 0.000 +3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 + 1 1 1.00 60.00 120.00 + 1305 4500 2025 3960 2970 3735 + 0.000 -1.000 0.000 +3 2 1 1 0 7 50 0 -1 4.000 0 1 0 3 + 1 1 1.00 60.00 120.00 + 1665 5040 2250 5130 2925 5130 0.000 -1.000 0.000 4 0 0 50 0 0 20 1.5708 4 195 1740 1665 3375 Data Structure\001 4 0 0 50 0 0 20 1.5708 4 255 1590 1260 3285 Triangulation\001 4 0 0 50 0 0 24 1.5708 4 330 2010 -2115 540 Triangulation\001 -4 0 0 50 0 0 16 0.0000 4 225 1080 4185 -2025 Final types\001 -4 0 0 50 0 0 18 0.0000 4 195 1200 45 -585 Geometric\001 -4 0 0 50 0 0 18 0.0000 4 255 1500 -90 -225 Functionality\001 4 0 0 50 0 0 18 0.0000 4 195 1290 2520 5715 VertexBase\001 4 0 0 50 0 0 18 0.0000 4 195 975 5850 5715 CellBase\001 4 0 0 50 0 0 18 0.0000 4 195 900 2655 4365 UserVB\001 @@ -128,4 +128,11 @@ Single 4 0 0 50 0 0 20 0.0000 4 195 780 2745 1665 Vertex\001 4 0 0 50 0 0 20 0.0000 4 195 465 6075 1665 Cell\001 4 0 0 50 0 0 12 0.0000 4 135 795 4230 5130 Derivation\001 -4 0 0 50 0 0 16 0.0000 4 225 2070 -270 4725 Template parameters\001 +4 0 0 50 0 0 16 0.0000 4 225 930 630 4725 Template\001 +4 0 0 50 0 0 16 0.0000 4 165 1095 585 4950 Parameters\001 +4 0 0 50 0 0 20 0.0000 4 195 780 2745 -1485 Vertex\001 +4 0 0 50 0 0 20 0.0000 4 195 465 6030 -1485 Cell\001 +4 0 0 50 0 0 18 0.0000 4 255 1500 -585 -585 Functionality\001 +4 0 0 50 0 0 18 0.0000 4 195 1200 -450 -900 Geometric\001 +4 0 0 50 0 0 14 0.0000 4 195 1530 -585 -1530 locate(), insert()...\001 +4 0 0 50 0 0 16 0.0000 4 225 585 4500 -1440 Types\001 diff --git a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.gif b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.gif index 38f51a27e58..51748390214 100644 Binary files a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.gif and b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/design.gif differ