Index: cpp/tests/SDK-tests.txt
===================================================================
--- cpp/tests/SDK-tests.txt	(revision 1175)
+++ cpp/tests/SDK-tests.txt	(revision 1263)
@@ -181,5 +181,5 @@
 TESTNAME:neuro_layout_test
 exe:neuro_layout_test
-arg:/*4*/<lX>CfmQ<,fm<<<<rFX>N:N[-2:-0.202]>X>mfrm<<<N:M<rFX>N:N[-2:3.64]>XF>mN:*>N:T>N:T>m<m<<<N:M<r<r<<N:M<rX>N:N[-2:0.58]>X>qfrm<<<N:M<rFX>N:N[-2:3.64]>XF>mN:*>N:T>N:N[-2:-0.495]>N:N[-2:-0.495]>X>qfm<<imN:*><XF>N:M<rFX>N:N[-2:3.64]>N:T>N:T>N:T
+arg:/*4*/<lX>Cfm<,fmm<<,Rfm<<<<<rQFX>N:N[-2:-0.2][1:2]>N:Gpart>X>rm<fm<<<N:|<>[-2:3.64]>mQ<,fmm<<,Rfm<<<<<rFX#2>>N:N[-2:-0.2]>N:Gpart>Xf>rm<fm<<<N:|<#2>>[-2:3.64]>XF>mN:*>X>X>N:T>N:N[-2:2][2:1]><<X><<rFX>N:N[-2:3.5][-2:-0.2][-2:1]>X>rm<fm<<<N:|<>[-2:3.64]>XF>mN:*>X>X>N:Sin>mmN:*>X>X>N:T>N:T>m<<<N:|<#2>>[-2:3.64]>XF>mN:*>X>N:T>
 out:*INSERTPLATFORMDEPENDENTFILE*:neuro_layout_test
 RUNTEST
Index: cpp/tests/evol_test-f4.goal
===================================================================
--- cpp/tests/evol_test-f4.goal	(revision 1175)
+++ cpp/tests/evol_test-f4.goal	(revision 1263)
@@ -1,22 +1,22 @@
-Evaluation 0	4,4,4	2,2,2	1,1,1	0,0,0	0,0,0	1,1,1
-Evaluation 10	4,5.8,15	2,2,2	1,1,1	0,0.1,1	0,0,0	1,2.7,11
-Evaluation 20	4,5.8,15	2,2,2	1,1,1	0,0.1,1	0,0,0	1,2.7,11
-Evaluation 30	4,5.5,7	2,2,2	1,1,1	0,0,0	0,0,0	1,2.5,4
-Evaluation 40	5,6.3,8	2,2,2	1,1,1	0,0,0	0,0,0	2,3.3,5
-Evaluation 50	6,8.1,10	2,2,2	1,1,1	0,0,0	0,0,0	3,5.1,7
-Evaluation 60	6,9.1,11	2,2,2	1,1,1	0,0,0	0,0,0	3,6.1,8
-Evaluation 70	8,11.8,20	2,2,2	1,1,1	0,0,0	0,0,0	5,8.8,17
-Evaluation 80	10,15.1,20	2,2.1,3	1,1.1,2	0,0,0	0,0,0	7,11.9,17
-Evaluation 90	16,18.5,21	2,2,2	1,1,1	0,0,0	0,0,0	13,15.5,18
-Evaluation 99	10,17.9,24	2,2,2	1,1,1	0,0,0	0,0,0	7,14.9,21
-20.0	/*4*/IX#2Ql#2>>l#2l>ll
-17.0	/*4*/IX#2Ql>l#2l>ll
-21.0	/*4*/IX#2Ql#2>>l#2l>ll,
-12.0	/*4*/IXl#2l>ll
-20.0	/*4*/IX#2Ql#2>>l#2l>ll
-24.0	/*4*/IX#2Ql#2>>l#2l>l#2l,>
-16.0	/*4*/IX#2Ql>#2l>ll
-10.0	/*4*/IXQl#2>
-24.0	/*4*/IXN:M#2Ql#2>>l#2l>ll,
-15.0	/*4*/IX#2l>#2l>ll
+Evaluation 0	4,4.1,5	2,2,2	1,1,1	0,0,0	0,0,0	1,1.1,2
+Evaluation 10	4,5,6	2,2,2	1,1,1	0,0,0	0,0,0	1,2,3
+Evaluation 20	4,5.1,6	2,2,2	1,1,1	0,0,0	0,0,0	1,2.1,3
+Evaluation 30	5,7.2,11	2,2.3,3	1,1.3,2	0,0,0	0,0,0	2,3.6,6
+Evaluation 40	6,8.9,13	2,2.4,3	1,1.4,2	0,0,0	0,0,0	3,5.1,8
+Evaluation 50	6,12.2,19	2,2.9,4	1,1.9,3	0,0.1,1	0,0,0	3,7.3,13
+Evaluation 60	12,17.8,25	2,3.6,4	1,2.6,3	0,0.4,1	0,0,0	7,11.2,17
+Evaluation 70	12,22.6,30	2,4.1,5	1,3.1,4	0,0.6,1	0,0,0	8,14.8,20
+Evaluation 80	17,26,32	4,4.8,6	3,3.8,5	0,0.3,1	0,0,0	10,17.1,21
+Evaluation 90	5,26.4,35	2,5,6	1,4,5	0,0.1,1	0,0,0	2,17.3,24
+Evaluation 99	17,30,36	4,5.5,6	3,4.5,5	0,0,0	0,0,0	10,20,25
+35.0	/*4*/<l<XC#2>>X>l<X>l<Xrm>XC>
+17.0	/*4*/<<Xrm>X>X>
+36.0	/*4*/<l<QXC#2>>X>l<l<Xrm>XC>X>
+27.0	/*4*/<l<Xrml>X>l<Xrm>X>
+35.0	/*4*/<l<XC#2>>X>l<l<Xrm>XC>X>
+33.0	/*4*/<l<Xrml><X>X>l<Xrm>lX>
+32.0	/*4*/<l<XC>X>l<l<Xrm>XC>X>
+32.0	/*4*/<l<Xrml><X>X>l<Xrm>X>
+27.0	/*4*/<l<X>Xrml>l<Xrm>X>
+26.0	/*4*/<<Xrm>X>ll<X>Xrm>
 
Index: cpp/tests/evol_test-fH.goal
===================================================================
--- cpp/tests/evol_test-fH.goal	(revision 1175)
+++ cpp/tests/evol_test-fH.goal	(revision 1263)
@@ -1,16 +1,16 @@
 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,25.2,48	2,2.7,3	1,1.7,2	0,0,0	0,0,0	4,20.8,43
-Evaluation 20	7,99.3,318	2,2.8,4	1,1.8,3	0,0.2,1	0,0,0	4,94.5,310
-Evaluation 30	13,216.7,427	2,2.7,4	1,1.7,3	0,0.2,1	0,0.1,1	8,212,421
-Evaluation 40	13,190.8,333	2,2.7,5	1,1.7,4	0,0,0	0,0,0	8,186.4,324
-Evaluation 50	139,346.4,534	2,2.7,5	1,1.7,4	0,0.3,1	0,0,0	136,341.7,529
-Evaluation 60	414,542.3,670	2,3,4	1,2,3	0,0.4,1	0,0,0	408,536.9,663
-Evaluation 70	405,612,784	2,2.8,4	1,1.8,3	0,0.4,1	0,0,0	402,607,780
-Evaluation 80	529,742.4,1450	2,3.1,4	1,2.1,3	0,0.6,2	0,0,0	526,736.6,1441
-Evaluation 90	664,1104.8,1598	2,4.1,5	1,3.1,4	0,1.1,3	0,0.2,1	657,1096.3,1585
-Evaluation 99	656,1261.6,2154	3,5,9	2,4,8	0,1.7,3	0,0.5,1	650,1250.4,2138
-1594.0	//H
+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
 3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
 j:
@@ -27,13 +27,13 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
 
-1785.0	//H
+1787.0	//H
 3
 j:
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
-j:stif=0.94
+j:rotstif=0.94
 j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, as=0.051
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+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:
 n:-0.48259536596015096, -0.5689423708245158, 0.15982480067759752, 0.7935223132371902, -0.18653331650421023, 0.10415654024109244, d=@:p=0.828
@@ -48,10 +48,10 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
 
-2154.0	//H
+2159.0	//H
 3
-j:stif=0.94
+j:rotstif=0.94
 j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, as=0.051
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+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:
 j:
@@ -71,7 +71,7 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 0.604
 
-1206.0	//H
+1203.0	//H
 3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
 j:
@@ -86,7 +86,7 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, -1.595
 
-1579.0	//H
+1576.0	//H
 3
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
 j:
@@ -113,9 +113,9 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 
-679.0	//H
+687.0	//H
 3
-j:stif=0.94
+j:rotstif=0.94
 j:
-j:0.5583839416503906, 0.850326859857887, 0.43035749765112996, -0.08028824254870415, -0.9107754053547978, 0.5995917664840817, as=0.051
+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
@@ -123,8 +123,8 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.28
 
-1598.0	//H
+1595.0	//H
 3
 j:
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
 j:
@@ -144,6 +144,6 @@
 3
 j:
-j:stif=0.94
-j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, stam=0.226
+j:rotstif=0.94
+j:-0.023887430783361197, -0.28877452993765473, 0.8808639030903578, -0.7503338782116771, 0.4441613215021789, -0.9390940684825182, l=0.952
 j:
 j:
@@ -153,12 +153,12 @@
 c:0.6846841583028436, 0.2943482771515846, 0.6827722443267703, -0.7364042759872973, 0.43265439569950104, -0.4211878180503845, 1.162
 
-656.0	//H
+658.0	//H
 3
+j:rotstif=0.94
 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.36, -1.556
+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, -2.881
+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
 
Index: cpp/tests/f0_variants_test-complex.goal
===================================================================
--- cpp/tests/f0_variants_test-complex.goal	(revision 1175)
+++ cpp/tests/f0_variants_test-complex.goal	(revision 1263)
@@ -8,9 +8,9 @@
 ==== With defdata (skips default values) ======
 m:
-p:fr=1.12, ing=0.53125, as=0.15625
-p:x=1.0, fr=1.12, ing=0.53125, as=0.15625
-p:x=2.0, fr=0.976, ing=0.475, as=0.175
-j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0, stam=0.15625
-j:p1=1, p2=2, dx=1.0, dy=0.0, dz=0.0, stam=0.175
+p:fr=2.2, ing=0.625
+p:x=1.0, fr=2.2, ing=0.625
+p:x=2.0, fr=1.84, ing=0.55
+j:p1=0, p2=1, dx=1.0, dy=0.0, dz=0.0
+j:p1=1, p2=2, dx=1.0, dy=0.0, dz=0.0
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -20,9 +20,9 @@
 ==== Without defdata (saves all fields) ======
 m:se=1.0, Vstyle=
-p:x=0.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.12, ing=0.53125, as=0.15625, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-p:x=1.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.12, ing=0.53125, as=0.15625, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-p:x=2.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.976, ing=0.475, as=0.175, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-j:p1=0, p2=1, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.15625, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
-j:p1=1, p2=2, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.175, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+p:x=0.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=2.2, ing=0.625, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=2.2, ing=0.625, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.84, ing=0.55, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=1, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=2, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
 n:p=-1, j=0, d=@:p=0.6543, i=, Vstyle=neuro
 n:p=-1, j=1, d=G, i=, Vstyle=neuro
Index: cpp/tests/full_props-complex.goal
===================================================================
--- cpp/tests/full_props-complex.goal	(revision 1175)
+++ cpp/tests/full_props-complex.goal	(revision 1263)
@@ -1,9 +1,9 @@
 //0
 m:se=1.0, Vstyle=
-p:x=0.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.12, ing=0.53125, as=0.15625, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-p:x=1.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.12, ing=0.53125, as=0.15625, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-p:x=2.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=0.976, ing=0.475, as=0.175, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
-j:p1=0, p2=1, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.15625, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
-j:p1=1, p2=2, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.175, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+p:x=0.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=2.2, ing=0.625, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=1.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=2.2, ing=0.625, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+p:x=2.0, y=0.0, z=0.0, sh=0, s=1.0, sx=1.0, sy=1.0, sz=1.0, h=0.0, dn=1.0, fr=1.84, ing=0.55, as=0.25, rx=0.0, ry=0.0, rz=0.0, i=, Vstyle=part, vr=0.5, vg=0.5, vb=0.5
+j:p1=0, p2=1, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
+j:p1=1, p2=2, rx=0.0, ry=0.0, rz=0.0, dx=1.0, dy=0.0, dz=0.0, sh=0, hx=0.0, hy=0.0, hz=0.0, hrx=0.0, hry=0.0, hrz=0.0, hxn=-1.5708, hxp=1.5708, hyn=-1.5708, hyp=1.5708, stif=1.0, rotstif=1.0, stam=0.25, i=, Vstyle=joint, vr=0.5, vg=0.5, vb=0.5
 n:p=-1, j=0, d=@:p=0.6543, i=, Vstyle=neuro
 n:p=-1, j=1, d=G, i=, Vstyle=neuro
Index: cpp/tests/genoconv_test-complex.goal
===================================================================
--- cpp/tests/genoconv_test-complex.goal	(revision 1175)
+++ cpp/tests/genoconv_test-complex.goal	(revision 1263)
@@ -7,9 +7,9 @@
 *** Converted:
 Genotype:
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.15625
-p:2.0, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625
+p:2.0, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.0
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -20,33 +20,33 @@
 Comment: 
 Conversion map:
-{ [0-1] -> [0-34]
-  [2] -> [35-74,112-150]
-  [3-25] -> [188-207,219-235]
-  [26] -> [75-111,151-187]
-  [27-29] -> [208-218]
+{ [0-1] -> [0-19]
+  [2] -> [20-44,70-94]
+  [3-25] -> [120-139,151-167]
+  [26] -> [45-69,95-119]
+  [27-29] -> [140-150]
 }
-                  p:fr=1.12, ing=0.53125, as=0.15625 p:1.0, fr=1.12, ing=0.53125, as=0.15625 p:2.0, fr=0.976, ing=0.475, as=0.175 j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625 j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175 n:j=0, d=@:p=0.6543 n:j=1, d=G c:0, 1, -1.23456 
-             FI : p:fr=1.12, ing=0.53125, as=0.15625 .........................................................................................................................................................................................................
-              X : ...................................p:1.0, fr=1.12, ing=0.53125, as=0.15625 .....................................j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625 .....................................................................................
-[@,p:0.6543,1:- : ............................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
-       1.23456] : ............................................................................................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
-              X : ...........................................................................p:2.0, fr=0.976, ing=0.475, as=0.175 .......................................j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175 ................................................
-            [G] : ................................................................................................................................................................................................................n:j=1, d=G .................
+                  p:fr=2.2, ing=0.625 p:1.0, fr=2.2, ing=0.625 p:2.0, fr=1.84, ing=0.55 j:0, 1, dx=1.0, 0.0, 0.0 j:1, 2, dx=1.0, 0.0, 0.0 n:j=0, d=@:p=0.6543 n:j=1, d=G c:0, 1, -1.23456 
+             FI : p:fr=2.2, ing=0.625 ....................................................................................................................................................
+              X : ....................p:1.0, fr=2.2, ing=0.625 .........................j:0, 1, dx=1.0, 0.0, 0.0 .........................................................................
+[@,p:0.6543,1:- : ........................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
+       1.23456] : ........................................................................................................................n:j=0, d=@:p=0.6543 ...........c:0, 1, -1.23456 
+              X : .............................................p:2.0, fr=1.84, ing=0.55 .........................j:1, 2, dx=1.0, 0.0, 0.0 ................................................
+            [G] : ............................................................................................................................................n:j=1, d=G .................
 Reverse conversion map:
-{ [0-34] -> [0-1]
-  [35-74] -> [2]
-  [75-111] -> [26]
-  [112-150] -> [2]
-  [151-187] -> [26]
-  [188-207] -> [3-25]
-  [208-218] -> [27-29]
-  [219-235] -> [3-25]
+{ [0-19] -> [0-1]
+  [20-44] -> [2]
+  [45-69] -> [26]
+  [70-94] -> [2]
+  [95-119] -> [26]
+  [120-139] -> [3-25]
+  [140-150] -> [27-29]
+  [151-167] -> [3-25]
 }
                                                 FIX[@,p:0.6543,1:-1.23456]X[G]
-          p:fr=1.12, ing=0.53125, as=0.15625  : FI............................
-     p:1.0, fr=1.12, ing=0.53125, as=0.15625  : ..X...........................
-        p:2.0, fr=0.976, ing=0.475, as=0.175  : ..........................X...
-      j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625  : ..X...........................
-        j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175  : ..........................X...
+                         p:fr=2.2, ing=0.625  : FI............................
+                    p:1.0, fr=2.2, ing=0.625  : ..X...........................
+                    p:2.0, fr=1.84, ing=0.55  : ..........................X...
+                    j:0, 1, dx=1.0, 0.0, 0.0  : ..X...........................
+                    j:1, 2, dx=1.0, 0.0, 0.0  : ..........................X...
                          n:j=0, d=@:p=0.6543  : ...[@,p:0.6543,1:-1.23456]....
                                   n:j=1, d=G  : ...........................[G]
@@ -72,20 +72,20 @@
                                                 Parts     Joints    Neurons
                                                 012345678901234567890123456789
-          p:fr=1.12, ing=0.53125, as=0.15625  : 0.............................
-     p:1.0, fr=1.12, ing=0.53125, as=0.15625  : .1............................
-        p:2.0, fr=0.976, ing=0.475, as=0.175  : ..2...........................
-      j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625  : ..........0...................
-        j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175  : ...........1..................
+                         p:fr=2.2, ing=0.625  : 0.............................
+                    p:1.0, fr=2.2, ing=0.625  : .1............................
+                    p:2.0, fr=1.84, ing=0.55  : ..2...........................
+                    j:0, 1, dx=1.0, 0.0, 0.0  : ..........0...................
+                    j:1, 2, dx=1.0, 0.0, 0.0  : ...........1..................
                          n:j=0, d=@:p=0.6543  : ....................0.........
                                   n:j=1, d=G  : .....................1........
                             c:0, 1, -1.23456  : ....................0.........
-{ [0-34] -> [0]
-  [35-74] -> [1]
-  [75-111] -> [2]
-  [112-150] -> [10]
-  [151-187] -> [11]
-  [188-207] -> [20]
-  [208-218] -> [21]
-  [219-235] -> [20]
+{ [0-19] -> [0]
+  [20-44] -> [1]
+  [45-69] -> [2]
+  [70-94] -> [10]
+  [95-119] -> [11]
+  [120-139] -> [20]
+  [140-150] -> [21]
+  [151-167] -> [20]
 }
 
Index: cpp/tests/genomanipulation-complex.goal
===================================================================
--- cpp/tests/genomanipulation-complex.goal	(revision 1175)
+++ cpp/tests/genomanipulation-complex.goal	(revision 1263)
@@ -10,9 +10,9 @@
                   ( format 1 )
 Converted to f0:
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.15625
-p:2.0, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625
+p:2.0, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.0
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -47,12 +47,12 @@
  8.        h = 0.0                  f 0 1 0 hollow      Other properties
  9.       dn = 1.0                  f 0.2 5.0 1.0 density     Other properties
-10.       fr = 1.12                 f 0.0 4.0 0.4 friction    Other properties
-11.      ing = 0.53125              f 0.0 1.0 0.25 ingestion   Other properties
-12.       as = 0.15625              f 0.0 1.0 0.25 assimilation  Other properties
+10.       fr = 2.2                  f 0.0 4.0 0.4 friction    Other properties
+11.      ing = 0.625                f 0.0 1.0 0.25 ingestion   Other properties
+12.       as = 0.25                 f 0.0 1.0 0.25 assimilation  Other properties
 13.       rx = 0.0                  f   rot.x       Geometry  
 14.       ry = 0.0                  f   rot.y       Geometry  
 15.       rz = 0.0                  f   rot.z       Geometry  
 16.        i =                      s   info        Other properties
-17.   Vstyle = part                 s 0 0 part vis_style   Visual    
+17.   Vstyle = part                 s 0 -1 part Visual style  Visual    
 18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -68,7 +68,7 @@
  0.        h = 0.0                  f 0 1 0 hollow      Extra properties
  1.       dn = 1.0                  f 0.2 5.0 1.0 density     Extra properties
- 2.       fr = 1.12                 f 0.0 4.0 0.4 friction    Extra properties
- 3.      ing = 0.53125              f 0.0 1.0 0.25 ingestion   Extra properties
- 4.       as = 0.15625              f 0.0 1.0 0.25 assimilation  Extra properties
+ 2.       fr = 2.2                  f 0.0 4.0 0.4 friction    Extra properties
+ 3.      ing = 0.625                f 0.0 1.0 0.25 ingestion   Extra properties
+ 4.       as = 0.25                 f 0.0 1.0 0.25 assimilation  Extra properties
  5.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
  6.       vg = 0.5                  f 0.0 1.0 0.5 green component  Extra properties
@@ -82,5 +82,5 @@
 
       Change property #4 to random value from range [0..1]
-      Current value of 'as' (assimilation) is '0.15625'
+      Current value of 'as' (assimilation) is '0.25'
       Setting new value... [ using ParamInterface::set() ]
       The value is now '0.715189'
@@ -88,9 +88,9 @@
 Let's see f0... (check out part #1 !)
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.0
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -125,9 +125,9 @@
 17.      hyn = -1.5708              f -6.2832 0 -1.5708 hinge y negative limit  Geometry  
 18.      hyp = 1.5708               f 0 6.2832 1.5708 hinge y positive limit  Geometry  
-19.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Other properties
+19.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Other properties
 20.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Other properties
-21.     stam = 0.175                f 0.0 1.0 0.25 stamina     Other properties
+21.     stam = 0.25                 f 0.0 1.0 0.25 stamina     Other properties
 22.        i =                      s   info        Other properties
-23.   Vstyle = joint                s 0 0 joint vis_style   Visual    
+23.   Vstyle = joint                s 0 -1 joint Visual style  Visual    
 24.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 25.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -142,9 +142,9 @@
 Position of the second Part referenced by this joint (part #2) is now changed:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, 0.1, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.1
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -156,9 +156,9 @@
 As you can see, Joint's delta fields have altered:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, -0.1, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=-0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, -0.1
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -169,9 +169,9 @@
 f0 is now:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=-0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -185,9 +185,9 @@
 The Part's position is changed, but everything else stays intact:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=-0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -199,5 +199,5 @@
 
  #        id                      type  name        group (5 properties)
- 0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
+ 0.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
  2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
@@ -212,9 +212,9 @@
 And after that we have this genotype:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, stam=0.175, vg=0.857946
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=-0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, vg=0.857946
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -235,5 +235,5 @@
  2.        d = G                    s   details     Other     
  3.        i =                      s   info        Other     
- 4.   Vstyle = neuro                s 0 0 neuro vis_style   Visual    
+ 4.   Vstyle = neuro                s 0 -1 neuro Visual style  Visual    
  5. getInputCount = 0                    d   input count  Connections
  9. classObject = null                 oNeuroClass neuron class  Connections
@@ -295,9 +295,9 @@
 And the full f0 genotype:
 
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.715189
-p:2.0, z=-0.1, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, stam=0.175, vg=0.857946
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625, as=0.715189
+p:2.0, z=-0.1, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, vg=0.857946
 n:j=0, d=@:p=0.6543
 n:j=1, d=ChMux
Index: cpp/tests/genomanipulation-default.goal
===================================================================
--- cpp/tests/genomanipulation-default.goal	(revision 1175)
+++ cpp/tests/genomanipulation-default.goal	(revision 1263)
@@ -54,5 +54,5 @@
 15.       rz = 0.0                  f   rot.z       Geometry  
 16.        i =                      s   info        Other properties
-17.   Vstyle = part                 s 0 0 part vis_style   Visual    
+17.   Vstyle = part                 s 0 -1 part Visual style  Visual    
 18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -125,9 +125,9 @@
 17.      hyn = -1.5708              f -6.2832 0 -1.5708 hinge y negative limit  Geometry  
 18.      hyp = 1.5708               f 0 6.2832 1.5708 hinge y positive limit  Geometry  
-19.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Other properties
+19.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Other properties
 20.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Other properties
 21.     stam = 0.25                 f 0.0 1.0 0.25 stamina     Other properties
 22.        i =                      s   info        Other properties
-23.   Vstyle = joint                s 0 0 joint vis_style   Visual    
+23.   Vstyle = joint                s 0 -1 joint Visual style  Visual    
 24.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 25.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -199,5 +199,5 @@
 
  #        id                      type  name        group (5 properties)
- 0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
+ 0.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
  2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
@@ -235,5 +235,5 @@
  2.        d = |:p=0.25,r=1         s   details     Other     
  3.        i =                      s   info        Other     
- 4.   Vstyle = neuro                s 0 0 neuro vis_style   Visual    
+ 4.   Vstyle = neuro                s 0 -1 neuro Visual style  Visual    
  5. getInputCount = 1                    d   input count  Connections
  9. classObject = null                 oNeuroClass neuron class  Connections
Index: cpp/tests/genomanipulation-fS.goal
===================================================================
--- cpp/tests/genomanipulation-fS.goal	(revision 1175)
+++ cpp/tests/genomanipulation-fS.goal	(revision 1263)
@@ -75,5 +75,5 @@
 15.       rz = 0.0                  f   rot.z       Geometry  
 16.        i =                      s   info        Other properties
-17.   Vstyle = part                 s 0 0 part vis_style   Visual    
+17.   Vstyle = part                 s 0 -1 part Visual style  Visual    
 18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -161,9 +161,9 @@
 11.      hyn = -1.5708              f -6.2832 0 -1.5708 hinge y negative limit  Geometry  
 12.      hyp = 1.5708               f 0 6.2832 1.5708 hinge y positive limit  Geometry  
-13.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Other properties
+13.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Other properties
 14.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Other properties
 15.     stam = 0.25                 f 0.0 1.0 0.25 stamina     Other properties
 16.        i =                      s   info        Other properties
-17.   Vstyle = joint                s 0 0 joint vis_style   Visual    
+17.   Vstyle = joint                s 0 -1 joint Visual style  Visual    
 18.       vr = 0.5                  f 0.0 1.0 0.5 red component  Visual    
 19.       vg = 0.5                  f 0.0 1.0 0.5 green component  Visual    
@@ -319,5 +319,5 @@
 
  #        id                      type  name        group (5 properties)
- 0.     stif = 1.0                  f 0.0 1.0 1.0 stiffness   Extra properties
+ 0.     stif = 1.0                  f 0.01 1.0 1.0 stiffness   Extra properties
  1.  rotstif = 1.0                  f 0.0 1.0 1.0 rotation stiffness  Extra properties
  2.       vr = 0.5                  f 0.0 1.0 0.5 red component  Extra properties
@@ -376,5 +376,5 @@
  2.        d = M:p=0.899            s   details     Other     
  3.        i =                      s   info        Other     
- 4.   Vstyle = neuro                s 0 0 neuro vis_style   Visual    
+ 4.   Vstyle = neuro                s 0 -1 neuro Visual style  Visual    
  5. getInputCount = 0                    d   input count  Connections
  9. classObject = null                 oNeuroClass neuron class  Connections
Index: cpp/tests/geometry_goals/f1.goal
===================================================================
--- cpp/tests/geometry_goals/f1.goal	(revision 1175)
+++ cpp/tests/geometry_goals/f1.goal	(revision 1263)
@@ -4,24 +4,24 @@
 p:sh=2, sx=0.05, sy=0.5, sz=0.05, vr=0.0, 1.0, 0.0
 p:sh=2, sx=0.05, sy=0.05, sz=0.5, vr=0.0, 0.0, 1.0
-p:y=-0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:y=-0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:y=0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:y=0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:4.009699, -0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:4.009699, -0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:4.009699, 0.8995007346349524, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:4.009699, 0.8995007346349524, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
-p:2.0048495, sh=2, sx=4.029601229724972, sy=0.05, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=1.0, 0.0, 0.0
-p:2.0048495, sh=2, sx=0.05, sy=1.8425049309676886, sz=0.05, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, 1.0, 0.0
-p:2.0048495, sh=2, sx=0.05, sy=0.05, sz=0.9058519381014852, rx=0.21773997806084824, -0.09942915321443663, -3.2451101949494454e-17, vr=0.0, 0.0, 1.0
-p:0.3995, sh=3, sx=0.3995, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
-p:0.7989983479760048, -0.44974999999696585, sh=3, sx=0.44975, sy=0.2, sz=0.2, rz=1.5707926535897934
-p:1.163325, sh=3, sx=0.36432499999999995, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
-p:1.879664, sh=3, sx=0.35201400000000005, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
-p:2.2316764351889136, -0.42600699999712605, sh=3, sx=0.42600699999999997, sy=0.2, sz=0.2, rz=1.5707926535897931
-p:2.657685, sh=3, sx=0.426007, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
-p:3.5466955000000002, sh=3, sx=0.4630035000000001, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
-p:2.2316764351889136, 0.42600699999712605, sh=3, sx=0.42600699999999997, sy=0.2, sz=0.2, rz=-1.5707926535897931
-p:0.7989983479760048, 0.44974999999696585, sh=3, sx=0.44975, sy=0.2, sz=0.2, rz=-1.5707926535897934
+p:y=-0.8325007346354043, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=-0.8325007346354043, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.8325007346354043, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:y=0.8325007346354043, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:3.4767959999999998, -0.8325007346354043, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:3.4767959999999998, -0.8325007346354043, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:3.4767959999999998, 0.8325007346354043, -0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:3.4767959999999998, 0.8325007346354043, 0.2, sh=1, sx=0.05, sy=0.05, sz=0.05, vr=1.0, 1.0, 0.0
+p:1.7383979999999999, sh=2, sx=3.4997300503918867, sy=0.05, sz=0.05, rx=0.2342831811098684, -0.11454484673768733, -3.443227636570292e-17, vr=1.0, 0.0, 0.0
+p:1.7383979999999999, sh=2, sx=0.05, sy=1.7117636757570973, sz=0.05, rx=0.2342831811098684, -0.11454484673768733, -3.443227636570292e-17, vr=0.0, 1.0, 0.0
+p:1.7383979999999999, sh=2, sx=0.05, sy=0.05, sz=0.8923778124409683, rx=0.2342831811098684, -0.11454484673768733, -3.443227636570292e-17, vr=0.0, 0.0, 1.0
+p:0.3325, sh=3, sx=0.3325, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
+p:0.6649984710283758, -0.41624999999719187, sh=3, sx=0.41624999999999995, sy=0.2, sz=0.2, rz=1.5707926535897934
+p:0.9556250000000001, sh=3, sx=0.290625, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
+p:1.5264060000000002, sh=3, sx=0.28015599999999996, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
+p:1.8065605671634997, -0.3900779999973684, sh=3, sx=0.390078, sy=0.2, sz=0.2, rz=1.5707926535897931
+p:2.19664, sh=3, sx=0.3900779999999999, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
+p:3.031757, sh=3, sx=0.44503899999999996, sy=0.2, sz=0.2, rx=-1.5707963267948966, rz=3.141592653589793
+p:1.8065605671634997, 0.3900779999973684, sh=3, sx=0.390078, sy=0.2, sz=0.2, rz=-1.5707926535897931
+p:0.6649984710283758, 0.41624999999719187, sh=3, sx=0.41624999999999995, sy=0.2, sz=0.2, rz=-1.5707926535897934
 j:0, 1, sh=1
 j:0, 2, sh=1
@@ -48,12 +48,12 @@
 j:0, 15, sh=1
 
-# volume=0.577076
-# area=8.353694
-# sizes.x=4.029601 sizes.y=1.842505 sizes.z=0.905852
-# axes.x=(0.995061, -0.000000, -0.099265)
-# axes.y=(0.021444, 0.976388, 0.214957)
-# axes.z=(0.096922, -0.216024, 0.971566)
-# box.x=[0.000000, 4.009699]
-# box.y=[-0.899501, 0.899501]
+# volume=0.463110
+# area=7.221219
+# sizes.x=3.499730 sizes.y=1.711764 sizes.z=0.892378
+# axes.x=(0.993447, -0.000000, -0.114295)
+# axes.y=(0.026533, 0.972681, 0.230625)
+# axes.z=(0.111172, -0.232146, 0.966307)
+# box.x=[0.000000, 3.476796]
+# box.y=[-0.832501, 0.832501]
 # box.z=[-0.200000, 0.200000]
 
Index: cpp/tests/multiline_f0_test-complex.goal
===================================================================
--- cpp/tests/multiline_f0_test-complex.goal	(revision 1175)
+++ cpp/tests/multiline_f0_test-complex.goal	(revision 1263)
@@ -3,9 +3,9 @@
                   ( format 1 )
 Converted to f0:
-p:fr=1.12, ing=0.53125, as=0.15625
-p:1.0, fr=1.12, ing=0.53125, as=0.15625
-p:2.0, fr=0.976, ing=0.475, as=0.175
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175
+p:fr=2.2, ing=0.625
+p:1.0, fr=2.2, ing=0.625
+p:2.0, fr=1.84, ing=0.55
+j:0, 1, dx=1.0, 0.0, 0.0
+j:1, 2, dx=1.0, 0.0, 0.0
 n:j=0, d=@:p=0.6543
 n:j=1, d=G
@@ -31,7 +31,7 @@
 h:0.0
 dn:1.0
-fr:1.12
-ing:0.53125
-as:0.15625
+fr:2.2
+ing:0.625
+as:0.25
 rx:0.0
 ry:0.0
@@ -54,7 +54,7 @@
 h:0.0
 dn:1.0
-fr:1.12
-ing:0.53125
-as:0.15625
+fr:2.2
+ing:0.625
+as:0.25
 rx:0.0
 ry:0.0
@@ -77,7 +77,7 @@
 h:0.0
 dn:1.0
-fr:0.976
-ing:0.475
-as:0.175
+fr:1.84
+ing:0.55
+as:0.25
 rx:0.0
 ry:0.0
@@ -111,5 +111,5 @@
 stif:1.0
 rotstif:1.0
-stam:0.15625
+stam:0.25
 i:
 Vstyle:joint
@@ -140,5 +140,5 @@
 stif:1.0
 rotstif:1.0
-stam:0.175
+stam:0.25
 i:
 Vstyle:joint
Index: cpp/tests/neuro_layout_test.goal
===================================================================
--- cpp/tests/neuro_layout_test.goal	(revision 1175)
+++ cpp/tests/neuro_layout_test.goal	(revision 1263)
@@ -1,29 +1,42 @@
-16 neurons, using layout type=2 (Smart)
+23 neurons, using layout type=2 (Smart)
 #0   T	0,0	50x50
-#1   T	140,0	50x50
+#1   |	140,0	50x50
 #2   T	0,-140	50x50
-#3   *	280,0	50x50
-#4   T	140,-140	50x50
-#5   N	350,0	50x50
-#6   *	280,-140	50x50
-#7   T	280,-280	50x50
-#8   N	350,-140	50x50
-#9   N	350,-280	50x50
-#10  N	420,-140	50x50
-#11  N	420,-280	50x50
-#12  T	0,-280	50x50
-#13  N	490,-280	50x50
-#14  *	140,-280	50x50
-#15  N	560,-280	50x50
+#3   T	140,-140	50x50
+#4   *	280,-140	50x50
+#5   |	280,0	50x50
+#6   Gpart	0,-350	50x50
+#7   |	350,-140	50x50
+#8   N	70,-350	50x50
+#9   *	0,-280	50x50
+#10  Sin	210,-350	50x50
+#11  |	70,-280	50x50
+#12  N	280,-350	50x50
+#13  *	210,-280	50x50
+#14  |	490,0	50x50
+#15  T	0,-490	50x50
+#16  |	490,-140	50x50
+#17  N	70,-490	50x50
+#18  Gpart	490,-280	50x50
+#19  N	140,-490	50x50
+#20  *	350,-490	50x50
+#21  |	210,-490	50x50
+#22  |	420,-490	50x50
 ===========================================
-   12:T          14:*          7:T    9:N    11:N   13:N   15:N   
-                                                                  
-                                                                  
-                                                                  
-   2:T           4:T           6:*    8:N    10:N                 
-                                                                  
-                                                                  
-                                                                  
-   0:T           1:T           3:*    5:N                         
+   15:T   17:N   19:N   21:|          20:*   22:|          
+                                                           
+                                                           
+                                                           
+   6:Gpart8:N           10:Sin 12:N                        
+                                                           
+   9:*    11:|          13:*                        18:Gpar
+                                                           
+                                                           
+                                                           
+   2:T           3:T           4:*    7:|           16:|   
+                                                           
+                                                           
+                                                           
+   0:T           1:|           5:|                  14:|   
 ===========================================
 
Index: cpp/tests/similarity_goals/all_weights_fixed_z_greedy.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights_fixed_z_greedy.goal	(revision 1175)
+++ cpp/tests/similarity_goals/all_weights_fixed_z_greedy.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	100.34	44.16	124.03	52.04	
-100.34	0.00	90.63	131.96	79.48	
-44.16	90.63	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	
+0.00	100.18	43.93	123.70	50.14	
+100.18	0.00	90.63	131.96	79.48	
+43.93	90.63	0.00	101.16	28.85	
+123.70	131.96	101.16	0.00	85.91	
+50.14	79.48	28.85	85.91	0.00	
 
Index: cpp/tests/similarity_goals/all_weights_fixed_z_hungarian.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights_fixed_z_hungarian.goal	(revision 1175)
+++ cpp/tests/similarity_goals/all_weights_fixed_z_hungarian.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	97.94	42.50	123.17	51.01	
-97.94	0.00	89.89	131.03	79.25	
-42.50	89.89	0.00	100.84	28.51	
-123.17	131.03	100.84	0.00	85.80	
-51.01	79.25	28.51	85.80	0.00	
+0.00	97.92	41.21	122.95	49.42	
+97.92	0.00	89.89	131.03	79.25	
+41.21	89.89	0.00	100.84	28.51	
+122.95	131.03	100.84	0.00	85.80	
+49.42	79.25	28.51	85.80	0.00	
 
Index: cpp/tests/similarity_goals/all_weights_greedy.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights_greedy.goal	(revision 1175)
+++ cpp/tests/similarity_goals/all_weights_greedy.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	97.74	43.78	67.77	52.04	
-97.74	0.00	90.03	70.35	78.85	
-43.78	90.03	0.00	47.65	27.89	
-67.77	70.35	47.65	0.00	28.18	
-52.04	78.85	27.89	28.18	0.00	
+0.00	97.68	42.66	67.06	50.14	
+97.68	0.00	90.03	70.35	78.85	
+42.66	90.03	0.00	47.65	27.89	
+67.06	70.35	47.65	0.00	28.18	
+50.14	78.85	27.89	28.18	0.00	
 
Index: cpp/tests/similarity_goals/all_weights_hungarian.goal
===================================================================
--- cpp/tests/similarity_goals/all_weights_hungarian.goal	(revision 1175)
+++ cpp/tests/similarity_goals/all_weights_hungarian.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	96.56	42.00	58.49	51.01	
-96.56	0.00	89.33	66.98	78.79	
-42.00	89.33	0.00	45.52	27.60	
-58.49	66.98	45.52	0.00	27.91	
-51.01	78.79	27.60	27.91	0.00	
+0.00	96.54	40.78	59.27	49.42	
+96.54	0.00	89.33	66.98	78.79	
+40.78	89.33	0.00	45.52	27.60	
+59.27	66.98	45.52	0.00	27.91	
+49.42	78.79	27.60	27.91	0.00	
 
Index: cpp/tests/similarity_goals/distances_weight_greedy.goal
===================================================================
--- cpp/tests/similarity_goals/distances_weight_greedy.goal	(revision 1175)
+++ cpp/tests/similarity_goals/distances_weight_greedy.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	16.87	10.34	21.05	10.87	
-16.87	0.00	18.03	16.35	19.85	
-10.34	18.03	0.00	19.65	6.89	
-21.05	16.35	19.65	0.00	19.18	
-10.87	19.85	6.89	19.18	0.00	
+0.00	16.75	9.15	20.48	9.38	
+16.75	0.00	18.03	16.35	19.85	
+9.15	18.03	0.00	19.65	6.89	
+20.48	16.35	19.65	0.00	19.18	
+9.38	19.85	6.89	19.18	0.00	
 
Index: cpp/tests/similarity_goals/distances_weight_hungarian.goal
===================================================================
--- cpp/tests/similarity_goals/distances_weight_hungarian.goal	(revision 1175)
+++ cpp/tests/similarity_goals/distances_weight_hungarian.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	16.56	7.88	12.49	10.01	
-16.56	0.00	17.33	12.98	19.79	
-7.88	17.33	0.00	17.03	6.60	
-12.49	12.98	17.03	0.00	18.68	
-10.01	19.79	6.60	18.68	0.00	
+0.00	16.54	6.61	13.27	8.42	
+16.54	0.00	17.33	12.98	19.79	
+6.61	17.33	0.00	17.03	6.60	
+13.27	12.98	17.03	0.00	18.68	
+8.42	19.79	6.60	18.68	0.00	
 
Index: cpp/tests/similarity_goals/distribution.goal
===================================================================
--- cpp/tests/similarity_goals/distribution.goal	(revision 1175)
+++ cpp/tests/similarity_goals/distribution.goal	(revision 1263)
@@ -1,6 +1,6 @@
-0.00	0.42	0.36	0.30	0.93	
-0.42	0.00	0.73	0.25	1.30	
-0.36	0.73	0.00	0.66	0.57	
-0.30	0.25	0.66	0.00	1.22	
-0.93	1.30	0.57	1.22	0.00	
+0.00	0.53	0.24	0.44	0.78	
+0.53	0.00	0.73	0.25	1.30	
+0.24	0.73	0.00	0.66	0.57	
+0.44	0.25	0.66	0.00	1.22	
+0.78	1.30	0.57	1.22	0.00	
 
