tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +49 -44
- package/dist/transfer.js +48 -43
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +14 -2
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +116 -64
- package/src/check.ts +516 -280
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +190 -1
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +123 -38
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +370 -99
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +51 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +21 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +713 -210
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +350 -195
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1274 -257
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +18 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +319 -135
- package/src/simulate.ts +235 -182
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +37 -13
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +67 -43
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -13,8 +13,10 @@ import {
|
|
|
13
13
|
OP_OR,
|
|
14
14
|
OP_TRUE,
|
|
15
15
|
OP_XOR,
|
|
16
|
+
SORT_BOOL,
|
|
16
17
|
} from "../ast";
|
|
17
18
|
import { EufSolver, type EufInternalizer, type ThSolverFactory } from "../euf/euf-solver";
|
|
19
|
+
import { getDependencyValues, type Goal } from "../goal";
|
|
18
20
|
import { DEFAULT_PRINT_OPTIONS, printExpr } from "../smt2-printer";
|
|
19
21
|
import { NULL_LITERAL } from "./clause";
|
|
20
22
|
import { PbSolver, type SatInternalizer } from "./pb-solver";
|
|
@@ -26,6 +28,12 @@ const PRINT_ENVIRONMENT = {
|
|
|
26
28
|
isClashing: () => false,
|
|
27
29
|
};
|
|
28
30
|
|
|
31
|
+
interface UnhandledFun {
|
|
32
|
+
decl: number;
|
|
33
|
+
domain: number[];
|
|
34
|
+
range: number;
|
|
35
|
+
}
|
|
36
|
+
|
|
29
37
|
interface Frame {
|
|
30
38
|
expr: number;
|
|
31
39
|
isRoot: boolean;
|
|
@@ -35,7 +43,7 @@ interface Frame {
|
|
|
35
43
|
|
|
36
44
|
export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
37
45
|
readonly atoms = new Map<number, number>();
|
|
38
|
-
readonly unhandledFuns:
|
|
46
|
+
readonly unhandledFuns: UnhandledFun[] = [];
|
|
39
47
|
private frames: Frame[] = [];
|
|
40
48
|
private results: number[] = [];
|
|
41
49
|
private app2lit = new Map<number, number>();
|
|
@@ -114,7 +122,6 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
114
122
|
|
|
115
123
|
private insertAtom(expr: number, boolVar: number) {
|
|
116
124
|
this.atoms.set(expr, boolVar);
|
|
117
|
-
if (this.mkThSolver === null) return;
|
|
118
125
|
this.manager.incRef(expr);
|
|
119
126
|
this.recentAtoms.push(expr);
|
|
120
127
|
}
|
|
@@ -214,7 +221,11 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
214
221
|
} else {
|
|
215
222
|
if (!manager.isUninterpretedConst(expr)) {
|
|
216
223
|
if (!manager.isApp(expr)) this.throwOpNotHandled(expr);
|
|
217
|
-
this.unhandledFuns.push(
|
|
224
|
+
this.unhandledFuns.push({
|
|
225
|
+
decl: manager.decls[expr],
|
|
226
|
+
domain: manager.getArgs(expr).map((arg) => manager.sorts[arg]),
|
|
227
|
+
range: manager.sorts[expr],
|
|
228
|
+
});
|
|
218
229
|
}
|
|
219
230
|
lit = 2 * this.mkBoolVar(expr) + (isSign ? 1 : 0);
|
|
220
231
|
}
|
|
@@ -503,13 +514,25 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
503
514
|
this.cacheTrail.push(expr);
|
|
504
515
|
}
|
|
505
516
|
|
|
506
|
-
|
|
507
|
-
getAssumptionLit(assumption: number) {
|
|
517
|
+
private insertDep(dep: number, dep2asm: Map<number, number>) {
|
|
508
518
|
const manager = this.manager;
|
|
509
|
-
const
|
|
510
|
-
|
|
519
|
+
const isSign = manager.isNot(dep);
|
|
520
|
+
const atom = isSign ? manager.getArg(dep, 0) : dep;
|
|
521
|
+
const newDep = manager.isUninterpretedConst(atom)
|
|
522
|
+
? atom
|
|
523
|
+
: manager.mkFreshConst("dep", SORT_BOOL);
|
|
524
|
+
if (newDep !== atom) this.process(manager.mkEq(newDep, atom), true);
|
|
525
|
+
this.convertAtom(newDep, false, false);
|
|
511
526
|
const lit = this.results.pop() as number;
|
|
512
|
-
|
|
527
|
+
dep2asm.set(dep, isSign ? lit ^ 1 : lit);
|
|
528
|
+
}
|
|
529
|
+
|
|
530
|
+
assumptions(assumptions: readonly number[], dep2asm: Map<number, number>) {
|
|
531
|
+
try {
|
|
532
|
+
for (const assumption of assumptions) this.insertDep(assumption, dep2asm);
|
|
533
|
+
} finally {
|
|
534
|
+
this.reset();
|
|
535
|
+
}
|
|
513
536
|
}
|
|
514
537
|
|
|
515
538
|
run(forms: readonly number[]) {
|
|
@@ -517,10 +540,40 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
517
540
|
try {
|
|
518
541
|
for (const form of forms) this.process(form, true);
|
|
519
542
|
} finally {
|
|
520
|
-
this.
|
|
521
|
-
this.results = [];
|
|
522
|
-
this.app2lit = new Map();
|
|
523
|
-
this.lit2app = new Map();
|
|
543
|
+
this.reset();
|
|
524
544
|
}
|
|
525
545
|
}
|
|
546
|
+
|
|
547
|
+
runGoal(goal: Goal, dep2asm: Map<number, number>) {
|
|
548
|
+
const manager = this.manager;
|
|
549
|
+
if (this.mkThSolver !== null) this.ensureEuf();
|
|
550
|
+
try {
|
|
551
|
+
forms: for (let index = 0; index < goal.forms.size; index++) {
|
|
552
|
+
const form = goal.forms.items[index];
|
|
553
|
+
const dependency = goal.getDependency(index);
|
|
554
|
+
if (dependency === undefined) {
|
|
555
|
+
this.process(form, true);
|
|
556
|
+
continue;
|
|
557
|
+
}
|
|
558
|
+
const clause = [form];
|
|
559
|
+
const deps = getDependencyValues(dependency);
|
|
560
|
+
for (let depIndex = 0; depIndex < deps.length; depIndex++) {
|
|
561
|
+
const dep = deps[depIndex];
|
|
562
|
+
this.insertDep(dep, dep2asm);
|
|
563
|
+
if (dep === form) continue forms;
|
|
564
|
+
clause.push(manager.isNot(dep) ? manager.getArg(dep, 0) : manager.mkNot(dep));
|
|
565
|
+
}
|
|
566
|
+
this.process(manager.mkOr(clause), true);
|
|
567
|
+
}
|
|
568
|
+
} finally {
|
|
569
|
+
this.reset();
|
|
570
|
+
}
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
private reset() {
|
|
574
|
+
this.frames = [];
|
|
575
|
+
this.results = [];
|
|
576
|
+
this.app2lit = new Map();
|
|
577
|
+
this.lit2app = new Map();
|
|
578
|
+
}
|
|
526
579
|
}
|
|
@@ -1,16 +1,31 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
2
2
|
import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
|
|
3
|
+
import { mkNot } from "../ast-util";
|
|
3
4
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
4
|
-
import { Goal } from "../goal";
|
|
5
|
+
import { Goal, mkDependencyLeaf } from "../goal";
|
|
5
6
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
7
|
import { ProtoModel } from "../proto-model";
|
|
7
8
|
import { RefVector } from "../ref-vector";
|
|
9
|
+
import {
|
|
10
|
+
DEFAULT_PRINT_OPTIONS,
|
|
11
|
+
formatSort,
|
|
12
|
+
getQuotedName,
|
|
13
|
+
mkSeq1,
|
|
14
|
+
mkSeq5,
|
|
15
|
+
mkText,
|
|
16
|
+
renderFormat,
|
|
17
|
+
} from "../smt2-printer";
|
|
8
18
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
9
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
applyDefinitions,
|
|
21
|
+
convertModel,
|
|
22
|
+
mkIncSatEufPreprocess,
|
|
23
|
+
mkIncSatPreprocess,
|
|
24
|
+
} from "../tactic";
|
|
10
25
|
import type { SatParams } from "./config";
|
|
11
26
|
import { Goal2Sat } from "./goal2sat";
|
|
12
27
|
import { getConsequences } from "./consequences";
|
|
13
|
-
import { isLiteral, sat2goal } from "./sat2goal";
|
|
28
|
+
import { isLiteral, Sat2GoalConverter, sat2goal } from "./sat2goal";
|
|
14
29
|
import { Solver } from "./solver";
|
|
15
30
|
|
|
16
31
|
const BIT_BLAST_PARAMS = {
|
|
@@ -24,6 +39,8 @@ interface Scope {
|
|
|
24
39
|
readonly converters: Goal["converters"];
|
|
25
40
|
readonly fmlsSize: number;
|
|
26
41
|
readonly fmlsHead: number;
|
|
42
|
+
readonly namesSize: number;
|
|
43
|
+
readonly hasUninterpreted: boolean;
|
|
27
44
|
}
|
|
28
45
|
|
|
29
46
|
export class IncSatSolver {
|
|
@@ -31,6 +48,7 @@ export class IncSatSolver {
|
|
|
31
48
|
private readonly goal2sat: Goal2Sat;
|
|
32
49
|
private readonly fmls: RefVector;
|
|
33
50
|
private fmlsHead = 0;
|
|
51
|
+
private readonly names: RefVector;
|
|
34
52
|
private isCnf = true;
|
|
35
53
|
private readonly core: RefVector;
|
|
36
54
|
private dep2asm = new Map<number, number>();
|
|
@@ -38,6 +56,7 @@ export class IncSatSolver {
|
|
|
38
56
|
private bitBlaster: BitBlasterRewriter | undefined;
|
|
39
57
|
// m_mcs.back(), the model converters of the preprocessed goals.
|
|
40
58
|
private readonly converters: Goal;
|
|
59
|
+
private readonly satConverter: Sat2GoalConverter;
|
|
41
60
|
private isInternalizedConverted = false;
|
|
42
61
|
private readonly internalized: RefVector;
|
|
43
62
|
private hasUninterpreted = false;
|
|
@@ -62,8 +81,10 @@ export class IncSatSolver {
|
|
|
62
81
|
);
|
|
63
82
|
if (mkThSolver !== null) this.goal2sat.ensureEuf();
|
|
64
83
|
this.fmls = new RefVector(manager);
|
|
84
|
+
this.names = new RefVector(manager);
|
|
65
85
|
this.core = new RefVector(manager);
|
|
66
86
|
this.converters = new Goal(manager);
|
|
87
|
+
this.satConverter = new Sat2GoalConverter(manager);
|
|
67
88
|
this.internalized = new RefVector(manager);
|
|
68
89
|
}
|
|
69
90
|
|
|
@@ -87,21 +108,44 @@ export class IncSatSolver {
|
|
|
87
108
|
this.fmls.push(expr);
|
|
88
109
|
}
|
|
89
110
|
|
|
90
|
-
|
|
111
|
+
assertNamed(expr: number, name: number) {
|
|
112
|
+
const manager = this.manager;
|
|
113
|
+
this.names.push(name);
|
|
114
|
+
if (this.isCnf && isLiteral(manager, expr) && isLiteral(manager, name))
|
|
115
|
+
return this.assertExpr(manager.mkApp(OP_OR, [mkNot(manager, name), expr], SORT_BOOL));
|
|
116
|
+
if (
|
|
117
|
+
this.isCnf &&
|
|
118
|
+
manager.getOp(expr) === OP_OR &&
|
|
119
|
+
this.isClause(expr) &&
|
|
120
|
+
isLiteral(manager, name)
|
|
121
|
+
)
|
|
122
|
+
return this.assertExpr(
|
|
123
|
+
manager.mkApp(OP_OR, [mkNot(manager, name), ...manager.getArgs(expr)], SORT_BOOL),
|
|
124
|
+
);
|
|
125
|
+
this.isCnf = false;
|
|
126
|
+
this.assertExpr(manager.mkApp(OP_IMPLIES, [name, expr], SORT_BOOL));
|
|
127
|
+
}
|
|
128
|
+
|
|
91
129
|
push() {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
130
|
+
try {
|
|
131
|
+
this.internalizeFormulas();
|
|
132
|
+
} finally {
|
|
133
|
+
this.goal2sat.push();
|
|
134
|
+
this.solver.userPush();
|
|
135
|
+
this.bitBlaster?.push();
|
|
136
|
+
this.scopes.push({
|
|
137
|
+
converters: this.converters.converters,
|
|
138
|
+
fmlsSize: this.fmls.size,
|
|
139
|
+
fmlsHead: this.fmlsHead,
|
|
140
|
+
namesSize: this.names.size,
|
|
141
|
+
hasUninterpreted: this.hasUninterpreted,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
101
144
|
}
|
|
102
145
|
|
|
103
146
|
pop(numScopes: number) {
|
|
104
147
|
const count = Math.min(numScopes, this.scopes.length);
|
|
148
|
+
this.bitBlaster?.pop(count);
|
|
105
149
|
this.goal2sat.pop(count);
|
|
106
150
|
this.solver.userPop(count);
|
|
107
151
|
for (let index = 0; index < count; index++) {
|
|
@@ -109,15 +153,33 @@ export class IncSatSolver {
|
|
|
109
153
|
this.converters.converters = scope.converters;
|
|
110
154
|
this.fmlsHead = scope.fmlsHead;
|
|
111
155
|
this.fmls.shrink(scope.fmlsSize);
|
|
156
|
+
this.names.shrink(scope.namesSize);
|
|
157
|
+
this.hasUninterpreted = scope.hasUninterpreted;
|
|
112
158
|
}
|
|
113
159
|
}
|
|
114
160
|
|
|
161
|
+
private getBitBlaster() {
|
|
162
|
+
const bitBlaster = (this.bitBlaster ??= new BitBlasterRewriter(this.manager, BIT_BLAST_PARAMS));
|
|
163
|
+
while (bitBlaster.getNumScopes() < this.scopes.length) bitBlaster.push();
|
|
164
|
+
return bitBlaster;
|
|
165
|
+
}
|
|
166
|
+
|
|
115
167
|
private checkUninterpreted() {
|
|
116
168
|
if (this.goal2sat.unhandledFuns.length === 0) return L_TRUE;
|
|
117
169
|
this.hasUninterpreted = true;
|
|
118
170
|
const manager = this.manager;
|
|
119
|
-
const
|
|
120
|
-
|
|
171
|
+
const funs = this.goal2sat.unhandledFuns.map((fun) => {
|
|
172
|
+
const declaration = mkSeq1(
|
|
173
|
+
[
|
|
174
|
+
mkText(getQuotedName(manager.funcDecls[fun.decl].name)),
|
|
175
|
+
mkSeq5(fun.domain.map((sort) => formatSort(manager, sort))),
|
|
176
|
+
formatSort(manager, fun.range),
|
|
177
|
+
],
|
|
178
|
+
"declare-fun",
|
|
179
|
+
);
|
|
180
|
+
return `${renderFormat(declaration, DEFAULT_PRINT_OPTIONS)}\n`;
|
|
181
|
+
});
|
|
182
|
+
this.reasonUnknown = `(sat.giveup interpreted functions sent to SAT solver ${funs.join("")})`;
|
|
121
183
|
return L_UNDEF;
|
|
122
184
|
}
|
|
123
185
|
|
|
@@ -131,7 +193,7 @@ export class IncSatSolver {
|
|
|
131
193
|
private internalizeGoal(goal: Goal) {
|
|
132
194
|
this.solver.popToBaseLevel();
|
|
133
195
|
if (this.solver.isInconsistent) return L_FALSE;
|
|
134
|
-
const bitBlaster =
|
|
196
|
+
const bitBlaster = this.getBitBlaster();
|
|
135
197
|
const subgoals = (() => {
|
|
136
198
|
if (this.isCnf) return [goal];
|
|
137
199
|
try {
|
|
@@ -144,15 +206,17 @@ export class IncSatSolver {
|
|
|
144
206
|
return goals;
|
|
145
207
|
} catch (error) {
|
|
146
208
|
this.releaseBitBlaster();
|
|
147
|
-
if (!(error instanceof SmtTacticError)) throw error;
|
|
148
|
-
|
|
209
|
+
if (!(error instanceof SmtTacticError || error instanceof SmtCanceledError)) throw error;
|
|
210
|
+
// The tactics of the preprocessing report a limit that stops their rewriters as a tactic_exception.
|
|
211
|
+
this.reasonUnknown =
|
|
212
|
+
error instanceof SmtCanceledError ? this.manager.limit.getCancelMessage() : error.message;
|
|
149
213
|
return undefined;
|
|
150
214
|
}
|
|
151
215
|
})();
|
|
152
216
|
if (subgoals?.length !== 1) return L_UNDEF;
|
|
153
217
|
const subgoal = subgoals[0];
|
|
154
218
|
this.converters.converters = [...this.converters.converters, ...subgoal.converters];
|
|
155
|
-
this.goal2sat.
|
|
219
|
+
this.goal2sat.runGoal(subgoal, this.dep2asm);
|
|
156
220
|
return this.checkUninterpreted();
|
|
157
221
|
}
|
|
158
222
|
|
|
@@ -171,15 +235,27 @@ export class IncSatSolver {
|
|
|
171
235
|
}
|
|
172
236
|
|
|
173
237
|
private internalizeAssumptions(assumptions: readonly number[]) {
|
|
238
|
+
const manager = this.manager;
|
|
239
|
+
const all = [...assumptions, ...this.names.items];
|
|
174
240
|
this.asms = [];
|
|
241
|
+
if (all.length === 0) return L_TRUE;
|
|
242
|
+
this.isCnf &&= all.every((assumption) => isLiteral(manager, assumption));
|
|
243
|
+
if (this.isCnf) this.goal2sat.assumptions(all, this.dep2asm);
|
|
244
|
+
else {
|
|
245
|
+
const goal = new Goal(manager);
|
|
246
|
+
goal.isCoresEnabled = true;
|
|
247
|
+
for (const assumption of all) goal.assert(assumption, mkDependencyLeaf(assumption));
|
|
248
|
+
const result = this.internalizeGoal(goal);
|
|
249
|
+
if (result !== L_TRUE) return result;
|
|
250
|
+
}
|
|
175
251
|
const seen = new Set<number>();
|
|
176
|
-
for (const assumption of
|
|
177
|
-
const lit = this.
|
|
178
|
-
|
|
179
|
-
if (seen.has(lit)) continue;
|
|
252
|
+
for (const assumption of all) {
|
|
253
|
+
const lit = this.dep2asm.get(assumption);
|
|
254
|
+
if (lit === undefined || seen.has(lit)) continue;
|
|
180
255
|
seen.add(lit);
|
|
181
256
|
this.asms.push(lit);
|
|
182
257
|
}
|
|
258
|
+
return L_TRUE;
|
|
183
259
|
}
|
|
184
260
|
|
|
185
261
|
check(assumptions: readonly number[] = []) {
|
|
@@ -203,10 +279,20 @@ export class IncSatSolver {
|
|
|
203
279
|
this.dep2asm = new Map();
|
|
204
280
|
const internalized = this.internalizeFormulas();
|
|
205
281
|
if (internalized !== L_TRUE) return internalized;
|
|
206
|
-
this.internalizeAssumptions(literals);
|
|
282
|
+
const internalizedAssumptions = this.internalizeAssumptions(literals);
|
|
283
|
+
if (internalizedAssumptions !== L_TRUE) return internalizedAssumptions;
|
|
207
284
|
this.reasonUnknown = "no reason given";
|
|
208
285
|
this.isInternalizedConverted = false;
|
|
209
|
-
const result =
|
|
286
|
+
const result = (() => {
|
|
287
|
+
try {
|
|
288
|
+
return this.solver.check(this.asms);
|
|
289
|
+
} catch (error) {
|
|
290
|
+
if (!(error instanceof SmtCanceledError)) throw error;
|
|
291
|
+
// check_sat_core counts a step to see whether the limit stopped the search.
|
|
292
|
+
manager.limit.inc();
|
|
293
|
+
return L_UNDEF;
|
|
294
|
+
}
|
|
295
|
+
})();
|
|
210
296
|
if (result === L_TRUE && this.hasUninterpreted) {
|
|
211
297
|
this.reasonUnknown = "(sat.giveup has-uninterpreted)";
|
|
212
298
|
return L_UNDEF;
|
|
@@ -239,20 +325,19 @@ export class IncSatSolver {
|
|
|
239
325
|
|
|
240
326
|
getConsequences(assumptions: readonly number[], vars: readonly number[]) {
|
|
241
327
|
const manager = this.manager;
|
|
242
|
-
this.
|
|
328
|
+
this.getBitBlaster();
|
|
243
329
|
this.dep2asm = new Map();
|
|
244
330
|
this.solver.popToBaseLevel();
|
|
245
331
|
const consequences: number[] = [];
|
|
246
332
|
const internalized = this.internalizeFormulas();
|
|
247
333
|
if (internalized !== L_TRUE) return { result: internalized, consequences };
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
this.internalizeAssumptions(assumptions);
|
|
251
|
-
const found = getConsequences(
|
|
252
|
-
this.solver,
|
|
253
|
-
this.asms,
|
|
254
|
-
vars.flatMap((expr) => this.internalizeVar(expr).filter((boolVar) => boolVar !== undefined)),
|
|
334
|
+
const boolVars = vars.flatMap((expr) =>
|
|
335
|
+
this.internalizeVar(expr).filter((boolVar) => boolVar !== undefined),
|
|
255
336
|
);
|
|
337
|
+
const internalizedAssumptions = this.internalizeAssumptions(assumptions);
|
|
338
|
+
if (internalizedAssumptions !== L_TRUE)
|
|
339
|
+
return { result: internalizedAssumptions, consequences };
|
|
340
|
+
const found = getConsequences(this.solver, this.asms, boolVars);
|
|
256
341
|
if (found.result === L_FALSE && this.asms.length > 0) this.extractCore(new Map());
|
|
257
342
|
if (found.result === L_FALSE) return { result: found.result, consequences };
|
|
258
343
|
const boolVar2conseq = new Map<number, number[]>();
|
|
@@ -304,18 +389,15 @@ export class IncSatSolver {
|
|
|
304
389
|
const manager = this.manager;
|
|
305
390
|
if (!this.solver.isModelCurrent || this.fmls.size > this.fmlsHead) return null;
|
|
306
391
|
const euf = this.goal2sat.euf;
|
|
307
|
-
|
|
308
|
-
const model = euf === null ? new ProtoModel(manager) : new ProtoModel(manager).mkModel();
|
|
392
|
+
const model = new ProtoModel(manager).mkModel();
|
|
309
393
|
for (const [expr, boolVar] of this.goal2sat.atoms) {
|
|
310
394
|
if (!manager.isUninterpretedConst(expr)) continue;
|
|
311
395
|
const value = this.solver.model[boolVar];
|
|
312
396
|
if (value === L_TRUE) model.registerConst(manager.decls[expr], manager.trueExpr);
|
|
313
397
|
else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
|
|
314
398
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
euf === null ? model.mkModel() : euf.updateModel(model),
|
|
318
|
-
);
|
|
399
|
+
if (this.satConverter.entries.length > 0) applyDefinitions(this.satConverter.entries, model);
|
|
400
|
+
const converted = convertModel(this.converters, euf === null ? model : euf.updateModel(model));
|
|
319
401
|
converted.incRef();
|
|
320
402
|
this.models.push(converted);
|
|
321
403
|
return converted;
|
|
@@ -346,10 +428,10 @@ export class IncSatSolver {
|
|
|
346
428
|
if (this.fmlsHead !== this.fmls.size) return this.fmls.items;
|
|
347
429
|
if (this.isInternalizedConverted) return this.internalized.items;
|
|
348
430
|
const goal = new Goal(this.manager);
|
|
349
|
-
sat2goal(this.manager, this.solver, this.goal2sat.atoms, goal);
|
|
431
|
+
sat2goal(this.manager, this.solver, this.goal2sat.atoms, goal, this.satConverter);
|
|
350
432
|
this.internalized.reset();
|
|
351
433
|
for (const form of goal.forms.items) this.internalized.push(form);
|
|
352
|
-
|
|
434
|
+
goal.reset();
|
|
353
435
|
this.isInternalizedConverted = true;
|
|
354
436
|
return this.internalized.items;
|
|
355
437
|
}
|
|
@@ -358,15 +440,19 @@ export class IncSatSolver {
|
|
|
358
440
|
// asserted formulas are internalized.
|
|
359
441
|
getConverters(): Goal["converters"] {
|
|
360
442
|
this.getAssertions();
|
|
361
|
-
return this.isInternalizedConverted
|
|
443
|
+
return this.isInternalizedConverted
|
|
444
|
+
? [...this.converters.converters, { definitions: this.satConverter.copyEntries() }]
|
|
445
|
+
: [];
|
|
362
446
|
}
|
|
363
447
|
|
|
364
448
|
release() {
|
|
365
449
|
for (const model of this.models) model.decRef();
|
|
366
450
|
this.models = [];
|
|
367
451
|
this.fmls.reset();
|
|
452
|
+
this.names.reset();
|
|
368
453
|
this.core.reset();
|
|
369
454
|
this.internalized.reset();
|
|
455
|
+
this.satConverter.release();
|
|
370
456
|
this.releaseBitBlaster();
|
|
371
457
|
}
|
|
372
458
|
|
|
@@ -33,6 +33,13 @@ export abstract class Constraint {
|
|
|
33
33
|
return this.lits.length;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
getMaxVar() {
|
|
37
|
+
let maxVar = this.lit === NULL_LITERAL ? 0 : this.lit >> 1;
|
|
38
|
+
for (let index = 0; index < this.lits.length; index++)
|
|
39
|
+
maxVar = Math.max(maxVar, this.lits[index] >> 1);
|
|
40
|
+
return maxVar;
|
|
41
|
+
}
|
|
42
|
+
|
|
36
43
|
getCoeff(_index: number) {
|
|
37
44
|
return 1;
|
|
38
45
|
}
|
|
@@ -832,6 +832,24 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
832
832
|
this.numPropagationsSincePop = 0;
|
|
833
833
|
}
|
|
834
834
|
|
|
835
|
+
gcVars(numVars: number) {
|
|
836
|
+
this.gcConstraintVars(numVars, this.constraints);
|
|
837
|
+
this.gcConstraintVars(numVars, this.learned);
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
private gcConstraintVars(numVars: number, constraints: Constraint[]) {
|
|
841
|
+
let next = 0;
|
|
842
|
+
for (let index = 0; index < constraints.length; index++) {
|
|
843
|
+
const constraint = constraints[index];
|
|
844
|
+
if (constraint.getMaxVar() >= numVars) {
|
|
845
|
+
constraint.clearWatch(this);
|
|
846
|
+
constraint.nullifyTrackingLiteral(this);
|
|
847
|
+
this.deallocate(constraint);
|
|
848
|
+
} else constraints[next++] = constraint;
|
|
849
|
+
}
|
|
850
|
+
constraints.length = next;
|
|
851
|
+
}
|
|
852
|
+
|
|
835
853
|
popReinit() {
|
|
836
854
|
const toReinit = this.constraintToReinit;
|
|
837
855
|
let size = this.constraintToReinitLastSize;
|
|
@@ -1443,7 +1461,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1443
1461
|
private convertPbWlits(expr: number): WLits {
|
|
1444
1462
|
const manager = this.manager;
|
|
1445
1463
|
const lits = this.convertPbArgs(expr);
|
|
1446
|
-
const coeffs = lits.map((
|
|
1464
|
+
const coeffs = lits.map((_value, index) =>
|
|
1447
1465
|
this.checkUnsigned(getPbCoeff(manager, manager.decls[expr], index)),
|
|
1448
1466
|
);
|
|
1449
1467
|
return { coeffs, lits };
|
|
@@ -1470,7 +1488,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1470
1488
|
k = k.add(Rational.of(BigInt(wlits.coeffs[index])));
|
|
1471
1489
|
}
|
|
1472
1490
|
const bound = this.checkUnsigned(k);
|
|
1473
|
-
if (isRoot) {
|
|
1491
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1474
1492
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1475
1493
|
return NULL_LITERAL;
|
|
1476
1494
|
}
|
|
@@ -1482,7 +1500,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1482
1500
|
private convertPbGe(expr: number, isRoot: boolean, isSign: boolean) {
|
|
1483
1501
|
const bound = this.checkUnsigned(getPbK(this.manager, this.manager.decls[expr]));
|
|
1484
1502
|
const wlits = this.convertPbWlits(expr);
|
|
1485
|
-
if (isRoot) {
|
|
1503
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1486
1504
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1487
1505
|
return NULL_LITERAL;
|
|
1488
1506
|
}
|
|
@@ -1495,7 +1513,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1495
1513
|
const solver = this.solver;
|
|
1496
1514
|
let k = getPbK(this.manager, this.manager.decls[expr]);
|
|
1497
1515
|
const wlits = this.convertPbWlits(expr);
|
|
1498
|
-
const isBaseAssert = isRoot && !isSign;
|
|
1516
|
+
const isBaseAssert = isRoot && !isSign && solver.numUserScopes === 0;
|
|
1499
1517
|
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1500
1518
|
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1501
1519
|
this.addPbGe(lit1, wlits, Number(BigInt.asUintN(32, k.num)), false);
|
|
@@ -1528,7 +1546,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1528
1546
|
private convertAtLeastK(expr: number, k: Rational, isRoot: boolean, isSign: boolean) {
|
|
1529
1547
|
const lits = this.convertPbArgs(expr);
|
|
1530
1548
|
let bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
1531
|
-
if (isRoot) {
|
|
1549
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1532
1550
|
if (isSign) {
|
|
1533
1551
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1534
1552
|
bound = lits.length + 1 - bound;
|
|
@@ -1547,7 +1565,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1547
1565
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1548
1566
|
const bound1 = k.compare(Rational.of(BigInt(lits.length))) >= 0 ? lits.length : Number(k.num);
|
|
1549
1567
|
let bound = lits.length - bound1;
|
|
1550
|
-
if (isRoot) {
|
|
1568
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1551
1569
|
if (isSign) {
|
|
1552
1570
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1553
1571
|
bound = lits.length + 1 - bound;
|
|
@@ -1564,7 +1582,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1564
1582
|
private convertEqK(expr: number, k: Rational, isRoot: boolean, isSign: boolean) {
|
|
1565
1583
|
const solver = this.solver;
|
|
1566
1584
|
const lits = this.convertPbArgs(expr);
|
|
1567
|
-
|
|
1585
|
+
// Deviation from Z3: convert_eq_k asserts at the base level in a user scope too, so the constraint outlives the pop.
|
|
1586
|
+
const isBaseAssert = isRoot && !isSign && solver.numUserScopes === 0;
|
|
1568
1587
|
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1569
1588
|
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1570
1589
|
const bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { SmtTacticError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
2
2
|
import type { AstManager } from "../ast";
|
|
3
3
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
4
4
|
import { OVER, type Goal } from "../goal";
|
|
5
|
-
import { L_FALSE, L_TRUE } from "../lbool";
|
|
5
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
6
|
import { ProtoModel } from "../proto-model";
|
|
7
7
|
import type { SatParams } from "./config";
|
|
8
8
|
import { Goal2Sat } from "./goal2sat";
|
|
9
|
-
import { sat2goal } from "./sat2goal";
|
|
9
|
+
import { Sat2GoalConverter, sat2goal } from "./sat2goal";
|
|
10
10
|
import { Solver } from "./solver";
|
|
11
11
|
|
|
12
12
|
// With a theory factory, the sat solver runs the euf solver of sat.euf as its extension.
|
|
@@ -19,11 +19,19 @@ export const createSatTactic =
|
|
|
19
19
|
const goal2sat = new Goal2Sat(manager, solver, params.get("ite_extra") !== false, mkThSolver);
|
|
20
20
|
goal2sat.run(goal.forms.items);
|
|
21
21
|
goal.reset();
|
|
22
|
-
const result =
|
|
22
|
+
const result = (() => {
|
|
23
|
+
try {
|
|
24
|
+
return solver.check();
|
|
25
|
+
} catch (error) {
|
|
26
|
+
if (error instanceof SmtCanceledError) throw new SmtTacticError("canceled");
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
})();
|
|
30
|
+
if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
|
|
23
31
|
const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
|
|
24
32
|
if (result === L_FALSE) goal.assert(manager.falseExpr);
|
|
25
33
|
else if (result === L_TRUE && unhandledFuns.length === 0) {
|
|
26
|
-
const model = new ProtoModel(manager);
|
|
34
|
+
const model = new ProtoModel(manager).mkModel();
|
|
27
35
|
for (const [expr, boolVar] of goal2sat.atoms) {
|
|
28
36
|
if (!manager.isUninterpretedConst(expr)) continue;
|
|
29
37
|
const value = solver.model[boolVar];
|
|
@@ -31,11 +39,13 @@ export const createSatTactic =
|
|
|
31
39
|
else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
|
|
32
40
|
}
|
|
33
41
|
const euf = goal2sat.euf;
|
|
34
|
-
goal.model =
|
|
42
|
+
goal.model = euf?.updateModel(model) ?? model;
|
|
35
43
|
euf?.validateModel(goal.model);
|
|
36
44
|
} else {
|
|
37
45
|
solver.popToBaseLevel();
|
|
38
|
-
|
|
46
|
+
const converter = new Sat2GoalConverter(manager);
|
|
47
|
+
sat2goal(manager, solver, goal2sat.atoms, goal, converter);
|
|
48
|
+
goal.addDefinitions(converter.entries);
|
|
39
49
|
if (unhandledFuns.length > 0) goal.updatePrecision(OVER);
|
|
40
50
|
}
|
|
41
51
|
goal.depth++;
|