Index: cpp/tests/evol_test-fL.goal
===================================================================
--- cpp/tests/evol_test-fL.goal	(revision 1301)
+++ cpp/tests/evol_test-fL.goal	(revision 1320)
@@ -1,61 +1,46 @@
 Evaluation 0	34,37.6,38	2,2,2	1,1,1	0,0,0	0,0,0	31,34.6,35
-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
+Evaluation 10	34,44.7,63	2,2,2	1,1,1	0,0.2,1	0,0,0	31,41.5,59
+Evaluation 20	34,52.9,75	2,2,2	1,1,1	0,0.1,1	0,0,0	31,49.8,72
+Evaluation 30	34,63.2,109	2,2,2	1,1,1	0,0,0	0,0,0	31,60.2,106
+Evaluation 40	34,73.5,125	2,2.1,3	1,1.1,2	0,0.1,1	0,0.1,1	31,70.1,118
+Evaluation 50	34,77.2,126	2,2,2	1,1,1	0,0,0	0,0,0	31,74.2,123
+Evaluation 60	56,95.4,126	2,2.1,3	1,1.1,2	0,0.5,2	0,0,0	53,91.7,123
+Evaluation 70	56,110.7,145	2,2,2	1,1,1	0,1.8,3	0,0,0	53,105.9,139
+Evaluation 80	56,117.7,158	2,2,2	1,1,1	0,2.5,4	0,0.3,1	53,111.9,150
+Evaluation 90	112,147.7,180	2,2.1,3	1,1.1,2	3,4,5	0,0.9,1	106,139.6,172
+Evaluation 99	120,164.5,213	2,2,2	1,1,1	3,4.5,6	0,0.9,1	114,156.1,204
+158.0	//L
+i:axiom=rotY(1.9037489495240152)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), maxwords=300
+
+134.0	//L
+i:axiom=N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), maxwords=300
+
+165.0	//L
+i:axiom=rotY(1.9037489495240152)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=*)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), maxwords=300
+
+149.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
+i:axiom=N(d=G)N(d=S)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), maxwords=300
 
-127.0	//L
-w:w1, 2
+120.0	//L
 w:w0, 2
-i:axiom=rotX(1.354823648929596)C(0.7401745021343231)w0()C(-0.6802658420056105)N(d=G)S(), 0.0, maxwords=300
+i:axiom=N(d=G)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=@:p=0.979)N(d=|:r=0.845)S(), 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
+163.0	//L
+w:w0
+i:axiom=rotY(1.9037489495240152)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), 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=rotY(1.9037489495240152)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=*)rotY(0.5448737954720855)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), 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
+213.0	//L
+i:axiom=rotY(1.9037489495240152)N(d=G)rotZ(1.4767806753516197)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=*)rotY(0.5448737954720855)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), 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
+187.0	//L
+i:axiom=rotY(1.9037489495240152)N(d=@:p=0.991)N(d=N:fo=1.0)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), 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
-
-93.0	//L
-w:w0, 2
-i:axiom=rotX(1.354823648929596)C(0.7401745021343231)N(d=G)S(), 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
-
-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
+167.0	//L
+w:w0
+i:axiom=w0()rotY(1.9037489495240152)N(d=G)N(d=|:p=0.216)rotZ(0.43379396200180054)C(0.8684280035085976)N(d=Gpart:ry=-0.461)N(d=|:r=0.845)S(), maxwords=300
 
 
