Diff Coverage

Diff: upstream/main...HEAD, staged and unstaged changes

Source File Diff Coverage (%) Missing Lines
crates/conjure-cp-cli/src/utils/conjure.rs 96.7% 31,34,40,121
crates/conjure-cp-core/src/rule_engine/mod.rs 88.9% 216
crates/conjure-cp-core/src/solver/adaptors/rustsat/adaptor.rs 82.9% 114,130,179-183,186,199,203-208,223-224,235-238,240,246,248,250-252,258-261,263,265,283-284,293-294,393,403-404,419
crates/conjure-cp-core/src/solver/adaptors/rustsat/convs.rs 74.3% 31,140,144-148,151-155,157-164,166-170,201
crates/conjure-cp-core/src/solver/adaptors/smt/adaptor.rs 87.6% 84,87,89,91,93,97,121,140,142-147,149,157,160,164,168-177,179,230,254-257,295-297,301-304,316-318,340,374,461,472-473
crates/conjure-cp-essence-parser/src/parser/parse_model.rs 100%  
crates/conjure-cp-rules/src/comprehensions/expansion/via_solver_common.rs 100%  
tests-integration/tests/integration_tests.rs 93.2% 256,319-320
crates/conjure-cp-cli/src/utils/conjure.rs
27
28
29
30
31
32
33
34
35
36
37
38
    value: &Literal,
) -> Option<Literal> {
    if matches!(reference_domain, Some(GroundDomain::Bool)) {
        return match value {
            Literal::Bool(x) => Some(Literal::Bool(*x)),
            Literal::Int(1) => Some(Literal::Bool(true)),
            Literal::Int(0) => Some(Literal::Bool(false)),
            _ => None,
        };
    }

    Some(value.clone())
36
37
38
39
40
41
42
43
44
    }

    Some(value.clone())
}

fn substitute_from_solution(
    expr: &Expression,
    previous_solution: &BTreeMap<Name, Literal>,
) -> Option<Expression> {
117
118
119
120
121
122
123
124
    solver_input_file: &Option<PathBuf>,
) -> Result<Vec<BTreeMap<Name, Literal>>, anyhow::Error> {
    let dominance_expression = model.dominance.as_ref().map(|expr| match expr {
        Expression::DominanceRelation(_, inner) => inner.as_ref().clone(),
        _ => expr.clone(),
    });

    let adaptor_name = solver.get_name();
crates/conjure-cp-core/src/rule_engine/mod.rs
212
213
214
215
216
217
218
219
    rule_sets: &Vec<&'a RuleSet<'a>>,
    configured_rewriter: Rewriter,
) -> Result<Model, RewriteError> {
    match configured_rewriter {
        Rewriter::Morph => Ok(rewrite_morph(model, rule_sets, false)),
        Rewriter::Naive => rewrite_naive(&model, rule_sets, false),
    }
}
crates/conjure-cp-core/src/solver/adaptors/rustsat/adaptor.rs
110
111
112
113
114
115
116
117
118
            if reprs.is_empty() {
                return None;
            }
            if reprs.len() > 1 || reprs[0].len() != 1 {
                return None;
            }
            Some((name, reprs[0][0].clone()))
        })
        .collect_vec();
126
127
128
129
130
131
132
133
134
        .into_iter()
        .collect::<BTreeMap<Name, Literal>>();
    for (name, representation) in representations {
        let Ok(value) = representation.value_up(&solution_btree) else {
            continue;
        };
        solution.insert(name.clone(), value.clone());
        solution_btree.insert(name, value);
    }
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
            return Ok(());
        };

        let Some(model_template) = dominance_model_template else {
            return Ok(());
        };

        use uniplate::Uniplate;

        let rewritten_dominance =
            dominance_expression.rewrite(&|e| sub_in_solution_into_dominance_expr(&e, solution));

        let mut dominance_model = model_template.clone();
        dominance_model.replace_constraints(vec![]);
        dominance_model.replace_clauses(vec![]);
        dominance_model.dominance = None;
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
            rewrite_model_with_configured_rewriter(dominance_model, &rule_sets, current_rewriter())
                .map_err(|e| {
                    SolverError::Runtime(format!(
                        "Failed to rewrite dominance constraint into CNF clauses: {e}"
                    ))
                })?;

        for clause in rewritten.clauses() {
            let mut missing_refs: Vec<Name> = Vec::new();
            let mut largest_new_var: Option<satVar> = None;
            for literal in clause.iter() {
                let maybe_name = match literal {
                    Expression::Atomic(_, Atom::Reference(reference)) => {
                        Some(reference.name().clone())
                    }
                    Expression::Not(_, inner) => {
                        if let Expression::Atomic(_, Atom::Reference(reference)) = inner.as_ref() {
                            Some(reference.name().clone())
219
220
221
222
223
224
225
226
227
228

                if let Some(name) = maybe_name
                    && !var_map.contains_key(&name)
                {
                    missing_refs.push(name);
                }
            }

            if !missing_refs.is_empty() {
                missing_refs.sort_by_key(|name| name.to_string());
231
232
233
234
235
236
237
238
239
240
241
242
243
244
                for name in &missing_refs {
                    if var_map.contains_key(name) {
                        continue;
                    }
                    let next_idx = var_map
                        .values()
                        .map(|lit| lit.var().idx32())
                        .max()
                        .map(|idx| idx + 1)
                        .unwrap_or(0);
                    let new_var = satVar::new(next_idx);
                    let new_lit = new_var.pos_lit();
                    var_map.insert(name.clone(), new_lit);
                    largest_new_var = Some(new_var);
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
                    let new_lit = new_var.pos_lit();
                    var_map.insert(name.clone(), new_lit);
                    largest_new_var = Some(new_var);
                }
            }

            if let Some(max_var) = largest_new_var {
                solver.reserve(max_var).map_err(|e| {
                    SolverError::Runtime(format!(
                        "Failed reserving SAT variable capacity up to {max_var} for dominance clauses: {e}"
                    ))
                })?;
            }

            if let Some(sat_clause) = cnf_clause_to_sat_clause(clause, var_map).map_err(|e| {
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
            }

            if let Some(sat_clause) = cnf_clause_to_sat_clause(clause, var_map).map_err(|e| {
                SolverError::Runtime(format!(
                    "Failed converting dominance CNF clause to SAT clause. clause={clause:?}; error={e}"
                ))
            })? {
                solver.add_clause(sat_clause).map_err(|e| {
                    SolverError::Runtime(format!(
                        "Failed adding dominance clause to SAT solver: {e}"
                    ))
                })?;
            }
        }

        Ok(())
279
280
281
282
283
284
285
286
287
288
        let dominance_expression = self.dominance_expression.clone();
        let dominance_model_template = self.dominance_model_template.clone();
        let mut solver = &mut self.solver_inst;
        let mut var_map = self.var_map.clone().ok_or_else(|| {
            SolverError::Runtime("Variable map is missing when retrieving solution".to_string())
        })?;

        let cnf: (Cnf, BasicVarManager) = self
            .model_inst
            .clone()
289
290
291
292
293
294
295
296
297
298
            .ok_or_else(|| SolverError::Runtime("Model instance is missing".to_string()))?
            .into_cnf();

        solver.add_cnf(cnf.0).map_err(|e| {
            SolverError::Runtime(format!("Failed adding CNF to SAT solver before solve: {e}"))
        })?;

        let mut has_sol = false;
        loop {
            let res = match solver.solve() {
389
390
391
392
393
394
395
396
397
                    dominance_model_template.as_ref(),
                    solver,
                    &dominance_solution,
                    &mut var_map,
                )?;
            }

            let blocking_vec: Vec<_> = sol.clone().iter().map(|lit| !lit).collect();
            let mut blocking_cl = Clause::new();
399
400
401
402
403
404
405
406
407
408
            for lit_i in blocking_vec {
                blocking_cl.add(lit_i);
            }
            solver.add_clause(blocking_cl).map_err(|e| {
                SolverError::Runtime(format!("Failed adding blocking clause to SAT solver: {e}"))
            })?;
        }
    }

    fn solve_mut(
415
416
417
418
419
420
421
422
423

    fn load_model(&mut self, model: ConjureModel, _: private::Internal) -> Result<(), SolverError> {
        self.dominance_expression = model.dominance.as_ref().map(|expr| match expr {
            Expression::DominanceRelation(_, inner) => inner.as_ref().clone(),
            _ => expr.clone(),
        });
        self.dominance_model_template = self.dominance_expression.as_ref().map(|_| model.clone());

        let sym_tab = model.symbols().deref().clone();
crates/conjure-cp-core/src/solver/adaptors/rustsat/convs.rs
27
28
29
30
31
32
33
34
35
    names.sort();
    let total = names.len();
    let preview = names.into_iter().take(25).collect::<Vec<_>>().join(", ");
    format!("known_vars_total={total}; known_vars_preview=[{preview}]")
}

pub fn handle_lit(
    l1: &Expression,
    vars_added: &mut HashMap<Name, Lit>,
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
pub fn cnf_literal_to_sat_lit(
    literal: &Expression,
    var_map: &HashMap<Name, Lit>,
) -> Result<Option<Lit>, SolverError> {
    match literal {
        Expression::Atomic(_, Atom::Reference(reference)) => {
            let name = reference.name();
            let lit = var_map.get(&name).ok_or_else(|| {
                SolverError::Runtime(format!(
                    "CNF clause references unknown variable '{name}'. literal={literal:?}. {}",
                    var_map_debug_summary(var_map)
                ))
            })?;
            Ok(Some(*lit))
        }
        Expression::Not(_, inner) => {
            let Expression::Atomic(_, Atom::Reference(reference)) = inner.as_ref() else {
                return Err(SolverError::Runtime(
                    "CNF clause contains unsupported negated literal".to_string(),
                ));
            };
            let name = reference.name();
            let lit = var_map.get(&name).ok_or_else(|| {
                SolverError::Runtime(format!(
                    "CNF clause references unknown variable '{name}'. literal={literal:?}. {}",
                    var_map_debug_summary(var_map)
                ))
            })?;
            Ok(Some(!*lit))
        }
        Expression::Atomic(_, Atom::Literal(Literal::Bool(true))) => Ok(None),
        Expression::Atomic(_, Atom::Literal(Literal::Bool(false))) => Ok(None),
        _ => Err(SolverError::Runtime(format!(
            "CNF clause contains non-literal expression: {literal:?}"
        ))),
    }
}

pub fn cnf_clause_to_sat_clause(
197
198
199
200
201
202
203
204
205
    }

    if sat_clause.iter().next().is_none() && !has_false_only {
        // Empty after simplification and no explicit false literal => tautology.
        return Ok(None);
    }

    Ok(Some(sat_clause))
}
crates/conjure-cp-core/src/solver/adaptors/smt/adaptor.rs
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
                let value = solution.get(&var_name)?;
                let value = if let Some(domain) = reference.resolved_domain() {
                    if domain.as_ref() == &GroundDomain::Bool {
                        match value {
                            Literal::Bool(x) => Literal::Bool(*x),
                            Literal::Int(1) => Literal::Bool(true),
                            Literal::Int(0) => Literal::Bool(false),
                            _ => return None,
                        }
                    } else {
                        value.clone()
                    }
                } else {
                    value.clone()
                };

                return Some(Expression::Atomic(Metadata::new(), Atom::Literal(value)));
            }
            Some(expr.clone())
        }
        _ => Some(expr.clone()),
    }
117
118
119
120
121
122
123
124
125
                        Literal::Int(0) => Literal::Bool(false),
                        _ => return None,
                    }
                } else {
                    value.clone()
                }
            } else {
                value.clone()
            };
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
            Metadata::new(),
            atom_expr.as_ref().clone(),
        )),
        _ => Some(expr.clone()),
    }
}

fn add_represented_decision_values(solution: &mut HashMap<Name, Literal>, model: &Model) {
    let symbols = model.symbols().clone();
    let names = symbols.clone().into_iter().map(|x| x.0).collect_vec();
    let representations = names
        .into_iter()
        .filter_map(|name| {
            symbols
                .representations_for(&name)
                .map(|reprs| (name, reprs))
        })
        .filter_map(|(name, reprs)| {
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
        .filter_map(|(name, reprs)| {
            if reprs.is_empty() {
                return None;
            }
            if reprs.len() > 1 || reprs[0].len() != 1 {
                return None;
            }
            Some((name, reprs[0][0].clone()))
        })
        .collect_vec();

    if representations.is_empty() {
        return;
    }

    let mut solution_btree = solution
        .clone()
        .into_iter()
        .collect::<BTreeMap<Name, Literal>>();
    for (name, representation) in representations {
        let Ok(value) = representation.value_up(&solution_btree) else {
            continue;
        };
        solution.insert(name.clone(), value.clone());
        solution_btree.insert(name, value);
    }
}

fn extract_z3_version(full_version: &str) -> Result<&str, SolverError> {
    match full_version.strip_prefix("Z3 ") {
        Some(v) => v.split_whitespace().next().ok_or_else(|| {
226
227
228
229
230
231
232
233
234
            return Ok(());
        };

        let Some(model_template) = dominance_model_template else {
            return Ok(());
        };

        // Block future solutions dominated by the current solution:
        // assert NOT dominance(current_solution, future_solution).
250
251
252
253
254
255
256
257
258
259
260
261
        let rule_sets = dominance_model.context.read().unwrap().rule_sets.clone();
        let rewritten =
            rewrite_model_with_configured_rewriter(dominance_model, &rule_sets, current_rewriter())
                .map_err(|e| {
                    SolverError::Runtime(format!(
                        "Failed to rewrite dominance constraint for SMT solving: {e}"
                    ))
                })?;

        load_model_impl(
            store,
            solver,
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
                    true,
                    |solver, store, instance| {
                        let mut dominance_solution = match instance.as_literals_map() {
                            Ok(solution) => solution,
                            Err(err) => {
                                hook_error = Some(err);
                                return false;
                            }
                        };
                        if let Some(model_template) = dominance_model_template.as_ref() {
                            add_represented_decision_values(
                                &mut dominance_solution,
                                model_template,
                            );
                        }

                        match Smt::add_dominance_constraints_for_solution(
                            dominance_expression.as_ref(),
312
313
314
315
316
317
318
319
320
321
322
                            theory_config,
                            &dominance_solution,
                        ) {
                            Ok(()) => true,
                            Err(err) => {
                                hook_error = Some(err);
                                false
                            }
                        }
                    },
                );
336
337
338
339
340
341
342
343
344
                    .count();

                drop(solutions);
                if let Some(err) = hook_error {
                    return Err(err);
                }

                let search_complete = if found_solution {
                    SearchComplete::HasSolutions
370
371
372
373
374
375
376
377
378
        // Fail fast if an older system or precompiled Z3 was linked in.
        ensure_supported_z3_runtime()?;
        self.dominance_expression = model.dominance.as_ref().map(|expr| match expr {
            Expression::DominanceRelation(_, inner) => inner.as_ref().clone(),
            _ => expr.clone(),
        });
        self.dominance_model_template = self.dominance_expression.as_ref().map(|_| model.clone());
        load_model_impl(
            &mut self.store,
457
458
459
460
461
462
463
464
465
    type Item = (T::ModelInstance, Statistics);

    fn next(&mut self) -> Option<Self::Item> {
        if self.done {
            return None;
        }

        match self.solver.check() {
            SatResult::Sat => {
468
469
470
471
472
473
474
475
476
477
                let instance = self.ast.read_from_model(&model, self.model_completion)?;
                let counterexample = self.ast.generate_constraint(&instance);

                if !(self.on_solution)(&mut self.solver, &mut self.ast, &instance) {
                    self.done = true;
                    return None;
                }

                self.solver.assert(counterexample);
                Some((instance, stats))
tests-integration/tests/integration_tests.rs
252
253
254
255
256
257
258
259
260

            tracing::subscriber::with_default(subscriber, || {
                rewrite_naive(&model, &rule_sets, false)
            })?
        }
        Rewriter::Naive => rewrite_naive(&model, &rule_sets, false)?,
        Rewriter::Morph => {
            let submodel = &mut model;
            let rules_grouped = get_rules_grouped(&rule_sets)
315
316
317
318
319
320
321
322
323
324
        // Always overwrite these ones. Unlike the rest, we don't need to selectively do these
        // based on the test results, so they don't get done later.
        copy_generated_to_expected(path, case_name, "solutions", "json", solver_fam)?;
        if should_validate_rule_trace {
            copy_human_trace_generated_to_expected(path, case_name, solver_fam)?;
        }
    }

    // Check Stage 3a (solutions)
    let expected_solutions_json = read_solutions_json(path, case_name, "expected", solver_fam)?;