Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print new top level expressions to human-readable rule trace #568

Merged
merged 4 commits into from
Jan 8, 2025
+316 −60
Merged

Print new top level expressions to human-readable rule trace #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef55e72
fix(rewrite_naive): remove duplicate log print for rule application
niklasdewally Jan 4, 2025
929108a
rewriter: log new top level constraints and symbol table changes to r…
niklasdewally Jan 6, 2025
e91f886
fiddle with the output strings slightly
ozgurakgun Jan 8, 2025
52790fd
remove unused import
ozgurakgun Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/div/04/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ Not((c != 0)),
(a != SafeDiv(b, c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..3)
new constraints:
__0 =aux SafeDiv(b, c)
--

__0 =aux SafeDiv(b, c),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/div/05/div-05-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ And([(c != 0)]),
(a != SafeDiv(b, c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..3)
new constraints:
__0 =aux SafeDiv(b, c)
--

__0 =aux SafeDiv(b, c),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/div/06/div-06-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ Not((c != 0)),
(a != SafeDiv(b, c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..3)
new constraints:
__0 =aux SafeDiv(b, c)
--

__0 =aux SafeDiv(b, c),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/max/02/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Max([2, a]),
~~> max_to_var ([("Base", 100)])
__0

new variables:
__0: int(2..3)
new constraints:
(__0 >= 2)
(__0 >= a)
Or([(__0 = 2), (__0 = a)])
--

(__0 <= 2),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/min/01/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__0

new variables:
__0: int(1..3)
new constraints:
(__0 <= a)
(__0 <= b)
Or([(__0 = a), (__0 = b)])
--

(__0 >= 3),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/min/02/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__0

new variables:
__0: int(1..3)
new constraints:
(__0 <= a)
(__0 <= b)
Or([(__0 = a), (__0 = b)])
--

(__0 <= 2),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/min/03/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__0

new variables:
__0: int(1..3)
new constraints:
(__0 <= a)
(__0 <= b)
Or([(__0 = a), (__0 = b)])
--

(__0 <= 2),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/min/04/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__0

new variables:
__0: int(1..2)
new constraints:
(__0 <= a)
(__0 <= b)
Or([(__0 = a), (__0 = b)])
--

(__0 >= 3),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/min/05/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__0

new variables:
__0: int(1..4)
new constraints:
(__0 <= a)
(__0 <= b)
Or([(__0 = a), (__0 = b)])
--

(__0 <= 2),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/mod/04/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ Not((c != 0)),
(a != SafeMod(b,c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..2)
new constraints:
__0 =aux SafeMod(b,c)
--

__0 =aux SafeMod(b,c),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/mod/05/mod-05-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ And([(c != 0)]),
(a != SafeMod(b,c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..2)
new constraints:
__0 =aux SafeMod(b,c)
--

__0 =aux SafeMod(b,c),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/mod/06/mod-06-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ Not((c != 0)),
(a != SafeMod(b,c)),
~~> flatten_binop ([("Minion", 4400)])
(a != __0)

new variables:
__0: int(0..2)
new constraints:
__0 =aux SafeMod(b,c)
--

__0 =aux SafeMod(b,c),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/neg/02-nested-neg/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ And([(z != 0)]),
SafeDiv(-(y), z),
~~> flatten_binop ([("Minion", 4400)])
SafeDiv(__0, z)

new variables:
__0: int(-1..1)
new constraints:
__0 =aux -(y)
--

__0 =aux -(y),
Expand Down
5 changes: 4 additions & 1 deletion ...ide/tests/integration/basic/neg/03-negated-expression/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ And([(z != 0)]),
(x = -(SafeDiv(y, z))),
~~> flatten_minuseq ([("Minion", 4400)])
MinusEq(x,__0)

new variables:
__0: int(-1..1)
new constraints:
__0 =aux SafeDiv(y, z)
--

__0 =aux SafeDiv(y, z),
Expand Down
10 changes: 8 additions & 2 deletions ...ts/integration/basic/neg/04-negated-expression-nested/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,19 @@ And([(x = SafeDiv(-(SafeDiv(y, z)), z)), (z != 0), (z != 0)])
SafeDiv(-(SafeDiv(y, z)), z),
~~> flatten_binop ([("Minion", 4400)])
SafeDiv(__0, z)

new variables:
__0: int(-1..1)
new constraints:
__0 =aux -(SafeDiv(y, z))
--

__0 =aux -(SafeDiv(y, z)),
~~> flatten_minuseq ([("Minion", 4400)])
MinusEq(__0,__1)

new variables:
__1: int(-1..1)
new constraints:
__1 =aux SafeDiv(y, z)
--

(x = SafeDiv(__0, z)),
Expand Down
5 changes: 4 additions & 1 deletion conjure_oxide/tests/integration/basic/neg/05-sum/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Sum([-(y), z]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, z])

new variables:
__0: int(-1..1)
new constraints:
__0 =aux -(y)
--

__0 =aux -(y),
Expand Down
7 changes: 6 additions & 1 deletion conjure_oxide/tests/integration/basic/neg/06-sum-nested/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ a
Sum([-(y), -(z), -1, a, b]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, __1, -1, a, b])

new variables:
__0: int(-1..1)
__1: int(-1..1)
new constraints:
__0 =aux -(y)
__1 =aux -(z)
--

__0 =aux -(y),
Expand Down
5 changes: 4 additions & 1 deletion ...ide/tests/integration/basic/sum/02-sum-put-in-aux-var/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ And([(a != 0)]),
SafeDiv(Sum([x, y, z]), a),
~~> flatten_binop ([("Minion", 4400)])
SafeDiv(__0, a)

new variables:
__0: int(6..14)
new constraints:
__0 =aux Sum([x, y, z])
--

(SafeDiv(__0, a) = 3),
Expand Down
7 changes: 6 additions & 1 deletion ..._oxide/tests/integration/basic/weighted-sum/01-simple/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Sum([Product([2, x]), Product([3, y])]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, __1])

new variables:
__0: int(4..8)
__1: int(6..12)
new constraints:
__0 =aux Product([2, x])
__1 =aux Product([3, y])
--

18 changes: 16 additions & 2 deletions ...s/integration/basic/weighted-sum/02-needs-normalising/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ Product([-5, y])
Sum([Product([5, x]), Product([9, y]), -(Product([3, x])), Product([-1, y]), Product([-5, y])]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, __1, __2, __3, __4])

new variables:
__0: int(10..25)
__1: int(18..45)
__2: int(-15..-6)
__3: int(-5..-2)
__4: int(-25..-10)
new constraints:
__0 =aux Product([5, x])
__1 =aux Product([9, y])
__2 =aux -(Product([3, x]))
__3 =aux Product([-1, y])
__4 =aux Product([-5, y])
--

__2 =aux -(Product([3, x])),
~~> flatten_minuseq ([("Minion", 4400)])
MinusEq(__2,__5)

new variables:
__5: int(6..15)
new constraints:
__5 =aux Product([3, x])
--

12 changes: 10 additions & 2 deletions ...xide/tests/integration/bugs/sm600-non-terminating-min/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Sum([Min([a, b]), 6]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, 6])

new variables:
__0: int(1..7)
new constraints:
__0 =aux Min([a, b])
--

(Sum([__0, 6]) <= 10),
Expand All @@ -13,7 +16,12 @@ SumLeq([__0, 6], 10)
Min([a, b]),
~~> min_to_var ([("Base", 2000)])
__1

new variables:
__1: int(1..7)
new constraints:
(__1 <= a)
(__1 <= b)
Or([(__1 = a), (__1 = b)])
--

(__1 <= a),
Expand Down
19 changes: 16 additions & 3 deletions conjure_oxide/tests/integration/experiment/works/max2/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Sum([Max([a, b]), 1]),
~~> flatten_vecop ([("Minion", 4400)])
Sum([__0, 1])

new variables:
__0: int(1..4)
new constraints:
__0 =aux Max([a, b])
--

(x = Sum([__0, 1])),
Expand All @@ -19,7 +22,12 @@ And([SumLeq([__0, 1], x), SumGeq([__0, 1], x)])
Max([a, b]),
~~> max_to_var ([("Base", 100)])
__1

new variables:
__1: int(1..4)
new constraints:
(__1 >= a)
(__1 >= b)
Or([(__1 = a), (__1 = b)])
--

(__1 >= 2),
Expand All @@ -43,7 +51,12 @@ Ineq(b, __1, 0)
Max([a, b]),
~~> max_to_var ([("Base", 100)])
__2

new variables:
__2: int(1..4)
new constraints:
(__2 >= a)
(__2 >= b)
Or([(__2 = a), (__2 = b)])
--

(__2 >= a),
Expand Down
10 changes: 8 additions & 2 deletions ...ntegration/minion_constraints/div_undefzero-03-nested/input-expected-rule-trace-human.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,19 @@ And([(SafeDiv(x, SafeDiv(y, z)) = 10), (SafeDiv(y, z) != 0), (z != 0)])
SafeDiv(x, SafeDiv(y, z)),
~~> flatten_binop ([("Minion", 4400)])
SafeDiv(x, __0)

new variables:
__0: int(0..5)
new constraints:
__0 =aux SafeDiv(y, z)
--

(SafeDiv(y, z) != 0),
~~> flatten_binop ([("Minion", 4400)])
(__1 != 0)

new variables:
__1: int(0..5)
new constraints:
__1 =aux SafeDiv(y, z)
--

(SafeDiv(x, __0) = 10),
Expand Down
Loading
Loading