tla-ts 0.0.10-dev.09e53c2a6 → 0.0.10-dev.1ebc153bd
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 +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +2 -1
- package/dist/index.d.ts +2 -1
- 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 +43 -43
- package/dist/prove.js +78 -78
- package/dist/run.cjs +33 -35
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +38 -38
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +152 -64
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +13 -8
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +9 -2
- package/src/environment.ts +57 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +43 -4
- package/src/liveness.ts +1 -1
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +106 -144
- 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/asserted-formulas.ts +66 -1
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +58 -11
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +2 -3
- 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 +3 -5
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -3
- package/src/prover/smt/solver/context.ts +24 -3
- 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 +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +4 -7
- 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 -10
- 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 +2 -0
- 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/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -1
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- 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/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-generator.ts +3 -1
- 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 +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.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 +1 -1
- 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/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 +9 -3
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +6 -3
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +74 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +4 -6
- 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/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +26 -1
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -3
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -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 +4 -7
- 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-kernel.ts +9 -3
- package/src/prover/smt/solver/smt-setup.ts +68 -6
- package/src/prover/smt/solver/smtlib-parser.ts +558 -220
- package/src/prover/smt/solver/smtlib-script.ts +495 -153
- package/src/prover/smt/solver/solve-eqs.ts +13 -21
- package/src/prover/smt/solver/tactic.ts +219 -130
- package/src/prover/smt/solver/theory-bv.ts +2 -2
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -4
- package/src/prover/smt/solver/theory-lra.ts +0 -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/tlapm/cache.ts +8 -8
- package/src/prover/zenon/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -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/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +624 -187
- package/src/runtime.ts +3 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- 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 +51 -22
- package/src/spec-description.ts +2 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +1 -0
- package/src/symmetry.ts +1 -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/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +18 -5
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +29 -23
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
|
@@ -214,6 +214,7 @@ export class Fpa2BvRewriter extends RewriterTpl {
|
|
|
214
214
|
isSwapped ? args[1] : args[2],
|
|
215
215
|
);
|
|
216
216
|
}
|
|
217
|
+
// Deviation from Z3: mk_sub hands mk_add a rounding mode under bv2rm, so fpa2bv fails on fp.sub.
|
|
217
218
|
case OP_FPA_SUB:
|
|
218
219
|
return converter.mkSub(sort, getRm(), args[1], args[2]);
|
|
219
220
|
case OP_FPA_NEG:
|
|
@@ -20,7 +20,6 @@ export const joinDependencies = (
|
|
|
20
20
|
? first
|
|
21
21
|
: { value: -1, children: [first, second] };
|
|
22
22
|
|
|
23
|
-
// Breadth first and once per node, so a value that two leaves hold is listed twice.
|
|
24
23
|
export const getDependencyValues = (dependency: Dependency | undefined) => {
|
|
25
24
|
if (dependency === undefined) return [];
|
|
26
25
|
const todo = [dependency];
|
|
@@ -35,7 +34,7 @@ export const getDependencyValues = (dependency: Dependency | undefined) => {
|
|
|
35
34
|
todo.push(child);
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
|
-
return values;
|
|
37
|
+
return [...new Set(values)];
|
|
39
38
|
};
|
|
40
39
|
|
|
41
40
|
interface Polarized {
|
|
@@ -43,7 +42,7 @@ interface Polarized {
|
|
|
43
42
|
isPositive: boolean;
|
|
44
43
|
}
|
|
45
44
|
|
|
46
|
-
|
|
45
|
+
const PRECISE = 0;
|
|
47
46
|
export const UNDER = 1;
|
|
48
47
|
export const OVER = 2;
|
|
49
48
|
const UNDER_OVER = 3;
|
|
@@ -81,7 +80,10 @@ export class Goal {
|
|
|
81
80
|
converters: (HiddenDecl | Definitions | ModelConversion)[] = [];
|
|
82
81
|
model: ProtoModel | undefined;
|
|
83
82
|
isProofsEnabled = false;
|
|
83
|
+
isModelsEnabled = true;
|
|
84
84
|
isCoresEnabled = false;
|
|
85
|
+
// As in Z3, it isn't copied with the goal.
|
|
86
|
+
reasonUnknown = "";
|
|
85
87
|
|
|
86
88
|
constructor(readonly manager: AstManager) {
|
|
87
89
|
this.forms = new RefVector(manager);
|
|
@@ -103,6 +105,7 @@ export class Goal {
|
|
|
103
105
|
this.precision = getPrecisionUnion(source.precision, this.precision);
|
|
104
106
|
this.converters = source.converters;
|
|
105
107
|
this.isProofsEnabled = source.isProofsEnabled;
|
|
108
|
+
this.isModelsEnabled = source.isModelsEnabled;
|
|
106
109
|
this.isCoresEnabled = source.isCoresEnabled;
|
|
107
110
|
}
|
|
108
111
|
|
|
@@ -22,9 +22,10 @@ import {
|
|
|
22
22
|
SORT_INT,
|
|
23
23
|
SORT_REAL,
|
|
24
24
|
} from "./ast";
|
|
25
|
-
import {
|
|
25
|
+
import { Expr2Polynomial } from "./expr2polynomial";
|
|
26
26
|
import { getLcm } from "./rational";
|
|
27
27
|
import { flipKind } from "./nlsat/atoms";
|
|
28
|
+
import { Factors, type Polynomial, PolynomialRef } from "./nlsat/polynomial";
|
|
28
29
|
import type { NlsatSolver } from "./nlsat/solver";
|
|
29
30
|
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
30
31
|
import type { IneqKind } from "./nlsat/types";
|
|
@@ -39,38 +40,54 @@ export const goal2nlsat = (
|
|
|
39
40
|
isFactoring = true,
|
|
40
41
|
) => {
|
|
41
42
|
const pm = solver.pm;
|
|
43
|
+
const expr2poly = new Expr2Polynomial(manager, pm, t2x, (isInt) => solver.mkVar(isInt));
|
|
42
44
|
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
const factorAtom = (polynomial: Polynomial, kind: IneqKind) => {
|
|
46
|
+
const factors = new Factors(pm);
|
|
47
|
+
pm.factor(polynomial, factors);
|
|
48
|
+
const literal = solver.mkIneqLiteral(
|
|
49
|
+
factors.constant < 0n ? flipKind(kind) : kind,
|
|
50
|
+
factors.factors,
|
|
51
|
+
factors.degrees.map((degree) => degree % 2 === 0),
|
|
52
|
+
);
|
|
53
|
+
factors.reset();
|
|
54
|
+
return literal;
|
|
50
55
|
};
|
|
51
56
|
|
|
52
|
-
const
|
|
53
|
-
const
|
|
54
|
-
const rhs = toPolynomial(manager, pm, manager.getArg(atom, 1), mkVar);
|
|
55
|
-
const lcm = getLcm(lhs.denominator, rhs.denominator);
|
|
56
|
-
const polynomial = pm.addmul(
|
|
57
|
-
lcm / lhs.denominator,
|
|
58
|
-
lhs.polynomial,
|
|
59
|
-
-(lcm / rhs.denominator),
|
|
60
|
-
rhs.polynomial,
|
|
61
|
-
);
|
|
57
|
+
const processIneqPolynomial = (p: PolynomialRef, kind: IneqKind) => {
|
|
58
|
+
const polynomial = p.get();
|
|
62
59
|
if (pm.isConst(polynomial)) {
|
|
63
60
|
const sign = pm.isZero(polynomial) ? 0 : polynomial.as[0] > 0n ? 1 : -1;
|
|
64
61
|
const isTrue = kind === "EQ" ? sign === 0 : kind === "LT" ? sign < 0 : sign > 0;
|
|
65
62
|
return isTrue ? 0 : 1;
|
|
66
63
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
64
|
+
return isFactoring
|
|
65
|
+
? factorAtom(polynomial, kind)
|
|
66
|
+
: solver.mkIneqLiteral(kind, [polynomial], [false]);
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
const processIneq = (atom: number, kind: IneqKind) => {
|
|
70
|
+
const first = new PolynomialRef(pm);
|
|
71
|
+
const second = new PolynomialRef(pm);
|
|
72
|
+
const p = new PolynomialRef(pm);
|
|
73
|
+
const firstDenominator = expr2poly.toPolynomial(manager.getArg(atom, 0), first);
|
|
74
|
+
const secondDenominator = expr2poly.toPolynomial(manager.getArg(atom, 1), second);
|
|
75
|
+
const lcm = getLcm(firstDenominator, secondDenominator);
|
|
76
|
+
p.set(
|
|
77
|
+
pm.addmulTerms(
|
|
78
|
+
lcm / firstDenominator,
|
|
79
|
+
pm.unit,
|
|
80
|
+
first.get(),
|
|
81
|
+
-(lcm / secondDenominator),
|
|
82
|
+
pm.unit,
|
|
83
|
+
second.get(),
|
|
84
|
+
),
|
|
73
85
|
);
|
|
86
|
+
const literal = processIneqPolynomial(p, kind);
|
|
87
|
+
p.reset();
|
|
88
|
+
second.reset();
|
|
89
|
+
first.reset();
|
|
90
|
+
return literal;
|
|
74
91
|
};
|
|
75
92
|
|
|
76
93
|
const processBoolVar = (atom: number) => {
|
|
@@ -129,20 +146,29 @@ export const goal2nlsat = (
|
|
|
129
146
|
// The polynomial conversion treats a transcendental application, argument included, as one
|
|
130
147
|
// variable, so its argument gets a variable here, through an equation unless it is one already.
|
|
131
148
|
const mkArgVar = (term: number) => {
|
|
132
|
-
const
|
|
133
|
-
const
|
|
149
|
+
const p = new PolynomialRef(pm);
|
|
150
|
+
const denominator = expr2poly.toPolynomial(term, p);
|
|
151
|
+
const polynomial = p.get();
|
|
134
152
|
const monomial = polynomial.ms[0];
|
|
135
153
|
if (
|
|
136
|
-
|
|
154
|
+
denominator === 1n &&
|
|
137
155
|
polynomial.ms.length === 1 &&
|
|
138
156
|
polynomial.as[0] === 1n &&
|
|
139
157
|
monomial.size === 1 &&
|
|
140
158
|
monomial.degrees[0] === 1
|
|
141
|
-
)
|
|
159
|
+
) {
|
|
160
|
+
p.reset();
|
|
142
161
|
return monomial.vars[0];
|
|
162
|
+
}
|
|
143
163
|
const variable = solver.mkVar(false);
|
|
144
|
-
const
|
|
145
|
-
|
|
164
|
+
const vp = new PolynomialRef(pm);
|
|
165
|
+
const equation = new PolynomialRef(pm);
|
|
166
|
+
vp.set(pm.mkVar(variable));
|
|
167
|
+
equation.set(pm.addmulTerms(denominator, pm.unit, vp.get(), -1n, pm.unit, polynomial));
|
|
168
|
+
solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation.get()], [false])], null);
|
|
169
|
+
equation.reset();
|
|
170
|
+
vp.reset();
|
|
171
|
+
p.reset();
|
|
146
172
|
return variable;
|
|
147
173
|
};
|
|
148
174
|
|
|
@@ -174,6 +200,7 @@ export const goal2nlsat = (
|
|
|
174
200
|
}
|
|
175
201
|
}
|
|
176
202
|
if (piVar !== undefined) solver.transcendentals.addPi(piVar);
|
|
203
|
+
expr2poly.release();
|
|
177
204
|
};
|
|
178
205
|
|
|
179
206
|
const hasTermIte = (manager: AstManager, form: number) => {
|
|
@@ -81,8 +81,8 @@ const getQfnraSolver = (solver: QfnraSolver) =>
|
|
|
81
81
|
`${solver.simpleCheck})`,
|
|
82
82
|
...(solver.heuristic === undefined ? [] : [`(try-for ${QFNRA_NLSAT} ${solver.heuristic})`]),
|
|
83
83
|
...solver.orders.map(
|
|
84
|
-
(
|
|
85
|
-
`(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${
|
|
84
|
+
(order) =>
|
|
85
|
+
`(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${order[0]}) ${order[1]})`,
|
|
86
86
|
),
|
|
87
87
|
`(using-params smt :use_ls true :ls_time ${solver.ls})`,
|
|
88
88
|
`(and-then (try-for (using-params smt :arith.greatest_error_pivot true) ${solver.smt}) ` +
|
|
@@ -256,6 +256,12 @@ export const QFUFBV_ACKR_PREAMBLE =
|
|
|
256
256
|
":pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000 " +
|
|
257
257
|
":ite_extra_rules true :mul2concat true :flat_and_or false))";
|
|
258
258
|
|
|
259
|
+
const QFUFBV =
|
|
260
|
+
"(using-params (and-then (and-then (using-params simplify :flat_and_or false) (using-params " +
|
|
261
|
+
"propagate-values :flat_and_or false) solve-eqs elim-uncnstr (if-no-proofs (if-no-unsat-cores " +
|
|
262
|
+
"reduce-args)) (if-no-proofs (if-no-unsat-cores reduce-bv-size)) max-bv-sharing (if-no-proofs " +
|
|
263
|
+
"(if-no-unsat-cores ackermannize_bv))) (if is-qfbv qfbv smt)) :elim_and true :blast_distinct true)";
|
|
264
|
+
|
|
259
265
|
const QFAUFLIA =
|
|
260
266
|
"(and-then (using-params (and-then simplify propagate-values solve-eqs elim-uncnstr simplify) " +
|
|
261
267
|
":elim_and true :som true :sort_store true) (using-params smt :array.simplify false))";
|
|
@@ -302,6 +308,7 @@ export const LOGIC_TACTICS: ReadonlyMap<string, string> = new Map([
|
|
|
302
308
|
["bv", UFBV],
|
|
303
309
|
["qfbv", QFBV],
|
|
304
310
|
["qfaufbv", QFAUFBV],
|
|
311
|
+
["qfufbv", QFUFBV],
|
|
305
312
|
["qfauflia", QFAUFLIA],
|
|
306
313
|
["qfuf", QFUF],
|
|
307
314
|
["qffp", QFFP],
|
|
@@ -159,7 +159,7 @@ interface HashLink<V> {
|
|
|
159
159
|
}
|
|
160
160
|
|
|
161
161
|
interface HashNode<V> extends HashLink<V> {
|
|
162
|
-
|
|
162
|
+
value: V;
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
const constrainHash = (hash: number, count: number) =>
|
|
@@ -197,6 +197,12 @@ export class UnorderedUintMap<V> {
|
|
|
197
197
|
for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
|
|
198
198
|
}
|
|
199
199
|
|
|
200
|
+
set(key: number, value: V) {
|
|
201
|
+
const node = this.nodes.get(key);
|
|
202
|
+
if (node === undefined) this.insert(key, value);
|
|
203
|
+
else node.value = value;
|
|
204
|
+
}
|
|
205
|
+
|
|
200
206
|
insert(key: number, value: V) {
|
|
201
207
|
const node: HashNode<V> = { key, value, next: null };
|
|
202
208
|
const count = this.buckets.length;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
|
|
2
|
-
// so an extracted common factor may list its variables in another order.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import {
|
|
5
3
|
type Nex,
|
|
@@ -146,7 +144,7 @@ export class CrossNested {
|
|
|
146
144
|
private getVarsFromOccurencesMap() {
|
|
147
145
|
const occurences = this.nexCreator.occurencesMap;
|
|
148
146
|
const isRandomBit = this.nextRandom() % 2 === 1;
|
|
149
|
-
return
|
|
147
|
+
return Array.from(occurences, (entry) => entry[0]).sort((first, second) => {
|
|
150
148
|
const firstOcc = occurences.get(first);
|
|
151
149
|
const secondOcc = occurences.get(second);
|
|
152
150
|
if (firstOcc === undefined || secondOcc === undefined) return 0;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Rational } from "../rational";
|
|
2
|
+
import { UnorderedUintMap } from "./containers";
|
|
2
3
|
import {
|
|
3
4
|
type Nex,
|
|
4
5
|
type NexMul,
|
|
@@ -24,8 +25,8 @@ interface MapEntry<Value> {
|
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export class NexCreator {
|
|
27
|
-
readonly occurencesMap = new
|
|
28
|
-
readonly powers = new
|
|
28
|
+
readonly occurencesMap = new UnorderedUintMap<Occ>();
|
|
29
|
+
readonly powers = new UnorderedUintMap<number>();
|
|
29
30
|
private activeVarsWeights: number[] = [];
|
|
30
31
|
|
|
31
32
|
setNumberOfVars(count: number) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Rational } from "../rational";
|
|
2
|
+
import type { UnorderedUintMap } from "./containers";
|
|
2
3
|
|
|
3
4
|
interface NexScalar {
|
|
4
5
|
readonly kind: "scalar";
|
|
@@ -63,7 +64,7 @@ export const isALinearTerm = (sum: NexSum) => {
|
|
|
63
64
|
return numberOfNonScalars > 1;
|
|
64
65
|
};
|
|
65
66
|
|
|
66
|
-
export const getPowersFromMul = (mul: NexMul, powers:
|
|
67
|
+
export const getPowersFromMul = (mul: NexMul, powers: UnorderedUintMap<number>) => {
|
|
67
68
|
powers.clear();
|
|
68
69
|
for (const child of mul.children)
|
|
69
70
|
if (child.expr.kind === "var") powers.set(child.expr.variable, child.power);
|
|
@@ -795,7 +795,7 @@ export class NlaCore {
|
|
|
795
795
|
this.limit.popChild(this.nraLimit);
|
|
796
796
|
stats.nraCalls++;
|
|
797
797
|
}
|
|
798
|
-
if (result === L_UNDEF && !hasNoEffect()) result = L_FALSE;
|
|
798
|
+
if (result === L_UNDEF && !hasNoEffect() && this.limit.inc()) result = L_FALSE;
|
|
799
799
|
stats.nlaLemmas += this.lemmas.length;
|
|
800
800
|
return result;
|
|
801
801
|
}
|