Index: cpp/tests/genoconv_test-complex.goal
===================================================================
--- cpp/tests/genoconv_test-complex.goal	(revision 1009)
+++ cpp/tests/genoconv_test-complex.goal	(revision 1143)
@@ -7,9 +7,9 @@
 *** Converted:
 Genotype:
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5
+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
@@ -20,38 +20,33 @@
 Comment: 
 Conversion map:
-{ [0-1] -> [0-52]
-  [2] -> [53-110,166-222]
-  [3-25] -> [278-297,309-325]
-  [26] -> [111-165,223-277]
-  [27-29] -> [298-308]
+{ [0-1] -> [0-34]
+  [2] -> [35-74,112-150]
+  [3-25] -> [188-207,219-235]
+  [26] -> [75-111,151-187]
+  [27-29] -> [208-218]
 }
-                  p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, 0.5, 0.5 j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5 j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5 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, vr=0.5, 0.5, 0.5 .................................................................................................................................................................................................................................................................................
-              X : .....................................................p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0.5, 0.5 .......................................................j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0.5, 0.5, 0.5 .......................................................................................................
-[@,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, vr=0.5, 0.5, 0.5 .........................................................j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, 0.5, 0.5 ................................................
-            [G] : ..........................................................................................................................................................................................................................................................................................................n:j=1, d=G .................
+                  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 .................
 Reverse conversion map:
-{ [0-52] -> [0-1]
-  [53-110] -> [2]
-  [111-165] -> [26]
-  [166-222] -> [2]
-  [223-277] -> [26]
-  [278-297] -> [3-25]
-  [298-308] -> [27-29]
-  [309-325] -> [3-25]
+{ [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]
 }
                                                 FIX[@,p:0.6543,1:-1.23456]X[G]
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0 : FI............................
-                                     .5, 0.5  : FI............................
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0 : ..X...........................
-                                .5, 0.5, 0.5  : ..X...........................
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, : ..........................X...
-                                    0.5, 0.5  : ..........................X...
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0. : ..X...........................
-                                 5, 0.5, 0.5  : ..X...........................
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, : ..........................X...
-                                    0.5, 0.5  : ..........................X...
+          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...
                          n:j=0, d=@:p=0.6543  : ...[@,p:0.6543,1:-1.23456]....
                                   n:j=1, d=G  : ...........................[G]
@@ -77,25 +72,20 @@
                                                 Parts     Joints    Neurons
                                                 012345678901234567890123456789
-p:fr=1.12, ing=0.53125, as=0.15625, vr=0.5, 0 : 0.............................
-                                     .5, 0.5  : 0.............................
-p:1.0, fr=1.12, ing=0.53125, as=0.15625, vr=0 : .1............................
-                                .5, 0.5, 0.5  : .1............................
-p:2.0, fr=0.976, ing=0.475, as=0.175, vr=0.5, : ..2...........................
-                                    0.5, 0.5  : ..2...........................
-j:0, 1, dx=1.0, 0.0, 0.0, stam=0.15625, vr=0. : ..........0...................
-                                 5, 0.5, 0.5  : ..........0...................
-j:1, 2, dx=1.0, 0.0, 0.0, stam=0.175, vr=0.5, : ...........1..................
-                                    0.5, 0.5  : ...........1..................
+          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..................
                          n:j=0, d=@:p=0.6543  : ....................0.........
                                   n:j=1, d=G  : .....................1........
                             c:0, 1, -1.23456  : ....................0.........
-{ [0-52] -> [0]
-  [53-110] -> [1]
-  [111-165] -> [2]
-  [166-222] -> [10]
-  [223-277] -> [11]
-  [278-297] -> [20]
-  [298-308] -> [21]
-  [309-325] -> [20]
+{ [0-34] -> [0]
+  [35-74] -> [1]
+  [75-111] -> [2]
+  [112-150] -> [10]
+  [151-187] -> [11]
+  [188-207] -> [20]
+  [208-218] -> [21]
+  [219-235] -> [20]
 }
 
