Redefined tests for new interface

Author: Kalashnikovni

test/CMakeLists.txt

@@ -16,11 +16,12 @@ file(MAKE_DIRECTORY
 
 add_subdirectory(eval)
 add_subdirectory(parser)
-add_subdirectory(partitioner)
+#add_subdirectory(partitioner)
 add_subdirectory(performance)
 
 add_custom_target(test
       COMMAND echo "Running Tests."
 )
 
-add_dependencies(test run-eval-test run-parser-test run-partitioner-test)
+add_dependencies(test run-eval-test run-parser-test)
+#add_dependencies(test run-eval-test run-parser-test run-partitioner-test)

test/interval.test

@@ -24,16 +24,11 @@ isEmpty([100:1:5]);
 [201:2:399] /\ [200:4:400];
 [300:1:1000000] /\ [300:1:500];
 
-minElem([500:5:499]);
 minElem([500:5:600]);
 
-maxElem([500:5:499]);
 maxElem([500:5:600]);
 
 [1:1:100] == [1:1:100];
 [1:2:100] == [1:1:100];
 [2:1:100] == [1:1:100];
 [1:1:101] == [1:1:100];
-
-[1:1:100] < [5:5:50];
-[50:3:100] < [50:5:80];

test/matching1.test

@@ -37,7 +37,7 @@ V: F \/ U
 Vmap: <<{[1:1:V1]} -> |0*x+1|, {[V1+1:1:V2]} -> |0*x+2|, {[V2+1:1:V3]} -> |0*x+3|>> 
 map1: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|>>
 map2: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|>>
-Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2], [E2+1:1:E3]} -> |0*x+2|>>
+Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|>>
 X: F
 Y: U;
 
@@ -46,7 +46,7 @@ match(
   Vmap: <<{[1:1:V1]} -> |0*x+1|, {[V1+1:1:V2]} -> |0*x+2|, {[V2+1:1:V3]} -> |0*x+3|>> 
   map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|>>
   map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|>>
-  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2], [E2+1:1:E3]} -> |0*x+2|>>
+  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|>>
   X: F
   Y: U
   , 1

test/matching2.test

@@ -35,7 +35,7 @@ V: F \/ U
 Vmap: <<{[1:1:V1]} -> |0*x+1|, {[V1+1:1:V2]} -> |0*x+2|, {[V2+1:1:V3]} -> |0*x+3|>> 
 map1: <<{[1:1:E1]} -> |1*x+0|, {[E1+1:1:E2]} -> |1*x+0|, {[E2+1:1:E3]} -> |1*x-off3b|>>
 map2: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|>>
-Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2], [E2+1:1:E3]} -> |0*x+2|>>
+Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|>>
 X: F
 Y: U;
 
@@ -44,7 +44,7 @@ match(
   Vmap: <<{[1:1:V1]} -> |0*x+1|, {[V1+1:1:V2]} -> |0*x+2|, {[V2+1:1:V3]} -> |0*x+3|>> 
   map1: <<{[1:1:E1]} -> |1*x+0|, {[E1+1:1:E2]} -> |1*x+0|, {[E2+1:1:E3]} -> |1*x-off3b|>>
   map2: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|>>
-  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2], [E2+1:1:E3]} -> |0*x+2|>>
+  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|>>
   X: F
   Y: U
   , 1

test/matching3.test

@@ -37,27 +37,35 @@ F = {[9:1:9], [10:1:10], [11:1:11], [12:1:12]};
 U = {[2:1:2], [3:1:3], [4:1:4], [5:1:5]};
 
 V: F \/ U
-Vmap: <<{[2:1:2]} -> |0*x+1|, {[3:1:3]} -> |0*x+2|, {[4:1:4]} -> |0*x+3|, {[5:1:5]} -> |0*x+4
-  |, {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|, {[11:1:11]} -> |0*x+11|, {[12:1:12]} -> |0*x+12|>>
-map1: <<{[1:1:1]} -> |1*x+9|, {[2:1:2]} -> |1*x+8|, {[3:1:3]} -> |1*x+8|, {[4:1:4]} -> |1*x+6|, {[5:1:5]} -> |1*x+4
-  |, {[6:1:6]} -> |1*x+3|, {[7:1:7]} -> |1*x+2|, {[8:1:8]} -> |1*x+3|, {[9:1:9]} -> |1*x+3|, {[10:1:10]} -> |1*x+2|>>
-map2: <<{[1:1:1]} -> |1*x+3|, {[2:1:2]} -> |1*x+1|, {[3:1:3]} -> |1*x-1|, {[4:1:4]} -> |1*x+1|, {[5:1:5]} -> |1*x+0
-  |, {[6:1:6]} -> |1*x-2|, {[7:1:7]} -> |1*x-4|, {[8:1:8]} -> |1*x-5|, {[9:1:9]} -> |1*x-5|, {[10:1:10]} -> |1*x-8|>>
-Emap: <<{[1:1:1]} -> |0*x+1|, {[2:1:2]} -> |0*x+2|, {[3:1:3]} -> |0*x+3|, {[4:1:4]} -> |0*x+4|, {[5:1:5]} -> |0*x+5
-  |, {[6:1:6]} -> |0*x+6|, {[7:1:7]} -> |0*x+7|, {[8:1:8]} -> |0*x+8|, {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|>>
+Vmap: <<{[2:1:2]} -> |0*x+1|, {[3:1:3]} -> |0*x+2|, {[4:1:4]} -> |0*x+3|, {[5:1:5]} -> |0*x+4|
+  , {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|, {[11:1:11]} -> |0*x+11|
+  , {[12:1:12]} -> |0*x+12|>>
+map1: <<{[1:1:1]} -> |1*x+9|, {[2:1:2]} -> |1*x+8|, {[3:1:3]} -> |1*x+8|, {[4:1:4]} -> |1*x+6|
+  , {[5:1:5]} -> |1*x+4|, {[6:1:6]} -> |1*x+3|, {[7:1:7]} -> |1*x+2|, {[8:1:8]} -> |1*x+3|
+  , {[9:1:9]} -> |1*x+3|, {[10:1:10]} -> |1*x+2|>>
+map2: <<{[1:1:1]} -> |1*x+3|, {[2:1:2]} -> |1*x+1|, {[3:1:3]} -> |1*x-1|, {[4:1:4]} -> |1*x+1|
+  , {[5:1:5]} -> |1*x+0|, {[6:1:6]} -> |1*x-2|, {[7:1:7]} -> |1*x-4|, {[8:1:8]} -> |1*x-5|
+  , {[9:1:9]} -> |1*x-5|, {[10:1:10]} -> |1*x-8|>>
+Emap: <<{[1:1:1]} -> |0*x+1|, {[2:1:2]} -> |0*x+2|, {[3:1:3]} -> |0*x+3|, {[4:1:4]} -> |0*x+4|
+  , {[5:1:5]} -> |0*x+5|, {[6:1:6]} -> |0*x+6|, {[7:1:7]} -> |0*x+7|, {[8:1:8]} -> |0*x+8|
+  , {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|>>
 X: F
 Y: U;
 
 match(
   V: F \/ U
-  Vmap: <<{[2:1:2]} -> |0*x+1|, {[3:1:3]} -> |0*x+2|, {[4:1:4]} -> |0*x+3|, {[5:1:5]} -> |0*x+4
-    |, {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|, {[11:1:11]} -> |0*x+11|, {[12:1:12]} -> |0*x+12|>>
-  map1: <<{[1:1:1]} -> |1*x+9|, {[2:1:2]} -> |1*x+8|, {[3:1:3]} -> |1*x+8|, {[4:1:4]} -> |1*x+6|, {[5:1:5]} -> |1*x+4
-    |, {[6:1:6]} -> |1*x+3|, {[7:1:7]} -> |1*x+2|, {[8:1:8]} -> |1*x+3|, {[9:1:9]} -> |1*x+3|, {[10:1:10]} -> |1*x+2|>>
-  map2: <<{[1:1:1]} -> |1*x+3|, {[2:1:2]} -> |1*x+1|, {[3:1:3]} -> |1*x-1|, {[4:1:4]} -> |1*x+1|, {[5:1:5]} -> |1*x+0
-    |, {[6:1:6]} -> |1*x-2|, {[7:1:7]} -> |1*x-4|, {[8:1:8]} -> |1*x-5|, {[9:1:9]} -> |1*x-5|, {[10:1:10]} -> |1*x-8|>>
-  Emap: <<{[1:1:1]} -> |0*x+1|, {[2:1:2]} -> |0*x+2|, {[3:1:3]} -> |0*x+3|, {[4:1:4]} -> |0*x+4|, {[5:1:5]} -> |0*x+5
-    |, {[6:1:6]} -> |0*x+6|, {[7:1:7]} -> |0*x+7|, {[8:1:8]} -> |0*x+8|, {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|>>
+  Vmap: <<{[2:1:2]} -> |0*x+1|, {[3:1:3]} -> |0*x+2|, {[4:1:4]} -> |0*x+3|, {[5:1:5]} -> |0*x+4|
+    , {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|, {[11:1:11]} -> |0*x+11|
+    , {[12:1:12]} -> |0*x+12|>>
+  map1: <<{[1:1:1]} -> |1*x+9|, {[2:1:2]} -> |1*x+8|, {[3:1:3]} -> |1*x+8|, {[4:1:4]} -> |1*x+6|
+    , {[5:1:5]} -> |1*x+4|, {[6:1:6]} -> |1*x+3|, {[7:1:7]} -> |1*x+2|, {[8:1:8]} -> |1*x+3|
+    , {[9:1:9]} -> |1*x+3|, {[10:1:10]} -> |1*x+2|>>
+  map2: <<{[1:1:1]} -> |1*x+3|, {[2:1:2]} -> |1*x+1|, {[3:1:3]} -> |1*x-1|, {[4:1:4]} -> |1*x+1|
+    , {[5:1:5]} -> |1*x+0|, {[6:1:6]} -> |1*x-2|, {[7:1:7]} -> |1*x-4|, {[8:1:8]} -> |1*x-5|
+    , {[9:1:9]} -> |1*x-5|, {[10:1:10]} -> |1*x-8|>>
+  Emap: <<{[1:1:1]} -> |0*x+1|, {[2:1:2]} -> |0*x+2|, {[3:1:3]} -> |0*x+3|, {[4:1:4]} -> |0*x+4|
+    , {[5:1:5]} -> |0*x+5|, {[6:1:6]} -> |0*x+6|, {[7:1:7]} -> |0*x+7|, {[8:1:8]} -> |0*x+8|
+    , {[9:1:9]} -> |0*x+9|, {[10:1:10]} -> |0*x+10|>>
   X: F
   Y: U
   , 1

test/matching4.test

@@ -48,27 +48,27 @@ F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3]};
 U = {[F3+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
 
 V: F \/ U
-Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
-  |, {[F3+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
-map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d
-  |, {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|>>
-map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b
-  |, {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|>>
-Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3
-  |, {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|>>
+Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3|
+  , {[F3+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
+map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|
+  , {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|>>
+map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|
+  , {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|>>
+Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|
+  , {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|>>
 X: F
 Y: U;
 
 match(
   V: F \/ U
-  Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
-    |, {[F3+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
-  map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d
-    |, {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|>>
-  map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b
-    |, {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|>>
-  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3
-    |, {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|>>
+  Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3|
+    , {[F3+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
+  map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|
+    , {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|>>
+  map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|
+    , {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|>>
+  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|
+    , {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|>>
   X: F
   Y: U
   , 1

test/matching5.test

@@ -92,55 +92,55 @@ F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5], [F5+1:1:F6]
 U = {[F9+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
 
 V: F \/ U
-Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
-  |, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5|, {[F5+1:1:F6]} -> |0*x+6
-  |, {[F6+1:1:F7]}-> |0*x+7|, {[F7+1:1:F8]} -> |0*x+8|, {[F8+1:1:F9]} -> |0*x+9
-  |, {[F9+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
-map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d
-  |, {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d
-  |, {[E6+1:1:E7]} -> |1*x+off7d|, {[E7+1:1:E8]} -> |1*x+off8d|, {[E8+1:1:E9]} -> |1*x+off9d
-  |, {[E9+1:1:E10]} -> |1*x+off10d|, {[E10+1:1:E11]} -> |1*x+off11d|, {[E11+1:1:E12]} -> |1*x+off12d
-  |, {[E12+1:1:E13]} -> |1*x+off13d|, {[E13+1:1:E14]} -> |1*x+off14d|, {[E14+1:1:E15]} -> |1*x+off15d
-  |, {[E15+1:1:E16]} -> |1*x+off16d|>>
-map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b
-  |, {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b
-  |, {[E6+1:1:E7]} -> |1*x+off7b|, {[E7+1:1:E8]} -> |1*x+off8b|, {[E8+1:1:E9]} -> |1*x+off9b
-  |, {[E9+1:1:E10]} -> |1*x+off10b|, {[E10+1:1:E11]} -> |1*x+off11b|, {[E11+1:1:E12]} -> |1*x+off12b
-  |, {[E12+1:1:E13]} -> |1*x+off13b|, {[E13+1:1:E14]} -> |1*x+off14b|, {[E14+1:1:E15]} -> |1*x+off15b
-  |, {[E15+1:1:E16]} -> |1*x+off16b|>>
-Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3], [E3+1:1:E4]} -> |0*x+3
-  |, {[E4+1:1:E5]} -> |0*x+4|, {[E5+1:1:E6]} -> |0*x+5
-  |, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
-  |, {[E9+1:1:E10]} -> |0*x+9|, {[E10+1:1:E11]} -> |0*x+10|, {[E11+1:1:E12]} -> |0*x+11
-  |, {[E12+1:1:E13], [E13+1:1:E14]} -> |0*x+12|, {[E14+1:1:E15]} -> |0*x+13
-  |, {[E15+1:1:E16]} -> |0*x+14|>>
+Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3|
+  , {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5|, {[F5+1:1:F6]} -> |0*x+6|
+  , {[F6+1:1:F7]}-> |0*x+7|, {[F7+1:1:F8]} -> |0*x+8|, {[F8+1:1:F9]} -> |0*x+9|
+  , {[F9+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
+map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|
+  , {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|
+  , {[E6+1:1:E7]} -> |1*x+off7d|, {[E7+1:1:E8]} -> |1*x+off8d|, {[E8+1:1:E9]} -> |1*x+off9d|
+  , {[E9+1:1:E10]} -> |1*x+off10d|, {[E10+1:1:E11]} -> |1*x+off11d|, {[E11+1:1:E12]} -> |1*x+off12d|
+  , {[E12+1:1:E13]} -> |1*x+off13d|, {[E13+1:1:E14]} -> |1*x+off14d|, {[E14+1:1:E15]} -> |1*x+off15d|
+  , {[E15+1:1:E16]} -> |1*x+off16d|>>
+map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|
+  , {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|
+  , {[E6+1:1:E7]} -> |1*x+off7b|, {[E7+1:1:E8]} -> |1*x+off8b|, {[E8+1:1:E9]} -> |1*x+off9b|
+  , {[E9+1:1:E10]} -> |1*x+off10b|, {[E10+1:1:E11]} -> |1*x+off11b|, {[E11+1:1:E12]} -> |1*x+off12b|
+  , {[E12+1:1:E13]} -> |1*x+off13b|, {[E13+1:1:E14]} -> |1*x+off14b|, {[E14+1:1:E15]} -> |1*x+off15b|
+  , {[E15+1:1:E16]} -> |1*x+off16b|>>
+Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|
+  , {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|
+  , {[E6+1:1:E7]} -> |0*x+7|, {[E7+1:1:E8]} -> |0*x+8|, {[E8+1:1:E9]} -> |0*x+9|
+  , {[E9+1:1:E10]} -> |0*x+10|, {[E10+1:1:E11]} -> |0*x+11|, {[E11+1:1:E12]} -> |0*x+12|
+  , {[E12+1:1:E13]} -> |0*x+13|, {[E13+1:1:E14]} -> |0*x+14|, {[E14+1:1:E15]} -> |0*x+15|
+  , {[E15+1:1:E16]} -> |0*x+16|>>
 X: F
 Y: U;
 
 match(
   V: F \/ U
-  Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
-    |, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5|, {[F5+1:1:F6]} -> |0*x+6
-    |, {[F6+1:1:F7]}-> |0*x+7|, {[F7+1:1:F8]} -> |0*x+8|, {[F8+1:1:F9]} -> |0*x+9
-    |, {[F9+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
-  map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d
-    |, {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d
-    |, {[E6+1:1:E7]} -> |1*x+off7d|, {[E7+1:1:E8]} -> |1*x+off8d|, {[E8+1:1:E9]} -> |1*x+off9d
-    |, {[E9+1:1:E10]} -> |1*x+off10d|, {[E10+1:1:E11]} -> |1*x+off11d|, {[E11+1:1:E12]} -> |1*x+off12d
-    |, {[E12+1:1:E13]} -> |1*x+off13d|, {[E13+1:1:E14]} -> |1*x+off14d|, {[E14+1:1:E15]} -> |1*x+off15d
-    |, {[E15+1:1:E16]} -> |1*x+off16d|>>
-  map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b
-    |, {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b
-    |, {[E6+1:1:E7]} -> |1*x+off7b|, {[E7+1:1:E8]} -> |1*x+off8b|, {[E8+1:1:E9]} -> |1*x+off9b
-    |, {[E9+1:1:E10]} -> |1*x+off10b|, {[E10+1:1:E11]} -> |1*x+off11b|, {[E11+1:1:E12]} -> |1*x+off12b
-    |, {[E12+1:1:E13]} -> |1*x+off13b|, {[E13+1:1:E14]} -> |1*x+off14b|, {[E14+1:1:E15]} -> |1*x+off15b
-    |, {[E15+1:1:E16]} -> |1*x+off16b|>>
-  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3], [E3+1:1:E4]} -> |0*x+3
-    |, {[E4+1:1:E5]} -> |0*x+4|, {[E5+1:1:E6]} -> |0*x+5
-    |, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
-    |, {[E9+1:1:E10]} -> |0*x+9|, {[E10+1:1:E11]} -> |0*x+10|, {[E11+1:1:E12]} -> |0*x+11
-    |, {[E12+1:1:E13], [E13+1:1:E14]} -> |0*x+12|, {[E14+1:1:E15]} -> |0*x+13
-    |, {[E15+1:1:E16]} -> |0*x+14|>>
+  Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3|
+    , {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5|, {[F5+1:1:F6]} -> |0*x+6|
+    , {[F6+1:1:F7]}-> |0*x+7|, {[F7+1:1:F8]} -> |0*x+8|, {[F8+1:1:F9]} -> |0*x+9|
+    , {[F9+1:1:U1]} -> |0*x+10|, {[U1+1:1:U2]} -> |0*x+11|, {[U2+1:1:U3]} -> |0*x+12|>>
+  map1: <<{[1:1:E1]} -> |1*x+off1d|, {[E1+1:1:E2]} -> |1*x+off2d|, {[E2+1:1:E3]} -> |1*x+off3d|
+    , {[E3+1:1:E4]} -> |1*x+off4d|, {[E4+1:1:E5]} -> |1*x+off5d|, {[E5+1:1:E6]} -> |1*x+off6d|
+    , {[E6+1:1:E7]} -> |1*x+off7d|, {[E7+1:1:E8]} -> |1*x+off8d|, {[E8+1:1:E9]} -> |1*x+off9d|
+    , {[E9+1:1:E10]} -> |1*x+off10d|, {[E10+1:1:E11]} -> |1*x+off11d|, {[E11+1:1:E12]} -> |1*x+off12d|
+    , {[E12+1:1:E13]} -> |1*x+off13d|, {[E13+1:1:E14]} -> |1*x+off14d|, {[E14+1:1:E15]} -> |1*x+off15d|
+    , {[E15+1:1:E16]} -> |1*x+off16d|>>
+  map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -> |1*x+off3b|
+    , {[E3+1:1:E4]} -> |1*x+off4b|, {[E4+1:1:E5]} -> |1*x+off5b|, {[E5+1:1:E6]} -> |1*x+off6b|
+    , {[E6+1:1:E7]} -> |1*x+off7b|, {[E7+1:1:E8]} -> |1*x+off8b|, {[E8+1:1:E9]} -> |1*x+off9b|
+    , {[E9+1:1:E10]} -> |1*x+off10b|, {[E10+1:1:E11]} -> |1*x+off11b|, {[E11+1:1:E12]} -> |1*x+off12b|
+    , {[E12+1:1:E13]} -> |1*x+off13b|, {[E13+1:1:E14]} -> |1*x+off14b|, {[E14+1:1:E15]} -> |1*x+off15b|
+    , {[E15+1:1:E16]} -> |1*x+off16b|>>
+  Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3|
+    , {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6|
+    , {[E6+1:1:E7]} -> |0*x+7|, {[E7+1:1:E8]} -> |0*x+8|, {[E8+1:1:E9]} -> |0*x+9|
+    , {[E9+1:1:E10]} -> |0*x+10|, {[E10+1:1:E11]} -> |0*x+11|, {[E11+1:1:E12]} -> |0*x+12|
+    , {[E12+1:1:E13]} -> |0*x+13|, {[E13+1:1:E14]} -> |0*x+14|, {[E14+1:1:E15]} -> |0*x+15|
+    , {[E15+1:1:E16]} -> |0*x+16|>>
   X: F
   Y: U
   , 1