Skip to content

Commit 6e937d3

Browse files
KalashnikovniKalashnikovni
committed
Adapted tests to bipartite SBGs
1 parent 779859c commit 6e937d3

50 files changed

Lines changed: 445 additions & 1338 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/Test1D_sbg_input.sbg‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎test/Test2D.test‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎test/TestRL1.test‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@ off11d = F5-E11;
7474
off12d = F6-E12;
7575
off13d = F6-E13;
7676

77-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
78-
, [F5+1:1:F6], [F6+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
77+
F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
78+
, [F5+1:1:F6]};
79+
U = {[F6+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
80+
81+
V: F \/ U
7982
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
8083
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
8184
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -93,11 +96,12 @@ Emap: <<{[1:1:E1]} -> |0*x+1|, {[E1+1:1:E2]} -> |0*x+2|, {[E2+1:1:E3]} -> |0*x+3
9396
|, {[E3+1:1:E4]} -> |0*x+4|, {[E4+1:1:E5]} -> |0*x+5|, {[E5+1:1:E6]} -> |0*x+6
9497
|, {[E6+1:1:E7]} -> |0*x+7|, {[E7+1:1:E8]} -> |0*x+8|, {[E8+1:1:E9]} -> |0*x+9
9598
|, {[E9+1:1:E10]} -> |0*x+10|, {[E10+1:1:E11]} -> |0*x+11|, {[E11+1:1:E12]} -> |0*x+12
96-
|, {[E12+1:1:E13]} -> |0*x+13|>>;
99+
|, {[E12+1:1:E13]} -> |0*x+13|>>
100+
X: F
101+
Y: U;
97102

98103
matchSCC(
99-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
100-
, [F5+1:1:F6], [F6+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
104+
V: F \/ U
101105
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
102106
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
103107
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -116,5 +120,7 @@ matchSCC(
116120
|, {[E6+1:1:E7]} -> |0*x+7|, {[E7+1:1:E8]} -> |0*x+8|, {[E8+1:1:E9]} -> |0*x+9
117121
|, {[E9+1:1:E10]} -> |0*x+10|, {[E10+1:1:E11]} -> |0*x+11|, {[E11+1:1:E12]} -> |0*x+12
118122
|, {[E12+1:1:E13]} -> |0*x+13|>>
123+
X: F
124+
Y: U
119125
, 1
120126
);

‎test/TestRL2.test‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ off8b = U2 - E8;
6565
off9b = U2 - E9 - N + 1;
6666
off10b = U3 - E10 - N + 1;
6767

68-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
69-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
68+
F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]};
69+
U = {[F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
70+
71+
V: F \/ U
7072
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
7173
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
7274
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -81,11 +83,12 @@ map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -
8183
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
8284
|, {[E4+1:1:E5]} -> |0*x+4
8385
|, {[E5+1:1:E6], [E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
84-
|, {[E9+1:1:E10]} -> |0*x+9|>>;
86+
|, {[E9+1:1:E10]} -> |0*x+9|>>
87+
X: F
88+
Y: U;
8589

8690
matchSCC(
87-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
88-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
91+
V: F \/ U
8992
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
9093
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
9194
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -101,5 +104,7 @@ matchSCC(
101104
|, {[E4+1:1:E5]} -> |0*x+4
102105
|, {[E5+1:1:E6], [E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
103106
|, {[E9+1:1:E10]} -> |0*x+9|>>
107+
X: F
108+
Y: U
104109
, 1
105110
);

‎test/TestRL3.test‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ off9b = U3-E9-N+1;
6969
off10b = U2-E10;
7070
off11b = U3-E11;
7171

72-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
73-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
72+
F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]};
73+
U = {[F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
74+
75+
V: F \/ U
7476
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
7577
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
7678
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -85,11 +87,12 @@ map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -
8587
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
8688
|, {[E4+1:1:E5], [E5+1:1:E6]} -> |0*x+4
8789
|, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
88-
|, {[E9+1:1:E10]} -> |0*x+9|, {[E10+1:1:E11]} -> |0*x+10|>>;
90+
|, {[E9+1:1:E10]} -> |0*x+9|, {[E10+1:1:E11]} -> |0*x+10|>>
91+
X: F
92+
Y: U;
8993

9094
matchSCC(
91-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
92-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
95+
V: F \/ U
9396
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
9497
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
9598
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -105,5 +108,7 @@ matchSCC(
105108
|, {[E4+1:1:E5], [E5+1:1:E6]} -> |0*x+4
106109
|, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
107110
|, {[E9+1:1:E10]} -> |0*x+9|, {[E10+1:1:E11]} -> |0*x+10|>>
111+
X: F
112+
Y: U
108113
, 1
109114
);

‎test/TestRL4.test‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ off8b = U2-E8-N+1;
6565
off9b = U2-E9;
6666
off10b = U3-E10;
6767

68-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
69-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
68+
F = {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]};
69+
U = {[F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]};
70+
71+
V: F \/ U
7072
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
7173
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
7274
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -81,11 +83,12 @@ map2: <<{[1:1:E1]} -> |1*x+off1b|, {[E1+1:1:E2]} -> |1*x+off2b|, {[E2+1:1:E3]} -
8183
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
8284
|, {[E4+1:1:E5], [E5+1:1:E6]} -> |0*x+4
8385
|, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
84-
|, {[E9+1:1:E10]} -> |0*x+9|>>;
86+
|, {[E9+1:1:E10]} -> |0*x+9|>>
87+
X: F
88+
Y: U;
8589

86-
matchSCCTS(
87-
V: {[1:1:F1], [F1+1:1:F2], [F2+1:1:F3], [F3+1:1:F4], [F4+1:1:F5]
88-
, [F5+1:1:U1], [U1+1:1:U2], [U2+1:1:U3]}
90+
matchSCC(
91+
V: F \/ U
8992
Vmap: <<{[1:1:F1]} -> |0*x+1|, {[F1+1:1:F2]} -> |0*x+2|, {[F2+1:1:F3]} -> |0*x+3
9093
|, {[F3+1:1:F4]} -> |0*x+4|, {[F4+1:1:F5]} -> |0*x+5
9194
|, {[F5+1:1:U1]} -> |0*x+6|, {[U1+1:1:U2]} -> |0*x+7|, {[U2+1:1:U3]} -> |0*x+8|>>
@@ -101,5 +104,7 @@ matchSCCTS(
101104
|, {[E4+1:1:E5], [E5+1:1:E6]} -> |0*x+4
102105
|, {[E6+1:1:E7]} -> |0*x+6|, {[E7+1:1:E8]} -> |0*x+7|, {[E8+1:1:E9]} -> |0*x+8
103106
|, {[E9+1:1:E10]} -> |0*x+9|>>
107+
X: F
108+
Y: U
104109
, 1
105110
);

‎test/advection.test‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)