tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +261 -68
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/anonymize.ts +2 -4
- package/src/obligations/index.ts +5 -3
- package/src/obligations/pragma.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/isar/attrib.ts +86 -45
- package/src/prover/isabelle/isar/context.ts +25 -22
- package/src/prover/isabelle/isar/induct.ts +2 -5
- package/src/prover/isabelle/isar/method.ts +5 -7
- package/src/prover/isabelle/isar/proof.ts +33 -16
- package/src/prover/isabelle/isar/rule-cases.ts +6 -14
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -52
- package/src/prover/isabelle/provers/classical.ts +1 -1
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/aig-tactic.ts +25 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -5
- package/src/prover/smt/solver/asserted-formulas.ts +1 -1
- package/src/prover/smt/solver/ast-util.ts +3 -1
- package/src/prover/smt/solver/ast.ts +110 -152
- package/src/prover/smt/solver/bound-manager.ts +39 -28
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
- package/src/prover/smt/solver/bv-rewriter.ts +14 -16
- package/src/prover/smt/solver/bv1-blast.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +19 -14
- package/src/prover/smt/solver/check-logic.ts +6 -1
- package/src/prover/smt/solver/context.ts +20 -10
- package/src/prover/smt/solver/demodulator.ts +2 -2
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
- package/src/prover/smt/solver/distribute-forall.ts +1 -10
- package/src/prover/smt/solver/dom-simplify.ts +1 -1
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
- package/src/prover/smt/solver/enode.ts +15 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
- package/src/prover/smt/solver/euf/egraph.ts +65 -32
- package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
- package/src/prover/smt/solver/euf/mam.ts +6 -48
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
- package/src/prover/smt/solver/euf/q-solver.ts +2 -0
- package/src/prover/smt/solver/euf/th-solver.ts +1 -1
- package/src/prover/smt/solver/factor.ts +1 -11
- package/src/prover/smt/solver/fd-solver.ts +1 -2
- package/src/prover/smt/solver/fm-tactic.ts +19 -13
- package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
- package/src/prover/smt/solver/internalizer.ts +41 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -4
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
- package/src/prover/smt/solver/macro-finder.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +13 -13
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
- package/src/prover/smt/solver/maxcore.ts +4 -12
- package/src/prover/smt/solver/maxlex.ts +0 -7
- package/src/prover/smt/solver/maxsmt-base.ts +7 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
- package/src/prover/smt/solver/model-evaluator.ts +9 -5
- package/src/prover/smt/solver/model-macro-solver.ts +3 -3
- package/src/prover/smt/solver/muz/dl-context.ts +57 -3
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
- package/src/prover/smt/solver/muz/hnf.ts +6 -5
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
- package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
- package/src/prover/smt/solver/muz/substitution.ts +88 -37
- package/src/prover/smt/solver/nlqsat.ts +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
- package/src/prover/smt/solver/nlsat/explain.ts +5 -0
- package/src/prover/smt/solver/nlsat/solver.ts +36 -25
- package/src/prover/smt/solver/opt-context.ts +9 -8
- package/src/prover/smt/solver/opt-nlsat.ts +68 -58
- package/src/prover/smt/solver/opt-solver.ts +16 -7
- package/src/prover/smt/solver/optsmt.ts +12 -9
- package/src/prover/smt/solver/pattern-inference.ts +2 -2
- package/src/prover/smt/solver/pb-rewriter.ts +13 -13
- package/src/prover/smt/solver/poly-rewriter.ts +2 -2
- package/src/prover/smt/solver/probes.ts +1 -1
- package/src/prover/smt/solver/propagate-values.ts +4 -0
- package/src/prover/smt/solver/proto-model.ts +5 -5
- package/src/prover/smt/solver/purify-arith.ts +50 -15
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -23
- package/src/prover/smt/solver/qe.ts +45 -53
- package/src/prover/smt/solver/qsat.ts +70 -90
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quasi-macros.ts +9 -18
- package/src/prover/smt/solver/rational.ts +17 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
- package/src/prover/smt/solver/rewriter.ts +1 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
- package/src/prover/smt/solver/sat/clause.ts +1 -3
- package/src/prover/smt/solver/sat/config.ts +3 -3
- package/src/prover/smt/solver/sat/consequences.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
- package/src/prover/smt/solver/sat/model-converter.ts +1 -15
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
- package/src/prover/smt/solver/sat/probing.ts +22 -19
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
- package/src/prover/smt/solver/sat/simplifier.ts +15 -56
- package/src/prover/smt/solver/sat/solver.ts +20 -19
- package/src/prover/smt/solver/sat/watch-list.ts +7 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
- package/src/prover/smt/solver/seq-derive.ts +6 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
- package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
- package/src/prover/smt/solver/seq-re-util.ts +1 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +4 -4
- package/src/prover/smt/solver/seq-rewriter.ts +1 -4
- package/src/prover/smt/solver/smt-setup.ts +15 -9
- package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
- package/src/prover/smt/solver/smtlib-script.ts +866 -728
- package/src/prover/smt/solver/tactic.ts +66 -14
- package/src/prover/smt/solver/theory-array.ts +25 -58
- package/src/prover/smt/solver/theory-bv.ts +13 -50
- package/src/prover/smt/solver/theory-fpa.ts +46 -78
- package/src/prover/smt/solver/theory-pb.ts +10 -6
- package/src/prover/smt/solver/theory-recfun.ts +2 -2
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
- package/src/prover/smt/solver/theory-seq-state.ts +6 -3
- package/src/prover/smt/solver/theory-seq.ts +32 -54
- package/src/prover/smt/solver/theory.ts +16 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
- package/src/prover/smt/solver/var-subst.ts +2 -2
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -11
- package/src/prover/zenon/node.ts +12 -11
- package/src/prover/zenon/tla/sets.ts +1 -1
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// Ported from Z3 (src/sat/smt/q_clause.h, src/sat/smt/q_eval.cpp, src/sat/smt/q_queue.cpp,
|
|
2
|
-
// src/sat/smt/q_ematch.cpp, src/
|
|
3
|
-
// z3-license.txt.
|
|
2
|
+
// src/sat/smt/q_ematch.cpp, src/util/dlist.h), MIT license, see z3-license.txt.
|
|
4
3
|
import { KIND_VAR, OP_DISTINCT, OP_EQ, QUANTIFIER_EXISTS, QUANTIFIER_FORALL } from "../ast";
|
|
5
4
|
import { flattenOrVector, mkNot } from "../ast-util";
|
|
6
5
|
import { PatternInferenceRw } from "../asserted-formulas";
|
|
@@ -22,13 +21,6 @@ export interface QLit {
|
|
|
22
21
|
readonly sign: boolean;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
|
-
// q::quantifier_stat, with the fields the default cost function reads.
|
|
26
|
-
interface QuantifierStat {
|
|
27
|
-
readonly generation: number;
|
|
28
|
-
maxGeneration: number;
|
|
29
|
-
maxCost: number;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
24
|
// q::binding: a match of a clause's quantifier, in a circular list of the clause's bindings.
|
|
33
25
|
export class Binding {
|
|
34
26
|
next: Binding = this;
|
|
@@ -36,10 +28,7 @@ export class Binding {
|
|
|
36
28
|
|
|
37
29
|
constructor(
|
|
38
30
|
readonly clause: Clause,
|
|
39
|
-
readonly pattern: number,
|
|
40
31
|
readonly maxGeneration: number,
|
|
41
|
-
readonly minTopGeneration: number,
|
|
42
|
-
readonly maxTopGeneration: number,
|
|
43
32
|
readonly nodes: readonly Enode[],
|
|
44
33
|
) {}
|
|
45
34
|
}
|
|
@@ -54,15 +43,11 @@ export class Clause {
|
|
|
54
43
|
readonly lits: readonly QLit[],
|
|
55
44
|
readonly q: number,
|
|
56
45
|
readonly numDecls: number,
|
|
57
|
-
readonly stat: QuantifierStat,
|
|
58
46
|
) {}
|
|
59
47
|
}
|
|
60
48
|
|
|
61
49
|
// q::justification: the evidence for a propagation from a binding.
|
|
62
50
|
interface Justification {
|
|
63
|
-
readonly lhs: number;
|
|
64
|
-
readonly rhs: number;
|
|
65
|
-
readonly sign: boolean;
|
|
66
51
|
readonly generation: number;
|
|
67
52
|
readonly explain: readonly number[];
|
|
68
53
|
readonly clause: Clause;
|
|
@@ -217,7 +202,13 @@ class Eval {
|
|
|
217
202
|
evidence: EnodePair[],
|
|
218
203
|
) {
|
|
219
204
|
const manager = this.ctx.manager;
|
|
220
|
-
if (
|
|
205
|
+
if (
|
|
206
|
+
s === t ||
|
|
207
|
+
(manager.isAlgebraicNumeral(s) &&
|
|
208
|
+
manager.isAlgebraicNumeral(t) &&
|
|
209
|
+
manager.compareArithValues(s, t) === 0)
|
|
210
|
+
)
|
|
211
|
+
return L_TRUE;
|
|
221
212
|
if (manager.areDistinct(s, t)) return L_FALSE;
|
|
222
213
|
if (!manager.isApp(s) || !manager.isApp(t)) return L_UNDEF;
|
|
223
214
|
if (manager.decls[s] !== manager.decls[t]) return L_UNDEF;
|
|
@@ -280,11 +271,7 @@ class Eval {
|
|
|
280
271
|
else todo.push(arg);
|
|
281
272
|
}
|
|
282
273
|
if (args.length !== manager.getNumArgs(term)) continue;
|
|
283
|
-
const node = ctx.egraph.findCongruent(
|
|
284
|
-
manager.decls[term],
|
|
285
|
-
args,
|
|
286
|
-
args.length === 2 && manager.getOp(term) === OP_EQ,
|
|
287
|
-
);
|
|
274
|
+
const node = ctx.egraph.findCongruent(manager.decls[term], args);
|
|
288
275
|
if (node === undefined) return null;
|
|
289
276
|
for (let index = args.length; index-- > 0;) {
|
|
290
277
|
const first = args[index];
|
|
@@ -323,14 +310,8 @@ class Queue {
|
|
|
323
310
|
this.subst = new VarSubst(ctx.manager, true);
|
|
324
311
|
}
|
|
325
312
|
|
|
326
|
-
private getCost(binding: Binding) {
|
|
327
|
-
const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
|
|
328
|
-
binding.clause.stat.maxCost = Math.max(binding.clause.stat.maxCost, cost);
|
|
329
|
-
return cost;
|
|
330
|
-
}
|
|
331
|
-
|
|
332
313
|
insert(binding: Binding) {
|
|
333
|
-
const cost = this.
|
|
314
|
+
const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
|
|
334
315
|
if (this.newEntries.length === 0) this.ctx.trail.push(() => (this.newEntries = []));
|
|
335
316
|
this.newEntries.push({ binding, cost, isInstantiated: false });
|
|
336
317
|
}
|
|
@@ -392,19 +373,13 @@ class Queue {
|
|
|
392
373
|
}
|
|
393
374
|
}
|
|
394
375
|
|
|
395
|
-
interface Prop {
|
|
396
|
-
readonly isConflict: boolean;
|
|
397
|
-
readonly idx: number;
|
|
398
|
-
readonly justification: number;
|
|
399
|
-
}
|
|
400
|
-
|
|
401
376
|
const GENERATION_PROPAGATION_THRESHOLD = 3;
|
|
402
377
|
|
|
403
378
|
export class Ematch {
|
|
404
379
|
private eval: Eval;
|
|
405
380
|
private bindings = new Set<string>();
|
|
406
381
|
private queue: Queue;
|
|
407
|
-
private props:
|
|
382
|
+
private props: number[] = [];
|
|
408
383
|
private inferPatterns: PatternInferenceRw;
|
|
409
384
|
private mam: Mam;
|
|
410
385
|
private lazyMam: Mam | null = null;
|
|
@@ -419,7 +394,6 @@ export class Ematch {
|
|
|
419
394
|
private evidence: EnodePair[] = [];
|
|
420
395
|
private names: DefinedNames;
|
|
421
396
|
private nnf: Nnf;
|
|
422
|
-
private numInstantiations = 0;
|
|
423
397
|
private subst: VarSubst;
|
|
424
398
|
|
|
425
399
|
constructor(
|
|
@@ -453,14 +427,8 @@ export class Ematch {
|
|
|
453
427
|
}
|
|
454
428
|
|
|
455
429
|
// mk_justification: the explanation of the evidence, taken while it is created.
|
|
456
|
-
private mkJustification(
|
|
457
|
-
idx: number,
|
|
458
|
-
generation: number,
|
|
459
|
-
clause: Clause,
|
|
460
|
-
binding: readonly Enode[],
|
|
461
|
-
) {
|
|
430
|
+
private mkJustification(generation: number, clause: Clause, binding: readonly Enode[]) {
|
|
462
431
|
const ctx = this.ctx;
|
|
463
|
-
const lit = idx === -1 ? null : clause.lits[idx];
|
|
464
432
|
const explain: number[] = [];
|
|
465
433
|
ctx.egraph.beginExplain();
|
|
466
434
|
for (const pair of this.evidence) {
|
|
@@ -469,9 +437,6 @@ export class Ematch {
|
|
|
469
437
|
}
|
|
470
438
|
ctx.egraph.endExplain();
|
|
471
439
|
const justification: Justification = {
|
|
472
|
-
lhs: lit === null ? -1 : lit.lhs,
|
|
473
|
-
rhs: lit === null ? -1 : lit.rhs,
|
|
474
|
-
sign: lit === null ? false : lit.sign,
|
|
475
440
|
generation,
|
|
476
441
|
explain,
|
|
477
442
|
clause,
|
|
@@ -555,14 +520,7 @@ export class Ematch {
|
|
|
555
520
|
return `${clause.q}:${nodes.map((node) => node.owner).join(",")}`;
|
|
556
521
|
}
|
|
557
522
|
|
|
558
|
-
private allocBinding(
|
|
559
|
-
clause: Clause,
|
|
560
|
-
pattern: number,
|
|
561
|
-
nodes: readonly Enode[],
|
|
562
|
-
maxGeneration: number,
|
|
563
|
-
minTopGeneration: number,
|
|
564
|
-
maxTopGeneration: number,
|
|
565
|
-
) {
|
|
523
|
+
private allocBinding(clause: Clause, nodes: readonly Enode[], maxGeneration: number) {
|
|
566
524
|
if (this.bindings.has(this.getBindingKey(clause, nodes))) return null;
|
|
567
525
|
if (
|
|
568
526
|
this.bindings.has(
|
|
@@ -573,14 +531,7 @@ export class Ematch {
|
|
|
573
531
|
)
|
|
574
532
|
)
|
|
575
533
|
return null;
|
|
576
|
-
const binding = new Binding(
|
|
577
|
-
clause,
|
|
578
|
-
pattern,
|
|
579
|
-
maxGeneration,
|
|
580
|
-
minTopGeneration,
|
|
581
|
-
maxTopGeneration,
|
|
582
|
-
[...nodes],
|
|
583
|
-
);
|
|
534
|
+
const binding = new Binding(clause, maxGeneration, [...nodes]);
|
|
584
535
|
const key = this.getBindingKey(clause, binding.nodes);
|
|
585
536
|
this.bindings.add(key);
|
|
586
537
|
this.ctx.trail.push(() => this.bindings.delete(key));
|
|
@@ -589,21 +540,12 @@ export class Ematch {
|
|
|
589
540
|
|
|
590
541
|
private onBinding = (
|
|
591
542
|
quantifier: number,
|
|
592
|
-
|
|
543
|
+
_pattern: number,
|
|
593
544
|
nodes: readonly Enode[],
|
|
594
545
|
maxGeneration: number,
|
|
595
|
-
minTopGeneration: number,
|
|
596
|
-
maxTopGeneration: number,
|
|
597
546
|
) => {
|
|
598
547
|
const clause = this.clauses[this.q2clauses.get(quantifier) as number];
|
|
599
|
-
const binding = this.allocBinding(
|
|
600
|
-
clause,
|
|
601
|
-
pattern,
|
|
602
|
-
nodes,
|
|
603
|
-
maxGeneration,
|
|
604
|
-
minTopGeneration,
|
|
605
|
-
maxTopGeneration,
|
|
606
|
-
);
|
|
548
|
+
const binding = this.allocBinding(clause, nodes, maxGeneration);
|
|
607
549
|
if (binding === null) return;
|
|
608
550
|
if (this.propagate(false, nodes, maxGeneration, clause).isDone) return;
|
|
609
551
|
pushToFront(clause, binding);
|
|
@@ -629,14 +571,9 @@ export class Ematch {
|
|
|
629
571
|
if (evaluated.value === L_UNDEF && maxGeneration > GENERATION_PROPAGATION_THRESHOLD)
|
|
630
572
|
return { isDone: false, isPropagated: false };
|
|
631
573
|
const owned = isOwned ? binding : [...binding];
|
|
632
|
-
const justification = this.mkJustification(
|
|
574
|
+
const justification = this.mkJustification(maxGeneration, clause, owned);
|
|
633
575
|
if (isOwned) this.propagateJustification(justification);
|
|
634
|
-
else
|
|
635
|
-
this.props.push({
|
|
636
|
-
isConflict: evaluated.value === L_FALSE,
|
|
637
|
-
idx: evaluated.idx,
|
|
638
|
-
justification,
|
|
639
|
-
});
|
|
576
|
+
else this.props.push(justification);
|
|
640
577
|
return { isDone: true, isPropagated: true };
|
|
641
578
|
}
|
|
642
579
|
|
|
@@ -652,21 +589,14 @@ export class Ematch {
|
|
|
652
589
|
private flushPropQueue() {
|
|
653
590
|
if (this.props.length === 0) return false;
|
|
654
591
|
for (let index = 0; index < this.props.length; index++)
|
|
655
|
-
this.propagateJustification(this.props[index]
|
|
592
|
+
this.propagateJustification(this.props[index]);
|
|
656
593
|
this.props = [];
|
|
657
594
|
return true;
|
|
658
595
|
}
|
|
659
596
|
|
|
660
|
-
private instantiateBinding(binding: Binding) {
|
|
661
|
-
const stat = binding.clause.stat;
|
|
662
|
-
stat.maxGeneration = Math.max(stat.maxGeneration, binding.maxGeneration, stat.generation);
|
|
663
|
-
this.numInstantiations++;
|
|
664
|
-
this.queue.insert(binding);
|
|
665
|
-
}
|
|
666
|
-
|
|
667
597
|
addInstantiation(clause: Clause, binding: Binding, lit: number) {
|
|
668
598
|
this.evidence = [];
|
|
669
|
-
this.ctx.propagate(lit, this.mkJustification(
|
|
599
|
+
this.ctx.propagate(lit, this.mkJustification(binding.maxGeneration, clause, binding.nodes));
|
|
670
600
|
}
|
|
671
601
|
|
|
672
602
|
private instantiateLit(generation: number, binding: readonly Enode[], lit: QLit) {
|
|
@@ -750,15 +680,12 @@ export class Ematch {
|
|
|
750
680
|
manager.decRef(q);
|
|
751
681
|
q = inferred;
|
|
752
682
|
}
|
|
753
|
-
const node = ctx.egraph.find(quantifier);
|
|
754
|
-
const generation = node === undefined ? ctx.generation : node.generation;
|
|
755
683
|
return new Clause(
|
|
756
684
|
this.clauses.length,
|
|
757
685
|
isExists ? literal ^ 1 : literal,
|
|
758
686
|
lits,
|
|
759
687
|
q,
|
|
760
688
|
manager.getQuantifier(q).sorts.length,
|
|
761
|
-
{ generation, maxGeneration: 0, maxCost: 0 },
|
|
762
689
|
);
|
|
763
690
|
}
|
|
764
691
|
|
|
@@ -852,7 +779,7 @@ export class Ematch {
|
|
|
852
779
|
isPropagated ||= result.isPropagated;
|
|
853
780
|
if (result.isDone) toRemove.push(binding);
|
|
854
781
|
else if (isFlushing) {
|
|
855
|
-
this.
|
|
782
|
+
this.queue.insert(binding);
|
|
856
783
|
toRemove.push(binding);
|
|
857
784
|
isPropagated = true;
|
|
858
785
|
}
|
|
@@ -410,13 +410,15 @@ export class Mbqi {
|
|
|
410
410
|
)
|
|
411
411
|
continue;
|
|
412
412
|
visited.add(value);
|
|
413
|
+
const replaced = this.replaceModelValue(value);
|
|
413
414
|
veqs.push(this.pin(manager.mkEq(sk, expr)));
|
|
414
|
-
meqs.push(this.pin(manager.mkEq(sk,
|
|
415
|
+
meqs.push(this.pin(manager.mkEq(sk, replaced)));
|
|
415
416
|
bound--;
|
|
416
417
|
}
|
|
417
418
|
if (veqs.length === 0) continue;
|
|
418
|
-
|
|
419
|
+
const meq = manager.mkOr(meqs);
|
|
419
420
|
qb.domainEqs.push(manager.mkOr(veqs));
|
|
421
|
+
this.assertExpr(meq);
|
|
420
422
|
}
|
|
421
423
|
}
|
|
422
424
|
|
|
@@ -237,7 +237,7 @@ export class ModelFixer {
|
|
|
237
237
|
isLess: (first, second) =>
|
|
238
238
|
manager.isBvNumeral(first) && manager.isBvNumeral(second)
|
|
239
239
|
? manager.getBvNumeralValue(first) < manager.getBvNumeralValue(second)
|
|
240
|
-
: first < second,
|
|
240
|
+
: manager.ids[first] < manager.ids[second],
|
|
241
241
|
mkLt: (first, second) =>
|
|
242
242
|
manager.mkApp(OP_NOT, [mkBvApp(manager, OP_ULEQ, [second, first])], SORT_BOOL),
|
|
243
243
|
};
|
|
@@ -116,7 +116,7 @@ export abstract class ThSolver {
|
|
|
116
116
|
}
|
|
117
117
|
addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
|
|
118
118
|
addDep(node: Enode, deps: Dependencies) {
|
|
119
|
-
deps.set(node,
|
|
119
|
+
deps.set(node, null);
|
|
120
120
|
return true;
|
|
121
121
|
}
|
|
122
122
|
includeFuncInterp(_decl: number) {
|
|
@@ -133,17 +133,7 @@ export const factor = (manager: AstManager, goal: Goal, isSplittingFactors: bool
|
|
|
133
133
|
runSimplifier(goal, false, (state) => {
|
|
134
134
|
const rewriter = new FactorRewriter(manager, isSplittingFactors);
|
|
135
135
|
return {
|
|
136
|
-
reduce: () =>
|
|
137
|
-
let rewritten = -1;
|
|
138
|
-
state.forEachIndex((index) => {
|
|
139
|
-
const form = state.get(index);
|
|
140
|
-
const next = rewriter.rewrite(form);
|
|
141
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
142
|
-
rewritten = next;
|
|
143
|
-
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
144
|
-
});
|
|
145
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
146
|
-
},
|
|
136
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
147
137
|
release: () => {
|
|
148
138
|
rewriter.expr2poly.release();
|
|
149
139
|
rewriter.release();
|
|
@@ -27,12 +27,11 @@ import { L_FALSE, L_TRUE } from "./lbool";
|
|
|
27
27
|
import { RefVector } from "./ref-vector";
|
|
28
28
|
import { Rewriter } from "./rewriter";
|
|
29
29
|
import { convertModel, getRewriterOptions } from "./tactic";
|
|
30
|
+
import { UINT_MAX } from "./sat/clause";
|
|
30
31
|
import type { SatParams } from "./sat/config";
|
|
31
32
|
import { IncSatSolver } from "./sat/inc-sat-solver";
|
|
32
33
|
import { SubstReplacer } from "./solve-eqs";
|
|
33
34
|
|
|
34
|
-
const UINT_MAX = 4294967295;
|
|
35
|
-
|
|
36
35
|
const getNumBits = (value: bigint) => {
|
|
37
36
|
let bound = 1n;
|
|
38
37
|
let numBits = 1;
|
|
@@ -20,10 +20,11 @@ import {
|
|
|
20
20
|
SORT_INT,
|
|
21
21
|
SORT_REAL,
|
|
22
22
|
} from "./ast";
|
|
23
|
-
import type
|
|
23
|
+
import { type Dependency, type Goal, joinDependencies } from "./goal";
|
|
24
24
|
import type { ProtoModel } from "./proto-model";
|
|
25
25
|
import { getGcd, getLcm, Rational } from "./rational";
|
|
26
26
|
import { RefVector } from "./ref-vector";
|
|
27
|
+
import { UINT_MAX } from "./sat/clause";
|
|
27
28
|
|
|
28
29
|
export interface FmOptions {
|
|
29
30
|
isRealOnly: boolean;
|
|
@@ -44,10 +45,9 @@ interface Constraint {
|
|
|
44
45
|
c: Rational;
|
|
45
46
|
isStrict: boolean;
|
|
46
47
|
isDead: boolean;
|
|
48
|
+
dependency: Dependency | undefined;
|
|
47
49
|
}
|
|
48
50
|
|
|
49
|
-
const UINT_MAX = 4294967295;
|
|
50
|
-
|
|
51
51
|
class ConstraintSet {
|
|
52
52
|
private id2pos: number[] = [];
|
|
53
53
|
private set: Constraint[] = [];
|
|
@@ -110,6 +110,7 @@ class Fm {
|
|
|
110
110
|
private idGen = new IdGen();
|
|
111
111
|
private counter = 0;
|
|
112
112
|
private isInconsistent = false;
|
|
113
|
+
private inconsistentCore: Dependency | undefined;
|
|
113
114
|
private subTodo = new ConstraintSet();
|
|
114
115
|
readonly converter: { decl: number; clauses: RefVector }[] = [];
|
|
115
116
|
|
|
@@ -211,6 +212,7 @@ class Fm {
|
|
|
211
212
|
as: Rational[],
|
|
212
213
|
c: Rational,
|
|
213
214
|
isStrict: boolean,
|
|
215
|
+
dependency: Dependency | undefined,
|
|
214
216
|
): Constraint {
|
|
215
217
|
return {
|
|
216
218
|
id: this.idGen.mk(),
|
|
@@ -220,6 +222,7 @@ class Fm {
|
|
|
220
222
|
c,
|
|
221
223
|
isStrict,
|
|
222
224
|
isDead: false,
|
|
225
|
+
dependency,
|
|
223
226
|
};
|
|
224
227
|
}
|
|
225
228
|
|
|
@@ -397,7 +400,7 @@ class Fm {
|
|
|
397
400
|
return isNegated ? -bvar : bvar;
|
|
398
401
|
}
|
|
399
402
|
|
|
400
|
-
private addConstraint(form: number) {
|
|
403
|
+
private addConstraint(form: number, dependency: Dependency | undefined) {
|
|
401
404
|
const manager = this.manager;
|
|
402
405
|
const lits: number[] = [];
|
|
403
406
|
const xs: number[] = [];
|
|
@@ -440,7 +443,7 @@ class Fm {
|
|
|
440
443
|
c = c.sub(Rational.one);
|
|
441
444
|
}
|
|
442
445
|
}
|
|
443
|
-
this.registerConstraint(this.mkConstraint(lits, xs, as, c, isStrict));
|
|
446
|
+
this.registerConstraint(this.mkConstraint(lits, xs, as, c, isStrict, dependency));
|
|
444
447
|
}
|
|
445
448
|
|
|
446
449
|
private isFalse(constraint: Constraint) {
|
|
@@ -469,7 +472,7 @@ class Fm {
|
|
|
469
472
|
this.subTodo.insert(constraint);
|
|
470
473
|
return;
|
|
471
474
|
}
|
|
472
|
-
this.goal.assert(this.toExpr(constraint));
|
|
475
|
+
this.goal.assert(this.toExpr(constraint), constraint.dependency);
|
|
473
476
|
this.delConstraint(constraint);
|
|
474
477
|
}
|
|
475
478
|
|
|
@@ -589,15 +592,17 @@ class Fm {
|
|
|
589
592
|
}
|
|
590
593
|
for (const lit of lower.lits) this.bvar2sign[Math.abs(lit)] = 0;
|
|
591
594
|
if (isTautology) return undefined;
|
|
595
|
+
const newDependency = joinDependencies(lower.dependency, upper.dependency);
|
|
592
596
|
if (
|
|
593
597
|
newLits.length === 0 &&
|
|
594
598
|
newXs.length === 0 &&
|
|
595
599
|
(newC.isNegative() || (isNewStrict && newC.isZero()))
|
|
596
600
|
) {
|
|
597
601
|
this.isInconsistent = true;
|
|
602
|
+
this.inconsistentCore = newDependency;
|
|
598
603
|
return undefined;
|
|
599
604
|
}
|
|
600
|
-
return this.mkConstraint(newLits, newXs, newAs, newC, isNewStrict);
|
|
605
|
+
return this.mkConstraint(newLits, newXs, newAs, newC, isNewStrict, newDependency);
|
|
601
606
|
}
|
|
602
607
|
|
|
603
608
|
private tryEliminate(variable: number) {
|
|
@@ -640,7 +645,7 @@ class Fm {
|
|
|
640
645
|
for (const constraint of list) {
|
|
641
646
|
if (constraint.isDead) continue;
|
|
642
647
|
constraint.isDead = true;
|
|
643
|
-
this.goal.assert(this.toExpr(constraint));
|
|
648
|
+
this.goal.assert(this.toExpr(constraint), constraint.dependency);
|
|
644
649
|
}
|
|
645
650
|
}
|
|
646
651
|
|
|
@@ -650,17 +655,18 @@ class Fm {
|
|
|
650
655
|
this.initForbiddenSet();
|
|
651
656
|
const forms = new RefVector(manager);
|
|
652
657
|
for (const form of goal.forms.items) forms.push(form);
|
|
658
|
+
const dependencies = goal.dependencies;
|
|
653
659
|
goal.reset();
|
|
654
660
|
goal.depth++;
|
|
655
|
-
for (const form of forms.items) {
|
|
661
|
+
for (const [index, form] of forms.items.entries()) {
|
|
656
662
|
if (this.isInconsistent) break;
|
|
657
|
-
if (this.isOcc(form)) this.addConstraint(form);
|
|
658
|
-
else goal.assert(form);
|
|
663
|
+
if (this.isOcc(form)) this.addConstraint(form, dependencies[index]);
|
|
664
|
+
else goal.assert(form, dependencies[index]);
|
|
659
665
|
}
|
|
660
666
|
forms.reset();
|
|
661
667
|
if (this.isInconsistent) {
|
|
662
668
|
goal.reset();
|
|
663
|
-
goal.assert(manager.falseExpr);
|
|
669
|
+
goal.assert(manager.falseExpr, this.inconsistentCore);
|
|
664
670
|
return false;
|
|
665
671
|
}
|
|
666
672
|
this.subsume();
|
|
@@ -671,7 +677,7 @@ class Fm {
|
|
|
671
677
|
this.tryEliminate(variable);
|
|
672
678
|
if (this.isInconsistent) {
|
|
673
679
|
goal.reset();
|
|
674
|
-
goal.assert(manager.falseExpr);
|
|
680
|
+
goal.assert(manager.falseExpr, this.inconsistentCore);
|
|
675
681
|
return false;
|
|
676
682
|
}
|
|
677
683
|
}
|
|
@@ -404,7 +404,9 @@ const mkIsInfOfInt = (
|
|
|
404
404
|
? mkCompare(OP_LE, -threshold)
|
|
405
405
|
: manager.falseExpr;
|
|
406
406
|
}
|
|
407
|
-
|
|
407
|
+
// Deviation from Z3: Z3 gives up from an exponent width of 34. From 31, MAX_FINITE is a numeral of
|
|
408
|
+
// 2^30 bits, more than a BigInt holds, so those widths give up too.
|
|
409
|
+
if (ebits > 30) return -1;
|
|
408
410
|
const maxFinite = mpfToRational(mkMaxValue(ebits, sbits, false)).num;
|
|
409
411
|
const halfUlp = 1n << BigInt(maxExp - sbits);
|
|
410
412
|
return rm === MPF_ROUND_NEAREST_TEVEN || rm === MPF_ROUND_NEAREST_TAWAY
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
// Ported from Z3 (src/ast/fpa/fpa2bv_converter.cpp), MIT license, see z3-license.txt.
|
|
2
|
+
// A statement that discards its result builds a term that upstream builds and never uses, so the
|
|
3
|
+
// terms after it get the ids Z3 gives them.
|
|
2
4
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
5
|
import {
|
|
4
6
|
type AstManager,
|
|
@@ -103,15 +105,15 @@ export class Fpa2BvConverter {
|
|
|
103
105
|
manager.decDeclRef(entry[0]);
|
|
104
106
|
manager.decRef(entry[1]);
|
|
105
107
|
}
|
|
108
|
+
for (const entry of this.uf2BvUf) {
|
|
109
|
+
manager.decDeclRef(entry[0]);
|
|
110
|
+
manager.decDeclRef(entry[1]);
|
|
111
|
+
}
|
|
106
112
|
for (const entry of this.minMaxUfs) {
|
|
107
113
|
manager.decDeclRef(entry[0]);
|
|
108
114
|
manager.decRef(entry[1][0]);
|
|
109
115
|
manager.decRef(entry[1][1]);
|
|
110
116
|
}
|
|
111
|
-
for (const entry of this.uf2BvUf) {
|
|
112
|
-
manager.decDeclRef(entry[0]);
|
|
113
|
-
manager.decDeclRef(entry[1]);
|
|
114
|
-
}
|
|
115
117
|
this.constants.clear();
|
|
116
118
|
this.rmConstants.clear();
|
|
117
119
|
this.minMaxUfs.clear();
|
|
@@ -1413,10 +1415,12 @@ export class Fpa2BvConverter {
|
|
|
1413
1415
|
if (manager.getOp(x) !== OP_NUM) return this.mkToFpSymbolicReal(sort, rm, x);
|
|
1414
1416
|
const value = manager.getRationalValue(x);
|
|
1415
1417
|
if (value.isZero()) return this.mkPzero(sort);
|
|
1416
|
-
if (manager.isBvNumeral(rm))
|
|
1418
|
+
if (manager.isBvNumeral(rm)) {
|
|
1419
|
+
const mode = Number(manager.getBvNumeralValue(rm));
|
|
1417
1420
|
return this.mkFpOfMpf(
|
|
1418
|
-
mpfFromRational(ebits, sbits,
|
|
1421
|
+
mpfFromRational(ebits, sbits, mode > BV_RM_TO_ZERO ? BV_RM_TO_ZERO : mode, 0n, value),
|
|
1419
1422
|
);
|
|
1423
|
+
}
|
|
1420
1424
|
const rmNta = this.mkIsRm(rm, BV_RM_TIES_TO_AWAY);
|
|
1421
1425
|
const rmNte = this.mkIsRm(rm, BV_RM_TIES_TO_EVEN);
|
|
1422
1426
|
const rmTp = this.mkIsRm(rm, BV_RM_TO_POSITIVE);
|
|
@@ -6,10 +6,18 @@ import {
|
|
|
6
6
|
FAMILY_USER,
|
|
7
7
|
KIND_APP,
|
|
8
8
|
KIND_QUANTIFIER,
|
|
9
|
+
OP_ADD,
|
|
9
10
|
OP_AND,
|
|
11
|
+
OP_BADD,
|
|
12
|
+
OP_BAND,
|
|
13
|
+
OP_BMUL,
|
|
14
|
+
OP_BOR,
|
|
15
|
+
OP_BXNOR,
|
|
16
|
+
OP_BXOR,
|
|
10
17
|
OP_EQ,
|
|
11
18
|
OP_IMPLIES,
|
|
12
19
|
OP_ITE,
|
|
20
|
+
OP_MUL,
|
|
13
21
|
OP_NOT,
|
|
14
22
|
OP_OR,
|
|
15
23
|
OP_XOR,
|
|
@@ -36,6 +44,7 @@ import {
|
|
|
36
44
|
NO_ENODES,
|
|
37
45
|
UnitResolutionJustification,
|
|
38
46
|
} from "./enode";
|
|
47
|
+
import { isCommutativeDecl } from "./euf/egraph";
|
|
39
48
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
40
49
|
import {
|
|
41
50
|
BoolVar,
|
|
@@ -84,6 +93,26 @@ export const BV_THEORY = 1 << 31;
|
|
|
84
93
|
export const UNDO_ADD_EQ = 8;
|
|
85
94
|
export const UNDO_TH_VAR = 9;
|
|
86
95
|
|
|
96
|
+
// func_decl_info::is_flat_associative of a commutative declaration. cg_table::mk_table_for gives
|
|
97
|
+
// such a declaration the n-ary table, not the binary commutative one.
|
|
98
|
+
const isFlatAssociativeDecl = (manager: AstManager, decl: number) => {
|
|
99
|
+
switch (manager.funcDecls[decl].op) {
|
|
100
|
+
case OP_AND:
|
|
101
|
+
case OP_OR:
|
|
102
|
+
case OP_ADD:
|
|
103
|
+
case OP_MUL:
|
|
104
|
+
case OP_BADD:
|
|
105
|
+
case OP_BMUL:
|
|
106
|
+
case OP_BAND:
|
|
107
|
+
case OP_BOR:
|
|
108
|
+
case OP_BXOR:
|
|
109
|
+
case OP_BXNOR:
|
|
110
|
+
return true;
|
|
111
|
+
default:
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
|
|
87
116
|
interface NewEq {
|
|
88
117
|
lhs: Enode;
|
|
89
118
|
rhs: Enode;
|
|
@@ -306,7 +335,13 @@ export abstract class Internalizer {
|
|
|
306
335
|
}
|
|
307
336
|
|
|
308
337
|
findCongruent(decl: number, args: Enode[]) {
|
|
309
|
-
return this.cgTable.findFor(
|
|
338
|
+
return this.cgTable.findFor(
|
|
339
|
+
decl,
|
|
340
|
+
args,
|
|
341
|
+
args.length === 2 &&
|
|
342
|
+
isCommutativeDecl(this.manager, decl) &&
|
|
343
|
+
!isFlatAssociativeDecl(this.manager, decl),
|
|
344
|
+
);
|
|
310
345
|
}
|
|
311
346
|
|
|
312
347
|
isDiseq(first: Enode, second: Enode, isCheckingValues = true) {
|
|
@@ -552,15 +587,19 @@ export abstract class Internalizer {
|
|
|
552
587
|
const moreArgs: Enode[] = numArgs > 2 ? [] : NO_ENODES;
|
|
553
588
|
for (let index = 2; index < numArgs; index++) moreArgs.push(this.getArgEnode(expr, index));
|
|
554
589
|
const isEq = !isSuppressingArgs && manager.getOp(expr) === OP_EQ;
|
|
590
|
+
const decl = manager.decls[expr];
|
|
591
|
+
const isCommutative = isEq || (numArgs === 2 && isCommutativeDecl(manager, decl));
|
|
555
592
|
const node = new Enode(
|
|
556
593
|
expr,
|
|
557
|
-
|
|
594
|
+
decl,
|
|
558
595
|
numArgs,
|
|
559
596
|
numArgs > 0 ? this.getArgEnode(expr, 0) : null,
|
|
560
597
|
numArgs > 1 ? this.getArgEnode(expr, 1) : null,
|
|
561
598
|
moreArgs,
|
|
562
599
|
generation,
|
|
563
600
|
isEq,
|
|
601
|
+
isCommutative,
|
|
602
|
+
isEq || (isCommutative && !isFlatAssociativeDecl(manager, decl)),
|
|
564
603
|
manager.sorts[expr] === SORT_BOOL,
|
|
565
604
|
isMergeTf,
|
|
566
605
|
isCgcEnabled,
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
isArithSort,
|
|
19
19
|
} from "./ast";
|
|
20
20
|
import { BoundManager } from "./bound-manager";
|
|
21
|
-
import type
|
|
21
|
+
import { type Definition, type Dependency, type Goal, joinDependencies } from "./goal";
|
|
22
22
|
import { Rational } from "./rational";
|
|
23
23
|
import { RefVector } from "./ref-vector";
|
|
24
24
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
@@ -38,7 +38,8 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
38
38
|
if (goal.isProofsEnabled) throw new SmtTacticError("lia2pb does not support proof production");
|
|
39
39
|
if (goal.isInconsistent) return;
|
|
40
40
|
const bounds = new BoundManager(manager);
|
|
41
|
-
for (
|
|
41
|
+
for (let index = 0; index < goal.forms.size; index++)
|
|
42
|
+
bounds.add(goal.forms.items[index], goal.getDependency(index));
|
|
42
43
|
const getTargetUpper = (expr: number) => {
|
|
43
44
|
if (!manager.isUninterpretedConst(expr)) return undefined;
|
|
44
45
|
const lower = bounds.lowers.get(expr);
|
|
@@ -101,6 +102,7 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
101
102
|
const terms = new RefVector(manager);
|
|
102
103
|
const definitions: Definition[] = [];
|
|
103
104
|
const substitution = new Map<number, number>();
|
|
105
|
+
const substitutionDependencies = new Map<number, Dependency | undefined>();
|
|
104
106
|
const zero = manager.mkNumeral(0n);
|
|
105
107
|
const one = manager.mkNumeral(1n);
|
|
106
108
|
terms.push(zero);
|
|
@@ -124,14 +126,26 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
124
126
|
const def = manager.mkApp(OP_ADD, args, SORT_INT);
|
|
125
127
|
terms.push(def);
|
|
126
128
|
substitution.set(variable, def);
|
|
129
|
+
substitutionDependencies.set(
|
|
130
|
+
variable,
|
|
131
|
+
joinDependencies(
|
|
132
|
+
bounds.lowerDependencies.get(variable),
|
|
133
|
+
bounds.upperDependencies.get(variable),
|
|
134
|
+
),
|
|
135
|
+
);
|
|
127
136
|
definitions.push({ decl: manager.decls[variable], def });
|
|
128
137
|
}
|
|
129
138
|
const rewriter = new Rewriter(manager, options.rewriter);
|
|
130
|
-
rewriter.setSubstitution(substitution);
|
|
139
|
+
rewriter.setSubstitution(substitution, substitutionDependencies);
|
|
131
140
|
const size = goal.forms.size;
|
|
132
141
|
for (let index = 0; !goal.isInconsistent && index < size; index++) {
|
|
133
142
|
const rewritten = rewriter.rewrite(goal.forms.items[index]);
|
|
134
|
-
goal.update(
|
|
143
|
+
goal.update(
|
|
144
|
+
index,
|
|
145
|
+
rewritten,
|
|
146
|
+
joinDependencies(rewriter.usedDependencies, goal.getDependency(index)),
|
|
147
|
+
);
|
|
148
|
+
rewriter.usedDependencies = undefined;
|
|
135
149
|
manager.decRef(rewritten);
|
|
136
150
|
}
|
|
137
151
|
rewriter.release();
|
|
@@ -628,7 +628,7 @@ export class LarSolver {
|
|
|
628
628
|
}
|
|
629
629
|
|
|
630
630
|
hasIntVar() {
|
|
631
|
-
return this.localIsInt.
|
|
631
|
+
return this.localIsInt.includes(true);
|
|
632
632
|
}
|
|
633
633
|
|
|
634
634
|
// Columns added after the backup get basic values from their rows, as the tableau requires.
|