Index: cpp/tests/geometry-tests.txt
===================================================================
--- cpp/tests/geometry-tests.txt	(revision 811)
+++ cpp/tests/geometry-tests.txt	(revision 811)
@@ -0,0 +1,86 @@
+exe:geometry_info_test
+
+TESTNAME:cuboid
+arg:-l
+arg:geometry.gen
+arg:cuboid
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/cuboid
+RUNTEST
+
+TESTNAME:cylinder
+arg:-l
+arg:geometry.gen
+arg:cylinder
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/cylinder
+RUNTEST
+
+TESTNAME:ellipsoid
+arg:-l
+arg:geometry.gen
+arg:ellipsoid
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/ellipsoid
+RUNTEST
+
+TESTNAME:cuboid-cylinder
+arg:-l
+arg:geometry.gen
+arg:cuboidCylinder
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/cuboid_cylinder
+RUNTEST
+
+TESTNAME:cuboid-ellipsoid
+arg:-l
+arg:geometry.gen
+arg:cuboidEllipsoid
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/cuboid_ellipsoid
+RUNTEST
+
+TESTNAME:cylinder-ellipsoid
+arg:-l
+arg:geometry.gen
+arg:cylinderEllipsoid
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/cylinder_ellipsoid
+RUNTEST
+
+##################################
+
+exe:geometry_apices_test
+
+TESTNAME:apices
+arg:-l
+arg:similarity.gen
+arg:Spiral plant
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/apices
+RUNTEST
+
+##################################
+
+exe:geometry_surface_test
+
+TESTNAME:surface
+arg:-l
+arg:similarity.gen
+arg:Spiral plant
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/surface
+RUNTEST
+
+##################################
+
+exe:geometry_volume_test
+
+TESTNAME:volume
+arg:-l
+arg:similarity.gen
+arg:Spiral plant
+arg:2
+out:*INSERTPLATFORMDEPENDENTFILE*:geometry_goals/volume
+RUNTEST
+
Index: cpp/tests/geometry.gen
===================================================================
--- cpp/tests/geometry.gen	(revision 811)
+++ cpp/tests/geometry.gen	(revision 811)
@@ -0,0 +1,150 @@
+org:
+name:cuboid
+genotype:/*0*/p:sh=2,sx=100,sy=1,sz=1
+info:(manually created)
+energy0:1.0
+numparts:1
+numjoints:0
+numneurons:0
+numconnections:0
+num:4
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g1
+
+org:
+name:cylinder
+genotype:/*0*/p:sh=3,sx=100,sy=1,sz=1
+info:(manually created)
+energy0:1.0
+numparts:1
+numjoints:0
+numneurons:0
+numconnections:0
+num:6
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g3
+
+org:
+name:ellipsoid
+genotype:/*0*/p:sh=1,sx=100,sy=1,sz=1
+info:(manually created)
+energy0:1.0
+numparts:1
+numjoints:0
+numneurons:0
+numconnections:0
+num:8
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g5
+
+org:
+name:cuboidCylinder
+genotype:~
+//0
+p:sh=2,sx=1,sy=1,s=1
+p:sh=3,sx=1,sy=1,sz=1,x=1,ry=1.57
+j:0,1,sh=1~
+info:(manually created)
+energy0:1.0
+numparts:2
+numjoints:1
+numneurons:0
+numconnections:0
+num:10
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g7
+
+org:
+name:cuboidEllipsoid
+genotype:~
+//0
+p:sh=2,sx=1,sy=1,sz=1
+p:sh=1,sx=1,sy=1,sz=1,x=1
+j:0,1,sh=1~
+info:(manually created)
+energy0:1.0
+numparts:2
+numjoints:1
+numneurons:0
+numconnections:0
+num:11
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g8
+
+org:
+name:cylinderEllipsoid
+genotype:~
+//0
+p:sh=3,sx=1,sy=1,sz=1
+p:sh=1,sx=1,sy=1,sz=1,x=1
+j:0,1,sh=1~
+info:(manually created)
+energy0:1.0
+numparts:2
+numjoints:1
+numneurons:0
+numconnections:0
+num:12
+gnum:0
+instances:0
+lifespan:0.0
+velocity:0.0
+distance:0.0
+vertvel:0.0
+vertpos:0.0
+user1:@Serialized:null
+user2:@Serialized:null
+user3:@Serialized:null
+is_valid:1
+uid:g9
+
Index: cpp/tests/geometry_goals/apices.goal
===================================================================
--- cpp/tests/geometry_goals/apices.goal	(revision 811)
+++ cpp/tests/geometry_goals/apices.goal	(revision 811)
@@ -0,0 +1,208 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.234116705191572, -0.0829808771104899, 4.50329270050758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.252367047930057, 0.0775184200642625, 4.815660326159, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.306397278516871, 0.0775184200642625, 4.73151322767821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0584025794580646, 0.286336227102044, 4.61611744315643, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.00437234887125065, 0.286336227102044, 4.53197034467564, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0766529221965495, -0.291798684148272, 4.70283558351016, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.130683152783363, -0.291798684148272, 4.61868848502937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.279971598952481, -0.174004225439998, 4.73450058009821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.464591119181096, -0.280713935323693, 5.30417475940345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.533655882847817, -0.333187294412801, 5.25440925924957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.513764876523997, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.582829640190718, -0.0109352833109247, 4.98286629224512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.161733077942859, -0.443782877452766, 5.05580904725653, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.23079784160958, -0.496256236541875, 5.00604354710266, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.346251103550975, -0.492826618361854, 5.19639532159512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.127672224852267, -0.587835806219948, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.15458709820757, -0.681303548167177, 5.73281060473579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.496078132354096, -0.443665961701197, 5.60276349367153, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.522993005709399, -0.537133703648425, 5.57953913560603, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0490696773061566, -0.543528720933377, 5.37289114879037, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0221548039508538, -0.636996462880606, 5.34966679072487, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0372804684875512, -0.677650820758153, 5.5680550996704, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.478877821939712, -0.491787207769674, 5.94281701714723, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.516219850388307, -0.580654565236895, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0976180632193059, -0.669014767265442, 5.99966232069671, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.134960091667901, -0.757882124732663, 5.97305093801679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.381198198759362, -0.411555903795164, 5.53782117880085, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.418540227207957, -0.500423261262385, 5.51120979612092, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55231993155049, -0.478193760134837, 5.68779930886685, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.851158415466058, 0.0239707672651165, 5.85669675690034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.92138934706828, -0.0185299081642229, 5.79958888673927, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.77412016275985, -0.350500431016251, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.844351094362072, -0.39300110644559, 5.98353569774096, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.559127252654475, -0.0612218864241298, 5.56096036802623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.629358184256698, -0.103722561853469, 5.50385249786516, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.771122380786354, 0.0360262783152098, 5.6035931128623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.68022950735179, 0.626692162710225, 5.71696109145707, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.724610985093507, 0.633737813573182, 5.62762664548364, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.971313008868463, 0.343278525444151, 5.8392194464125, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.01569448661018, 0.350324176307108, 5.74988500043907, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.435657401527965, 0.312394264718326, 5.5706692038803, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.480038879269682, 0.319439915581284, 5.48133475790687, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.512473274220572, 0.533543219211279, 5.53313052438532, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.109213517134263, 0.91125950029905, 5.78751601791024, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0905192670394194, 0.92979834784884, 5.69104407305103, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.525965711349134, 0.931425931410375, 5.71063348625758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.507271461254291, 0.949964778960164, 5.61416154139838, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.114415330100544, 0.494837940550165, 5.70648500089719, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0957210800057008, 0.513376788099955, 5.61001305603798, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.00750365092639154, 0.696791413213126, 5.68266803690503, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.385812072880215, 0.737325170731662, 6.157262339842, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.45231629527596, 0.719739372590381, 6.08468184585587, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.190426548038641, 1.02095287711702, 5.90951282752571, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.256930770434386, 1.00336707897574, 5.83693233353958, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.136384953372221, 0.430749504969044, 6.00299804320745, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.202889175767966, 0.413163706827763, 5.93041754922132, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.355205953094113, 0.486385828606998, 6.07537663397741, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.392009483942956, 0.346109623754502, 6.66611184239928, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.451270154289353, 0.274844501819251, 6.62856912878333, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.580803213573042, 0.633825631483438, 6.41796586409441, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.640063883919438, 0.562560509548188, 6.38042315047845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.107151553117631, 0.269934942813312, 6.36106532589824, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.166412223464028, 0.198669820878061, 6.32352261228228, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.240399248511016, 0.173898529959914, 6.53205874655437, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0966530839800632, 0.159656146484489, 7.03821374225752, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0936613590709195, 0.0618293038199061, 7.01769647059809, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.319416019707846, 0.188685170751332, 6.96047175420438, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.32240774461699, 0.0908583280867492, 6.93995448254495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.178661580086038, 0.242696348357654, 6.63031800626694, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.175669855176894, 0.144869505693071, 6.6098007346075, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+j:0, 16, sh=1
+j:0, 17, sh=1
+j:0, 18, sh=1
+j:0, 19, sh=1
+j:0, 20, sh=1
+j:0, 21, sh=1
+j:0, 22, sh=1
+j:0, 23, sh=1
+j:0, 24, sh=1
+j:0, 25, sh=1
+j:0, 26, sh=1
+j:0, 27, sh=1
+j:0, 28, sh=1
+j:0, 29, sh=1
+j:0, 30, sh=1
+j:0, 31, sh=1
+j:0, 32, sh=1
+j:0, 33, sh=1
+j:0, 34, sh=1
+j:0, 35, sh=1
+j:0, 36, sh=1
+j:0, 37, sh=1
+j:0, 38, sh=1
+j:0, 39, sh=1
+j:0, 40, sh=1
+j:0, 41, sh=1
+j:0, 42, sh=1
+j:0, 43, sh=1
+j:0, 44, sh=1
+j:0, 45, sh=1
+j:0, 46, sh=1
+j:0, 47, sh=1
+j:0, 48, sh=1
+j:0, 49, sh=1
+j:0, 50, sh=1
+j:0, 51, sh=1
+j:0, 52, sh=1
+j:0, 53, sh=1
+j:0, 54, sh=1
+j:0, 55, sh=1
+j:0, 56, sh=1
+j:0, 57, sh=1
+j:0, 58, sh=1
+j:0, 59, sh=1
+j:0, 60, sh=1
+j:0, 61, sh=1
+j:0, 62, sh=1
+j:0, 63, sh=1
+j:0, 64, sh=1
+j:0, 65, sh=1
+j:0, 66, sh=1
+j:0, 67, sh=1
+j:0, 68, sh=1
+j:0, 69, sh=1
+j:0, 70, sh=1
+j:0, 71, sh=1
+j:0, 72, sh=1
+j:0, 73, sh=1
+j:0, 74, sh=1
+j:0, 75, sh=1
+j:0, 76, sh=1
+j:0, 77, sh=1
+j:0, 78, sh=1
+j:0, 79, sh=1
+j:0, 80, sh=1
+j:0, 81, sh=1
+j:0, 82, sh=1
+j:0, 83, sh=1
+j:0, 84, sh=1
+j:0, 85, sh=1
+j:0, 86, sh=1
+j:0, 87, sh=1
+j:0, 88, sh=1
+j:0, 89, sh=1
+j:0, 90, sh=1
+j:0, 91, sh=1
+j:0, 92, sh=1
+j:0, 93, sh=1
+j:0, 94, sh=1
+j:0, 95, sh=1
+j:0, 96, sh=1
+j:0, 97, sh=1
+j:0, 98, sh=1
+j:0, 99, sh=1
+j:0, 100, sh=1
+j:0, 101, sh=1
+j:0, 102, sh=1
+
+
Index: cpp/tests/geometry_goals/cuboid.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid.goal	(revision 811)
+++ cpp/tests/geometry_goals/cuboid.goal	(revision 811)
@@ -0,0 +1,43 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=2, sx=200.0199990001, sy=0.05, sz=0.05, rx=-2.35624448519293, 0.00999916677415087, 0.00999966668666524, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=5.6562886489061, sz=0.05, rx=-2.35624448519293, 0.00999916677415087, 0.00999966668666524, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.82842712474619, rx=-2.35624448519293, 0.00999916677415087, 0.00999966668666524, vr=0.0, 0.0
+p:sh=2, sx=100.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+
+# volume=800.000000
+# area=1608.000000
+# sizes.x=200.019999 sizes.y=5.656289 sizes.z=2.828427
+# axes.x=(0.999900, 0.009999, 0.009999)
+# axes.y=(0.014141, -0.707036, -0.707036)
+# axes.z=(0.000000, 0.707107, -0.707107)
+# box.x=[-100.000000, 100.000000]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000000, 1.000000]
+
Index: cpp/tests/geometry_goals/cuboid_cylinder.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid_cylinder.goal	(revision 811)
+++ cpp/tests/geometry_goals/cuboid_cylinder.goal	(revision 811)
@@ -0,0 +1,45 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-1.0, -1.0, -1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, -1.0, 1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, -1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, 1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.00079600964257, -1.0, -1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.00079600964257, -1.0, 1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.00079600964257, 1.0, -1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.00079600964257, 1.0, 1.00079600964257, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.500398004821284, sh=2, sx=3.80282057851894, sy=0.05, sz=0.05, rx=-2.37355889227126, 0.55357491735977, 0.440529723934382, vg=0.0, 0.0
+p:0.500398004821284, sh=2, sx=0.05, sy=3.75118291331815, sz=0.05, rx=-2.37355889227126, 0.55357491735977, 0.440529723934382, vr=0.0, vb=0.0
+p:0.500398004821284, sh=2, sx=0.05, sy=0.05, sz=2.89459791349714, rx=-2.37355889227126, 0.55357491735977, 0.440529723934382, vr=0.0, 0.0
+p:sh=2
+p:1.0, sh=3, ry=1.57
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:15, 16, sh=1
+j:0, 15, sh=1
+
+# volume=6.206582
+# area=31.493900
+# sizes.x=3.802821 sizes.y=3.751183 sizes.z=2.894598
+# axes.x=(0.769435, 0.362733, 0.525732)
+# axes.y=(0.637080, -0.494862, -0.590966)
+# axes.z=(0.045801, 0.789643, -0.611854)
+# box.x=[-1.000000, 2.000796]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000796, 1.000796]
+
Index: cpp/tests/geometry_goals/cuboid_ellipsoid.goal
===================================================================
--- cpp/tests/geometry_goals/cuboid_ellipsoid.goal	(revision 811)
+++ cpp/tests/geometry_goals/cuboid_ellipsoid.goal	(revision 811)
@@ -0,0 +1,45 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.5, sh=2, sx=3.46410161513775, sy=0.05, sz=0.05, rx=-2.61799387799149, 0.615479708670387, 0.785398163397448, vg=0.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=3.43508830243667, sz=0.05, rx=-2.61799387799149, 0.615479708670387, 0.785398163397448, vr=0.0, vb=0.0
+p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.82842712474619, rx=-2.61799387799149, 0.615479708670387, 0.785398163397448, vr=0.0, 0.0
+p:sh=2
+p:1.0, sh=1
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:15, 16, sh=1
+j:0, 15, sh=1
+
+# volume=9.257143
+# area=27.446922
+# sizes.x=3.464102 sizes.y=3.435088 sizes.z=2.828427
+# axes.x=(0.577350, 0.577350, 0.577350)
+# axes.y=(0.816497, -0.408248, -0.408248)
+# axes.z=(0.000000, 0.707107, -0.707107)
+# box.x=[-1.000000, 2.000000]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000000, 1.000000]
+
Index: cpp/tests/geometry_goals/cylinder.goal
===================================================================
--- cpp/tests/geometry_goals/cylinder.goal	(revision 811)
+++ cpp/tests/geometry_goals/cylinder.goal	(revision 811)
@@ -0,0 +1,43 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=2, sx=200.009999750012, sy=0.05, sz=0.05, rz=0.00999966668666524, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=3.99980001499875, sz=0.05, rz=0.00999966668666524, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.0, rz=0.00999966668666524, vr=0.0, 0.0
+p:sh=3, sx=100.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+
+# volume=416.000000
+# area=1262.920247
+# sizes.x=200.010000 sizes.y=3.999800 sizes.z=2.000000
+# axes.x=(0.999950, 0.010000, 0.000000)
+# axes.y=(-0.010000, 0.999950, 0.000000)
+# axes.z=(0.000000, -0.000000, 1.000000)
+# box.x=[-100.000000, 100.000000]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000000, 1.000000]
+
Index: cpp/tests/geometry_goals/cylinder_ellipsoid.goal
===================================================================
--- cpp/tests/geometry_goals/cylinder_ellipsoid.goal	(revision 811)
+++ cpp/tests/geometry_goals/cylinder_ellipsoid.goal	(revision 811)
@@ -0,0 +1,45 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-1.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:2.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.5, sh=2, sx=3.2348263655315, sy=0.05, sz=0.05, rx=-3.14159265358979, rz=0.482170608511459, vg=0.0, 0.0
+p:0.5, sh=2, sx=0.05, sy=2.81253927824297, sz=0.05, rx=-3.14159265358979, rz=0.482170608511459, vr=0.0, vb=0.0
+p:0.5, sh=2, sx=0.05, sy=0.05, sz=2.0, rx=-3.14159265358979, rz=0.482170608511459, vr=0.0, 0.0
+p:sh=3
+p:1.0, sh=1
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:15, 16, sh=1
+j:0, 15, sh=1
+
+# volume=5.142857
+# area=19.676573
+# sizes.x=3.234826 sizes.y=2.812539 sizes.z=2.000000
+# axes.x=(0.885990, 0.463703, 0.000000)
+# axes.y=(0.463703, -0.885990, 0.000000)
+# axes.z=(0.000000, 0.000000, -1.000000)
+# box.x=[-1.000000, 2.000000]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000000, 1.000000]
+
Index: cpp/tests/geometry_goals/ellipsoid.goal
===================================================================
--- cpp/tests/geometry_goals/ellipsoid.goal	(revision 811)
+++ cpp/tests/geometry_goals/ellipsoid.goal	(revision 811)
@@ -0,0 +1,43 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, -1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, -1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:100.0, 1.0, 1.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:sh=2, sx=200.0, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=2.0, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=2.0, vr=0.0, 0.0
+p:sh=1, sx=100.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+
+# volume=233.416459
+# area=976.671778
+# sizes.x=200.000000 sizes.y=2.000000 sizes.z=2.000000
+# axes.x=(1.000000, 0.000000, 0.000000)
+# axes.y=(0.000000, 1.000000, 0.000000)
+# axes.z=(0.000000, 0.000000, 1.000000)
+# box.x=[-100.000000, 100.000000]
+# box.y=[-1.000000, 1.000000]
+# box.z=[-1.000000, 1.000000]
+
Index: cpp/tests/geometry_goals/surface.goal
===================================================================
--- cpp/tests/geometry_goals/surface.goal	(revision 811)
+++ cpp/tests/geometry_goals/surface.goal	(revision 811)
@@ -0,0 +1,452 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.2, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.2, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.2, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.2, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.2, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, -0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.6, 0.6, 3.4, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, -0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, -0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, 0.2, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, 0.6, 3.1, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, 0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.2, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.2, -0.6, 3.7, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, 0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, 0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, -0.55, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.35, -0.35, 2.9, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.5, z=4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:y=-0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:y=0.5, 4.0, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:z=4.5, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.234116705191572, -0.0829808771104899, 4.50329270050758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.306397278516871, 0.0775184200642625, 4.73151322767821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.252367047930057, 0.0775184200642625, 4.815660326159, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.00437234887125065, 0.286336227102044, 4.53197034467564, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0584025794580646, 0.286336227102044, 4.61611744315643, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.130683152783363, -0.291798684148272, 4.61868848502937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0766529221965495, -0.291798684148272, 4.70283558351016, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0766529221965495, -0.291798684148272, 4.70283558351016, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.252367047930057, 0.0775184200642625, 4.815660326159, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.00912517136924244, -0.00273122852311374, 4.65947651333329, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.234116705191572, -0.0829808771104899, 4.50329270050758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0584025794580646, 0.286336227102044, 4.61611744315643, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.130683152783363, -0.291798684148272, 4.61868848502937, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.306397278516871, 0.0775184200642625, 4.73151322767821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0631554019560564, -0.00273122852311374, 4.5753294148525, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.00437234887125065, 0.286336227102044, 4.53197034467564, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.279971598952481, -0.174004225439998, 4.73450058009821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.533655882847817, -0.333187294412801, 5.25440925924957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.464591119181096, -0.280713935323693, 5.30417475940345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.582829640190718, -0.0109352833109247, 4.98286629224512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.513764876523997, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.23079784160958, -0.496256236541875, 5.00604354710266, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.161733077942859, -0.443782877452766, 5.05580904725653, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.161733077942859, -0.443782877452766, 5.05580904725653, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.464591119181096, -0.280713935323693, 5.30417475940345, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.337748977233428, -0.201122400837291, 5.04422041982777, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.513764876523997, 0.0415380757781835, 5.032631792399, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.23079784160958, -0.496256236541875, 5.00604354710266, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.533655882847817, -0.333187294412801, 5.25440925924957, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.406813740900149, -0.2535957599264, 4.99445491967389, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.279971598952481, -0.174004225439998, 4.73450058009821, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.582829640190718, -0.0109352833109247, 4.98286629224512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.346251103550975, -0.492826618361854, 5.19639532159512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.15458709820757, -0.681303548167177, 5.73281060473579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.127672224852267, -0.587835806219948, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.522993005709399, -0.537133703648425, 5.57953913560603, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.496078132354096, -0.443665961701197, 5.60276349367153, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0221548039508538, -0.636996462880606, 5.34966679072487, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0490696773061566, -0.543528720933377, 5.37289114879037, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0490696773061566, -0.543528720933377, 5.37289114879037, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.127672224852267, -0.587835806219948, 5.75603496280128, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.22350422752397, -0.493597341317287, 5.48782732123095, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.496078132354096, -0.443665961701197, 5.60276349367153, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0221548039508538, -0.636996462880606, 5.34966679072487, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.15458709820757, -0.681303548167177, 5.73281060473579, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.250419100879273, -0.587065083264516, 5.46460296316545, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.346251103550975, -0.492826618361854, 5.19639532159512, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.522993005709399, -0.537133703648425, 5.57953913560603, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0372804684875512, -0.677650820758153, 5.5680550996704, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.516219850388307, -0.580654565236895, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.478877821939712, -0.491787207769674, 5.94281701714723, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.134960091667901, -0.757882124732663, 5.97305093801679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0976180632193059, -0.669014767265442, 5.99966232069671, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.418540227207957, -0.500423261262385, 5.51120979612092, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.381198198759362, -0.411555903795164, 5.53782117880085, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.381198198759362, -0.411555903795164, 5.53782117880085, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.478877821939712, -0.491787207769674, 5.94281701714723, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.239408130989334, -0.540285335530303, 5.76874174974878, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0976180632193059, -0.669014767265442, 5.99966232069671, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.418540227207957, -0.500423261262385, 5.51120979612092, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.516219850388307, -0.580654565236895, 5.91620563446731, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.276750159437929, -0.629152692997524, 5.74213036706885, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0372804684875512, -0.677650820758153, 5.5680550996704, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.134960091667901, -0.757882124732663, 5.97305093801679, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55231993155049, -0.478193760134837, 5.68779930886685, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.92138934706828, -0.0185299081642229, 5.79958888673927, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.851158415466058, 0.0239707672651165, 5.85669675690034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.844351094362072, -0.39300110644559, 5.98353569774096, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.77412016275985, -0.350500431016251, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.629358184256698, -0.103722561853469, 5.50385249786516, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.559127252654475, -0.0612218864241298, 5.56096036802623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.559127252654475, -0.0612218864241298, 5.56096036802623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.851158415466058, 0.0239707672651165, 5.85669675690034, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.666623707707162, -0.20586115872019, 5.80080196796413, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.77412016275985, -0.350500431016251, 6.04064356790203, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.629358184256697, -0.103722561853469, 5.50385249786516, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.92138934706828, -0.0185299081642229, 5.79958888673927, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.736854639309385, -0.24836183414953, 5.74369409780306, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.55231993155049, -0.478193760134837, 5.68779930886685, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.844351094362072, -0.39300110644559, 5.98353569774096, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.771122380786354, 0.0360262783152098, 5.6035931128623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.724610985093507, 0.633737813573182, 5.62762664548364, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.68022950735179, 0.626692162710225, 5.71696109145707, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.01569448661018, 0.350324176307108, 5.74988500043907, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.971313008868463, 0.343278525444151, 5.8392194464125, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.480038879269682, 0.319439915581284, 5.48133475790687, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.435657401527965, 0.312394264718326, 5.5706692038803, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.435657401527965, 0.312394264718326, 5.5706692038803, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.68022950735179, 0.626692162710225, 5.71696109145707, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.703485205198214, 0.327836395081239, 5.7049443251464, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.971313008868463, 0.343278525444151, 5.8392194464125, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.480038879269682, 0.319439915581284, 5.48133475790687, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.724610985093507, 0.633737813573182, 5.62762664548364, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.747866682939931, 0.334882045944196, 5.61560987917297, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.771122380786354, 0.0360262783152098, 5.6035931128623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-1.01569448661018, 0.350324176307108, 5.74988500043907, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.512473274220572, 0.533543219211279, 5.53313052438532, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0905192670394194, 0.92979834784884, 5.69104407305103, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.109213517134263, 0.91125950029905, 5.78751601791024, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.507271461254291, 0.949964778960164, 5.61416154139838, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.525965711349134, 0.931425931410375, 5.71063348625758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0957210800057008, 0.513376788099955, 5.61001305603798, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.114415330100544, 0.494837940550165, 5.70648500089719, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.114415330100544, 0.494837940550165, 5.70648500089719, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.109213517134263, 0.91125950029905, 5.78751601791024, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.320190520724839, 0.71313193598027, 5.70855924357738, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.525965711349134, 0.931425931410375, 5.71063348625758, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0957210800057008, 0.513376788099955, 5.61001305603798, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0905192670394194, 0.92979834784884, 5.69104407305103, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.301496270629996, 0.731670783530059, 5.61208729871818, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.512473274220572, 0.533543219211279, 5.53313052438532, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.507271461254291, 0.949964778960164, 5.61416154139838, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.00750365092639154, 0.696791413213126, 5.68266803690503, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.45231629527596, 0.719739372590381, 6.08468184585587, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.385812072880215, 0.737325170731662, 6.157262339842, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.256930770434386, 1.00336707897574, 5.83693233353958, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.190426548038641, 1.02095287711702, 5.90951282752571, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.202889175767966, 0.413163706827763, 5.93041754922132, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.136384953372221, 0.430749504969044, 6.00299804320745, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.136384953372221, 0.430749504969044, 6.00299804320745, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.385812072880215, 0.737325170731662, 6.157262339842, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.163405750705431, 0.725851191043034, 5.95625543536658, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.190426548038641, 1.02095287711702, 5.90951282752571, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.202889175767966, 0.413163706827763, 5.93041754922132, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.45231629527596, 0.719739372590381, 6.08468184585587, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.229909973101176, 0.708265392901753, 5.88367494138045, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.00750365092639155, 0.696791413213126, 5.68266803690503, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.256930770434386, 1.00336707897574, 5.83693233353958, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.355205953094113, 0.486385828606998, 6.07537663397741, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.451270154289353, 0.274844501819251, 6.62856912878333, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.392009483942956, 0.346109623754502, 6.66611184239928, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.640063883919438, 0.562560509548188, 6.38042315047845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.580803213573042, 0.633825631483438, 6.41796586409441, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.166412223464028, 0.198669820878061, 6.32352261228228, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.107151553117631, 0.269934942813312, 6.36106532589824, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.107151553117631, 0.269934942813312, 6.36106532589824, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.392009483942956, 0.346109623754502, 6.66611184239928, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.343977383345336, 0.451880287148375, 6.38951559499632, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.580803213573042, 0.633825631483438, 6.41796586409441, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.166412223464028, 0.198669820878061, 6.32352261228228, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.451270154289353, 0.274844501819251, 6.62856912878333, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.403238053691733, 0.380615165213125, 6.35197288138037, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.355205953094113, 0.486385828606998, 6.07537663397741, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.640063883919438, 0.562560509548188, 6.38042315047845, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.240399248511016, 0.173898529959914, 6.53205874655437, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0936613590709195, 0.0618293038199061, 7.01769647059809, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0966530839800632, 0.159656146484489, 7.03821374225752, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.32240774461699, 0.0908583280867492, 6.93995448254495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.319416019707846, 0.188685170751332, 6.96047175420438, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.175669855176894, 0.144869505693071, 6.6098007346075, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.178661580086038, 0.242696348357654, 6.63031800626694, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.178661580086038, 0.242696348357654, 6.63031800626694, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0966530839800632, 0.159656146484489, 7.03821374225752, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0703772198109044, 0.215690759554493, 6.79539488023566, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.319416019707846, 0.188685170751332, 6.96047175420438, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.175669855176894, 0.144869505693071, 6.6098007346075, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.0936613590709195, 0.0618293038199061, 7.01769647059809, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.0733689447200481, 0.11786391688991, 6.77487760857623, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.240399248511016, 0.173898529959914, 6.53205874655437, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.32240774461699, 0.0908583280867492, 6.93995448254495, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+j:0, 16, sh=1
+j:0, 17, sh=1
+j:0, 18, sh=1
+j:0, 19, sh=1
+j:0, 20, sh=1
+j:0, 21, sh=1
+j:0, 22, sh=1
+j:0, 23, sh=1
+j:0, 24, sh=1
+j:0, 25, sh=1
+j:0, 26, sh=1
+j:0, 27, sh=1
+j:0, 28, sh=1
+j:0, 29, sh=1
+j:0, 30, sh=1
+j:0, 31, sh=1
+j:0, 32, sh=1
+j:0, 33, sh=1
+j:0, 34, sh=1
+j:0, 35, sh=1
+j:0, 36, sh=1
+j:0, 37, sh=1
+j:0, 38, sh=1
+j:0, 39, sh=1
+j:0, 40, sh=1
+j:0, 41, sh=1
+j:0, 42, sh=1
+j:0, 43, sh=1
+j:0, 44, sh=1
+j:0, 45, sh=1
+j:0, 46, sh=1
+j:0, 47, sh=1
+j:0, 48, sh=1
+j:0, 49, sh=1
+j:0, 50, sh=1
+j:0, 51, sh=1
+j:0, 52, sh=1
+j:0, 53, sh=1
+j:0, 54, sh=1
+j:0, 55, sh=1
+j:0, 56, sh=1
+j:0, 57, sh=1
+j:0, 58, sh=1
+j:0, 59, sh=1
+j:0, 60, sh=1
+j:0, 61, sh=1
+j:0, 62, sh=1
+j:0, 63, sh=1
+j:0, 64, sh=1
+j:0, 65, sh=1
+j:0, 66, sh=1
+j:0, 67, sh=1
+j:0, 68, sh=1
+j:0, 69, sh=1
+j:0, 70, sh=1
+j:0, 71, sh=1
+j:0, 72, sh=1
+j:0, 73, sh=1
+j:0, 74, sh=1
+j:0, 75, sh=1
+j:0, 76, sh=1
+j:0, 77, sh=1
+j:0, 78, sh=1
+j:0, 79, sh=1
+j:0, 80, sh=1
+j:0, 81, sh=1
+j:0, 82, sh=1
+j:0, 83, sh=1
+j:0, 84, sh=1
+j:0, 85, sh=1
+j:0, 86, sh=1
+j:0, 87, sh=1
+j:0, 88, sh=1
+j:0, 89, sh=1
+j:0, 90, sh=1
+j:0, 91, sh=1
+j:0, 92, sh=1
+j:0, 93, sh=1
+j:0, 94, sh=1
+j:0, 95, sh=1
+j:0, 96, sh=1
+j:0, 97, sh=1
+j:0, 98, sh=1
+j:0, 99, sh=1
+j:0, 100, sh=1
+j:0, 101, sh=1
+j:0, 102, sh=1
+j:0, 103, sh=1
+j:0, 104, sh=1
+j:0, 105, sh=1
+j:0, 106, sh=1
+j:0, 107, sh=1
+j:0, 108, sh=1
+j:0, 109, sh=1
+j:0, 110, sh=1
+j:0, 111, sh=1
+j:0, 112, sh=1
+j:0, 113, sh=1
+j:0, 114, sh=1
+j:0, 115, sh=1
+j:0, 116, sh=1
+j:0, 117, sh=1
+j:0, 118, sh=1
+j:0, 119, sh=1
+j:0, 120, sh=1
+j:0, 121, sh=1
+j:0, 122, sh=1
+j:0, 123, sh=1
+j:0, 124, sh=1
+j:0, 125, sh=1
+j:0, 126, sh=1
+j:0, 127, sh=1
+j:0, 128, sh=1
+j:0, 129, sh=1
+j:0, 130, sh=1
+j:0, 131, sh=1
+j:0, 132, sh=1
+j:0, 133, sh=1
+j:0, 134, sh=1
+j:0, 135, sh=1
+j:0, 136, sh=1
+j:0, 137, sh=1
+j:0, 138, sh=1
+j:0, 139, sh=1
+j:0, 140, sh=1
+j:0, 141, sh=1
+j:0, 142, sh=1
+j:0, 143, sh=1
+j:0, 144, sh=1
+j:0, 145, sh=1
+j:0, 146, sh=1
+j:0, 147, sh=1
+j:0, 148, sh=1
+j:0, 149, sh=1
+j:0, 150, sh=1
+j:0, 151, sh=1
+j:0, 152, sh=1
+j:0, 153, sh=1
+j:0, 154, sh=1
+j:0, 155, sh=1
+j:0, 156, sh=1
+j:0, 157, sh=1
+j:0, 158, sh=1
+j:0, 159, sh=1
+j:0, 160, sh=1
+j:0, 161, sh=1
+j:0, 162, sh=1
+j:0, 163, sh=1
+j:0, 164, sh=1
+j:0, 165, sh=1
+j:0, 166, sh=1
+j:0, 167, sh=1
+j:0, 168, sh=1
+j:0, 169, sh=1
+j:0, 170, sh=1
+j:0, 171, sh=1
+j:0, 172, sh=1
+j:0, 173, sh=1
+j:0, 174, sh=1
+j:0, 175, sh=1
+j:0, 176, sh=1
+j:0, 177, sh=1
+j:0, 178, sh=1
+j:0, 179, sh=1
+j:0, 180, sh=1
+j:0, 181, sh=1
+j:0, 182, sh=1
+j:0, 183, sh=1
+j:0, 184, sh=1
+j:0, 185, sh=1
+j:0, 186, sh=1
+j:0, 187, sh=1
+j:0, 188, sh=1
+j:0, 189, sh=1
+j:0, 190, sh=1
+j:0, 191, sh=1
+j:0, 192, sh=1
+j:0, 193, sh=1
+j:0, 194, sh=1
+j:0, 195, sh=1
+j:0, 196, sh=1
+j:0, 197, sh=1
+j:0, 198, sh=1
+j:0, 199, sh=1
+j:0, 200, sh=1
+j:0, 201, sh=1
+j:0, 202, sh=1
+j:0, 203, sh=1
+j:0, 204, sh=1
+j:0, 205, sh=1
+j:0, 206, sh=1
+j:0, 207, sh=1
+j:0, 208, sh=1
+j:0, 209, sh=1
+j:0, 210, sh=1
+j:0, 211, sh=1
+j:0, 212, sh=1
+j:0, 213, sh=1
+j:0, 214, sh=1
+j:0, 215, sh=1
+j:0, 216, sh=1
+j:0, 217, sh=1
+j:0, 218, sh=1
+j:0, 219, sh=1
+j:0, 220, sh=1
+j:0, 221, sh=1
+j:0, 222, sh=1
+j:0, 223, sh=1
+j:0, 224, sh=1
+
+
Index: cpp/tests/geometry_goals/volume.goal
===================================================================
--- cpp/tests/geometry_goals/volume.goal	(revision 811)
+++ cpp/tests/geometry_goals/volume.goal	(revision 811)
@@ -0,0 +1,38 @@
+//0
+p:sh=1, sx=0.1, sy=0.1, sz=0.1, vg=0.0
+p:sh=2, sx=0.5, sy=0.05, sz=0.05, vg=0.0, 0.0
+p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, vb=0.0
+p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0
+p:-0.601794692807856, -0.317762103550233, 5.7688604108175, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, -0.317762103550233, 3.37814340180292, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, -0.317762103550233, 3.85628680360583, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, -0.317762103550233, 4.33443020540875, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, 0.170856045392826, 3.37814340180292, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, 0.170856045392826, 3.85628680360583, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, 0.170856045392826, 4.33443020540875, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:-0.164639201159108, 0.170856045392826, 6.72514721442333, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, -0.317762103550233, 3.37814340180292, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, -0.317762103550233, 3.85628680360583, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, 0.170856045392826, 3.37814340180292, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, 0.170856045392826, 3.85628680360583, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, 0.170856045392826, 4.33443020540875, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+p:0.272516290489639, 0.170856045392826, 6.72514721442333, sh=1, sx=0.05, sy=0.05, sz=0.05, vb=0.0
+j:0, 1, sh=1
+j:0, 2, sh=1
+j:0, 3, sh=1
+j:0, 4, sh=1
+j:0, 5, sh=1
+j:0, 6, sh=1
+j:0, 7, sh=1
+j:0, 8, sh=1
+j:0, 9, sh=1
+j:0, 10, sh=1
+j:0, 11, sh=1
+j:0, 12, sh=1
+j:0, 13, sh=1
+j:0, 14, sh=1
+j:0, 15, sh=1
+j:0, 16, sh=1
+j:0, 17, sh=1
+
+
Index: cpp/tests/go.sh
===================================================================
--- cpp/tests/go.sh	(revision 810)
+++ cpp/tests/go.sh	(revision 811)
@@ -1,1 +1,3 @@
 python3 ../../tester/tester.py -e '(.*)=../\1' -f SDK-tests.txt
+python3 ../../tester/tester.py -val -e '(.*)=../\1' -f geometry-tests.txt
+python3 ../../tester/tester.py -val -e '(.*)=../\1' -f similarity-tests.txt
Index: cpp/tests/similarity-tests.txt
===================================================================
--- cpp/tests/similarity-tests.txt	(revision 811)
+++ cpp/tests/similarity-tests.txt	(revision 811)
@@ -0,0 +1,62 @@
+exe:simil_test
+
+TESTNAME:parts weight
+arg:similarity.gen
+arg:1
+arg:0
+arg:0
+arg:0
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/parts_weight
+RUNTEST
+
+TESTNAME:degrees weight
+arg:similarity.gen
+arg:0
+arg:1
+arg:0
+arg:0
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/degrees_weight
+RUNTEST
+
+TESTNAME:neurons weight
+arg:similarity.gen
+arg:0
+arg:0
+arg:1
+arg:0
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/neurons_weight
+RUNTEST
+
+TESTNAME:distances weight
+arg:similarity.gen
+arg:0
+arg:0
+arg:0
+arg:1
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/distances_weight
+RUNTEST
+
+TESTNAME:all weights
+arg:similarity.gen
+arg:1
+arg:1
+arg:1
+arg:1
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights
+RUNTEST
+
+TESTNAME:all weights fixed z
+arg:similarity.gen
+arg:1
+arg:1
+arg:1
+arg:1
+arg:1
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_fixed_z
+RUNTEST
+
Index: cpp/tests/similarity.gen
===================================================================
--- cpp/tests/similarity.gen	(revision 811)
+++ cpp/tests/similarity.gen	(revision 811)
@@ -0,0 +1,245 @@
+org:
+name:Fast Lizard
+genotype:~
+lfffffffMMMMMMMMX(FFFMMMMMMMMX[|0:0.928, T:2.480], lfffffffMMMMMMMMX[0:-2.199](, lfffffffMMMMMMMMX[@0:3.390, 1:-1.521, 7:-2.227](FFFMMMMMMMMX[|3:-2.486, T:3.915], fffffffffffMMMMMMMMX[@1:1.029][0:-0.687][0:1.917, T:4.813]ffffffffffffMMMMMMMMX[|-1:2.880, -1:-2.879], FFFMMMMMMMMX[G:245.116, 1:1.309][|-3:2.369, 0:-0.817, T:-4.705]), ), FFFMMMMMMMMX[|T:-1.607, 0:0.286, -1:-0.309])~
+info_timestamp:946684800.0
+info_author:Ander Taylor
+info_author_ispublic:1
+info_email:Ander_Taylor@hotmail.com
+info_email_ispublic:1
+info:
+info_origin:2
+info_how_created:~
+I fist made the Framstick with 8 legs, I then realised that if I removed some of the legs that it would make quite a natural looking lizard.
+~
+info_performance:It looks natural and is fast.
+num:60
+instances:0
+data:
+
+org:
+name:Rolling Wheel
+genotype:~
+//0
+p:-0.5,0,-1.2071,rx=1.57
+p:0.5,0,-1.2071,rx=1.57
+p:1.2071,0,-0.5,rx=1.57
+p:1.2071,0,0.5,rx=1.57
+p:0.5,0,1.2071,rx=1.57
+p:-0.5,0,1.2071,rx=1.57
+p:-1.2071,0,0.5,rx=1.57
+p:-1.2071,0,-0.5,rx=1.57
+p:-0.5,1,-1.2071,rx=1.57
+p:0.5,1,-1.2071,rx=1.57
+p:1.2071,1,-0.5,rx=1.57
+p:1.2071,1,0.5,rx=1.57
+p:0.5,1,1.2071,rx=1.57
+p:-0.5,1,1.2071,rx=1.57
+p:-1.2071,1,0.5,rx=1.57
+p:-1.2071,1,-0.5,rx=1.57
+
+j:0,1
+j:1,2
+j:2,3
+j:3,4
+j:4,5
+j:5,6
+j:6,7
+j:7,0
+j:8,9
+j:9,10
+j:10,11
+j:11,12
+j:12,13
+j:13,14
+j:14,15
+j:15,8
+j:0,8
+j:1,9
+j:2,10
+j:3,11
+j:4,12
+j:5,13
+j:6,14
+j:7,15
+
+n:j=0,d="|:r=0.18"
+n:j=8,d="|:r=0.18"
+n:j=0,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:0,3
+c:1,3
+c:3,2
+
+n:j=1,d="|:r=0.18"
+n:j=9,d="|:r=0.18"
+n:j=1,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:4,7
+c:5,7
+c:7,6
+
+n:j=2,d="|:r=0.18"
+n:j=10,d="|:r=0.18"
+n:j=2,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:8,11
+c:9,11
+c:11,10
+
+n:j=3,d="|:r=0.18"
+n:j=11,d="|:r=0.18"
+n:j=3,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:12,15
+c:13,15
+c:15,14
+
+n:j=4,d="|:r=0.18"
+n:j=12,d="|:r=0.18"
+n:j=4,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:16,19
+c:17,19
+c:19,18
+
+n:j=5,d="|:r=0.18"
+n:j=13,d="|:r=0.18"
+n:j=5,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:20,23
+c:21,23
+c:23,22
+
+n:j=6,d="|:r=0.18"
+n:j=14,d="|:r=0.18"
+n:j=6,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:24,27
+c:25,27
+c:27,26
+
+n:j=7,d="|:r=0.18"
+n:j=15,d="|:r=0.18"
+n:j=7,d="G:"
+n:d="Thr: t=-0.01,lo=-1,hi=1"
+c:28,31
+c:29,31
+c:31,30~
+info_timestamp:1178928000.0
+info_author:Juan A. Medina
+info_author_ispublic:1
+info_email:jamt3@hotmail.com
+info_email_ispublic:1
+info:A wheel that runs on a straight line.
+info_origin:1
+info_how_created:~
+Every joint has a bending muscle controlled by a gyroscope through a threshold neuron.
+I've found the range of the bending muscles = 0.18 as an optimal value.
+In 2015, Maciej Komosinski fixed neuron types (there were 8 invalid "Trh" neurons which the original author probably wanted to be "Thr"), so the conclusion about the optimal value of 0.18 may be no longer valid. Would be nice to optimize the four parameters (three for Thr and one muscle range) again.~
+info_performance:~
+An example of a modular design: every side of the creature is identical to any other.~
+num:434
+instances:0
+data:
+
+org:
+name:Table
+genotype:~
+//0
+p:
+p:1
+p:1,1
+p:0,1
+j:0,1
+j:1,2
+j:2,3
+j:0,3
+p:z=-1
+p:1,z=-1
+p:1,1,-1
+p:0,1,-1
+j:0,4
+j:1,5
+j:2,6
+j:3,7
+~
+info_timestamp:915148800.0
+info_author:Szymon Ulatowski
+info_author_ispublic:1
+info_email:
+info_email_ispublic:0
+info:An example of a table - described by format #0 (f0) genotype.
+info_origin:1
+info_how_created:
+info_performance:
+num:105
+instances:0
+data:
+
+org:
+name:Spiral plant
+genotype:~
+//0
+p:sh=2,sx=0.6,sy=0.6,sz=0.3,z=3.4,vr=0.8,0.8,0.4
+p:sh=2,sx=0.1,sy=0.1,sz=0.1,vr=0.8,0.8,0.4
+p:sh=2,sx=0.1,sy=0.1,sz=0.1,vr=0.8,0.8,0.4
+p:sh=2,sx=0.1,sy=0.1,sz=0.1,vr=0.8,0.8,0.4
+p:sh=2,sx=0.1,sy=0.1,sz=0.1,vr=0.8,0.8,0.4
+p:sh=1,sx=0.5,sy=0.5,sz=0.5,vr=0.6,0.3,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+p:sh=3,sx=0.05,sy=0.3,sz=0.3,vr=0.3,0.8,0.1
+j:0,1,sh=1,dx=0.45,dy=0.45,dz=-0.4
+j:0,2,sh=1,dx=-0.45,dy=0.45,dz=-0.4
+j:0,3,sh=1,dx=0.45,dy=-0.45,dz=-0.4
+j:0,4,sh=1,dx=-0.45,dy=-0.45,dz=-0.4
+j:0,5,sh=1,dz=0.6
+j:5,6,sh=1,dx=-0.5,dy=0.35,dz=0.1,ry=-1.0,rx=1.3
+j:6,7,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:7,8,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:8,9,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:9,10,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:10,11,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:11,12,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:12,13,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:13,14,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+j:14,15,sh=1,dx=0.15,dy=0.55,rx=0.63,ry=0.63,rz=0.2
+~
+info_timestamp:1442966400.0
+info_author:Szymon Ulatowski
+info_author_ispublic:1
+info_email:
+info_email_ispublic:0
+info:A demo model with ellipsoids, cuboids, cylinders.
+info_origin:1
+info_how_created:~
+This model uses all available shape Part types (ellipsoids, cuboids, cylinders) and also delta Joints (Part positions and orientations are defined relative to previous Parts using dx/dy/dz and rx/ry/rz in Joints).~
+info_performance:
+num:467
+instances:0
+data:
+
+org:
+name:Foraminifera (planispiral)
+genotype:/*F*/13,0.1,0.1,0.1,1.1,1.1,1.1,0.54,2.75,0
+info_timestamp:1442966400.0
+info_author:Maciej Komosinski
+info_author_ispublic:1
+info_email:
+info_email_ispublic:0
+info:http://www.framsticks.com/foraminifera
+info_origin:1
+info_how_created:
+info_performance:
+num:456
+instances:0
+data:
+
Index: cpp/tests/similarity_goals/all_weights.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights.goal	(revision 811)
+++ cpp/tests/similarity_goals/all_weights.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	97.74	43.00	67.77	52.04	
+97.74	0.00	90.58	70.35	78.88	
+43.00	90.58	0.00	47.08	28.12	
+67.77	70.35	47.08	0.00	28.18	
+52.04	78.88	28.12	28.18	0.00	
+
Index: cpp/tests/similarity_goals/all_weights_fixed_z.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights_fixed_z.goal	(revision 811)
+++ cpp/tests/similarity_goals/all_weights_fixed_z.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	100.34	44.16	124.03	52.04	
+100.34	0.00	90.17	131.96	79.48	
+44.16	90.17	0.00	101.16	28.85	
+124.03	131.96	101.16	0.00	85.91	
+52.04	79.48	28.85	85.91	0.00	
+
Index: cpp/tests/similarity_goals/degrees_weight.goal
===================================================================
--- cpp/tests/similarity_goals/degrees_weight.goal	(revision 811)
+++ cpp/tests/similarity_goals/degrees_weight.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	34.00	6.00	16.00	14.00	
+34.00	0.00	32.00	22.00	24.00	
+6.00	32.00	0.00	20.00	16.00	
+16.00	22.00	20.00	0.00	6.00	
+14.00	24.00	16.00	6.00	0.00	
+
Index: cpp/tests/similarity_goals/distances_weight.goal
===================================================================
--- cpp/tests/similarity_goals/distances_weight.goal	(revision 811)
+++ cpp/tests/similarity_goals/distances_weight.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	16.87	11.12	21.05	10.87	
+16.87	0.00	18.58	16.35	19.88	
+11.12	18.58	0.00	19.08	7.12	
+21.05	16.35	19.08	0.00	19.18	
+10.87	19.88	7.12	19.18	0.00	
+
Index: cpp/tests/similarity_goals/neurons_weight.goal
===================================================================
--- cpp/tests/similarity_goals/neurons_weight.goal	(revision 811)
+++ cpp/tests/similarity_goals/neurons_weight.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	40.00	24.00	24.00	24.00	
+40.00	0.00	32.00	32.00	32.00	
+24.00	32.00	0.00	0.00	0.00	
+24.00	32.00	0.00	0.00	0.00	
+24.00	32.00	0.00	0.00	0.00	
+
Index: cpp/tests/similarity_goals/parts_weight.goal
===================================================================
--- cpp/tests/similarity_goals/parts_weight.goal	(revision 811)
+++ cpp/tests/similarity_goals/parts_weight.goal	(revision 811)
@@ -0,0 +1,6 @@
+0.00	6.00	2.00	6.00	3.00	
+6.00	0.00	8.00	0.00	3.00	
+2.00	8.00	0.00	8.00	5.00	
+6.00	0.00	8.00	0.00	3.00	
+3.00	3.00	5.00	3.00	0.00	
+
