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
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
|
|
2
|
+
import type { Definition, Goal } from "./goal";
|
|
3
|
+
import { DefinedNames } from "./nnf";
|
|
4
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
5
|
+
|
|
6
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
7
|
+
readonly hidden: Definition[] = [];
|
|
8
|
+
|
|
9
|
+
constructor(
|
|
10
|
+
manager: AstManager,
|
|
11
|
+
private names: DefinedNames,
|
|
12
|
+
private goal: Goal,
|
|
13
|
+
) {
|
|
14
|
+
super(manager);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
18
|
+
const manager = this.manager;
|
|
19
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
20
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
21
|
+
manager.incRef(ite);
|
|
22
|
+
const named = this.names.mkName(ite);
|
|
23
|
+
if (named.definition !== -1) {
|
|
24
|
+
this.goal.assert(named.definition);
|
|
25
|
+
if (this.goal.isModelsEnabled) this.hidden.push({ decl: manager.decls[named.name], def: -1 });
|
|
26
|
+
}
|
|
27
|
+
manager.incRef(named.name);
|
|
28
|
+
if (named.definition !== -1) manager.decRef(named.definition);
|
|
29
|
+
manager.decRef(ite);
|
|
30
|
+
return named.name;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export const runElimTermIte = (manager: AstManager) => (goal: Goal) => {
|
|
35
|
+
const names = new DefinedNames(manager, null);
|
|
36
|
+
const rewriter = new ElimTermIteRw(manager, names, goal);
|
|
37
|
+
const size = goal.forms.size;
|
|
38
|
+
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
39
|
+
const result = rewriter.rewrite(goal.forms.items[index]);
|
|
40
|
+
goal.update(index, result, goal.getDependency(index));
|
|
41
|
+
manager.decRef(result);
|
|
42
|
+
}
|
|
43
|
+
if (rewriter.hidden.length > 0) goal.addDefinitions(rewriter.hidden);
|
|
44
|
+
goal.depth++;
|
|
45
|
+
names.release();
|
|
46
|
+
rewriter.release();
|
|
47
|
+
return [goal];
|
|
48
|
+
};
|
|
@@ -59,8 +59,7 @@ export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
|
|
|
59
59
|
const repeated = new Set<number>();
|
|
60
60
|
for (const form of goal.forms.items) {
|
|
61
61
|
const todo = [form];
|
|
62
|
-
|
|
63
|
-
const expr = todo.pop() as number;
|
|
62
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
64
63
|
const isConst = manager.kinds[expr] === KIND_APP && manager.isUninterpretedConst(expr);
|
|
65
64
|
if (visited.has(expr)) {
|
|
66
65
|
if (isConst) repeated.add(expr);
|
|
@@ -82,8 +81,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
82
81
|
const disabled = new Set<number>();
|
|
83
82
|
const visited = new Set<number>();
|
|
84
83
|
const todo = [...goal.forms.items];
|
|
85
|
-
|
|
86
|
-
const expr = todo.pop() as number;
|
|
84
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
87
85
|
if (visited.has(expr)) continue;
|
|
88
86
|
visited.add(expr);
|
|
89
87
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -92,8 +90,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
92
90
|
if (disabled.has(body)) continue;
|
|
93
91
|
bodies.push(body);
|
|
94
92
|
const marks = [body];
|
|
95
|
-
|
|
96
|
-
const marked = marks.pop() as number;
|
|
93
|
+
for (let marked = marks.pop(); marked !== undefined; marked = marks.pop()) {
|
|
97
94
|
if (disabled.has(marked)) continue;
|
|
98
95
|
disabled.add(marked);
|
|
99
96
|
if (manager.kinds[marked] === KIND_APP) manager.pushArgs(marked, marks);
|
|
@@ -259,7 +256,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
259
256
|
if (index === -1) return -1;
|
|
260
257
|
const found = this.mkFreshFor(decl, args, sort);
|
|
261
258
|
if (!found.isNew) return found.fresh;
|
|
262
|
-
const rest = args.filter((
|
|
259
|
+
const rest = args.filter((_value, other) => other !== index);
|
|
263
260
|
const restExpr =
|
|
264
261
|
rest.length === 0
|
|
265
262
|
? -1
|
|
@@ -525,7 +522,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
|
|
|
525
522
|
const rewritten = rewriter.rewrite(form);
|
|
526
523
|
if (rewritten !== form) {
|
|
527
524
|
isModified = true;
|
|
528
|
-
goal.update(index, rewritten);
|
|
525
|
+
goal.update(index, rewritten, goal.dependencies[index]);
|
|
529
526
|
}
|
|
530
527
|
manager.decRef(rewritten);
|
|
531
528
|
}
|
|
@@ -71,7 +71,7 @@ import { type Enode, NULL_THEORY_VAR } from "./egraph";
|
|
|
71
71
|
import type { EufSolver } from "./euf-solver";
|
|
72
72
|
import { ThSolver } from "./th-solver";
|
|
73
73
|
|
|
74
|
-
|
|
74
|
+
interface ZeroOneBit {
|
|
75
75
|
readonly owner: number;
|
|
76
76
|
readonly index: number;
|
|
77
77
|
readonly isTrue: boolean;
|
|
@@ -23,8 +23,8 @@ export const NULL_THEORY_VAR = -1;
|
|
|
23
23
|
export const NULL_BOOL_VAR = -1;
|
|
24
24
|
|
|
25
25
|
const J_AXIOM = 0;
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
const J_CONGRUENCE = 1;
|
|
27
|
+
const J_EXTERNAL = 2;
|
|
28
28
|
|
|
29
29
|
export interface Justification {
|
|
30
30
|
readonly kind: number;
|
|
@@ -32,7 +32,7 @@ export interface Justification {
|
|
|
32
32
|
readonly external: number;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
|
|
35
|
+
const AXIOM: Justification = {
|
|
36
36
|
kind: J_AXIOM,
|
|
37
37
|
isCommutative: false,
|
|
38
38
|
external: 0,
|
|
@@ -490,8 +490,7 @@ export class Egraph {
|
|
|
490
490
|
}
|
|
491
491
|
const rootVar = root.getThVar(id);
|
|
492
492
|
node.replaceThVar(thVar, id);
|
|
493
|
-
// Deviation from Z3: the undo gives the node back its own variable
|
|
494
|
-
// which later equates the wrong terms.
|
|
493
|
+
// Deviation from Z3: the undo gives the node back its own variable, where Z3 gives it the root's and later equates the wrong terms.
|
|
495
494
|
this.updates.push({
|
|
496
495
|
tag: U_REPLACE_TH_VAR,
|
|
497
496
|
r1: node,
|
|
@@ -523,12 +522,6 @@ export class Egraph {
|
|
|
523
522
|
this.push(U_TOGGLE_CGC, node);
|
|
524
523
|
}
|
|
525
524
|
|
|
526
|
-
setRelevant(node: Enode) {
|
|
527
|
-
if (node.isRelevant) return;
|
|
528
|
-
node.isRelevant = true;
|
|
529
|
-
this.push(U_SET_RELEVANT, node);
|
|
530
|
-
}
|
|
531
|
-
|
|
532
525
|
private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
|
|
533
526
|
const isEnabled = !node.isCgcEnabled;
|
|
534
527
|
node.isCgcEnabled = isEnabled;
|
|
@@ -465,8 +465,7 @@ export class EufSolver implements SatExtension {
|
|
|
465
465
|
let generation = 0;
|
|
466
466
|
const visited = new Set<number>();
|
|
467
467
|
const todo = [expr];
|
|
468
|
-
|
|
469
|
-
const current = todo.pop() as number;
|
|
468
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
470
469
|
if (visited.has(current)) continue;
|
|
471
470
|
visited.add(current);
|
|
472
471
|
const node = this.egraph.find(current);
|
|
@@ -42,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
|
|
|
42
42
|
import type { TrailStack } from "./th-solver";
|
|
43
43
|
|
|
44
44
|
// euf::mam_solver: the solver whose trail undoes the matcher.
|
|
45
|
-
|
|
45
|
+
interface MamSolver {
|
|
46
46
|
readonly manager: AstManager;
|
|
47
47
|
readonly egraph: Egraph;
|
|
48
48
|
readonly trail: TrailStack;
|
|
@@ -590,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
590
590
|
return this.ctx.egraph.find(expr) ?? null;
|
|
591
591
|
}
|
|
592
592
|
|
|
593
|
-
canPropagate() {
|
|
594
|
-
return this.toMatch.length > 0 || this.newPatterns.length > 0;
|
|
595
|
-
}
|
|
596
|
-
|
|
597
593
|
private setLbls(root: Enode, isParent: boolean, hash: number) {
|
|
598
594
|
const low = isParent ? root.plbls : root.lbls;
|
|
599
595
|
const high = isParent ? root.plblsHigh : root.lblsHigh;
|
|
@@ -493,8 +493,7 @@ export class Ematch {
|
|
|
493
493
|
const manager = this.ctx.manager;
|
|
494
494
|
const todo = [expr];
|
|
495
495
|
const marked = new Set<number>();
|
|
496
|
-
|
|
497
|
-
const term = todo.pop() as number;
|
|
496
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
498
497
|
if (marked.has(term)) continue;
|
|
499
498
|
marked.add(term);
|
|
500
499
|
if (manager.isGroundApp(term)) {
|
|
@@ -25,10 +25,6 @@ export class TrailStack {
|
|
|
25
25
|
this.scopes.length -= numScopes;
|
|
26
26
|
while (this.undos.length > lim) (this.undos.pop() as () => void)();
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
get numScopes() {
|
|
30
|
-
return this.scopes.length;
|
|
31
|
-
}
|
|
32
28
|
}
|
|
33
29
|
|
|
34
30
|
// A th_explain: the literals and equalities that explain a propagation or a conflict.
|
|
@@ -109,9 +105,6 @@ export abstract class ThSolver {
|
|
|
109
105
|
isBetaRedex(_parent: Enode, _node: Enode) {
|
|
110
106
|
return false;
|
|
111
107
|
}
|
|
112
|
-
isFixed(_thVar: number, _lits: number[]): number {
|
|
113
|
-
return -1;
|
|
114
|
-
}
|
|
115
108
|
addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
|
|
116
109
|
addDep(node: Enode, deps: Dependencies) {
|
|
117
110
|
deps.set(node, null);
|
|
@@ -12,105 +12,227 @@ import {
|
|
|
12
12
|
SORT_INT,
|
|
13
13
|
SORT_REAL,
|
|
14
14
|
} from "./ast";
|
|
15
|
-
import
|
|
15
|
+
import {
|
|
16
|
+
type Polynomial,
|
|
17
|
+
type PolynomialManager,
|
|
18
|
+
PolynomialRef,
|
|
19
|
+
PolynomialRefVector,
|
|
20
|
+
} from "./nlsat/polynomial";
|
|
16
21
|
import { getLcm, Rational } from "./rational";
|
|
17
22
|
import { RefVector } from "./ref-vector";
|
|
18
23
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
24
|
+
interface Frame {
|
|
25
|
+
term: number;
|
|
26
|
+
index: number;
|
|
22
27
|
}
|
|
23
28
|
|
|
24
|
-
export
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
export class Expr2Polynomial {
|
|
30
|
+
private cache = new Map<number, number>();
|
|
31
|
+
private cachedDomain: RefVector;
|
|
32
|
+
private cachedPolynomials: PolynomialRefVector;
|
|
33
|
+
private cachedDenominators: bigint[] = [];
|
|
34
|
+
private frames: Frame[] = [];
|
|
35
|
+
private presult: PolynomialRefVector;
|
|
36
|
+
private dresult: bigint[] = [];
|
|
37
|
+
private var2expr: RefVector;
|
|
38
|
+
|
|
39
|
+
constructor(
|
|
40
|
+
private manager: AstManager,
|
|
41
|
+
readonly pm: PolynomialManager,
|
|
42
|
+
private t2x: Map<number, number>,
|
|
43
|
+
private mkVar: (isInt: boolean) => number,
|
|
44
|
+
) {
|
|
45
|
+
this.cachedDomain = new RefVector(manager);
|
|
46
|
+
this.cachedPolynomials = new PolynomialRefVector(pm);
|
|
47
|
+
this.presult = new PolynomialRefVector(pm);
|
|
48
|
+
this.var2expr = new RefVector(manager);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
private reset() {
|
|
52
|
+
this.frames.length = 0;
|
|
53
|
+
this.presult.reset();
|
|
54
|
+
this.dresult.length = 0;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
private cacheResult(term: number) {
|
|
58
|
+
if (this.manager.getRefCount(term) <= 1) return;
|
|
59
|
+
this.cache.set(term, this.cachedPolynomials.size);
|
|
60
|
+
this.cachedDomain.push(term);
|
|
61
|
+
this.cachedPolynomials.push(this.presult.get(this.presult.size - 1));
|
|
62
|
+
this.cachedDenominators.push(this.dresult[this.dresult.length - 1]);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
private storeResult(term: number, polynomial: Polynomial, denominator: bigint) {
|
|
66
|
+
this.presult.push(polynomial);
|
|
67
|
+
this.dresult.push(denominator);
|
|
68
|
+
this.cacheResult(term);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
private storeVarPoly(term: number) {
|
|
72
|
+
let variable = this.t2x.get(term);
|
|
73
|
+
if (variable === undefined) {
|
|
74
|
+
variable = this.mkVar(this.manager.sorts[term] === SORT_INT);
|
|
75
|
+
this.t2x.set(term, variable);
|
|
76
|
+
if (variable >= this.var2expr.size) this.var2expr.resize(variable + 1);
|
|
77
|
+
this.var2expr.set(variable, term);
|
|
78
|
+
}
|
|
79
|
+
this.storeResult(term, this.pm.mkVar(variable), 1n);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
private visitArithApp(term: number) {
|
|
83
|
+
const manager = this.manager;
|
|
84
|
+
switch (manager.getOp(term)) {
|
|
35
85
|
case OP_NUM: {
|
|
36
|
-
const value = manager.getRationalValue(
|
|
37
|
-
|
|
86
|
+
const value = manager.getRationalValue(term);
|
|
87
|
+
this.storeResult(term, this.pm.mkConst(value.num), value.den);
|
|
88
|
+
return true;
|
|
38
89
|
}
|
|
39
90
|
case OP_ADD:
|
|
40
|
-
case OP_SUB:
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
let polynomial = pm.zero;
|
|
44
|
-
for (const [index, arg] of args.entries()) {
|
|
45
|
-
const scaled = pm.mulConst(denominator / arg.denominator, arg.polynomial);
|
|
46
|
-
polynomial =
|
|
47
|
-
index === 0
|
|
48
|
-
? scaled
|
|
49
|
-
: op === OP_ADD
|
|
50
|
-
? pm.add(polynomial, scaled)
|
|
51
|
-
: pm.sub(polynomial, scaled);
|
|
52
|
-
}
|
|
53
|
-
return { polynomial, denominator };
|
|
54
|
-
}
|
|
55
|
-
case OP_MUL: {
|
|
56
|
-
let polynomial = pm.one;
|
|
57
|
-
let denominator = 1n;
|
|
58
|
-
for (const arg of manager.getArgs(expr).map(convert)) {
|
|
59
|
-
polynomial = pm.mul(polynomial, arg.polynomial);
|
|
60
|
-
denominator *= arg.denominator;
|
|
61
|
-
}
|
|
62
|
-
return { polynomial, denominator };
|
|
63
|
-
}
|
|
64
|
-
case OP_UMINUS: {
|
|
65
|
-
const arg = convert(manager.getArg(expr, 0));
|
|
66
|
-
return { polynomial: pm.neg(arg.polynomial), denominator: arg.denominator };
|
|
67
|
-
}
|
|
91
|
+
case OP_SUB:
|
|
92
|
+
case OP_MUL:
|
|
93
|
+
case OP_UMINUS:
|
|
68
94
|
case OP_TO_REAL:
|
|
69
|
-
|
|
95
|
+
this.frames.push({ term, index: 0 });
|
|
96
|
+
return false;
|
|
70
97
|
case OP_POWER: {
|
|
71
|
-
const exponent = manager.getArg(
|
|
98
|
+
const exponent = manager.getArg(term, 1);
|
|
72
99
|
const value = manager.isNumeral(exponent) ? manager.getRationalValue(exponent) : undefined;
|
|
73
|
-
if (value === undefined || !value.isInt() || value.num <= 0n || value.num > 0xffffffffn)
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
};
|
|
100
|
+
if (value === undefined || !value.isInt() || value.num <= 0n || value.num > 0xffffffffn) {
|
|
101
|
+
this.storeVarPoly(term);
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
this.frames.push({ term, index: 0 });
|
|
105
|
+
return false;
|
|
80
106
|
}
|
|
81
107
|
default:
|
|
82
|
-
|
|
108
|
+
this.storeVarPoly(term);
|
|
109
|
+
return true;
|
|
83
110
|
}
|
|
84
|
-
}
|
|
85
|
-
return convert(term);
|
|
86
|
-
};
|
|
111
|
+
}
|
|
87
112
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
113
|
+
private visit(term: number) {
|
|
114
|
+
const manager = this.manager;
|
|
115
|
+
const cached = manager.getRefCount(term) > 1 ? this.cache.get(term) : undefined;
|
|
116
|
+
if (cached !== undefined) {
|
|
117
|
+
this.presult.push(this.cachedPolynomials.get(cached));
|
|
118
|
+
this.dresult.push(this.cachedDenominators[cached]);
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
if (manager.kinds[term] !== KIND_APP || manager.getFamily(term) !== FAMILY_ARITH) {
|
|
122
|
+
this.storeVarPoly(term);
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
return this.visitArithApp(term);
|
|
126
|
+
}
|
|
91
127
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
) {
|
|
96
|
-
this.varToTerm = new RefVector(manager);
|
|
128
|
+
private pop(numArgs: number) {
|
|
129
|
+
this.presult.shrink(this.presult.size - numArgs);
|
|
130
|
+
this.dresult.length -= numArgs;
|
|
97
131
|
}
|
|
98
132
|
|
|
99
|
-
private
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
133
|
+
private processAddSub(term: number, numArgs: number, isAdd: boolean) {
|
|
134
|
+
const pm = this.pm;
|
|
135
|
+
const first = this.presult.size - numArgs;
|
|
136
|
+
const p = new PolynomialRef(pm);
|
|
137
|
+
const pAux = new PolynomialRef(pm);
|
|
138
|
+
let denominator = 1n;
|
|
139
|
+
for (let index = 0; index < numArgs; index++)
|
|
140
|
+
denominator = getLcm(denominator, this.dresult[first + index]);
|
|
141
|
+
p.set(pm.zero);
|
|
142
|
+
for (let index = 0; index < numArgs; index++) {
|
|
143
|
+
pAux.set(
|
|
144
|
+
pm.mulConst(denominator / this.dresult[first + index], this.presult.get(first + index)),
|
|
145
|
+
);
|
|
146
|
+
if (index === 0) p.copy(pAux);
|
|
147
|
+
else p.set(isAdd ? pm.add(p.get(), pAux.get()) : pm.sub(p.get(), pAux.get()));
|
|
148
|
+
}
|
|
149
|
+
this.pop(numArgs);
|
|
150
|
+
this.storeResult(term, p.get(), denominator);
|
|
151
|
+
pAux.reset();
|
|
152
|
+
p.reset();
|
|
106
153
|
}
|
|
107
154
|
|
|
108
|
-
private
|
|
109
|
-
|
|
155
|
+
private processMul(term: number, numArgs: number) {
|
|
156
|
+
const first = this.presult.size - numArgs;
|
|
157
|
+
const p = new PolynomialRef(this.pm);
|
|
158
|
+
let denominator = 1n;
|
|
159
|
+
p.set(this.pm.one);
|
|
160
|
+
for (let index = 0; index < numArgs; index++) {
|
|
161
|
+
p.set(this.pm.mul(p.get(), this.presult.get(first + index)));
|
|
162
|
+
denominator *= this.dresult[first + index];
|
|
163
|
+
}
|
|
164
|
+
this.pop(numArgs);
|
|
165
|
+
this.storeResult(term, p.get(), denominator);
|
|
166
|
+
p.reset();
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
private processUminus(term: number) {
|
|
170
|
+
const negP = new PolynomialRef(this.pm);
|
|
171
|
+
negP.set(this.pm.neg(this.presult.get(this.presult.size - 1)));
|
|
172
|
+
this.presult.shrink(this.presult.size - 1);
|
|
173
|
+
this.presult.push(negP.get());
|
|
174
|
+
this.cacheResult(term);
|
|
175
|
+
negP.reset();
|
|
110
176
|
}
|
|
111
177
|
|
|
112
|
-
|
|
113
|
-
|
|
178
|
+
private processPower(term: number, numArgs: number) {
|
|
179
|
+
const first = this.presult.size - numArgs;
|
|
180
|
+
const k = Number(this.manager.getRationalValue(this.manager.getArg(term, 1)).num);
|
|
181
|
+
const p = new PolynomialRef(this.pm);
|
|
182
|
+
this.pm.pw(this.presult.get(first), k, p);
|
|
183
|
+
const denominator = this.dresult[first] ** BigInt(k);
|
|
184
|
+
this.pop(numArgs);
|
|
185
|
+
this.storeResult(term, p.get(), denominator);
|
|
186
|
+
p.reset();
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
private processApp(term: number) {
|
|
190
|
+
const numArgs = this.manager.getNumArgs(term);
|
|
191
|
+
switch (this.manager.getOp(term)) {
|
|
192
|
+
case OP_ADD:
|
|
193
|
+
return this.processAddSub(term, numArgs, true);
|
|
194
|
+
case OP_SUB:
|
|
195
|
+
return this.processAddSub(term, numArgs, false);
|
|
196
|
+
case OP_MUL:
|
|
197
|
+
return this.processMul(term, numArgs);
|
|
198
|
+
case OP_POWER:
|
|
199
|
+
return this.processPower(term, numArgs);
|
|
200
|
+
case OP_UMINUS:
|
|
201
|
+
return this.processUminus(term);
|
|
202
|
+
default:
|
|
203
|
+
return this.cacheResult(term);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
toPolynomial(term: number, p: PolynomialRef) {
|
|
208
|
+
this.reset();
|
|
209
|
+
if (!this.visit(term)) {
|
|
210
|
+
const frames = this.frames;
|
|
211
|
+
while (frames.length > 0) {
|
|
212
|
+
const frame = frames[frames.length - 1];
|
|
213
|
+
const numArgs = this.manager.getNumArgs(frame.term);
|
|
214
|
+
let isPushed = false;
|
|
215
|
+
while (frame.index < numArgs) {
|
|
216
|
+
const arg = this.manager.getArg(frame.term, frame.index);
|
|
217
|
+
frame.index++;
|
|
218
|
+
if (!this.visit(arg)) {
|
|
219
|
+
isPushed = true;
|
|
220
|
+
break;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
if (isPushed) continue;
|
|
224
|
+
this.processApp(frame.term);
|
|
225
|
+
frames.pop();
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
p.set(this.presult.get(this.presult.size - 1));
|
|
229
|
+
const denominator = this.dresult[this.dresult.length - 1];
|
|
230
|
+
this.reset();
|
|
231
|
+
return denominator;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
private isIntVar(variable: number) {
|
|
235
|
+
return this.manager.sorts[this.var2expr.items[variable]] === SORT_INT;
|
|
114
236
|
}
|
|
115
237
|
|
|
116
238
|
toExpr(polynomial: Polynomial, isUsingPower: boolean) {
|
|
@@ -125,7 +247,7 @@ export class Expr2Polynomial {
|
|
|
125
247
|
const coeff = polynomial.as[index];
|
|
126
248
|
if (coeff !== 1n) factors.push(mkNumeral(coeff));
|
|
127
249
|
for (const [position, variable] of monomial.vars.entries()) {
|
|
128
|
-
const term = this.
|
|
250
|
+
const term = this.var2expr.items[variable];
|
|
129
251
|
const base =
|
|
130
252
|
this.isIntVar(variable) && !isInt ? manager.mkApp(OP_TO_REAL, [term], SORT_REAL) : term;
|
|
131
253
|
const degree = monomial.degrees[position];
|
|
@@ -141,6 +263,9 @@ export class Expr2Polynomial {
|
|
|
141
263
|
}
|
|
142
264
|
|
|
143
265
|
release() {
|
|
144
|
-
this.
|
|
266
|
+
this.presult.reset();
|
|
267
|
+
this.cachedPolynomials.reset();
|
|
268
|
+
this.cachedDomain.reset();
|
|
269
|
+
this.var2expr.reset();
|
|
145
270
|
}
|
|
146
271
|
}
|
|
@@ -18,7 +18,7 @@ import { runSimplifier } from "./dependent-expr-state";
|
|
|
18
18
|
import { Expr2Polynomial } from "./expr2polynomial";
|
|
19
19
|
import type { Goal } from "./goal";
|
|
20
20
|
import { getLcm, Rational } from "./rational";
|
|
21
|
-
import { PolynomialManager } from "./nlsat/polynomial";
|
|
21
|
+
import { Factors, type Polynomial, PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
22
22
|
import type { Rewrite } from "./rewriter-tpl";
|
|
23
23
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
24
24
|
|
|
@@ -37,7 +37,13 @@ class FactorRewriter extends RewriterTpl {
|
|
|
37
37
|
private isSplittingFactors: boolean,
|
|
38
38
|
) {
|
|
39
39
|
super(manager);
|
|
40
|
-
|
|
40
|
+
let variableCount = 0;
|
|
41
|
+
this.expr2poly = new Expr2Polynomial(
|
|
42
|
+
manager,
|
|
43
|
+
new PolynomialManager(manager.limit),
|
|
44
|
+
new Map(),
|
|
45
|
+
() => variableCount++,
|
|
46
|
+
);
|
|
41
47
|
}
|
|
42
48
|
|
|
43
49
|
private mkZeroFor(expr: number) {
|
|
@@ -51,20 +57,36 @@ class FactorRewriter extends RewriterTpl {
|
|
|
51
57
|
: this.manager.mkApp(OP_MUL, args, this.manager.sorts[args[0]]);
|
|
52
58
|
}
|
|
53
59
|
|
|
54
|
-
private factor(op: number, lhs: number, rhs: number)
|
|
55
|
-
const manager = this.manager;
|
|
60
|
+
private factor(op: number, lhs: number, rhs: number) {
|
|
56
61
|
const pm = this.expr2poly.pm;
|
|
57
|
-
const first =
|
|
58
|
-
const second =
|
|
59
|
-
const
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
const first = new PolynomialRef(pm);
|
|
63
|
+
const second = new PolynomialRef(pm);
|
|
64
|
+
const p = new PolynomialRef(pm);
|
|
65
|
+
const firstDenominator = this.expr2poly.toPolynomial(lhs, first);
|
|
66
|
+
const secondDenominator = this.expr2poly.toPolynomial(rhs, second);
|
|
67
|
+
const lcm = getLcm(firstDenominator, secondDenominator);
|
|
68
|
+
p.set(
|
|
69
|
+
pm.addmulTerms(
|
|
70
|
+
lcm / firstDenominator,
|
|
71
|
+
pm.unit,
|
|
72
|
+
first.get(),
|
|
73
|
+
-(lcm / secondDenominator),
|
|
74
|
+
pm.unit,
|
|
75
|
+
second.get(),
|
|
76
|
+
),
|
|
65
77
|
);
|
|
66
|
-
|
|
67
|
-
const
|
|
78
|
+
const factors = new Factors(pm);
|
|
79
|
+
const result = pm.isConst(p.get()) ? -1 : this.factorPolynomial(op, p.get(), factors);
|
|
80
|
+
factors.reset();
|
|
81
|
+
p.reset();
|
|
82
|
+
second.reset();
|
|
83
|
+
first.reset();
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
private factorPolynomial(op: number, polynomial: Polynomial, factors: Factors): number {
|
|
88
|
+
const manager = this.manager;
|
|
89
|
+
this.expr2poly.pm.factor(polynomial, factors);
|
|
68
90
|
if (factors.factors.length === 1 && factors.degrees[0] === 1) return -1;
|
|
69
91
|
const terms = factors.factors.map((factor) => this.expr2poly.toExpr(factor, true));
|
|
70
92
|
if (op === OP_EQ) {
|