Index: cpp/tests/evol_test-fS.goal
===================================================================
--- cpp/tests/evol_test-fS.goal	(revision 1009)
+++ cpp/tests/evol_test-fS.goal	(revision 1033)
@@ -1,66 +1,22 @@
-Evaluation 0	31,36.4,37	1,1,1	0,0,0	0,0,0	0,0,0	30,35.4,36
-Evaluation 10	31,34,39	1,1,1	0,0,0	0,0,0	0,0,0	30,33,38
-Evaluation 20	23,34,39	1,1,1	0,0,0	0,0,0	0,0,0	22,33,38
-Evaluation 30	23,40.7,50	1,1,1	0,0,0	0,0,0	0,0,0	22,39.7,49
-Evaluation 40	39,74.6,148	1,1.3,2	0,0.3,1	0,0.4,1	0,0,0	38,72.6,144
-Evaluation 50	39,69.8,148	1,1.3,2	0,0.3,1	0,0.3,1	0,0,0	38,67.9,144
-Evaluation 60	39,75.9,148	1,1.4,2	0,0.4,1	0,0.4,1	0,0,0	38,73.7,144
-Evaluation 70	39,108.9,216	1,1.7,3	0,0.7,2	0,0.7,1	0,0,0	38,105.8,210
-[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-Evaluation 80	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-39,137.8,221	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-1,2,3	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,1,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,1,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0,0	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-38,133.8,215
-[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-Evaluation 90	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-39,137.3,159	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-1,1.9,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0.9,1	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,1.1,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0,0	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-38,133.4,154
-[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-Evaluation 99	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-39,134.9,159	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-1,1.9,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0.9,1	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0.9,2	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-0,0,0	[WARN] Model.internalCheck: stif too big in Joint #0 (adjusted)
-[WARN] Model.internalCheck: rotstif too big in Joint #0 (adjusted)
-38,131.2,154
-140.0	/*S*/1.1:R[Gpart]{i=0.014;rz=-1.102;y=0.806;z=0.806}bC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-39.0	/*S*/1.1:C{i=0.014;x=0.806;y=0.806;z=0.441}
-150.0	/*S*/1.1:R[Gpart:ry=-0.382]{i=0.014;rz=-1.102;y=0.806;z=0.806}FC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-140.0	/*S*/1.1:R[Gpart:ry=0.214]{i=0.014;y=0.806;z=0.806}FTC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-132.0	/*S*/1.1:R{i=0.014;rz=-1.102;y=0.806;z=0.806}FC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-150.0	/*S*/1.1:R[Gpart:ry=-0.382]{i=0.014;rz=-1.102;y=0.806;z=0.806}FC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-159.0	/*S*/1.1:R[Gpart:ry=-0.382]{i=0.014;rz=-1.102;y=0.806;z=0.806}bFC[Gpart]{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-139.0	/*S*/1.1:R[Gpart]{i=0.014;rz=-1.102;y=0.806;z=0.806}C{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-150.0	/*S*/1.1:R[Gpart:ry=-0.382]{i=0.014;rz=-1.102;y=0.806;z=0.806}FC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
-150.0	/*S*/1.1:R[Gpart:ry=-0.382]{i=0.014;rz=-1.102;y=0.806;z=0.806}FC{rx=0.6168;ry=1.4967;rz=-0.3841;tx=-0.0382;ty=-0.5913;tz=1.197;x=0.971;y=0.433;z=0.829}
+Evaluation 0	37,42.4,43	1,1,1	0,0,0	0,0,0	0,0,0	36,41.4,42
+Evaluation 10	37,40,45	1,1,1	0,0,0	0,0,0	0,0,0	36,39,44
+Evaluation 20	30,50.8,130	1,1.1,2	0,0.1,1	0,0.3,2	0,0,0	29,49.3,126
+Evaluation 30	38,82.4,131	1,1.4,2	0,0.4,1	0,0.4,1	0,0,0	37,80.2,127
+Evaluation 40	38,91,130	1,1.3,2	0,0.3,1	0,0.3,1	0,0,0	37,89.1,126
+Evaluation 50	47,96.1,122	1,1.1,2	0,0.1,1	0,0.2,1	0,0,0	46,94.7,118
+Evaluation 60	98,106.2,113	1,1,1	0,0,0	0,0,0	0,0,0	97,105.2,112
+Evaluation 70	100,109.8,119	1,1,1	0,0,0	0,0.5,2	0,0,0	99,108.3,116
+Evaluation 80	112,114.8,118	1,1,1	0,0,0	0,0.8,2	0,0,0	110,113,115
+Evaluation 90	112,141.7,200	1,1.3,2	0,0.3,1	0,1.7,3	0,0,0	110,138.4,195
+Evaluation 99	116,183.7,224	1,1.7,2	0,0.7,1	1,2,3	0,0,0	114,179.3,218
+216.0	/*S*/1.1,0,0.4:cFiR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}FR{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,ty=-0.5055,tz=-0.8089,x=0.8736,y=0.8736,z=0.8736}
+215.0	/*S*/1.1,0,0.4:cFiR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}R{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,ty=-0.5055,tz=-0.8089,x=0.8736,y=0.8736,z=0.8736}
+224.0	/*S*/1.1,0,0.4:cFiR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}FR[Gpart]{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,ty=-0.5055,tz=-0.8089,x=0.8736,y=0.8736,z=0.8736}
+116.0	/*S*/1.1,0,0.4:csC[N]{rx=0.6168,ry=1.4967,rz=-0.3841,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.6537,y=0.8414,z=0.8414}
+208.0	/*S*/1.1,0,0.4:ciC[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=1.465,y=0.359,z=0.88}C{rx=-0.0202,ry=-1.4451,rz=1.0233,tx=-0.593,ty=-1.2751,tz=0.0792,x=1.299,y=1.145,z=1.64}
+117.0	/*S*/1.1,0,0.4:ciC[*;Gpart]{rx=0.6168,ry=1.4967,rz=2.579,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=1.465,y=0.359,z=0.88}
+205.0	/*S*/1.1,0,0.4:cFiR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}FR{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,tz=-0.8089,x=0.8736,y=0.8736,z=0.8736}
+120.0	/*S*/1.1,0,0.4:ciR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}
+201.0	/*S*/1.1,0,0.4:ciC[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.6537,y=0.8414,z=0.8414}E{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,ty=-0.5055,tz=-0.8089,x=1,y=1,z=1}
+215.0	/*S*/1.1,0,0.4:cFiR[*;Gpart]{rx=0.6168,ry=1.4967,rz=-0.468,s=1.026,tx=-0.0382,ty=-0.5913,tz=1.197,x=0.7085,y=0.912,z=0.912}R{rx=-0.9779,ry=0.174,rz=0.9518,tx=-0.4499,ty=-0.5055,tz=-0.8089,x=0.8736,y=0.8736,z=0.8736}
 
