Skip to content

Commit bb6a970

Browse files
committed
chore: fix tests
1 parent 90e6f97 commit bb6a970

17 files changed

+137
-137
lines changed

tests/lean/run/grind_canon_bug_2.lean

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ set_option warn.sorry false
44

55
-- The following trace should contain only one `m[k]` and `(m.insert 1 3)[k]`
66
/--
7-
trace: [grind.cutsat.model] k := 101
8-
[grind.cutsat.model] (ExtHashMap.filter (fun k x => decide (101 ≤ k)) (m.insert 1 3))[k] := 4
9-
[grind.cutsat.model] (m.insert 1 2)[k] := 4
10-
[grind.cutsat.model] (m.insert 1 3)[k] := 4
11-
[grind.cutsat.model] m[k] := 4
12-
[grind.cutsat.model] (m.insert 1 2).getKey k ⋯ := 101
13-
[grind.cutsat.model] m.getKey k ⋯ := 101
7+
trace: [grind.lia.model] k := 101
8+
[grind.lia.model] (ExtHashMap.filter (fun k x => decide (101 ≤ k)) (m.insert 1 3))[k] := 4
9+
[grind.lia.model] (m.insert 1 2)[k] := 4
10+
[grind.lia.model] (m.insert 1 3)[k] := 4
11+
[grind.lia.model] m[k] := 4
12+
[grind.lia.model] (m.insert 1 2).getKey k ⋯ := 101
13+
[grind.lia.model] m.getKey k ⋯ := 101
1414
-/
1515
#guard_msgs in
1616
example (m : ExtHashMap Nat Nat) :
1717
(m.insert 1 2).filter (fun k _ => k > 1000) = (m.insert 1 3).filter fun k _ => k > 100 := by
1818
ext1 k
19-
set_option trace.grind.cutsat.model true in
19+
set_option trace.grind.lia.model true in
2020
fail_if_success grind (splits := 4)
2121
sorry

tests/lean/run/grind_cutsat_auto.lean

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ abbrev problem (x y z w v : Int) : Prop :=
2929
(y ≥ -10)
3030

3131
/--
32-
trace: [grind.cutsat.model] x := 121
33-
[grind.cutsat.model] y := -10
34-
[grind.cutsat.model] z := -34
35-
[grind.cutsat.model] w := 0
36-
[grind.cutsat.model] v := 1
32+
trace: [grind.lia.model] x := 121
33+
[grind.lia.model] y := -10
34+
[grind.lia.model] z := -34
35+
[grind.lia.model] w := 0
36+
[grind.lia.model] v := 1
3737
-/
3838
#guard_msgs (trace) in
39-
set_option trace.grind.cutsat.model true in
39+
set_option trace.grind.lia.model true in
4040
example (x y z w v : Int) : problem x y z w v → False := by
4141
fail_if_success grind
4242
sorry

tests/lean/run/grind_cutsat_cooper.lean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ abbrev problem₁ [∀ n, OfNat α n] [Neg α] [Mul α] [Sub α] [Add α] [LE α
1818
7*x - 9*y ≤ 4
1919

2020
/--
21-
trace: [grind.cutsat.model] x := 241/154
22-
[grind.cutsat.model] y := 1
21+
trace: [grind.lia.model] x := 241/154
22+
[grind.lia.model] y := 1
2323
-/
2424
#guard_msgs (trace) in
25-
set_option trace.grind.cutsat.model true in
25+
set_option trace.grind.lia.model true in
2626
example (x y : Int) : problem₁ x y → False := by
2727
fail_if_success grind +qlia -- Rational counterexamples allowed
2828
sorry

tests/lean/run/grind_cutsat_diseq_1.lean

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module
22
set_option grind.debug true
33
open Int.Linear
44

5-
set_option trace.grind.cutsat.assert true
5+
set_option trace.grind.lia.assert true
66

77
/--
8-
trace: [grind.cutsat.assert] a + b + 1 ≤ 0
9-
[grind.cutsat.assert] a + -1*b ≠ 0
8+
trace: [grind.lia.assert] a + b + 1 ≤ 0
9+
[grind.lia.assert] a + -1*b ≠ 0
1010
-/
1111
#guard_msgs (trace) in
1212
example (a b : Int) : a + b < 0 → a ≠ b → False := by
@@ -17,62 +17,62 @@ example (a b : Int) : a ≠ b → False := by
1717
(fail_if_success grind); sorry
1818

1919
/--
20-
trace: [grind.cutsat.assert] a + -1*b ≠ 0
21-
[grind.cutsat.assert] a + b + 1 ≤ 0
20+
trace: [grind.lia.assert] a + -1*b ≠ 0
21+
[grind.lia.assert] a + b + 1 ≤ 0
2222
-/
2323
#guard_msgs (trace) in
2424
example (a b : Int) : a ≠ b → a + b < 0 → False := by
2525
(fail_if_success grind); sorry
2626

2727
/--
28-
trace: [grind.cutsat.assert] a + -1*b ≠ 0
29-
[grind.cutsat.assert] a + b + 1 ≤ 0
28+
trace: [grind.lia.assert] a + -1*b ≠ 0
29+
[grind.lia.assert] a + b + 1 ≤ 0
3030
-/
3131
#guard_msgs (trace) in
3232
example (a b c : Int) : a ≠ c → c = b → a + b < 0 → False := by
3333
(fail_if_success grind); sorry
3434

3535
/--
36-
trace: [grind.cutsat.assert] a + -1*b ≠ 0
37-
[grind.cutsat.assert] a + b + 1 ≤ 0
36+
trace: [grind.lia.assert] a + -1*b ≠ 0
37+
[grind.lia.assert] a + b + 1 ≤ 0
3838
-/
3939
#guard_msgs (trace) in
4040
example (a b c d : Int) : d ≠ c → c = b → a = d → a + b < 0 → False := by
4141
(fail_if_success grind); sorry
4242

4343
/--
44-
trace: [grind.cutsat.assert] a + b + 1 ≤ 0
45-
[grind.cutsat.assert] a + -1*b ≠ 0
44+
trace: [grind.lia.assert] a + b + 1 ≤ 0
45+
[grind.lia.assert] a + -1*b ≠ 0
4646
-/
4747
#guard_msgs (trace) in
4848
example (a b c d : Int) : d ≠ c → a = d → a + b < 0 → c = b → False := by
4949
(fail_if_success grind); sorry
5050

5151
/--
52-
trace: [grind.cutsat.assert] a + b + 1 ≤ 0
53-
[grind.cutsat.assert] a + -1*b ≠ 0
54-
[grind.cutsat.assert] e + -1*b = 0
55-
[grind.cutsat.assert] -1*e + 1 ≤ 0
52+
trace: [grind.lia.assert] a + b + 1 ≤ 0
53+
[grind.lia.assert] a + -1*b ≠ 0
54+
[grind.lia.assert] e + -1*b = 0
55+
[grind.lia.assert] -1*e + 1 ≤ 0
5656
-/
5757
#guard_msgs (trace) in
5858
example (a b c d e : Int) : d ≠ c → a = d → a + b < 0 → c = b → c = e → e > 0 → False := by
5959
(fail_if_success grind); sorry
6060

6161
/--
62-
trace: [grind.cutsat.assert] -1*e + 1 ≤ 0
63-
[grind.cutsat.assert] b + -1*e = 0
64-
[grind.cutsat.assert] a + -1*e ≠ 0
65-
[grind.cutsat.assert] a + b + 1 ≤ 0
62+
trace: [grind.lia.assert] -1*e + 1 ≤ 0
63+
[grind.lia.assert] b + -1*e = 0
64+
[grind.lia.assert] a + -1*e ≠ 0
65+
[grind.lia.assert] a + b + 1 ≤ 0
6666
-/
6767
#guard_msgs (trace) in
6868
example (a b c d e : Int) : d ≠ c → a = d → c = b → c = e → e > 0 → a + b < 0 → False := by
6969
(fail_if_success grind); sorry
7070

7171
/--
72-
trace: [grind.cutsat.assert] -1*e + 1 ≤ 0
73-
[grind.cutsat.assert] b + -1*e = 0
74-
[grind.cutsat.assert] a + b + 1 ≤ 0
75-
[grind.cutsat.assert] a + -1*e ≠ 0
72+
trace: [grind.lia.assert] -1*e + 1 ≤ 0
73+
[grind.lia.assert] b + -1*e = 0
74+
[grind.lia.assert] a + b + 1 ≤ 0
75+
[grind.lia.assert] a + -1*e ≠ 0
7676
-/
7777
#guard_msgs (trace) in
7878
example (a b c d e : Int) : a = d → c = b → c = e → e > 0 → a + b < 0 → d ≠ c → False := by

tests/lean/run/grind_cutsat_diseq_2.lean

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ theorem ex₃ (a b c : Int) : a + b + c = 0 → a = c → b = 4 → c = -2 := by
1212
grind
1313

1414
/--
15-
trace: [grind.cutsat.assert] -1*「a + -2 * b + -2 * c」 + a + -2*b + -2*c = 0
16-
[grind.cutsat.assert] -1*「0」 = 0
17-
[grind.cutsat.assert] 「a + -2 * b + -2 * c」 = 0
18-
[grind.cutsat.assert] -1*「a + -2 * b + -2 * d」 + a + -2*b + -2*d = 0
19-
[grind.cutsat.assert] 「a + -2 * b + -2 * d」 ≠ 0
20-
[grind.cutsat.assert] -1*d + c = 0
21-
[grind.cutsat.assert] 0 ≠ 0
15+
trace: [grind.lia.assert] -1*「a + -2 * b + -2 * c」 + a + -2*b + -2*c = 0
16+
[grind.lia.assert] -1*「0」 = 0
17+
[grind.lia.assert] 「a + -2 * b + -2 * c」 = 0
18+
[grind.lia.assert] -1*「a + -2 * b + -2 * d」 + a + -2*b + -2*d = 0
19+
[grind.lia.assert] 「a + -2 * b + -2 * d」 ≠ 0
20+
[grind.lia.assert] -1*d + c = 0
21+
[grind.lia.assert] 0 ≠ 0
2222
-/
2323
#guard_msgs (trace) in
24-
set_option trace.grind.cutsat.assert true in
24+
set_option trace.grind.lia.assert true in
2525
theorem ex₄ (a b c d : Int) : a = 2*b + 2*c → a - 2*b - 2*d ≠ 0 → c ≠ d := by
2626
grind
2727

tests/lean/run/grind_cutsat_div_1.lean

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,56 @@ theorem ex₄ (f : Int → Int) (a b : Int) (_ : 2 ∣ f (f a) + 1) (h₁ : 3
2121
#print ex₄
2222

2323
/--
24-
trace: [grind.debug.cutsat.search.assign] a := 1
25-
[grind.debug.cutsat.search.assign] b := 0
24+
trace: [grind.debug.lia.search.assign] a := 1
25+
[grind.debug.lia.search.assign] b := 0
2626
-/
2727
#guard_msgs (trace) in -- finds the model without any backtracking
28-
set_option trace.grind.debug.cutsat.search.assign true in
28+
set_option trace.grind.debug.lia.search.assign true in
2929
example (a b : Int) (_ : 2 ∣ a + 3) (_ : 3 ∣ a + b - 4) : False := by
3030
fail_if_success grind
3131
sorry
3232

3333
/--
34-
trace: [grind.cutsat.assert] 2 ∣ a + 3
35-
[grind.cutsat.assert] 3 ∣ a + 3*b + -4
36-
[grind.debug.cutsat.search.assign] a := 1
37-
[grind.debug.cutsat.search.assign] b := 0
34+
trace: [grind.lia.assert] 2 ∣ a + 3
35+
[grind.lia.assert] 3 ∣ a + 3*b + -4
36+
[grind.debug.lia.search.assign] a := 1
37+
[grind.debug.lia.search.assign] b := 0
3838
-/
3939
#guard_msgs (trace) in
40-
set_option trace.grind.cutsat.assert true in
41-
set_option trace.grind.debug.cutsat.search.assign true in
40+
set_option trace.grind.lia.assert true in
41+
set_option trace.grind.debug.lia.search.assign true in
4242
example (a b : Int) (_ : 2 ∣ a + 3) (_ : 3 ∣ a + 3*b - 4) : False := by
4343
fail_if_success grind
4444
sorry
4545

4646
/--
47-
trace: [grind.debug.cutsat.search.assign] a := 1
48-
[grind.debug.cutsat.search.assign] b := 15
47+
trace: [grind.debug.lia.search.assign] a := 1
48+
[grind.debug.lia.search.assign] b := 15
4949
-/
5050
#guard_msgs (trace) in
51-
set_option trace.grind.debug.cutsat.search.assign true in
51+
set_option trace.grind.debug.lia.search.assign true in
5252
example (a b : Int) (_ : 2 ∣ a + 3) (_ : 3 ∣ a + b - 4) (_ : b < 18): False := by
5353
fail_if_success grind
5454
sorry
5555

5656
/--
57-
trace: [grind.debug.cutsat.search.assign] a := 1
58-
[grind.debug.cutsat.search.assign] b := 12
57+
trace: [grind.debug.lia.search.assign] a := 1
58+
[grind.debug.lia.search.assign] b := 12
5959
-/
6060
#guard_msgs (trace) in
61-
set_option trace.grind.debug.cutsat.search.assign true in
61+
set_option trace.grind.debug.lia.search.assign true in
6262
example (a b : Int) (_ : 2 ∣ a + 3) (_ : 3 ∣ a + b - 4) (_ : b ≥ 11): False := by
6363
fail_if_success grind
6464
sorry
6565

6666
/--
67-
trace: [grind.debug.cutsat.search.assign] f 0 := 11
68-
[grind.debug.cutsat.search.assign] f 1 := 2
69-
[grind.debug.cutsat.search.assign] 「1」 := 1
70-
[grind.debug.cutsat.search.assign] 「0」 := 0
67+
trace: [grind.debug.lia.search.assign] f 0 := 11
68+
[grind.debug.lia.search.assign] f 1 := 2
69+
[grind.debug.lia.search.assign] 「1」 := 1
70+
[grind.debug.lia.search.assign] 「0」 := 0
7171
-/
7272
#guard_msgs (trace) in
73-
set_option trace.grind.debug.cutsat.search.assign true in
73+
set_option trace.grind.debug.lia.search.assign true in
7474
example (f : Int → Int) (_ : 2 ∣ f 0 + 3) (_ : 3 ∣ f 0 + f 1 - 4) (_ : f 011): False := by
7575
fail_if_success grind
7676
sorry

tests/lean/run/grind_cutsat_div_mod.lean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ example (x y : Int) : x % 2 + y = 3 → x = 5 → y = 2 := by
1212
grind
1313

1414
/--
15-
trace: [grind.cutsat.model] x := 5
16-
[grind.cutsat.model] y := 2
15+
trace: [grind.lia.model] x := 5
16+
[grind.lia.model] y := 2
1717
-/
1818
#guard_msgs (trace) in
19-
set_option trace.grind.cutsat.model true in
19+
set_option trace.grind.lia.model true in
2020
example (x y : Int) : x % 2 + y = 3 → x ≤ 5 → x > 4 → y = 1 := by
2121
fail_if_success grind
2222
sorry

tests/lean/run/grind_cutsat_eq_1.lean

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set_option grind.debug true
33
open Int.Linear
44

55
/--
6-
trace: [grind.cutsat.assert] -1*「b + f a + 1」 + b + f a + 1 = 0
7-
[grind.cutsat.assert] -1*「0」 = 0
8-
[grind.cutsat.assert] 「b + f a + 1」 = 0
6+
trace: [grind.lia.assert] -1*「b + f a + 1」 + b + f a + 1 = 0
7+
[grind.lia.assert] -1*「0」 = 0
8+
[grind.lia.assert] 「b + f a + 1」 = 0
99
-/
1010
#guard_msgs (trace) in
11-
set_option trace.grind.cutsat.assert true in
11+
set_option trace.grind.lia.assert true in
1212
example (a b : Int) (f : Int → Int) (h₁ : f a + b + 3 = 2) : False := by
1313
fail_if_success grind
1414
sorry

tests/lean/run/grind_cutsat_le_1.lean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module
22
set_option grind.debug true
33

44
/--
5-
trace: [grind.debug.cutsat.search.assign] b := -1
6-
[grind.debug.cutsat.search.assign] a := 3
5+
trace: [grind.debug.lia.search.assign] b := -1
6+
[grind.debug.lia.search.assign] a := 3
77
-/
88
#guard_msgs (trace) in
9-
set_option trace.grind.debug.cutsat.search.assign true in
9+
set_option trace.grind.debug.lia.search.assign true in
1010
example (a b : Int) (h₁ : a ≤ 3) (h₂ : a > 2) (h₃ : a + b < 3) : False := by
1111
fail_if_success grind
1212
sorry

tests/lean/run/grind_cutsat_le_2.lean

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ example (a b c d e : Int) :
88
→ a + b + 3*c + d + 2*e ≥ 0 := by
99
grind
1010

11-
set_option trace.grind.cutsat.model true
11+
set_option trace.grind.lia.model true
1212

1313
/--
14-
trace: [grind.cutsat.model] a := 7
15-
[grind.cutsat.model] b := 0
16-
[grind.cutsat.model] c := 3
17-
[grind.cutsat.model] d := 2
14+
trace: [grind.lia.model] a := 7
15+
[grind.lia.model] b := 0
16+
[grind.lia.model] c := 3
17+
[grind.lia.model] d := 2
1818
-/
1919
#guard_msgs (trace) in
2020
example (a b c d e : Int) :
@@ -25,9 +25,9 @@ example (a b c d e : Int) :
2525
(fail_if_success grind); sorry
2626

2727
/--
28-
trace: [grind.cutsat.model] a := 17
29-
[grind.cutsat.model] b := -9
30-
[grind.cutsat.model] c := -9
28+
trace: [grind.lia.model] a := 17
29+
[grind.lia.model] b := -9
30+
[grind.lia.model] c := -9
3131
-/
3232
#guard_msgs (trace) in
3333
example (a b c : Int) :

0 commit comments

Comments
 (0)