diff --git a/tools/adaptive-isogrid/test_data/geometry_sandbox_2_brain.json b/tools/adaptive-isogrid/test_data/geometry_sandbox_2_brain.json index 4b9efa81..f9de07ce 100644 --- a/tools/adaptive-isogrid/test_data/geometry_sandbox_2_brain.json +++ b/tools/adaptive-isogrid/test_data/geometry_sandbox_2_brain.json @@ -114,79 +114,79 @@ ], [ 102.59233744553647, - -8.67325848780173 + -6.326741512198268 ], [ 102.86707612778635, - -9.817627457812105 + -5.182372542187894 ], [ 103.31745106858725, - -10.9049287480466 + -4.0950712519533985 ], [ 103.93237254218789, - -11.908389392193548 + -3.0916106078064507 ], [ 104.6966991411009, - -12.803300858899107 + -2.1966991411008934 ], [ - 105.59161060780644, - -13.567627457812105 + 105.59161060780646, + -1.4323725421878937 ], [ 106.5950712519534, - -14.182548931412757 + -0.8174510685872409 ], [ 107.68237254218789, - -14.632923872213652 + -0.3670761277863477 ], [ 108.82674151219827, - -14.907662554463531 + -0.09233744553646694 ], [ 110.0, - -15.0 + 0.0 ], [ 111.17325848780173, - -14.907662554463533 + -0.09233744553646694 ], [ 112.31762745781211, - -14.632923872213652 + -0.36707612778634857 ], [ 113.4049287480466, - -14.182548931412759 + -0.8174510685872418 ], [ - 114.40838939219354, - -13.567627457812106 + 114.40838939219356, + -1.4323725421878937 ], [ 115.3033008588991, - -12.803300858899107 + -2.1966991411008943 ], [ 116.06762745781211, - -11.90838939219355 + -3.0916106078064516 ], [ 116.68254893141275, - -10.904928748046602 + -4.095071251953399 ], [ 117.13292387221365, - -9.817627457812108 + -5.182372542187895 ], [ 117.40766255446353, - -8.673258487801734 + -6.326741512198268 ], [ 117.5, diff --git a/tools/adaptive-isogrid/test_data/rib_profile_sandbox_2.json b/tools/adaptive-isogrid/test_data/rib_profile_sandbox_2.json index e7d517ad..3095a574 100644 --- a/tools/adaptive-isogrid/test_data/rib_profile_sandbox_2.json +++ b/tools/adaptive-isogrid/test_data/rib_profile_sandbox_2.json @@ -115,79 +115,79 @@ ], [ 102.59233744553647, - -8.67325848780173 + -6.326741512198268 ], [ 102.86707612778635, - -9.817627457812105 + -5.182372542187894 ], [ 103.31745106858725, - -10.9049287480466 + -4.0950712519533985 ], [ 103.93237254218789, - -11.908389392193548 + -3.0916106078064507 ], [ 104.6966991411009, - -12.803300858899107 + -2.1966991411008934 ], [ - 105.59161060780644, - -13.567627457812105 + 105.59161060780646, + -1.4323725421878937 ], [ 106.5950712519534, - -14.182548931412757 + -0.8174510685872409 ], [ 107.68237254218789, - -14.632923872213652 + -0.3670761277863477 ], [ 108.82674151219827, - -14.907662554463531 + -0.09233744553646694 ], [ 110.0, - -15.0 + 0.0 ], [ 111.17325848780173, - -14.907662554463533 + -0.09233744553646694 ], [ 112.31762745781211, - -14.632923872213652 + -0.36707612778634857 ], [ 113.4049287480466, - -14.182548931412759 + -0.8174510685872418 ], [ - 114.40838939219354, - -13.567627457812106 + 114.40838939219356, + -1.4323725421878937 ], [ 115.3033008588991, - -12.803300858899107 + -2.1966991411008943 ], [ 116.06762745781211, - -11.90838939219355 + -3.0916106078064516 ], [ 116.68254893141275, - -10.904928748046602 + -4.095071251953399 ], [ 117.13292387221365, - -9.817627457812108 + -5.182372542187895 ], [ 117.40766255446353, - -8.673258487801734 + -6.326741512198268 ], [ 117.5, @@ -486,85 +486,85 @@ "lines": [ [ [ - 25.678190292214307, - 26.128773849808056 + 25.811430661020143, + 26.13909085002153 ], [ - 7.942071550492628, - 37.843065178063824 + 7.960094874180465, + 38.048286676904844 ] ], [ [ - -1.3106118172865522, - 32.033099427571145 + -1.3164920360660393, + 32.25966846274093 ], [ - 0.7648914397234292, - 16.67241303170882 + 0.7724940666492425, + 16.680389924345413 ] ], [ [ - 8.0714951423363, - 11.632133176397048 + 8.079907820953625, + 11.634091972323406 ], [ - 23.732110627047998, - 15.278528244003608 + 23.84225750507802, + 15.304174683835626 ] ] ], "arcs": [ { "tangent_start": [ - 23.732110627047998, - 15.278528244003608 + 23.84225750507802, + 15.304174683835626 ], "tangent_end": [ - 25.678190292214307, - 26.128773849808056 + 25.811430661020143, + 26.13909085002153 ], "center": [ - 22.37147512843125, - 21.122214669531928 + 22.481622006461272, + 21.147861109363944 ], "radius": 6.0, "start_angle": -1.3420336769029066, - "end_angle": 0.9870914088763131 + "end_angle": 0.9824716974806893 }, { "tangent_start": [ - 7.942071550492628, - 37.843065178063824 + 7.960094874180465, + 38.048286676904844 ], "tangent_end": [ - -1.3106118172865522, - 32.033099427571145 + -1.3164920360660393, + 32.25966846274093 ], "center": [ - 4.635356386709571, - 32.83650599778769 + 4.630286219621596, + 33.05705693624725 ], "radius": 6.0, - "start_angle": 0.9870914088763137, - "end_angle": -3.007288165294132 + "start_angle": 0.9824716974806903, + "end_angle": -3.0083002269263126 }, { "tangent_start": [ - 0.7648914397234292, - 16.67241303170882 + 0.7724940666492425, + 16.680389924345413 ], "tangent_end": [ - 8.0714951423363, - 11.632133176397048 + 8.079907820953625, + 11.634091972323406 ], "center": [ - 6.710859643719552, - 17.475819601925366 + 6.719272322336877, + 17.477778397851726 ], "radius": 6.0, - "start_angle": -3.007288165294132, + "start_angle": -3.008300226926313, "end_angle": -1.3420336769029066 } ] @@ -573,86 +573,86 @@ "lines": [ [ [ - 8.133286213410534, - 57.991336223083145 + 8.13270119402392, + 58.10315837240393 ], [ - 3.425847598210722, - 53.986633700644695 + 3.5143100198814707, + 54.24829383760509 ] ], [ [ - 4.006927428977144, - 44.41005810022782 + 4.029259054738017, + 44.65078161432867 ], [ - 19.332499109928943, - 34.28787668855169 + 19.368989958208086, + 34.417157562743895 ] ], [ [ - 26.240463516382007, - 40.79262627645285 + 26.216098060036682, + 40.83482848726619 ], [ - 17.217233706808162, - 56.42131967106142 + 17.173611382287486, + 56.49687575790413 ] ] ], "arcs": [ { "tangent_start": [ - 17.217233706808162, - 56.42131967106142 + 17.173611382287486, + 56.49687575790413 ], "tangent_end": [ - 8.133286213410534, - 57.991336223083145 + 8.13270119402392, + 58.10315837240393 ], "center": [ - 12.021081207960012, - 53.4213198029424 + 11.977458883439335, + 53.49687588978511 ], "radius": 6.0, - "start_angle": 0.5235987502177925, - "end_angle": 2.2757070496193097 + "start_angle": 0.5235987502177922, + "end_angle": 2.2663270174218986 }, { "tangent_start": [ - 3.425847598210722, - 53.986633700644695 + 3.5143100198814707, + 54.24829383760509 ], "tangent_end": [ - 4.006927428977144, - 44.41005810022782 + 4.029259054738017, + 44.65078161432867 ], "center": [ - 7.313642592760202, - 49.41661728050395 + 7.359067709296886, + 49.642011354986266 ], "radius": 6.0, - "start_angle": 2.2757070496193097, - "end_angle": -2.1545012447134804 + "start_angle": 2.2663270174218986, + "end_angle": -2.159120956109103 }, { "tangent_start": [ - 19.332499109928943, - 34.28787668855169 + 19.368989958208086, + 34.417157562743895 ], "tangent_end": [ - 26.240463516382007, - 40.79262627645285 + 26.216098060036682, + 40.83482848726619 ], "center": [ - 22.018965789174345, - 38.35534357012445 + 22.043123631343366, + 38.42556071875496 ], - "radius": 4.8745656269443085, - "start_angle": -2.1545012447134795, - "end_angle": 0.523598750217792 + "radius": 4.818535748846888, + "start_angle": -2.159120956109104, + "end_angle": 0.5235987502177916 } ] }, @@ -660,22 +660,22 @@ "lines": [ [ [ - 88.44248935771635, - 28.31881476393816 + 88.44247688013891, + 28.318814763938157 ], [ - 74.19615180506855, - 52.99419667321773 + 74.19614556627984, + 52.99418586731805 ] ], [ [ - 63.80384680737225, - 52.99419667321772 + 63.80384056858354, + 52.994185867318045 ], [ 49.55750925472447, - 28.31881476393816 + 28.318814763938164 ] ], [ @@ -684,7 +684,7 @@ 19.318814895819145 ], [ - 83.2463368588682, + 83.24632438129076, 19.31881489581914 ] ] @@ -692,16 +692,16 @@ "arcs": [ { "tangent_start": [ - 83.2463368588682, + 83.24632438129076, 19.31881489581914 ], "tangent_end": [ - 88.44248935771635, - 28.31881476393816 + 88.44247688013891, + 28.318814763938157 ], "center": [ - 83.2463368588682, - 25.318814895819145 + 83.24632438129076, + 25.31881489581914 ], "radius": 6.0, "start_angle": -1.5707963267948966, @@ -709,16 +709,16 @@ }, { "tangent_start": [ - 74.19615180506855, - 52.99419667321773 + 74.19614556627984, + 52.99418586731805 ], "tangent_end": [ - 63.80384680737225, - 52.99419667321772 + 63.80384056858354, + 52.994185867318045 ], "center": [ - 68.9999993062204, - 49.99419680509871 + 68.99999306743169, + 49.99418599919903 ], "radius": 6.0, "start_angle": 0.5235987502177925, @@ -727,7 +727,7 @@ { "tangent_start": [ 49.55750925472447, - 28.31881476393816 + 28.318814763938164 ], "tangent_end": [ 54.75366175357262, @@ -738,7 +738,7 @@ 25.318814895819145 ], "radius": 6.0, - "start_angle": 2.6179939033720014, + "start_angle": 2.617993903372001, "end_angle": -1.5707963267948966 } ] @@ -747,31 +747,31 @@ "lines": [ [ [ - 61.530526380394065, - 6.614207995699676 + 61.71203085370033, + 6.446076995367809 ], [ - 74.10863060451796, - -1.6342001378664799 + 74.42346050333508, + -1.924797597540301 ] ], [ [ - 82.35607506481739, - 0.002876309515363218 + 82.74885298782833, + -0.19166768258088318 ], [ - 86.87272278179121, - 6.626481492281668 + 87.26284239651952, + 6.728877719143885 ] ], [ [ - 81.91555146223997, - 16.006785104180864 + 82.23737493815108, + 16.00678510418086 ], [ - 64.33556206184979, + 64.57730313424713, 16.00678510418086 ] ] @@ -779,53 +779,53 @@ "arcs": [ { "tangent_start": [ - 64.33556206184979, + 64.57730313424713, 16.00678510418086 ], "tangent_end": [ - 61.530526380394065, - 6.614207995699676 + 61.71203085370033, + 6.446076995367809 ], "center": [ - 64.33556206184977, - 10.891643178636297 + 64.57730313424713, + 10.79708077842246 ], - "radius": 5.115141925544568, - "start_angle": 1.570796326794894, - "end_angle": -2.1512206964387595 + "radius": 5.209704325758401, + "start_angle": 1.5707963267948966, + "end_angle": -2.153145602842353 }, { "tangent_start": [ - 74.10863060451796, - -1.6342001378664799 + 74.42346050333508, + -1.924797597540301 ], "tangent_end": [ - 82.35607506481739, - 0.002876309515363218 + 82.74885298782833, + -0.19166768258088318 ], "center": [ - 77.39890374526615, - 3.3831799214145573 + 77.7233855294599, + 3.0862397024560924 ], "radius": 6.0, - "start_angle": -2.1512206964387617, - "end_angle": -0.5984759136089466 + "start_angle": -2.153145602842355, + "end_angle": -0.5779617713737514 }, { "tangent_start": [ - 86.87272278179121, - 6.626481492281668 + 87.26284239651952, + 6.728877719143885 ], "tangent_end": [ - 81.91555146223997, - 16.006785104180864 + 82.23737493815108, + 16.00678510418086 ], "center": [ - 81.91555146223997, - 10.006785104180862 + 82.23737493815108, + 10.00678510418086 ], "radius": 6.0, - "start_angle": -0.5984759136089466, + "start_angle": -0.57796177137375, "end_angle": 1.5707963267948966 } ] @@ -838,24 +838,24 @@ 63.63956316155779 ], [ - 82.25286751938091, + 82.25287999695834, 63.63956316155778 ] ], [ [ - 77.05671502053275, - 54.63956329343877 + 77.05672749811019, + 54.63956329343876 ], [ - 91.29968717717698, - 29.97001042136663 + 91.2996934159657, + 29.970021227266297 ] ], [ [ - 101.69199217487328, - 29.97001042136663 + 101.691998413662, + 29.970021227266297 ], [ 115.9349643315175, @@ -883,37 +883,37 @@ }, { "tangent_start": [ - 82.25286751938091, + 82.25287999695834, 63.63956316155778 ], "tangent_end": [ - 77.05671502053275, - 54.63956329343877 + 77.05672749811019, + 54.63956329343876 ], "center": [ - 82.25286751938091, + 82.25287999695834, 57.63956316155778 ], "radius": 6.0, "start_angle": 1.5707963267948966, - "end_angle": -2.617993903372003 + "end_angle": -2.617993903372001 }, { "tangent_start": [ - 91.29968717717698, - 29.97001042136663 + 91.2996934159657, + 29.970021227266297 ], "tangent_end": [ - 101.69199217487328, - 29.97001042136663 + 101.691998413662, + 29.970021227266297 ], "center": [ - 96.49583967602513, - 32.97001028948564 + 96.49584591481386, + 32.97002109538531 ], "radius": 6.0, - "start_angle": -2.617993903372002, - "end_angle": -0.5235987502177913 + "start_angle": -2.6179939033720014, + "end_angle": -0.5235987502177919 } ] }, @@ -921,86 +921,86 @@ "lines": [ [ [ - 48.92795298612055, - 103.3635587556606 + 48.9564435495213, + 103.31421164942182 ], [ - 57.907825203840545, - 87.8099629174385 + 58.23682325179843, + 87.24012154938391 ] ], [ [ - 68.85633163853508, - 90.39321689431053 + 69.41154853289426, + 89.73349780241267 ], [ - 69.86363872905723, - 107.11051075246694 + 70.87302272840886, + 106.9800879474539 ] ], [ [ - 63.19714552684507, - 113.43303173441817 + 64.24340193253434, + 113.45128501619133 ], [ - 53.44674971625615, - 112.32520178339524 + 53.50154803474262, + 112.278784971188 ] ] ], "arcs": [ { "tangent_start": [ - 53.44674971625615, - 112.32520178339524 + 53.50154803474262, + 112.278784971188 ], "tangent_end": [ - 48.92795298612055, - 103.3635587556606 + 48.9564435495213, + 103.31421164942182 ], "center": [ - 54.1241054849687, - 106.36355862377962 + 54.15259604836945, + 106.31421151754083 ], "radius": 6.0, - "start_angle": 1.6839301386806083, - "end_angle": -2.617993903372001 + "start_angle": 1.6795183938215752, + "end_angle": -2.6179939033720028 }, { "tangent_start": [ - 57.907825203840545, - 87.8099629174385 + 58.23682325179843, + 87.24012154938391 ], "tangent_end": [ - 68.85633163853508, - 90.39321689431053 + 69.41154853289426, + 89.73349780241267 ], "center": [ - 62.99397937716844, - 90.74645522643041 + 63.43297575064658, + 90.24012141750293 ], - "radius": 5.872984876162154, - "start_angle": -2.617993903372, - "end_angle": -0.06018262687391234 + "radius": 6.0, + "start_angle": -2.617993903372001, + "end_angle": -0.08453792719298019 }, { "tangent_start": [ - 69.86363872905723, - 107.11051075246694 + 70.87302272840886, + 106.9800879474539 ], "tangent_end": [ - 63.19714552684507, - 113.43303173441817 + 64.24340193253434, + 113.45128501619133 ], "center": [ - 63.87450129555762, - 107.47138857480253 + 64.89444994616117, + 107.48671156254416 ], "radius": 6.0, - "start_angle": -0.060182626873911425, - "end_angle": 1.683930138680608 + "start_angle": -0.08453792719298019, + "end_angle": 1.6795183938215752 } ] }, @@ -1095,86 +1095,86 @@ "lines": [ [ [ - 72.76051204285014, - 100.22041198538561 + 73.60557617560289, + 100.06107485501332 ], [ - 71.82417839314658, - 84.68099513956493 + 72.28664870189479, + 84.49665254780392 ] ], [ [ - 81.77666534361508, - 80.14179565316361 + 82.26576325570866, + 79.55708675004865 ], [ - 90.51537442266364, - 88.703552774549 + 91.27397341404169, + 87.71771027067821 ] ], [ [ - 90.34960464715543, - 97.43152973408192 + 91.41113044430638, + 96.48284449730379 ], [ - 82.78290633953517, - 104.30170019726887 + 83.74959123343446, + 103.8729105310104 ] ] ], "arcs": [ { "tangent_start": [ - 82.78290633953517, - 104.30170019726887 + 83.74959123343446, + 103.8729105310104 ], "tangent_end": [ - 72.76051204285014, - 100.22041198538561 + 73.60557617560289, + 100.06107485501332 ], "center": [ - 78.74964947634976, - 99.85953416305001 + 79.58414895785059, + 99.55445123992305 ], "radius": 6.0, - "start_angle": 0.8336072430925475, - "end_angle": 3.081410026715882 + "start_angle": 0.8034323691499936, + "end_angle": 3.0570547263968133 }, { "tangent_start": [ - 71.82417839314658, - 84.68099513956493 + 72.28664870189479, + 84.49665254780392 ], "tangent_end": [ - 81.77666534361508, - 80.14179565316361 + 82.26576325570866, + 79.55708675004865 ], "center": [ - 77.6747724480807, - 84.32846530277997 + 78.24864621380212, + 83.99143351934106 ], - "radius": 5.861205343737255, - "start_angle": 3.08141002671588, - "end_angle": -0.7956259679764766 + "radius": 5.983365323854969, + "start_angle": 3.057054726396812, + "end_angle": -0.8347258630261806 }, { "tangent_start": [ - 90.51537442266364, - 88.703552774549 + 91.27397341404169, + 87.71771027067821 ], "tangent_end": [ - 90.34960464715543, - 97.43152973408192 + 91.41113044430638, + 96.48284449730379 ], "center": [ - 86.31634778397002, - 92.98936369986305 + 87.24568816872252, + 92.16438520621644 ], "radius": 6.0, - "start_angle": -0.7956259679764799, - "end_angle": 0.8336072430925492 + "start_angle": -0.8347258630261801, + "end_angle": 0.8034323691499954 } ] }, @@ -1182,86 +1182,173 @@ "lines": [ [ [ - 93.04865060782011, - 86.52623673217205 + 94.03579716799696, + 85.72906223412326 ], [ - 83.5650257249942, - 77.23464776375626 + 84.58768427583934, + 77.16992663025621 ] ], [ [ - 87.76405236368782, + 88.5289828663966, 66.94883683844222 ], [ - 106.0310452598441, + 105.98358072060091, 66.94883683844222 ] ], [ [ - 110.39125478407091, - 77.07055649228113 + 110.332893067366, + 77.08205375874495 ], [ - 101.60788677074055, - 86.36214546069691 + 102.41339476008122, + 85.41560421888776 ] ] ], "arcs": [ { "tangent_start": [ - 101.60788677074055, - 86.36214546069691 + 102.41339476008122, + 85.41560421888776 ], "tangent_end": [ - 93.04865060782011, - 86.52623673217205 + 94.03579716799696, + 85.72906223412326 ], "center": [ - 97.24767724651375, - 82.240425806858 + 98.06408241331613, + 81.28238729858504 ], "radius": 6.0, - "start_angle": 0.757288160820468, - "end_angle": 2.3459666856133152 + "start_angle": 0.7599283194780172, + "end_angle": 2.306866790563613 }, { "tangent_start": [ - 83.5650257249942, - 77.23464776375626 + 84.58768427583934, + 77.16992663025621 ], "tangent_end": [ - 87.76405236368782, + 88.5289828663966, 66.94883683844222 ], "center": [ - 87.76405236368782, - 72.94883683844222 + 88.5289828663966, + 72.81927304223939 ], - "radius": 6.0, - "start_angle": 2.3459666856133152, + "radius": 5.870436203797164, + "start_angle": 2.306866790563615, "end_angle": -1.5707963267948966 }, { "tangent_start": [ - 106.0310452598441, + 105.98358072060091, 66.94883683844222 ], "tangent_end": [ - 110.39125478407091, - 77.07055649228113 + 110.332893067366, + 77.08205375874495 ], "center": [ - 106.0310452598441, + 105.98358072060091, 72.94883683844222 ], "radius": 6.0, "start_angle": -1.5707963267948966, - "end_angle": 0.757288160820468 + "end_angle": 0.7599283194780172 + } + ] + }, + { + "lines": [ + [ + [ + 114.31818010656582, + 3.827037655440659 + ], + [ + 121.37126398624447, + -1.0002998192014232 + ] + ], + [ + [ + 130.76010536121507, + 3.951038801342257 + ], + [ + 130.76010536121507, + 16.34592566009247 + ] + ], + [ + [ + 120.70902672914055, + 20.439734733593852 + ], + [ + 113.41448772788276, + 12.970530134532947 + ] + ] + ], + "arcs": [ + { + "tangent_start": [ + 113.41448772788276, + 12.970530134532947 + ], + "tangent_end": [ + 114.31818010656582, + 3.827037655440659 + ], + "center": [ + 117.70702148153643, + 8.77837627598434 + ], + "radius": 6.0, + "start_angle": 2.3680246502214573, + "end_angle": -2.1709955592499783 + }, + { + "tangent_start": [ + 121.37126398624447, + -1.0002998192014232 + ], + "tangent_end": [ + 130.76010536121507, + 3.951038801342257 + ], + "center": [ + 124.76010536121507, + 3.951038801342257 + ], + "radius": 6.0, + "start_angle": -2.1709955592499766, + "end_angle": 0.0 + }, + { + "tangent_start": [ + 130.76010536121507, + 16.34592566009247 + ], + "tangent_end": [ + 120.70902672914055, + 20.439734733593852 + ], + "center": [ + 124.90086086070134, + 16.345925660092465 + ], + "radius": 5.859244500513722, + "start_angle": 6.063433056068931e-16, + "end_angle": 2.368024650221457 } ] } @@ -1292,15 +1379,15 @@ "min_web_width": true, "no_islands": true, "no_self_intersections": true, - "mass_estimate_g": 379.1010794934022, - "area_mm2": 14040.780721977859, - "num_interiors": 10 + "mass_estimate_g": 365.94825649714704, + "area_mm2": 13553.639129523961, + "num_interiors": 11 }, "pipeline": { "geometry_file": "test_data/geometry_sandbox_2_brain.json", "num_vertices": 19, - "num_triangles": 22, - "num_pockets": 10, + "num_triangles": 23, + "num_pockets": 11, "validation_ok": true } } \ No newline at end of file