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

Jump to bottom

Add partial evaluator and improved boolean support #363

Merged
merged 9 commits into from
Oct 15, 2024
Merged

Add partial evaluator and improved boolean support #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3394b92
add partial evaluator
niklasdewally Oct 11, 2024
4c2e1d7
parser: add boolean constants
niklasdewally Oct 11, 2024
40ce5a9
add w-lit constraint, enabling support for variables in and/or clauses
niklasdewally Oct 11, 2024
9773972
add test for partial evaluation of or, and
niklasdewally Oct 11, 2024
1460788
implement not(x) ~> w-lit(x,0)
niklasdewally Oct 11, 2024
0333550
add broken complex partial evaluator test (arithmetic, nesting, min)
niklasdewally Oct 12, 2024
6c6d511
change rule priorities to run simplifiers first; add reify
niklasdewally Oct 12, 2024
9f326e4
fix: add test case for soph's non-terminating min problem
niklasdewally Oct 12, 2024
a9b71f1
fix: empty or([]) being parsed as nothing
niklasdewally Oct 14, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,7 @@ fabric.properties
*.eprime.infor
*.eprime.minion
*.eprime.solution
*.eprime.solution.*
*.eprime.info

.MINION*
6 changes: 3 additions & 3 deletions conjure_oxide/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ pub fn main() -> AnyhowResult<()> {
.append(true)
.open("conjure_oxide.log")?;

//Builder::with_level("Trace")
Builder::new()
Builder::with_level("TRACE")
//Builder::new()
.with_target_writer("info", new_writer(stdout()))
.with_target_writer("file", new_writer(log_file))
.with_target_writer("file,jsonparser", new_writer(log_file))
.init();

if target_family != SolverFamily::Minion {
Expand Down
8 changes: 6 additions & 2 deletions conjure_oxide/tests/generated_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ fn integration_test_inner(
}

fn assert_vector_operators_have_partially_evaluated(model: &conjure_core::Model) {
model.constraints.descend(Arc::new(|x| {
model.constraints.transform(Arc::new(|x| {
use conjure_core::ast::Expression::*;
match &x {
Nothing => (),
Expand All @@ -171,7 +171,11 @@ fn assert_vector_operators_have_partially_evaluated(model: &conjure_core::Model)
SumLeq(_, vec, _) => assert_constants_leq_one(&x, vec),
DivEq(_, _, _, _) => (),
Ineq(_, _, _, _) => (),
AllDiff(_, vec) => assert_constants_leq_one(&x, vec),
// this is a vector operation, but we don't want to fold values into each-other in this
// one
AllDiff(_, _) => (),
WatchedLiteral(_, _, _) => (),
Reify(_, _, _) => (),
};
x.clone()
}));
Expand Down
4 changes: 0 additions & 4 deletions conjure_oxide/tests/integration/basic/div/01/input.expected-minion.solutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
[
{
"MachineName(0)": 1,
"UserName(a)": 1,
"UserName(b)": 1
},
{
"MachineName(0)": 1,
"UserName(a)": 2,
"UserName(b)": 2
},
{
"MachineName(0)": 1,
"UserName(a)": 3,
"UserName(b)": 2
},
{
"MachineName(0)": 1,
"UserName(a)": 3,
"UserName(b)": 3
}
Expand Down
59 changes: 6 additions & 53 deletions conjure_oxide/tests/integration/basic/div/01/input.expected-rewrite.serialised.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
[
{
"Eq": [
"DivEq": [
{
"clean": false,
"etype": null
Expand All @@ -19,28 +19,9 @@
"etype": null
},
{
"MachineName": 0
}
]
},
{
"Constant": [
{
"clean": false,
"etype": null
},
{
"Int": 1
"UserName": "a"
}
]
}
]
},
{
"Neq": [
{
"clean": false,
"etype": null
},
{
"Reference": [
Expand All @@ -60,29 +41,18 @@
"etype": null
},
{
"Int": 0
"Int": 1
}
]
}
]
},
{
"DivEq": [
"Neq": [
{
"clean": false,
"etype": null
},
{
"Reference": [
{
"clean": false,
"etype": null
},
{
"UserName": "a"
}
]
},
{
"Reference": [
{
Expand All @@ -95,13 +65,13 @@
]
},
{
"Reference": [
"Constant": [
{
"clean": false,
"etype": null
},
{
"MachineName": 0
"Int": 0
}
]
}
Expand All @@ -112,23 +82,6 @@
},
"next_var": 1,
"variables": [
[
{
"MachineName": 0
},
{
"domain": {
"IntDomain": [
{
"Bounded": [
0,
3
]
}
]
}
}
],
[
{
"UserName": "a"
Expand Down
2 changes: 0 additions & 2 deletions conjure_oxide/tests/integration/basic/div/03/input.expected-minion.solutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
[
{
"MachineName(0)": 2,
"UserName(a)": 3
},
{
"MachineName(0)": 2,
"UserName(a)": 4
}
]
59 changes: 6 additions & 53 deletions conjure_oxide/tests/integration/basic/div/03/input.expected-rewrite.serialised.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
[
{
"Eq": [
"DivEq": [
{
"clean": false,
"etype": null
Expand All @@ -19,29 +19,10 @@
"etype": null
},
{
"Int": 2
"Int": 8
}
]
},
{
"Reference": [
{
"clean": false,
"etype": null
},
{
"MachineName": 0
}
]
}
]
},
{
"Neq": [
{
"clean": false,
"etype": null
},
{
"Reference": [
{
Expand All @@ -60,29 +41,18 @@
"etype": null
},
{
"Int": 0
"Int": 2
}
]
}
]
},
{
"DivEq": [
"Neq": [
{
"clean": false,
"etype": null
},
{
"Constant": [
{
"clean": false,
"etype": null
},
{
"Int": 8
}
]
},
{
"Reference": [
{
Expand All @@ -95,13 +65,13 @@
]
},
{
"Reference": [
"Constant": [
{
"clean": false,
"etype": null
},
{
"MachineName": 0
"Int": 0
}
]
}
Expand All @@ -112,23 +82,6 @@
},
"next_var": 1,
"variables": [
[
{
"MachineName": 0
},
{
"domain": {
"IntDomain": [
{
"Bounded": [
0,
8
]
}
]
}
}
],
[
{
"UserName": "a"
Expand Down
Loading
Loading