Skip to content

Commit d3679cd

Browse files
reb-ddmreb-ddm
committed
update regression tests to new printing
1 parent 4c9983a commit d3679cd

File tree

9 files changed

+187
-175
lines changed

9 files changed

+187
-175
lines changed

‎tests/integration/boolean_parameters/agents_domain/output/LOG.ref‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ Id=21
398398
Leaf False
399399

400400
EXTENSIONAL DESCRIPTION:
401-
A(x{u}) => P1.and.P2
402-
B(x{u}) => P1.or.P2
401+
A(x) => A(x{u})[ only if P1.and.P2 ]
402+
B(x) => B(x{u})[ only if P1.or.P2 ]
403403

404404
------------------------------------------------------------
405405
* Relational properties:
@@ -677,6 +677,8 @@ EXTENSIONAL DESCRIPTION:
677677
------------------------------------------------------------
678678
* Export Views domain - non relational properties to JSon (internal constraints_list):
679679
------------------------------------------------------------
680+
A(x)=> [A(x{u})[ only if P1.and.P2 ]]
681+
B(x)=> [B(x{u})[ only if P1.or.P2 ]]
680682

681683
------------------------------------------------------------
682684
* Export Views domain - relational properties to JSon (internal constraints_list):
@@ -694,12 +696,6 @@ EXTENSIONAL DESCRIPTION:
694696
* Export Counters to JSon (internal constraints_list):
695697
------------------------------------------------------------
696698

697-
------------------------------------------------------------
698-
* Export Views domain - non relational properties to JSon (internal formula_constraints_list):
699-
------------------------------------------------------------
700-
A(x{u}) => P1.and.P2
701-
B(x{u}) => P1.or.P2
702-
703699
execution finished without any exception
704700
Parsing example_agents_params.ka...
705701
done

‎tests/integration/boolean_parameters/conflict/output/LOG.ref‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,37 @@ A can occur in the model if P.
2424
------------------------------------------------------------
2525
* Non relational properties:
2626
------------------------------------------------------------
27-
A(x[x.A]) => P.and.x.and.y
28-
A(x[.]) => P
29-
A(y[y.A]) => (B.or.C).and.P
30-
A(y[.]) => P
31-
A(x{p}) => P
32-
A(x{u}) => P
27+
A(x) => [ A(x[.])[ only if P ] v A(x[x.A])[ only if P.and.x.and.y ] ]
28+
A(x) => [ A(x{u})[ only if P ] v A(x{p})[ only if P ] ]
29+
A(y) => [ A(y[.])[ only if P ] v A(y[y.A])[ only if (B.or.C).and.P ] ]
3330

3431
------------------------------------------------------------
3532
* Relational properties:
3633
------------------------------------------------------------
37-
A(x[x.A],y[.]) => P.and.x.and.y
38-
A(x[x.A],y[y.A]) => (B.or.C).and.P.and.(~@co-A-x-y).and.x.and.y
39-
A(x[.],y[.]) => P
40-
A(x[.],y[y.A]) => (B.or.C).and.P
34+
A() =>
35+
[
36+
A(x[x.A],y[.])[ only if P.and.x.and.y ]
37+
v A(x[x.A],y[y.A])[ only if (B.or.C).and.P.and.(~@co-A-x-y).and.x.and.y ]
38+
v A(x[.],y[.])[ only if P ]
39+
v A(x[.],y[y.A])[ only if (B.or.C).and.P ]
40+
]
4141
------------------------------------------------------------
4242
* Properties in connected agents
4343
------------------------------------------------------------
44-
45-
A(x[1],y[y.A]),A(x[1],y[.]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
46-
A(x[1],y[y.A]),A(x[1],y[y.A]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
47-
A(x[1],y[.]),A(x[1],y[.]) => P.and.x.and.y
48-
A(x[1],y[.]),A(x[1],y[y.A]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
49-
50-
A(x[x.A],y[1]),A(x[.],y[1]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
51-
A(x[x.A],y[1]),A(x[x.A],y[1]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
52-
A(x[.],y[1]),A(x[.],y[1]) => (B.or.C).and.P
53-
A(x[.],y[1]),A(x[x.A],y[1]) => (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y)
44+
A(x[1]),A(x[1]) =>
45+
[
46+
A(x[1],y[y.A]),A(x[1],y[.])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
47+
v A(x[1],y[y.A]),A(x[1],y[y.A])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
48+
v A(x[1],y[.]),A(x[1],y[.])[ only if P.and.x.and.y ]
49+
v A(x[1],y[.]),A(x[1],y[y.A])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
50+
]
51+
A(y[1]),A(y[1]) =>
52+
[
53+
A(x[x.A],y[1]),A(x[.],y[1])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
54+
v A(x[x.A],y[1]),A(x[x.A],y[1])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
55+
v A(x[.],y[1]),A(x[.],y[1])[ only if (B.or.C).and.P ]
56+
v A(x[.],y[1]),A(x[x.A],y[1])[ only if (x.or.B.or.C).and.((~x).or.y.or.B.or.C).and.P.and.(~@co-A-x-y) ]
57+
]
5458
------------------------------------------------------------
5559
* Properties of pairs of bonds
5660
------------------------------------------------------------

‎tests/integration/boolean_parameters/initial_state/output/LOG.ref‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,14 +1867,10 @@ Id=150
18671867
Leaf False
18681868

18691869
EXTENSIONAL DESCRIPTION:
1870-
A(x[x.C]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
1871-
A(x[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
1872-
A(y[y.B]) => test1.and.test2
1873-
A(y[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
1874-
B(y[y.A]) => test1.and.test2
1875-
B(y[.]) => test1.and.test2
1876-
C(x[x.A]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
1877-
C(x[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
1870+
A(x) => [ A(x[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ] v A(x[x.C])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ] ]
1871+
A(y) => [ A(y[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ] v A(y[y.B])[ only if test1.and.test2 ] ]
1872+
B(y) => [ B(y[.])[ only if test1.and.test2 ] v B(y[y.A])[ only if test1.and.test2 ] ]
1873+
C(x) => [ C(x[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ] v C(x[x.A])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ] ]
18781874

18791875
------------------------------------------------------------
18801876
* Relational properties:
@@ -2905,6 +2901,18 @@ EXTENSIONAL DESCRIPTION:
29052901
------------------------------------------------------------
29062902
* Export Views domain - non relational properties to JSon (internal constraints_list):
29072903
------------------------------------------------------------
2904+
A(x)=> [
2905+
A(x[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ]
2906+
v A(x[x.C])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ]]
2907+
A(y)=> [
2908+
A(y[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ]
2909+
v A(y[y.B])[ only if test1.and.test2 ]]
2910+
B(y)=> [
2911+
B(y[.])[ only if test1.and.test2 ]
2912+
v B(y[y.A])[ only if test1.and.test2 ]]
2913+
C(x)=> [
2914+
C(x[.])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ]
2915+
v C(x[x.A])[ only if (test1.or.test3).and.((~test1).or.test2.or.test3) ]]
29082916

29092917
------------------------------------------------------------
29102918
* Export Views domain - relational properties to JSon (internal constraints_list):
@@ -2922,18 +2930,6 @@ EXTENSIONAL DESCRIPTION:
29222930
* Export Counters to JSon (internal constraints_list):
29232931
------------------------------------------------------------
29242932

2925-
------------------------------------------------------------
2926-
* Export Views domain - non relational properties to JSon (internal formula_constraints_list):
2927-
------------------------------------------------------------
2928-
A(x[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
2929-
A(x[x.C]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
2930-
A(y[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
2931-
A(y[y.B]) => test1.and.test2
2932-
B(y[.]) => test1.and.test2
2933-
B(y[y.A]) => test1.and.test2
2934-
C(x[.]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
2935-
C(x[x.A]) => (test1.or.test3).and.((~test1).or.test2.or.test3)
2936-
29372933
execution finished without any exception
29382934
Parsing example_initial_state.ka...
29392935
done

‎tests/integration/boolean_parameters/parallel_bond/output/LOG.ref‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,16 +1197,14 @@ A(y)=> [
11971197
------------------------------------------------------------
11981198
* Export Parallel bonds to JSon (internal constraints_list):
11991199
------------------------------------------------------------
1200+
A(x[x.A],y[y.A])=> [
1201+
A(x[2],y[1]),A(x[2],y[1])
1202+
v A(x[2],y[1]),A(y[1]),A(x[2])[ only if ~P ]]
12001203

12011204
------------------------------------------------------------
12021205
* Export Counters to JSon (internal constraints_list):
12031206
------------------------------------------------------------
12041207

1205-
------------------------------------------------------------
1206-
* Export Parallel bonds to JSon (internal formula_constraints_list):
1207-
------------------------------------------------------------
1208-
A(x[2],y[1]),A(y[1]),A(x[2]) => ~P
1209-
12101208
execution finished without any exception
12111209
Parsing example_double_bonds.ka...
12121210
done

‎tests/integration/boolean_parameters/parallel_bond2/output/LOG.ref‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,21 +1814,30 @@ Id=253
18141814
Leaf False
18151815

18161816
EXTENSIONAL DESCRIPTION:
1817-
A(x[.],y[y.A])
1818-
A(x[x.A],y[y.A]) => P.or.Q.or.R
1819-
A(x[.],y[.])
1820-
A(x[x.A],y[.])
1817+
A() =>
1818+
[
1819+
A(x[.],y[y.A])
1820+
v A(x[x.A],y[y.A])[ only if P.or.Q.or.R ]
1821+
v A(x[.],y[.])
1822+
v A(x[x.A],y[.])
1823+
]
18211824
------------------------------------------------------------
18221825
* Properties in connected agents
18231826
------------------------------------------------------------
1824-
1825-
A(x[x.A],y[1]),A(x[.],y[1]) => Q.or.R
1826-
A(x[x.A],y[1]),A(x[x.A],y[1]) => P.or.Q.or.R
1827-
A(x[.],y[1]),A(x[x.A],y[1]) => Q.or.R
1828-
1829-
A(x[1],y[y.A]),A(x[1],y[.]) => Q.or.R
1830-
A(x[1],y[y.A]),A(x[1],y[y.A]) => P.or.Q.or.R
1831-
A(x[1],y[.]),A(x[1],y[y.A]) => Q.or.R
1827+
A(y[1]),A(y[1]) =>
1828+
[
1829+
A(x[x.A],y[1]),A(x[.],y[1])[ only if Q.or.R ]
1830+
v A(x[x.A],y[1]),A(x[x.A],y[1])[ only if P.or.Q.or.R ]
1831+
v A(x[.],y[1]),A(x[.],y[1])
1832+
v A(x[.],y[1]),A(x[x.A],y[1])[ only if Q.or.R ]
1833+
]
1834+
A(x[1]),A(x[1]) =>
1835+
[
1836+
A(x[1],y[y.A]),A(x[1],y[.])[ only if Q.or.R ]
1837+
v A(x[1],y[y.A]),A(x[1],y[y.A])[ only if P.or.Q.or.R ]
1838+
v A(x[1],y[.]),A(x[1],y[.])
1839+
v A(x[1],y[.]),A(x[1],y[y.A])[ only if Q.or.R ]
1840+
]
18321841
------------------------------------------------------------
18331842
* Properties of pairs of bonds
18341843
------------------------------------------------------------
@@ -2117,37 +2126,35 @@ A(y)=> [
21172126
------------------------------------------------------------
21182127
* Export Views domain - relational properties to JSon (internal constraints_list):
21192128
------------------------------------------------------------
2129+
A()=> [
2130+
A(x[.],y[y.A])
2131+
v A(x[x.A],y[y.A])[ only if P.or.Q.or.R ]
2132+
v A(x[.],y[.])
2133+
v A(x[x.A],y[.])]
21202134

21212135
------------------------------------------------------------
21222136
* Export Connected agents to JSon (internal constraints_list):
21232137
------------------------------------------------------------
2138+
A(y[1]),A(y[1])=> [
2139+
A(x[x.A],y[1]),A(x[.],y[1])[ only if Q.or.R ]
2140+
v A(x[x.A],y[1]),A(x[x.A],y[1])[ only if P.or.Q.or.R ]
2141+
v A(x[.],y[1]),A(x[.],y[1])
2142+
v A(x[.],y[1]),A(x[x.A],y[1])[ only if Q.or.R ]]
2143+
A(x[1]),A(x[1])=> [
2144+
A(x[1],y[y.A]),A(x[1],y[.])[ only if Q.or.R ]
2145+
v A(x[1],y[y.A]),A(x[1],y[y.A])[ only if P.or.Q.or.R ]
2146+
v A(x[1],y[.]),A(x[1],y[.])
2147+
v A(x[1],y[.]),A(x[1],y[y.A])[ only if Q.or.R ]]
21242148

21252149
------------------------------------------------------------
21262150
* Export Parallel bonds to JSon (internal constraints_list):
21272151
------------------------------------------------------------
2152+
A(x[x.A],y[y.A])=> [
2153+
A(x[2],y[1]),A(x[2],y[1])[ only if P.or.R ]
2154+
v A(x[2],y[1]),A(y[1]),A(x[2])[ only if Q.or.R ]]
21282155

21292156
------------------------------------------------------------
21302157
* Export Counters to JSon (internal constraints_list):
21312158
------------------------------------------------------------
21322159

2133-
------------------------------------------------------------
2134-
* Export Parallel bonds to JSon (internal formula_constraints_list):
2135-
------------------------------------------------------------
2136-
A(x[2],y[1]),A(x[2],y[1]) => P.or.R
2137-
2138-
------------------------------------------------------------
2139-
* Export Connected agents to JSon (internal formula_constraints_list):
2140-
------------------------------------------------------------
2141-
A(x[x.A],y[1]),A(x[.],y[1]) => Q.or.R
2142-
A(x[x.A],y[1]),A(x[x.A],y[1]) => P.or.Q.or.R
2143-
A(x[.],y[1]),A(x[x.A],y[1]) => Q.or.R
2144-
A(x[1],y[y.A]),A(x[1],y[.]) => Q.or.R
2145-
A(x[1],y[y.A]),A(x[1],y[y.A]) => P.or.Q.or.R
2146-
A(x[1],y[.]),A(x[1],y[y.A]) => Q.or.R
2147-
2148-
------------------------------------------------------------
2149-
* Export Views domain - relational properties to JSon (internal formula_constraints_list):
2150-
------------------------------------------------------------
2151-
A(x[x.A],y[y.A]) => P.or.Q.or.R
2152-
21532160
execution finished without any exception

‎tests/integration/boolean_parameters/sequential_bond/output/LOG.ref‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,23 @@ A(y) => [ A(y[.]) v A(y[y.A]) ]
2424
------------------------------------------------------------
2525
* Relational properties:
2626
------------------------------------------------------------
27-
A(x[x.A],y[.])
28-
A(x[x.A],y[y.A])
29-
A(x[.],y[.])
30-
A(x[.],y[y.A]) => ~@sq-A-x-y
27+
A() =>
28+
[
29+
A(x[x.A],y[.])
30+
v A(x[x.A],y[y.A])
31+
v A(x[.],y[.])
32+
v A(x[.],y[y.A])[ only if ~@sq-A-x-y ]
33+
]
3134
------------------------------------------------------------
3235
* Properties in connected agents
3336
------------------------------------------------------------
34-
35-
A(x[.],y[1]),A(x[.],y[1]) => ~@sq-A-x-y
37+
A(y[1]),A(y[1]) =>
38+
[
39+
A(x[x.A],y[1]),A(x[.],y[1])
40+
v A(x[x.A],y[1]),A(x[x.A],y[1])
41+
v A(x[.],y[1]),A(x[.],y[1])[ only if ~@sq-A-x-y ]
42+
v A(x[.],y[1]),A(x[x.A],y[1])
43+
]
3644
------------------------------------------------------------
3745
* Properties of pairs of bonds
3846
------------------------------------------------------------

0 commit comments

Comments
 (0)