Index: /cpp/tests/evol_test-fB.goal
===================================================================
--- /cpp/tests/evol_test-fB.goal	(revision 1300)
+++ /cpp/tests/evol_test-fB.goal	(revision 1301)
@@ -1,42 +1,42 @@
 Evaluation 0	12,12,12	3,3,3	2,2,2	0,0,0	0,0,0	7,7,7
-Evaluation 10	9,12.3,16	2,2.5,3	1,1.5,2	0,0.3,1	0,0,0	6,8,11
-Evaluation 20	9,13.8,17	2,2.8,3	1,1.8,2	0,0.1,1	0,0,0	6,9.1,12
-Evaluation 30	9,17.5,21	2,4,6	1,3,5	0,0,0	0,0,0	6,10.5,13
-Evaluation 40	14,18.7,23	3,4.3,6	2,3.3,5	0,0,0	0,0,0	9,11.1,12
-Evaluation 50	17,19.7,22	4,4.8,5	3,3.8,4	0,0,0	0,0,0	10,11.1,13
-Evaluation 60	16,19.6,22	3,4.6,5	2,3.6,4	0,0,0	0,0,0	10,11.4,13
-Evaluation 70	18,21.3,22	4,4.9,5	3,3.9,4	0,0,0	0,0,0	11,12.5,13
-Evaluation 80	16,20.3,22	3,4.8,5	2,3.8,4	0,0,0	0,0,0	11,11.7,13
-Evaluation 90	18,20.9,23	4,4.8,5	3,3.8,4	0,0,0	0,0,0	11,12.3,14
-Evaluation 99	18,22,25	4,4.8,5	3,3.8,4	0,0,0	0,0,0	11,13.4,16
-23.0	//B
-5
-aaaaabzbgacz
-19.0	//B
-5
-aaacfaaazy
-18.0	//B
-5
-aabdaaazz
-22.0	//B
-5
-aaaaaazbacz
-25.0	//B
-5
-aaabaaabzbgacz
-22.0	//B
-5
-aaaaabzbacz
-23.0	//B
-5
-aaaaabzbgacz
-22.0	//B
-5
-aaaaaazbacz
-25.0	//B
-5
-aabaaaabzbgacz
-21.0	//B
-5
-aaacfaaazz
+Evaluation 10	9,14.9,23	2,2.8,4	1,1.8,3	0,0,0	0,0,0	6,10.3,20
+Evaluation 20	9,20.4,37	2,2.7,4	1,1.7,3	0,0,0	0,0,0	6,16,32
+Evaluation 30	12,20,26	2,2.6,4	1,1.6,3	0,0,0	0,0,0	7,15.8,23
+Evaluation 40	12,23.9,39	2,2.3,4	1,1.3,3	0,0,0	0,0,0	9,20.3,34
+Evaluation 50	12,31.8,43	2,2.7,4	1,1.7,3	0,0,0	0,0,0	9,27.4,36
+Evaluation 60	12,29.5,43	2,2.6,4	1,1.6,3	0,0,0	0,0,0	9,25.3,36
+Evaluation 70	23,38.2,44	2,3.1,4	1,2.1,3	0,0,0	0,0,0	20,33,37
+Evaluation 80	39,43.6,50	2,3.8,6	1,2.8,5	0,0,0	0,0,0	36,37,39
+Evaluation 90	41,45.2,51	3,4.1,6	2,3.1,5	0,0.1,1	0,0.1,1	36,37.8,40
+Evaluation 99	41,45.5,51	3,4,5	2,3,4	0,0.2,1	0,0.2,1	36,38.1,42
+44.0	//B
+3
+aaaba"N:s=-0.213"aaa"T:rz=-0.939"zz
+47.0	//B
+3
+aaaa"N:s=-0.213"aaa"T:rz=-0.939"zbkz
+45.0	//B
+3
+aaakba"N:s=-0.213"aaa"T:rz=-0.939"zz
+41.0	//B
+3
+aaba"N:s=-0.213"aaa"T:rz=-0.939"zz
+51.0	//B
+3
+aaa"G"aaba"N:s=-0.213"aaa"T:rz=-0.939"zz
+49.0	//B
+3
+aabaaaka"N:s=-0.213"aaa"T:rz=-0.939"zz
+45.0	//B
+3
+aaa"T:rz=-0.939"zbk"N:s=-0.213"aaaaz
+41.0	//B
+3
+aaaba"N:s=-0.213"aa"T:rz=-0.939"zz
+47.0	//B
+3
+aaaa"N:s=-0.213"aaa"T:rz=-0.939"zbkz
+45.0	//B
+3
+aaaba"N:s=-0.213"daaa"T:rz=-0.939"zz
 
Index: /cpp/tests/evol_test-fH.goal
===================================================================
--- /cpp/tests/evol_test-fH.goal	(revision 1300)
+++ /cpp/tests/evol_test-fH.goal	(revision 1301)
@@ -1,165 +1,148 @@
 Evaluation 0	7,7.6,13	2,2.1,3	1,1.1,2	0,0,0	0,0,0	4,4.4,8
-Evaluation 10	7,26.2,53	2,2.7,3	1,1.7,2	0,0,0	0,0,0	4,21.8,48
-Evaluation 20	7,100.8,323	2,2.8,4	1,1.8,3	0,0.2,1	0,0,0	4,96,315
-Evaluation 30	13,217.7,427	2,2.7,4	1,1.7,3	0,0.2,1	0,0.1,1	8,213,421
-Evaluation 40	13,192.8,343	2,2.7,5	1,1.7,4	0,0,0	0,0,0	8,188.4,334
-Evaluation 50	139,348.3,534	2,2.7,5	1,1.7,4	0,0.3,1	0,0,0	136,343.6,529
-Evaluation 60	416,543.9,675	2,3,4	1,2,3	0,0.4,1	0,0,0	410,538.5,668
-Evaluation 70	402,611.6,781	2,2.8,4	1,1.8,3	0,0.4,1	0,0,0	399,606.6,777
-Evaluation 80	529,742.8,1447	2,3.1,4	1,2.1,3	0,0.6,2	0,0,0	526,737,1438
-Evaluation 90	670,1105.1,1595	2,4.1,5	1,3.1,4	0,1.1,3	0,0.2,1	664,1096.6,1582
-Evaluation 99	658,1262.1,2159	3,5.1,9	2,4.1,8	0,1.6,3	0,0.5,1	651,1250.8,2143
-1591.0	//H
+Evaluation 10	7,95.7,300	2,2.6,4	1,1.6,3	0,0.3,1	0,0,0	4,91.2,292
+Evaluation 20	7,213.5,441	2,3.2,4	1,2.2,3	0,0.5,1	0,0,0	4,207.6,433
+Evaluation 30	154,500.3,868	3,4.5,5	2,3.5,4	0,1.1,2	0,0,0	147,491.2,857
+Evaluation 40	421,597.5,868	4,4.8,6	3,3.8,5	0,1.2,2	0,0,0	412,587.7,857
+Evaluation 50	421,768.7,1432	4,5.6,9	3,4.6,8	0,1.5,3	0,0,0	412,757,1413
+Evaluation 60	453,958.1,1444	3,6.7,10	2,5.7,9	1,1.8,3	0,0,0	445,943.9,1424
+Evaluation 70	453,1125.2,1582	4,7.6,9	3,6.6,8	1,2,3	0,0,0	445,1109,1562
+Evaluation 80	878,1350,1590	7,8.2,10	6,7.2,9	2,2.6,3	0,0,0	863,1332,1570
+Evaluation 90	595,1179.2,1736	6,7.7,10	5,6.7,9	1,2.3,4	0,0,0	583,1162.5,1713
+Evaluation 99	1015,1336.6,1736	7,8.4,10	6,7.4,9	2,2.9,4	0,0,0	998,1317.9,1713
+1735.0	//H
 3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.363
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
 j:
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.51
+
+1278.0	//H
+3
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.364
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
 j:
-n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
-n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6980766113847494, -0.9333907472901046, 0.9179654428735375, 0.4844759553670883, -0.38602789491415024, -0.7604573033750057, -0.583
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
+j:0.2289294134825468, -0.9338508220389485, -0.9687878657132387, 0.6790259419940412, 0.04474106524139643, 0.026149732992053032, rotstif=0.98
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+c:0.23696052748709917, 0.948512434028089, 0.9806900122202933, -0.5106971822679043, -0.25135360984131694, -0.9086807160638273, 0.005
 
-1787.0	//H
+1146.0	//H
+3
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:
+j:0.2289294134825468, -0.9338508220389485, -0.9687878657132387, 0.6790259419940412, 0.04474106524139643, 0.026149732992053032, rotstif=0.98
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+
+1448.0	//H
+3
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:
+j:0.3556330786086619, -0.459984062705189, 0.47038804087787867, 0.13923680875450373, 0.40747456159442663, -0.4230471351183951, l=0.966
+j:-0.7859917231835425, 0.17938943253830075, 0.49079614458605647, 0.16680837189778686, 0.8729361924342811, 0.8815633179619908, fr=0.267, l=1.217
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.363
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+
+1278.0	//H
+3
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:
+j:0.2289294134825468, -0.9338508220389485, -0.9687878657132387, 0.6790259419940412, 0.04474106524139643, 0.026149732992053032, rotstif=0.98
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+c:0.23696052748709917, 0.948512434028089, 0.9806900122202933, -0.5106971822679043, -0.25135360984131694, -0.9086807160638273, 0.005
+
+1438.0	//H
+3
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:
+j:0.3556330786086619, -0.459984062705189, 0.47038804087787867, 0.13923680875450373, 0.40747456159442663, -0.4230471351183951, l=0.966
+j:-0.7859917231835425, 0.17938943253830075, 0.49079614458605647, 0.16680837189778686, 0.8729361924342811, 0.8815633179619908, l=1.217
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.363
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+
+1015.0	//H
 3
 j:
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
 j:
-j:rotstif=0.94
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+
+1023.0	//H
+3
+j:fr=0.866
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
 j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, rotstif=0.801
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+
+1736.0	//H
+3
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.363
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
 j:
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
 
-2159.0	//H
+1269.0	//H
 3
-j:rotstif=0.94
+j:-0.06737845437601209, -0.511148823890835, -0.6820608270354569, -0.050604989752173424, 0.24702021200209856, -0.3239847649820149, fr=0.919, l=1.232
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
 j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, rotstif=0.801
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
 j:
-j:
-n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6980766113847494, -0.9333907472901046, 0.9179654428735375, 0.4844759553670883, -0.38602789491415024, -0.7604573033750057, -0.583
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
-
-1203.0	//H
-3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
-j:
-j:
-j:
-n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6980766113847494, -0.9333907472901046, 0.9179654428735375, 0.4844759553670883, -0.38602789491415024, -0.7604573033750057, -3.081
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
-
-1576.0	//H
-3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
-j:
-j:
-n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
-n:0.644235469866544, -0.6203041723929346, 0.261, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6980766113847494, -0.9333907472901046, 0.9179654428735375, 0.4844759553670883, -0.38602789491415024, -0.7604573033750057, -3.081
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
-
-670.0	//H
-3
-j:
-j:
-n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.556
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -2.881
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-
-687.0	//H
-3
-j:rotstif=0.94
-j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, rotstif=0.801
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-
-1595.0	//H
-3
-j:
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
-j:
-j:
-n:0.5960936606861651, -0.6287281136028469, 0.788, 0.7706753285601735, 0.359758909791708, -0.08774045528843999, d=*
-n:0.644235469866544, -0.6203041723929346, 0.022637964691966772, -0.4043163564056158, -0.19773531705141068, -0.7586860070005059, d=G
-n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6980766113847494, -0.9333907472901046, 0.9179654428735375, 0.4844759553670883, -0.38602789491415024, -0.7604573033750057, -0.583
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
-
-695.0	//H
-3
-j:
-j:rotstif=0.94
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
-j:
-j:
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-
-658.0	//H
-3
-j:rotstif=0.94
-j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, 0.108, -0.9107754053547978, 0.5995917664840817, rotstif=0.801
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.36, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
-c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
+j:0.3556330786086619, -0.459984062705189, 0.47038804087787867, 0.13923680875450373, 0.40747456159442663, -0.4230471351183951, l=0.966
+j:0.7835460035130382, 0.9273255281150341, -0.23311695735901594, -0.8865740485489368, -0.45468741096556187, -0.0446697766892612, l=1.272
+j:-0.7859917231835425, 0.17938943253830075, 0.49079614458605647, 0.16680837189778686, 0.8729361924342811, 0.8815633179619908, l=1.217
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+n:0.1043849429115653, 0.16895214468240738, 0.9238727670162916, 0.4633875167928636, -0.9087707279250026, -0.5816859439946711, d=Gpart:ry=-1.415
+c:0.23696052748709917, 0.948512434028089, 0.9806900122202933, -0.5106971822679043, -0.25135360984131694, -0.9086807160638273, 0.005
 
 
Index: /cpp/tests/evol_test-fL.goal
===================================================================
--- /cpp/tests/evol_test-fL.goal	(revision 1300)
+++ /cpp/tests/evol_test-fL.goal	(revision 1301)
@@ -1,47 +1,61 @@
 Evaluation 0	34,37.6,38	2,2,2	1,1,1	0,0,0	0,0,0	31,34.6,35
-Evaluation 10	29,40.4,56	2,2,2	1,1,1	0,0,0	0,0,0	26,37.4,53
-Evaluation 20	29,53,98	2,2.2,3	1,1.2,2	0,0.5,2	0,0.2,1	26,48.9,90
-Evaluation 30	29,80,119	2,2.3,3	1,1.3,2	0,1.2,2	0,0.6,1	26,74.6,111
-Evaluation 40	29,84.7,147	2,2.4,4	1,1.4,3	0,1.2,2	0,0.6,1	26,79.1,137
-Evaluation 50	34,126.8,162	2,3.5,4	1,2.5,3	0,2,3	0,0.5,1	31,118.3,151
-Evaluation 60	124,148.5,162	4,4,4	3,3,3	2,2.6,3	0,0.6,1	115,138.3,151
-Evaluation 70	133,158,178	4,4.2,5	3,3.2,4	2,2.9,4	0,0.8,1	124,146.9,167
-Evaluation 80	136,159.7,173	4,4.4,5	3,3.4,4	2,2.8,3	1,1,1	126,148.1,162
-Evaluation 90	136,163,189	4,4.6,5	3,3.6,4	2,2.8,3	1,1,1	126,151,178
-Evaluation 99	136,168.2,189	4,4.8,5	3,3.8,4	2,2.9,3	1,1,1	126,155.7,178
-167.0	//L
-w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.993)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+Evaluation 10	34,47.7,77	2,2,2	1,1,1	0,0.2,1	0,0,0	31,44.5,74
+Evaluation 20	34,44.8,55	2,2,2	1,1,1	0,0,0	0,0,0	31,41.8,52
+Evaluation 30	34,46.4,55	2,2,2	1,1,1	0,0.1,1	0,0,0	31,43.3,52
+Evaluation 40	34,51.6,79	2,2,2	1,1,1	0,0.1,1	0,0,0	31,48.5,76
+Evaluation 50	36,52.8,62	2,2,2	1,1,1	0,0.3,1	0,0,0	32,49.5,58
+Evaluation 60	36,65.2,88	2,2.1,3	1,1.1,2	0,0.8,1	0,0,0	32,61.2,82
+Evaluation 70	36,70.5,96	2,2.2,3	1,1.2,2	0,1,2	0,0,0	32,66.1,90
+Evaluation 80	69,85.3,123	2,2,2	1,1,1	1,1.1,2	0,0,0	64,81.2,119
+Evaluation 90	70,98.3,127	2,2,2	1,1,1	1,1.1,2	0,0,0	66,94.2,123
+Evaluation 99	93,117.9,143	2,2,2	1,1,1	1,1.4,2	0,0.2,1	89,113.3,137
+143.0	//L
+w:w0, 2
+w:w1, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)w0()N(d=@:p=0.925)C(-0.6802658420056105)N(d=G)S(), 0.0, maxwords=300
 
-162.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+127.0	//L
+w:w1, 2
+w:w0, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)w0()C(-0.6802658420056105)N(d=G)S(), 0.0, maxwords=300
 
-167.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+123.0	//L
+w:w0, 2
+w:w1, 2
+i:axiom=N(d=Gpart:ry=-0.962)rotY(1.9037489495240152)C(0.7401745021343231)N(d=G)S(), 0.0, maxwords=300
 
-136.0	//L
-i:axiom=N(d=@:p=0.993)N(d=@:p=0.975)S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+143.0	//L
+w:w0, 2
+w:w1, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)w0()N(d=@:p=0.925)C(-0.6802658420056105)N(d=G)S(), 0.0, maxwords=300
 
-189.0	//L
-i:axiom="N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232, stam=0.4012594970408827)S()C(-0.7881847871467471)S(stam=0.5370225172955543)", maxwords=300
+102.0	//L
+w:w1, 2
+w:w0, 2
+i:axiom=rotY(1.9037489495240152)C(0.7401745021343231)N(d=G)S(), 0.0, maxwords=300
 
-167.0	//L
-w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.993)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+96.0	//L
+w:w1, 2
+w:w0, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)N(d=G)S(), maxwords=300
 
-172.0	//L
-w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.993)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+123.0	//L
+w:w1, 2
+w:w0, 2
+i:axiom=N(d=Gpart:ry=-0.962)rotY(1.9037489495240152)C(0.7401745021343231)N(d=G)S(), 0.0, maxwords=300
 
-166.0	//L
-w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.99)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), maxwords=300
+93.0	//L
+w:w0, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)N(d=G)S(), 0.0, maxwords=300
 
-189.0	//L
-w:w0
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.993)N(d=@:p=0.975)S()S(fr=0.8289400283247232)C(-0.8130810903385282)C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+127.0	//L
+w:w0, 2
+w:w1, 2
+i:axiom=rotX(1.354823648929596)C(0.7401745021343231)w0()C(-0.6802658420056105)N(d=G)S(), 0.0, maxwords=300
 
-167.0	//L
-i:axiom=N(d=Gpart:rz=-0.665)N(d=@:p=0.947)N(d=@:p=0.975)S()S(fr=0.8289400283247232)S()C(-0.7881847871467471)S(stam=0.5370225172955543), 0.0, maxwords=300
+102.0	//L
+w:w0, 2
+w:w1, 2
+i:axiom=rotY(1.9037489495240152)C(0.7401745021343231)N(d=G)S(), 0.0, maxwords=300
 
 
