tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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 +3 -2
- package/dist/index.d.ts +3 -2
- 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 +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- 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 +39 -39
- 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 +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- 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 +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- 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 +112 -145
- 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 +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- 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 +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- 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-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 +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/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- 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-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 +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 +20 -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 +9 -5
- 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 +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 +16 -6
- 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.ts +31 -25
- 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/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- 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 +13 -5
- 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 +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-kernel.ts +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- 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 +284 -168
- 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.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/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 +959 -243
- package/src/runtime.ts +7 -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 +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- 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/random.ts +2 -1
- package/src/tlc/replay.ts +3 -2
- 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/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
|
@@ -25,7 +25,13 @@ import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
|
25
25
|
import type { MaxsatContext, MaxsatParams, MaxsatSolver } from "./maxsmt-base";
|
|
26
26
|
import { Maxsmt } from "./maxsmt";
|
|
27
27
|
import { isInNraFragment } from "./opt-nlsat";
|
|
28
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
canReuseNlsatSolver,
|
|
30
|
+
giaPareto,
|
|
31
|
+
ParetoNlsatSolver,
|
|
32
|
+
type ParetoObjective,
|
|
33
|
+
type ParetoSolver,
|
|
34
|
+
} from "./opt-pareto";
|
|
29
35
|
import type { ProtoModel } from "./proto-model";
|
|
30
36
|
import { Rational } from "./rational";
|
|
31
37
|
import { RefVector } from "./ref-vector";
|
|
@@ -131,7 +137,7 @@ export class OptContext {
|
|
|
131
137
|
private boxIndex = -1;
|
|
132
138
|
private pareto: ParetoSolver | null = null;
|
|
133
139
|
private internal: Objective[] = [];
|
|
134
|
-
private normalized:
|
|
140
|
+
private normalized: ParetoObjective[] = [];
|
|
135
141
|
private normalizedGoal: Goal | null = null;
|
|
136
142
|
private normalizedTerms: RefVector;
|
|
137
143
|
private hiddenDecls: number[] = [];
|
|
@@ -225,6 +231,11 @@ export class OptContext {
|
|
|
225
231
|
return pareto;
|
|
226
232
|
}
|
|
227
233
|
|
|
234
|
+
getReasonUnknown() {
|
|
235
|
+
if (this.reasonUnknown !== "") return this.reasonUnknown;
|
|
236
|
+
return (this.satSolver ?? this.optSolver)?.reasonUnknown ?? "unknown";
|
|
237
|
+
}
|
|
238
|
+
|
|
228
239
|
optimize(hard: readonly number[], options: OptOptions) {
|
|
229
240
|
if (this.pareto !== null) return this.executePareto();
|
|
230
241
|
if (this.boxIndex !== -1) {
|
|
@@ -353,8 +364,6 @@ export class OptContext {
|
|
|
353
364
|
this.updateBound(optsmt, true);
|
|
354
365
|
const count = this.internal.length;
|
|
355
366
|
if (count > 1 && options.priority === "pareto") {
|
|
356
|
-
if (this.internal.some((objective) => objective.type === O_MAXSMT))
|
|
357
|
-
throw new SmtUnsupportedError("pareto optimization of soft constraints");
|
|
358
367
|
this.pareto = this.mkParetoSolver(solver, hard, options);
|
|
359
368
|
return this.executePareto();
|
|
360
369
|
}
|
|
@@ -694,6 +703,9 @@ export class OptContext {
|
|
|
694
703
|
this.normalized = this.internal.map((objective) => ({
|
|
695
704
|
term: objective.term,
|
|
696
705
|
isMax: objective.type === O_MAXIMIZE,
|
|
706
|
+
isMaxsmt: objective.type === O_MAXSMT,
|
|
707
|
+
terms: objective.terms,
|
|
708
|
+
weights: objective.weights,
|
|
697
709
|
}));
|
|
698
710
|
result.forms.reset();
|
|
699
711
|
return normalizedHard;
|
|
@@ -704,13 +716,14 @@ export class OptContext {
|
|
|
704
716
|
const maxsmt = objective?.maxsmt;
|
|
705
717
|
if (maxsmt !== null && maxsmt !== undefined)
|
|
706
718
|
return new ObjectiveValue(InfEps.of(isLower ? maxsmt.getLower() : maxsmt.getUpper()));
|
|
719
|
+
// Z3 reads the bounds of a solver it never set up, as when the hard constraints are false, as 0.
|
|
720
|
+
if (objective?.type === O_MAXSMT)
|
|
721
|
+
return new ObjectiveValue(InfEps.of(this.adjust(index, Rational.zero)));
|
|
707
722
|
const isMax = this.objectives[index].type === O_MAXIMIZE;
|
|
708
723
|
const optsmt = this.optsmt;
|
|
709
724
|
const value =
|
|
710
725
|
optsmt === null || objective === undefined
|
|
711
|
-
?
|
|
712
|
-
? ObjectiveValue.minusInfinity
|
|
713
|
-
: ObjectiveValue.infinity
|
|
726
|
+
? new ObjectiveValue(InfEps.of(Rational.zero))
|
|
714
727
|
: (isLower === isMax ? optsmt.lower : optsmt.upper)[objective.index];
|
|
715
728
|
return isMax ? value : value.negated(this.manager.am);
|
|
716
729
|
}
|
|
@@ -19,7 +19,8 @@ import {
|
|
|
19
19
|
import { Goal } from "./goal";
|
|
20
20
|
import { goal2nlsat } from "./goal2nlsat";
|
|
21
21
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
22
|
-
import {
|
|
22
|
+
import type { AlgebraicManager, Anum } from "./nlsat/algebraic";
|
|
23
|
+
import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
23
24
|
import { NlsatSolver } from "./nlsat/solver";
|
|
24
25
|
import { ProtoModel } from "./proto-model";
|
|
25
26
|
import { Rational } from "./rational";
|
|
@@ -97,10 +98,16 @@ export const isInNraFragment = (manager: AstManager, exprs: readonly number[]) =
|
|
|
97
98
|
return true;
|
|
98
99
|
};
|
|
99
100
|
|
|
100
|
-
const getCoarseInterval = (
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
101
|
+
const getCoarseInterval = (
|
|
102
|
+
manager: AstManager,
|
|
103
|
+
am: AlgebraicManager,
|
|
104
|
+
value: Anum,
|
|
105
|
+
): [Rational, Rational] => {
|
|
106
|
+
const pm = new PolynomialManager(manager.limit);
|
|
107
|
+
const p = new PolynomialRef(pm);
|
|
108
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), 0));
|
|
109
|
+
const roots = am.isolateRoots(pm, p.get(), []);
|
|
110
|
+
p.reset();
|
|
104
111
|
const index = roots.findIndex((root) => am.compare(root, value) === 0);
|
|
105
112
|
const lower = index === 0 ? am.intLt(value) : am.select(roots[index - 1], value);
|
|
106
113
|
const upper = index + 1 === roots.length ? am.intGt(value) : am.select(value, roots[index + 1]);
|
|
@@ -108,8 +115,7 @@ const getCoarseInterval = (solver: NlsatSolver, value: Anum): [Rational, Rationa
|
|
|
108
115
|
};
|
|
109
116
|
|
|
110
117
|
export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) => {
|
|
111
|
-
const
|
|
112
|
-
const am = solver.am;
|
|
118
|
+
const am = manager.am;
|
|
113
119
|
if (am.isRational(value))
|
|
114
120
|
return manager.mkApp(OP_EQ, [term, manager.mkRealNumeral(am.toRational(value))], SORT_BOOL);
|
|
115
121
|
const coeffs = am.getPolynomial(value);
|
|
@@ -125,7 +131,7 @@ export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) =>
|
|
|
125
131
|
SORT_REAL,
|
|
126
132
|
);
|
|
127
133
|
}
|
|
128
|
-
const [lower, upper] = getCoarseInterval(
|
|
134
|
+
const [lower, upper] = getCoarseInterval(manager, am, value);
|
|
129
135
|
return manager.mkApp(
|
|
130
136
|
OP_AND,
|
|
131
137
|
[
|
|
@@ -152,19 +158,24 @@ const isOccurring = (manager: AstManager, target: number, expr: number) => {
|
|
|
152
158
|
const mkLowerBound = (solver: NlsatSolver, variable: number, value: Anum, isStrict: boolean) => {
|
|
153
159
|
const am = solver.am;
|
|
154
160
|
const pm = solver.pm;
|
|
161
|
+
const p = new PolynomialRef(pm);
|
|
155
162
|
if (am.isRational(value)) {
|
|
156
163
|
const rational = am.toRational(value);
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
? solver.mkIneqLiteral("GT", [
|
|
160
|
-
: solver.mkIneqLiteral("LT", [
|
|
164
|
+
p.set(pm.mkLinear([rational.den], [variable], -rational.num));
|
|
165
|
+
const literal = isStrict
|
|
166
|
+
? solver.mkIneqLiteral("GT", [p.get()], [false])
|
|
167
|
+
: solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1;
|
|
168
|
+
p.reset();
|
|
169
|
+
return literal;
|
|
161
170
|
}
|
|
162
|
-
|
|
163
|
-
const index = am
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
171
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), variable));
|
|
172
|
+
const index = am.isolateRoots(pm, p.get(), []).findIndex((root) => am.compare(root, value) === 0);
|
|
173
|
+
const literal =
|
|
174
|
+
index === -1
|
|
175
|
+
? null
|
|
176
|
+
: 2 * solver.mkRootAtom(isStrict ? "ROOT_GT" : "ROOT_GE", variable, index + 1, p.get());
|
|
177
|
+
p.reset();
|
|
178
|
+
return literal;
|
|
168
179
|
};
|
|
169
180
|
|
|
170
181
|
const getBracket = (solver: NlsatSolver, value: Anum): [Rational, Rational] => {
|
|
@@ -27,7 +27,9 @@ import { goal2nlsat } from "./goal2nlsat";
|
|
|
27
27
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
28
28
|
import { NlsatSolver } from "./nlsat/solver";
|
|
29
29
|
import { getModelValueBound } from "./opt-solver";
|
|
30
|
+
import { mkPbGe, mkPbLe } from "./pb-rewriter";
|
|
30
31
|
import { ProtoModel } from "./proto-model";
|
|
32
|
+
import { Rational } from "./rational";
|
|
31
33
|
import { RefVector } from "./ref-vector";
|
|
32
34
|
import { compileInternalTactic, type TacticEnvironment } from "./tactic";
|
|
33
35
|
|
|
@@ -53,6 +55,9 @@ const REUSABLE_OPS = new Set([
|
|
|
53
55
|
export interface ParetoObjective {
|
|
54
56
|
term: number;
|
|
55
57
|
isMax: boolean;
|
|
58
|
+
isMaxsmt: boolean;
|
|
59
|
+
terms: readonly number[];
|
|
60
|
+
weights: readonly Rational[];
|
|
56
61
|
}
|
|
57
62
|
|
|
58
63
|
export const canReuseNlsatSolver = (manager: AstManager, terms: readonly number[]) => {
|
|
@@ -238,6 +243,20 @@ export const giaPareto = (
|
|
|
238
243
|
return bound === undefined ? -1 : pin(manager.mkRealNumeral(bound));
|
|
239
244
|
};
|
|
240
245
|
const mkCmp = (isGe: boolean, model: ProtoModel, objective: ParetoObjective) => {
|
|
246
|
+
if (objective.isMaxsmt) {
|
|
247
|
+
let bound = Rational.zero;
|
|
248
|
+
for (const [index, term] of objective.terms.entries()) {
|
|
249
|
+
const value = model.eval(term, true);
|
|
250
|
+
if (value === manager.trueExpr) bound = bound.add(objective.weights[index]);
|
|
251
|
+
manager.decRef(value);
|
|
252
|
+
}
|
|
253
|
+
const terms = [...objective.terms];
|
|
254
|
+
return pin(
|
|
255
|
+
isGe
|
|
256
|
+
? mkPbGe(manager, objective.weights, terms, bound)
|
|
257
|
+
: mkPbLe(manager, objective.weights, terms, bound),
|
|
258
|
+
);
|
|
259
|
+
}
|
|
241
260
|
const isGreater = objective.isMax ? isGe : !isGe;
|
|
242
261
|
const evaluated = model.eval(objective.term, true);
|
|
243
262
|
pin(evaluated);
|
|
@@ -90,7 +90,7 @@ export class Preprocess {
|
|
|
90
90
|
if (dual.size !== soft.size) soft = this.dualize(dual, fmls);
|
|
91
91
|
}
|
|
92
92
|
return {
|
|
93
|
-
soft: [...soft].map((
|
|
93
|
+
soft: [...soft].map((entry) => ({ expr: entry[0], weight: entry[1], value: L_UNDEF })),
|
|
94
94
|
lower: lower.value,
|
|
95
95
|
};
|
|
96
96
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { SmtCanceledError, SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
2
2
|
import { type AstManager, FAMILY_ARITH, FAMILY_PB } from "./ast";
|
|
3
3
|
import { InfEps } from "./inf-eps";
|
|
4
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
5
|
-
import { AlgebraicManager } from "./nlsat/algebraic";
|
|
5
|
+
import type { AlgebraicManager } from "./nlsat/algebraic";
|
|
6
6
|
import type { ParetoSolver } from "./opt-pareto";
|
|
7
7
|
import type { ProtoModel } from "./proto-model";
|
|
8
8
|
import { Rational } from "./rational";
|
|
@@ -40,7 +40,6 @@ export const getModelValueBound = (
|
|
|
40
40
|
|
|
41
41
|
export class OptSolver {
|
|
42
42
|
private readonly kernel: SmtKernel;
|
|
43
|
-
private readonly am = new AlgebraicManager();
|
|
44
43
|
private model: ProtoModel | null = null;
|
|
45
44
|
private objectiveVars: number[] = [];
|
|
46
45
|
private objectiveValues: InfEps[] = [];
|
|
@@ -130,6 +129,10 @@ export class OptSolver {
|
|
|
130
129
|
return this.kernel.context.unsatCore;
|
|
131
130
|
}
|
|
132
131
|
|
|
132
|
+
get reasonUnknown() {
|
|
133
|
+
return this.kernel.context.getLastFailureMessage();
|
|
134
|
+
}
|
|
135
|
+
|
|
133
136
|
findMutexes(vars: readonly number[]) {
|
|
134
137
|
const mutexes = this.kernel.context.findMutexes(vars);
|
|
135
138
|
for (const mutex of mutexes) for (const literal of mutex) this.pinned.push(literal);
|
|
@@ -165,7 +168,7 @@ export class OptSolver {
|
|
|
165
168
|
|
|
166
169
|
private getModelValueLowerBound(model: ProtoModel, index: number) {
|
|
167
170
|
const value = model.eval(this.objectiveTerms[index], false);
|
|
168
|
-
const bound = getModelValueBound(this.manager, this.am, value, true);
|
|
171
|
+
const bound = getModelValueBound(this.manager, this.manager.am, value, true);
|
|
169
172
|
this.manager.decRef(value);
|
|
170
173
|
return bound;
|
|
171
174
|
}
|
|
@@ -229,7 +232,8 @@ export class OptSolver {
|
|
|
229
232
|
try {
|
|
230
233
|
this.kernel.push();
|
|
231
234
|
} catch (error) {
|
|
232
|
-
|
|
235
|
+
const isPushCanceled = error instanceof SmtDefaultError && error.message === "push canceled";
|
|
236
|
+
if (!(error instanceof SmtCanceledError || isPushCanceled)) throw error;
|
|
233
237
|
return L_UNDEF;
|
|
234
238
|
}
|
|
235
239
|
limit.push(this.dualBoundRlimit);
|
|
@@ -17,7 +17,7 @@ const UNBOUNDED_CHECK_RLIMIT = 100000;
|
|
|
17
17
|
const UNBOUNDED_CHECK_ROUNDS = 8;
|
|
18
18
|
const MAX_ONE_SIDED_ROUNDS = 16;
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
interface OptsmtHost {
|
|
21
21
|
getBaseModel(): ProtoModel | null;
|
|
22
22
|
setModel(model: ProtoModel | null): void;
|
|
23
23
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type AstManager,
|
|
3
|
-
FAMILY_PB,
|
|
4
3
|
OP_AT_LEAST_K,
|
|
5
4
|
OP_AT_MOST_K,
|
|
6
5
|
OP_PB_EQ,
|
|
@@ -19,8 +18,6 @@ interface PbArg {
|
|
|
19
18
|
coeff: Rational;
|
|
20
19
|
}
|
|
21
20
|
|
|
22
|
-
export const isPb = (manager: AstManager, expr: number) => manager.getFamily(expr) === FAMILY_PB;
|
|
23
|
-
|
|
24
21
|
export const getPbK = (manager: AstManager, decl: number) => manager.getPbParameters(decl)[0];
|
|
25
22
|
|
|
26
23
|
export const getPbCoeff = (manager: AstManager, decl: number, index: number) => {
|
|
@@ -31,7 +28,7 @@ export const getPbCoeff = (manager: AstManager, decl: number, index: number) =>
|
|
|
31
28
|
};
|
|
32
29
|
|
|
33
30
|
export const hasUnitCoefficients = (manager: AstManager, decl: number) =>
|
|
34
|
-
manager.funcDecls[decl].domain.every((
|
|
31
|
+
manager.funcDecls[decl].domain.every((_value, index) =>
|
|
35
32
|
getPbCoeff(manager, decl, index).equals(Rational.one),
|
|
36
33
|
);
|
|
37
34
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
KIND_APP,
|
|
@@ -43,12 +42,14 @@ import {
|
|
|
43
42
|
SORT_INT,
|
|
44
43
|
} from "./ast";
|
|
45
44
|
import { isAstLess } from "./ast-lt";
|
|
45
|
+
import { ObjHashtable } from "./hashtable";
|
|
46
46
|
import { Rational } from "./rational";
|
|
47
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
48
48
|
|
|
49
49
|
export interface ArithRewriterOptions {
|
|
50
50
|
readonly isSom: boolean;
|
|
51
51
|
readonly isSortSums: boolean;
|
|
52
|
+
readonly isArithLhs: boolean;
|
|
52
53
|
readonly isArithIneqLhs: boolean;
|
|
53
54
|
readonly isGcdRounding: boolean;
|
|
54
55
|
readonly isAnumSimp: boolean;
|
|
@@ -232,17 +233,6 @@ export class PolyRewriter {
|
|
|
232
233
|
|
|
233
234
|
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
234
235
|
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
235
|
-
const manager = this.manager;
|
|
236
|
-
if (
|
|
237
|
-
this.options.isHoistIte === true &&
|
|
238
|
-
args.some(
|
|
239
|
-
(arg) =>
|
|
240
|
-
manager.getOp(arg) === OP_ITE ||
|
|
241
|
-
(this.isAdd(arg) &&
|
|
242
|
-
manager.getArgs(arg).some((inner) => manager.getOp(inner) === OP_ITE)),
|
|
243
|
-
)
|
|
244
|
-
)
|
|
245
|
-
throw new SmtUnsupportedError("hoisting an if-then-else out of a sum");
|
|
246
236
|
this.currSort = this.manager.sorts[args[0]];
|
|
247
237
|
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
248
238
|
return this.mkNflatAdd(args);
|
|
@@ -300,24 +290,29 @@ export class PolyRewriter {
|
|
|
300
290
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
301
291
|
}
|
|
302
292
|
}
|
|
303
|
-
return this.
|
|
293
|
+
return this.hoist(
|
|
304
294
|
this.mkAddApp(
|
|
305
295
|
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
306
296
|
),
|
|
307
297
|
);
|
|
308
298
|
}
|
|
309
|
-
if (isOrdered && this.options.isHoistMul !== true) {
|
|
299
|
+
if (isOrdered && this.options.isHoistMul !== true && this.options.isHoistIte !== true) {
|
|
310
300
|
if (numCoeffs === 0) return undefined;
|
|
311
301
|
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
312
302
|
return undefined;
|
|
313
303
|
}
|
|
314
304
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
315
305
|
for (const arg of args) if (!this.isNumeral(arg)) newArgs.push(arg);
|
|
316
|
-
return this.
|
|
306
|
+
return this.hoist(
|
|
317
307
|
this.mkAddApp(isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1)),
|
|
318
308
|
);
|
|
319
309
|
}
|
|
320
310
|
|
|
311
|
+
private hoist(sum: number): number | Rewrite {
|
|
312
|
+
const hoisted = this.hoistMultiplication(sum) ?? this.hoistIte(sum);
|
|
313
|
+
return hoisted === undefined ? sum : this.reduce(hoisted, Infinity);
|
|
314
|
+
}
|
|
315
|
+
|
|
321
316
|
// TO_BUFFER: the first argument takes the place of the term, and the others go at the end.
|
|
322
317
|
private getFlatArgs(expr: number, isSplit: (expr: number) => boolean) {
|
|
323
318
|
const manager = this.manager;
|
|
@@ -335,8 +330,8 @@ export class PolyRewriter {
|
|
|
335
330
|
return buffer;
|
|
336
331
|
}
|
|
337
332
|
|
|
338
|
-
private hoistMultiplication(sum: number)
|
|
339
|
-
if (this.options.isHoistMul !== true) return
|
|
333
|
+
private hoistMultiplication(sum: number) {
|
|
334
|
+
if (this.options.isHoistMul !== true) return undefined;
|
|
340
335
|
const isMul = (expr: number) => this.isMul(expr);
|
|
341
336
|
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
342
337
|
const isValid = adds.map(() => true);
|
|
@@ -372,7 +367,69 @@ export class PolyRewriter {
|
|
|
372
367
|
isChanged = true;
|
|
373
368
|
break;
|
|
374
369
|
}
|
|
375
|
-
return isChanged ? this.
|
|
370
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
private hoistIte(sum: number) {
|
|
374
|
+
if (this.options.isHoistIte !== true) return undefined;
|
|
375
|
+
const manager = this.manager;
|
|
376
|
+
const shared = new ObjHashtable((expr) => manager.hashes[expr]);
|
|
377
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
378
|
+
let isChanged = false;
|
|
379
|
+
for (let index = 0; index < adds.length; index++) {
|
|
380
|
+
const add = adds[index];
|
|
381
|
+
if (manager.getOp(add) !== OP_ITE) continue;
|
|
382
|
+
shared.clear();
|
|
383
|
+
if (!this.collectSharedSummands(add, shared)) continue;
|
|
384
|
+
const summands = [this.applyHoist(add, shared)];
|
|
385
|
+
for (const summand of shared) summands.push(summand);
|
|
386
|
+
const hoisted = this.mkAddApp(summands);
|
|
387
|
+
if (hoisted === add) continue;
|
|
388
|
+
adds[index] = hoisted;
|
|
389
|
+
isChanged = true;
|
|
390
|
+
}
|
|
391
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private collectSharedSummands(expr: number, shared: ObjHashtable): boolean {
|
|
395
|
+
const manager = this.manager;
|
|
396
|
+
if (manager.getOp(expr) === OP_ITE)
|
|
397
|
+
return (
|
|
398
|
+
this.collectSharedSummands(manager.getArg(expr, 1), shared) &&
|
|
399
|
+
this.collectSharedSummands(manager.getArg(expr, 2), shared)
|
|
400
|
+
);
|
|
401
|
+
if (this.isNumeral(expr) && this.getValue(expr).isInt()) return false;
|
|
402
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
403
|
+
if (shared.size === 0)
|
|
404
|
+
for (let index = 0; index < summands.length; index++) shared.add(summands[index]);
|
|
405
|
+
else {
|
|
406
|
+
const removed: number[] = [];
|
|
407
|
+
for (const summand of shared) if (!summands.includes(summand)) removed.push(summand);
|
|
408
|
+
for (let index = removed.length - 1; index >= 0; index--) shared.delete(removed[index]);
|
|
409
|
+
}
|
|
410
|
+
if (shared.size === 0) return false;
|
|
411
|
+
for (let index = 1; index < summands.length; index++)
|
|
412
|
+
if (summands.lastIndexOf(summands[index], index - 1) !== -1) return false;
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private applyHoist(expr: number, shared: ObjHashtable): number {
|
|
417
|
+
const manager = this.manager;
|
|
418
|
+
if (manager.getOp(expr) === OP_ITE) {
|
|
419
|
+
const thenExpr = this.applyHoist(manager.getArg(expr, 1), shared);
|
|
420
|
+
const elseExpr = this.applyHoist(manager.getArg(expr, 2), shared);
|
|
421
|
+
return manager.mkApp(
|
|
422
|
+
OP_ITE,
|
|
423
|
+
[manager.getArg(expr, 0), thenExpr, elseExpr],
|
|
424
|
+
manager.sorts[expr],
|
|
425
|
+
);
|
|
426
|
+
}
|
|
427
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
428
|
+
let size = 0;
|
|
429
|
+
for (let index = 0; index < summands.length; index++)
|
|
430
|
+
if (!shared.has(summands[index])) summands[size++] = summands[index];
|
|
431
|
+
summands.length = size;
|
|
432
|
+
return this.mkAddApp(summands);
|
|
376
433
|
}
|
|
377
434
|
|
|
378
435
|
private growStamps(expr: number) {
|
|
@@ -45,9 +45,11 @@ import {
|
|
|
45
45
|
} from "./ast";
|
|
46
46
|
import { getAckrBound } from "./ackr-helper";
|
|
47
47
|
import { BoundManager } from "./bound-manager";
|
|
48
|
+
import { Expr2Polynomial } from "./expr2polynomial";
|
|
49
|
+
import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
48
50
|
import { findNonPb } from "./pb2bv-tactic";
|
|
49
51
|
import type { Goal } from "./goal";
|
|
50
|
-
import { isSymbol, type SExpr
|
|
52
|
+
import { isSymbol, type SExpr } from "./smtlib-parser";
|
|
51
53
|
|
|
52
54
|
export interface Probe {
|
|
53
55
|
(goal: Goal): number;
|
|
@@ -57,8 +59,7 @@ const forEachExpr = (goal: Goal, visit: (expr: number) => void) => {
|
|
|
57
59
|
const manager = goal.manager;
|
|
58
60
|
const visited = new Set<number>();
|
|
59
61
|
const todo = [...goal.forms.items].reverse();
|
|
60
|
-
|
|
61
|
-
const expr = todo.pop() as number;
|
|
62
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
62
63
|
if (visited.has(expr)) continue;
|
|
63
64
|
visited.add(expr);
|
|
64
65
|
visit(expr);
|
|
@@ -361,6 +362,65 @@ const hasPatterns: Probe = (goal) => {
|
|
|
361
362
|
);
|
|
362
363
|
};
|
|
363
364
|
|
|
365
|
+
const mkArithDegreeProbe =
|
|
366
|
+
(isAverage: boolean): Probe =>
|
|
367
|
+
(goal) => {
|
|
368
|
+
const manager = goal.manager;
|
|
369
|
+
let variableCount = 0;
|
|
370
|
+
const expr2poly = new Expr2Polynomial(
|
|
371
|
+
manager,
|
|
372
|
+
new PolynomialManager(manager.limit),
|
|
373
|
+
new Map(),
|
|
374
|
+
() => variableCount++,
|
|
375
|
+
);
|
|
376
|
+
let maxDegree = 0;
|
|
377
|
+
let accDegree = 0;
|
|
378
|
+
let counter = 0;
|
|
379
|
+
const updateDegree = (polynomial: PolynomialRef) => {
|
|
380
|
+
const degree = expr2poly.pm.totalDegree(polynomial.get());
|
|
381
|
+
if (degree > maxDegree) maxDegree = degree;
|
|
382
|
+
accDegree += degree;
|
|
383
|
+
counter++;
|
|
384
|
+
};
|
|
385
|
+
const process = (expr: number) => {
|
|
386
|
+
const first = new PolynomialRef(expr2poly.pm);
|
|
387
|
+
const second = new PolynomialRef(expr2poly.pm);
|
|
388
|
+
expr2poly.toPolynomial(manager.getArg(expr, 0), first);
|
|
389
|
+
expr2poly.toPolynomial(manager.getArg(expr, 1), second);
|
|
390
|
+
updateDegree(first);
|
|
391
|
+
updateDegree(second);
|
|
392
|
+
second.reset();
|
|
393
|
+
first.reset();
|
|
394
|
+
};
|
|
395
|
+
forEachExpr(goal, (expr) => {
|
|
396
|
+
const op = manager.getOp(expr);
|
|
397
|
+
if (op === OP_LE || op === OP_LT || op === OP_GT || op === OP_GE) process(expr);
|
|
398
|
+
if (op === OP_EQ && isArithSort(manager.sorts[manager.getArg(expr, 0)])) process(expr);
|
|
399
|
+
});
|
|
400
|
+
expr2poly.release();
|
|
401
|
+
return isAverage ? (counter === 0 ? 0 : accDegree / counter) : maxDegree;
|
|
402
|
+
};
|
|
403
|
+
|
|
404
|
+
const getBitsize = (value: bigint) => (value < 0n ? -value : value).toString(2).length;
|
|
405
|
+
|
|
406
|
+
const mkArithBwProbe =
|
|
407
|
+
(isAverage: boolean): Probe =>
|
|
408
|
+
(goal) => {
|
|
409
|
+
const manager = goal.manager;
|
|
410
|
+
let maxBitWidth = 0;
|
|
411
|
+
let accBitWidth = 0;
|
|
412
|
+
let counter = 0;
|
|
413
|
+
forEachExpr(goal, (expr) => {
|
|
414
|
+
if (!manager.isNumeral(expr)) return;
|
|
415
|
+
const value = manager.getRationalValue(expr);
|
|
416
|
+
const bitWidth = getBitsize(value.num) + (value.den === 1n ? 0 : getBitsize(value.den));
|
|
417
|
+
if (bitWidth > maxBitWidth) maxBitWidth = bitWidth;
|
|
418
|
+
accBitWidth += bitWidth;
|
|
419
|
+
counter++;
|
|
420
|
+
});
|
|
421
|
+
return isAverage ? (counter === 0 ? 0 : accBitWidth / counter) : maxBitWidth;
|
|
422
|
+
};
|
|
423
|
+
|
|
364
424
|
const NAMED_PROBES = new Map<string, Probe>([
|
|
365
425
|
["depth", (goal) => goal.depth],
|
|
366
426
|
["size", (goal) => goal.forms.size],
|
|
@@ -436,11 +496,13 @@ const NAMED_PROBES = new Map<string, Probe>([
|
|
|
436
496
|
),
|
|
437
497
|
],
|
|
438
498
|
["ackr-bound-probe", getAckrBound],
|
|
499
|
+
["arith-max-deg", mkArithDegreeProbe(false)],
|
|
500
|
+
["arith-avg-deg", mkArithDegreeProbe(true)],
|
|
501
|
+
["arith-max-bw", mkArithBwProbe(false)],
|
|
502
|
+
["arith-avg-bw", mkArithBwProbe(true)],
|
|
439
503
|
]);
|
|
440
504
|
|
|
441
|
-
const UNPORTED_PROBES = new Set(
|
|
442
|
-
"memory arith-max-deg arith-avg-deg arith-max-bw arith-avg-bw".split(" "),
|
|
443
|
-
);
|
|
505
|
+
const UNPORTED_PROBES = new Set(["memory"]);
|
|
444
506
|
|
|
445
507
|
const BINARY_PROBES = new Map<string, (first: number, second: number) => number>([
|
|
446
508
|
["=", (first, second) => Number(first === second)],
|
|
@@ -461,48 +523,51 @@ const NARY_PROBES = new Map<string, (first: number, second: number) => number>([
|
|
|
461
523
|
["*", (first, second) => first * second],
|
|
462
524
|
]);
|
|
463
525
|
|
|
464
|
-
export const compileProbe = (sexpr: SExpr,
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
526
|
+
export const compileProbe = (sexpr: SExpr, isInternal = false): Probe => {
|
|
527
|
+
// A decimal is a numeral of the s-expression, which is_int32 rejects unless it is whole.
|
|
528
|
+
if (sexpr.kind === "numeral" || sexpr.kind === "decimal") {
|
|
529
|
+
const [whole, fraction = ""] = sexpr.text.split(".");
|
|
530
|
+
const value = Number(whole);
|
|
531
|
+
if (!/^0*$/.test(fraction) || value > 2 ** 31 - 1)
|
|
468
532
|
throw new SmtParseError(
|
|
469
533
|
"invalid probe, constant is too big to fit in a fixed size integer",
|
|
470
|
-
|
|
534
|
+
sexpr,
|
|
471
535
|
);
|
|
472
536
|
return () => value;
|
|
473
537
|
}
|
|
474
538
|
if (sexpr.kind !== "list") {
|
|
475
|
-
if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input",
|
|
539
|
+
if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input", sexpr);
|
|
476
540
|
const named =
|
|
477
541
|
NAMED_PROBES.get(sexpr.text) ?? (isInternal ? INTERNAL_PROBES.get(sexpr.text) : undefined);
|
|
478
542
|
if (named !== undefined) return named;
|
|
479
543
|
if (UNPORTED_PROBES.has(sexpr.text)) throw new SmtUnsupportedError(`the probe ${sexpr.text}`);
|
|
480
|
-
throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`,
|
|
544
|
+
throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`, sexpr);
|
|
481
545
|
}
|
|
482
546
|
const head = sexpr.items[0];
|
|
483
|
-
if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", end);
|
|
484
|
-
if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", end);
|
|
547
|
+
if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", sexpr.end);
|
|
548
|
+
if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", sexpr.end);
|
|
485
549
|
const children = sexpr.items.slice(1);
|
|
486
550
|
if (head.text === "not") {
|
|
487
551
|
if (children.length !== 1)
|
|
488
|
-
throw new SmtParseError("invalid probe expression, one argument expected", end);
|
|
489
|
-
const child = compileProbe(children[0],
|
|
552
|
+
throw new SmtParseError("invalid probe expression, one argument expected", sexpr.end);
|
|
553
|
+
const child = compileProbe(children[0], isInternal);
|
|
490
554
|
return (goal) => Number(child(goal) === 0);
|
|
491
555
|
}
|
|
492
556
|
const binary = BINARY_PROBES.get(head.text);
|
|
493
557
|
if (binary !== undefined) {
|
|
494
558
|
if (children.length !== 2)
|
|
495
|
-
throw new SmtParseError("invalid probe expression, two arguments expected", end);
|
|
496
|
-
const first = compileProbe(children[0],
|
|
497
|
-
const second = compileProbe(children[1],
|
|
559
|
+
throw new SmtParseError("invalid probe expression, two arguments expected", sexpr.end);
|
|
560
|
+
const first = compileProbe(children[0], isInternal);
|
|
561
|
+
const second = compileProbe(children[1], isInternal);
|
|
498
562
|
return (goal) => binary(first(goal), second(goal));
|
|
499
563
|
}
|
|
500
564
|
const nary = NARY_PROBES.get(head.text);
|
|
501
565
|
if (nary === undefined)
|
|
502
|
-
throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, end);
|
|
566
|
+
throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, sexpr.end);
|
|
503
567
|
if (children.length === 0)
|
|
504
|
-
throw new SmtParseError("invalid probe, at least one argument expected", end);
|
|
505
|
-
const probes = children.map((child) => compileProbe(child,
|
|
568
|
+
throw new SmtParseError("invalid probe, at least one argument expected", sexpr.end);
|
|
569
|
+
const probes = children.map((child) => compileProbe(child, isInternal));
|
|
570
|
+
// Deviation from Z3: MK_NARY_PROBE applies the operator to its first argument twice.
|
|
506
571
|
return (goal) => probes.map((probe) => probe(goal)).reduce(nary);
|
|
507
572
|
};
|
|
508
573
|
|
|
@@ -28,7 +28,7 @@ import {
|
|
|
28
28
|
} from "./datatype-decl-plugin";
|
|
29
29
|
import { mkArrayApp, mkAsArray } from "./array-decl-plugin";
|
|
30
30
|
import { mkFpNumeral, mkRmNumeral } from "./fpa-decl-plugin";
|
|
31
|
-
import { MPF_ROUND_TOWARD_ZERO, mkZero } from "./mpf";
|
|
31
|
+
import { MPF_ROUND_TOWARD_ZERO, mkNan, mkZero } from "./mpf";
|
|
32
32
|
import { RandomGen } from "./random-gen";
|
|
33
33
|
import { mkEmptySeq, mkSeqApp } from "./seq-decl-plugin";
|
|
34
34
|
import { Rational } from "./rational";
|
|
@@ -45,7 +45,7 @@ export const getManagerSomeValue = (manager: AstManager, sort: number): number =
|
|
|
45
45
|
if (sort === SORT_BOOL) return manager.falseExpr;
|
|
46
46
|
if (manager.isRmSort(sort)) return mkRmNumeral(manager, MPF_ROUND_TOWARD_ZERO);
|
|
47
47
|
if (manager.isFpSort(sort))
|
|
48
|
-
return mkFpNumeral(manager,
|
|
48
|
+
return mkFpNumeral(manager, mkNan(manager.getEbits(sort), manager.getSbits(sort)));
|
|
49
49
|
if (isArithSort(sort)) return manager.mkNumeralOfSort(Rational.zero, sort);
|
|
50
50
|
if (manager.isBvSort(sort)) return manager.mkBvNumeral(0n, manager.getBvSize(sort));
|
|
51
51
|
if (manager.isArraySort(sort))
|
|
@@ -267,7 +267,7 @@ export class FuncInterp {
|
|
|
267
267
|
const lambda = manager.mkQuantifier({
|
|
268
268
|
kind: QUANTIFIER_LAMBDA,
|
|
269
269
|
sorts: [...domain],
|
|
270
|
-
names: domain.map((
|
|
270
|
+
names: domain.map((_value, index) => index),
|
|
271
271
|
body,
|
|
272
272
|
patterns: [],
|
|
273
273
|
noPatterns: [],
|
|
@@ -518,6 +518,8 @@ export class ProtoModel {
|
|
|
518
518
|
const manager = this.manager;
|
|
519
519
|
if (this.charFactory !== undefined && manager.isCharSort(sort))
|
|
520
520
|
return manager.mkChar(this.charFactory.getSomeValue());
|
|
521
|
+
if (manager.isFpSort(sort) && !this.isFinal)
|
|
522
|
+
return mkFpNumeral(manager, mkZero(manager.getEbits(sort), manager.getSbits(sort), false));
|
|
521
523
|
if (
|
|
522
524
|
manager.isFpSort(sort) ||
|
|
523
525
|
manager.isRmSort(sort) ||
|
|
@@ -753,7 +755,7 @@ export class ProtoModel {
|
|
|
753
755
|
]);
|
|
754
756
|
}
|
|
755
757
|
for (const [decl, value] of this.constInterps)
|
|
756
|
-
if (!manager.recFunDefs.has(decl)) collectDeps(decl, [value]);
|
|
758
|
+
if (!manager.recFunDefs.has(decl) && !manager.macros.has(decl)) collectDeps(decl, [value]);
|
|
757
759
|
sort.sort();
|
|
758
760
|
const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
759
761
|
for (const decl of sort.sorted) {
|
|
@@ -1037,10 +1039,8 @@ export class ProtoModel {
|
|
|
1037
1039
|
copy() {
|
|
1038
1040
|
const model = new ProtoModel(this.manager);
|
|
1039
1041
|
model.isFinal = this.isFinal;
|
|
1040
|
-
for (const
|
|
1041
|
-
|
|
1042
|
-
for (const decl of this.funcDecls)
|
|
1043
|
-
model.registerFunc(decl, (this.funcInterps.get(decl) as FuncInterp).copy());
|
|
1042
|
+
for (const entry of this.constInterps) model.registerConst(entry[0], entry[1]);
|
|
1043
|
+
for (const entry of this.funcInterps) model.registerFunc(entry[0], entry[1].copy());
|
|
1044
1044
|
for (const sort of this.getUninterpretedSorts())
|
|
1045
1045
|
for (const value of this.getKnownUniverse(sort)) model.registerValue(value);
|
|
1046
1046
|
for (const entry of this.universes) model.registerUsort(entry[0], entry[1].items);
|