tla-ts 0.0.10-dev.3a85c3a9e → 0.0.10-dev.45c0eaef5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +56 -56
- package/dist/prove.js +79 -79
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -107
- package/src/check.ts +535 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +21 -7
- package/src/cli/tlc.ts +31 -11
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +131 -41
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -13
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +204 -62
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -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 +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
- package/src/prover/smt/solver/lp/nla-core.ts +26 -6
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -71
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +21 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +20 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +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-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +713 -210
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +350 -195
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +10 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/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 +1274 -258
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +18 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +348 -153
- package/src/simulate.ts +250 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -75,6 +75,7 @@ import {
|
|
|
75
75
|
TRUE_LITERAL,
|
|
76
76
|
} from "./literal";
|
|
77
77
|
import { UnionFind } from "./lp/union-find";
|
|
78
|
+
import type { ProtoModel } from "./proto-model";
|
|
78
79
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
79
80
|
import { Theory } from "./theory";
|
|
80
81
|
|
|
@@ -247,6 +248,7 @@ export class TheoryBv extends Theory {
|
|
|
247
248
|
private propQueue: number[] = [];
|
|
248
249
|
private mergeAux: [number[], number[]] = [[], []];
|
|
249
250
|
private bv2ints: Enode[] = [];
|
|
251
|
+
private model: ProtoModel | undefined;
|
|
250
252
|
|
|
251
253
|
constructor(context: Context) {
|
|
252
254
|
super(context, FAMILY_BV);
|
|
@@ -286,7 +288,7 @@ export class TheoryBv extends Theory {
|
|
|
286
288
|
const isRelevant = context.isRelevant(owner);
|
|
287
289
|
const bits = this.bits[thVar];
|
|
288
290
|
bits.length = 0;
|
|
289
|
-
const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (
|
|
291
|
+
const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (_value, index) =>
|
|
290
292
|
mkBvApp(this.manager, OP_BIT2BOOL, [owner], [index]),
|
|
291
293
|
);
|
|
292
294
|
context.internalizeAll(bitExprs, true);
|
|
@@ -578,7 +580,7 @@ export class TheoryBv extends Theory {
|
|
|
578
580
|
const numArgs = node.numArgs;
|
|
579
581
|
const parameters = this.manager.funcDecls[this.manager.decls[term]].parameters;
|
|
580
582
|
if (!isAssociative) {
|
|
581
|
-
const args = Array.from({ length: numArgs }, (
|
|
583
|
+
const args = Array.from({ length: numArgs }, (_value, index) => this.getArgBits(node, index));
|
|
582
584
|
const bits: number[] = [];
|
|
583
585
|
blast(this.blaster, args, parameters[0], bits);
|
|
584
586
|
this.initBits(node, bits);
|
|
@@ -1193,8 +1195,16 @@ export class TheoryBv extends Theory {
|
|
|
1193
1195
|
this.dropAll(clause);
|
|
1194
1196
|
}
|
|
1195
1197
|
|
|
1198
|
+
initModel(model: ProtoModel) {
|
|
1199
|
+
this.model = model;
|
|
1200
|
+
}
|
|
1201
|
+
|
|
1196
1202
|
mkValue(node: Enode) {
|
|
1203
|
+
const model = this.model;
|
|
1204
|
+
if (model === undefined) throw new SmtInvariantError("the model was not initialized");
|
|
1197
1205
|
const thVar = this.getThVar(node);
|
|
1198
|
-
|
|
1206
|
+
const value = this.manager.mkBvNumeral(this.getFixedValue(thVar).value, this.getBvSize(thVar));
|
|
1207
|
+
model.registerValue(value);
|
|
1208
|
+
return value;
|
|
1199
1209
|
}
|
|
1200
1210
|
}
|
|
@@ -48,7 +48,7 @@ const CONVERTED_OPS = new Set([
|
|
|
48
48
|
export const mkFpaConversion = (manager: AstManager) => {
|
|
49
49
|
const theoryRewriter = new Rewriter(manager, {
|
|
50
50
|
isEliminatingAnd: false,
|
|
51
|
-
arith: { ...TACTIC_ARITH_OPTIONS,
|
|
51
|
+
arith: { ...TACTIC_ARITH_OPTIONS, isArithLhs: true },
|
|
52
52
|
isRewritingPatterns: true,
|
|
53
53
|
});
|
|
54
54
|
const simp = new Rewriter(manager, {
|
|
@@ -125,6 +125,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
125
125
|
this.context.setTrueFirstFlag(getVar(literal));
|
|
126
126
|
}
|
|
127
127
|
for (const lemma of nla.lemmas) this.falseCaseOfCheckNla(lemma);
|
|
128
|
+
if (!this.isPropagatingEqs()) return;
|
|
128
129
|
for (const equality of nla.fixedEqualities)
|
|
129
130
|
this.addEquality(equality.lpVar, equality.value, equality.explanation);
|
|
130
131
|
for (const equality of nla.equalities)
|
|
@@ -86,10 +86,12 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
86
86
|
|
|
87
87
|
init() {
|
|
88
88
|
const manager = this.manager;
|
|
89
|
+
this.solver.settings.isPropagatingEqs = this.context.config.isArithPropagatingEqs;
|
|
89
90
|
this.oneVar = this.addConst(manager.mkNumeral(1n));
|
|
90
91
|
this.realOneVar = this.addConst(manager.mkRealNumeral(Rational.one));
|
|
91
92
|
this.zeroVar = this.addConst(manager.mkNumeral(0n));
|
|
92
93
|
this.realZeroVar = this.addConst(manager.mkRealNumeral(Rational.zero));
|
|
94
|
+
this.solver.settings.setRandomSeed(this.context.params.randomSeed ?? 0);
|
|
93
95
|
}
|
|
94
96
|
|
|
95
97
|
private addConst(expr: number) {
|
|
@@ -240,10 +242,18 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
240
242
|
nla.isRelevant = (lpVar) =>
|
|
241
243
|
this.context.isRelevant(this.getExpr(this.solver.getExternal(lpVar)));
|
|
242
244
|
nla.grobner.updateParams();
|
|
245
|
+
nla.addMulDefHook = (vars) => this.addMulDef(vars);
|
|
243
246
|
this.nla = nla;
|
|
244
247
|
return nla;
|
|
245
248
|
}
|
|
246
249
|
|
|
250
|
+
private addMulDef(vars: readonly number[]) {
|
|
251
|
+
const isInt = vars.every((lpVar) => this.isIntVar(this.solver.getExternal(lpVar)));
|
|
252
|
+
const product = this.manager.mkFreshConst("mul!", isInt ? SORT_INT : SORT_REAL);
|
|
253
|
+
this.mkEnode(product);
|
|
254
|
+
return this.registerVar(this.mkVar(product));
|
|
255
|
+
}
|
|
256
|
+
|
|
247
257
|
private registerDivision(quotient: number, remainder: number): Division {
|
|
248
258
|
const register = (expr: number) => {
|
|
249
259
|
this.internalizeTermCore(expr);
|
|
@@ -33,11 +33,11 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
33
33
|
private delayIneqsQhead = 0;
|
|
34
34
|
protected explanation = new Explanation();
|
|
35
35
|
protected coreLiterals: Literal[] = [];
|
|
36
|
-
protected numConflicts = 0;
|
|
37
36
|
private lowerTerms: (TermBound | undefined)[] = [];
|
|
38
37
|
private upperTerms: (TermBound | undefined)[] = [];
|
|
39
38
|
protected isModelInitialized = false;
|
|
40
39
|
private activeInfEpsConstraints: number[] = [];
|
|
40
|
+
protected numConflicts = 0;
|
|
41
41
|
|
|
42
42
|
canPropagate() {
|
|
43
43
|
return (
|
|
@@ -131,11 +131,16 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
131
131
|
: bound.isLower
|
|
132
132
|
? bound.value.sub(Rational.one)
|
|
133
133
|
: bound.value.add(Rational.one);
|
|
134
|
-
if (isTrue ? bound.eps.isZero() : bound.isInt)
|
|
134
|
+
if (this.isPropagatingEqs() && (isTrue ? bound.eps.isZero() : bound.isInt))
|
|
135
135
|
this.propagateEqs(bound.column, constraint, kind, bound, value);
|
|
136
136
|
return true;
|
|
137
137
|
}
|
|
138
138
|
|
|
139
|
+
protected isPropagatingEqs() {
|
|
140
|
+
const config = this.context.config;
|
|
141
|
+
return config.isArithPropagatingEqs && this.numConflicts < config.arithPropagationThreshold;
|
|
142
|
+
}
|
|
143
|
+
|
|
139
144
|
private propagateEqs(
|
|
140
145
|
column: number,
|
|
141
146
|
constraint: number,
|
|
@@ -256,7 +261,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
256
261
|
}
|
|
257
262
|
|
|
258
263
|
protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
|
|
259
|
-
if (this.context.isInconsistent()) return false;
|
|
264
|
+
if (this.context.isInconsistent() || !this.isPropagatingEqs()) return false;
|
|
260
265
|
const v1 = this.solver.getExternal(first);
|
|
261
266
|
const v2 = this.solver.getExternal(second);
|
|
262
267
|
if (v1 === NULL_THEORY_VAR || v2 === NULL_THEORY_VAR) return false;
|
|
@@ -299,6 +304,9 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
299
304
|
}
|
|
300
305
|
|
|
301
306
|
private propagateBoundsWithLpSolver() {
|
|
307
|
+
const config = this.context.config;
|
|
308
|
+
if (!config.isArithBoundPropagating || this.numConflicts >= config.arithPropagationThreshold)
|
|
309
|
+
return;
|
|
302
310
|
this.bp.init();
|
|
303
311
|
this.bp.propagateBoundsForTouchedRows();
|
|
304
312
|
if (this.context.checkCanceled()) return;
|
|
@@ -9,7 +9,7 @@ export abstract class TheoryLraState extends Theory {
|
|
|
9
9
|
|
|
10
10
|
constructor(context: Context) {
|
|
11
11
|
super(context, FAMILY_ARITH);
|
|
12
|
-
this.solver = new LarSolver(() => context.checkCanceled());
|
|
12
|
+
this.solver = new LarSolver((cost) => context.checkCanceled(cost));
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
protected isIntExpr(expr: number) {
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
-
import { SmtInvariantError
|
|
2
|
-
import {
|
|
1
|
+
import { SmtInvariantError } from "../../../errors";
|
|
2
|
+
import {
|
|
3
|
+
FAMILY_PB,
|
|
4
|
+
OP_AT_LEAST_K,
|
|
5
|
+
OP_AT_MOST_K,
|
|
6
|
+
OP_PB_AUX_BOOL,
|
|
7
|
+
OP_PB_EQ,
|
|
8
|
+
OP_PB_GE,
|
|
9
|
+
OP_PB_LE,
|
|
10
|
+
} from "./ast";
|
|
3
11
|
import { mkNot } from "./ast-util";
|
|
4
12
|
import { BinJustification, CLS_TH_LEMMA } from "./clause";
|
|
5
13
|
import type { Context } from "./context";
|
|
@@ -221,7 +229,6 @@ class Card {
|
|
|
221
229
|
constructor(
|
|
222
230
|
public lit: Literal,
|
|
223
231
|
public k: number,
|
|
224
|
-
readonly isAux: boolean,
|
|
225
232
|
) {}
|
|
226
233
|
|
|
227
234
|
get size() {
|
|
@@ -309,6 +316,10 @@ export class TheoryPb extends Theory {
|
|
|
309
316
|
const context = this.context;
|
|
310
317
|
const manager = this.manager;
|
|
311
318
|
if (context.isBInternalized(atom)) return true;
|
|
319
|
+
if (manager.getOp(atom) === OP_PB_AUX_BOOL) {
|
|
320
|
+
context.setVarTheory(context.mkBoolVar(atom), this.id);
|
|
321
|
+
return true;
|
|
322
|
+
}
|
|
312
323
|
if (this.internalizeCard(atom)) return true;
|
|
313
324
|
const boolVar = context.mkBoolVar(atom);
|
|
314
325
|
context.setVarTheory(boolVar, this.id);
|
|
@@ -317,7 +328,7 @@ export class TheoryPb extends Theory {
|
|
|
317
328
|
const args = manager.getArgs(atom);
|
|
318
329
|
const op = manager.getOp(atom);
|
|
319
330
|
if (op === OP_PB_EQ) {
|
|
320
|
-
const coeffs = args.map((
|
|
331
|
+
const coeffs = args.map((_value, index) => getPbCoeff(manager, decl, index));
|
|
321
332
|
const sum = coeffs.reduce((total, coeff) => total.add(coeff), Rational.zero);
|
|
322
333
|
const k = getPbK(manager, decl);
|
|
323
334
|
const le = mkPbGe(
|
|
@@ -395,8 +406,14 @@ export class TheoryPb extends Theory {
|
|
|
395
406
|
hasBoolVar = true;
|
|
396
407
|
isNot = !isNot;
|
|
397
408
|
}
|
|
398
|
-
if (!hasBoolVar)
|
|
399
|
-
|
|
409
|
+
if (!hasBoolVar) {
|
|
410
|
+
const proxy = manager.mkPbAuxBool();
|
|
411
|
+
const definition = manager.mkEq(proxy, arg);
|
|
412
|
+
context.internalize(definition, false);
|
|
413
|
+
boolVar = context.getBoolVar(proxy);
|
|
414
|
+
context.mkThAxiom([mkLiteral(context.getBoolVar(definition))]);
|
|
415
|
+
context.markAsRelevant(proxy);
|
|
416
|
+
}
|
|
400
417
|
return mkLiteral(boolVar, isNot);
|
|
401
418
|
}
|
|
402
419
|
|
|
@@ -473,7 +490,7 @@ export class TheoryPb extends Theory {
|
|
|
473
490
|
context.mkThAxiom([negate(lit)]);
|
|
474
491
|
return true;
|
|
475
492
|
}
|
|
476
|
-
const card = new Card(lit, bound
|
|
493
|
+
const card = new Card(lit, bound);
|
|
477
494
|
for (const arg of args) card.addArg(this.compileArg(arg));
|
|
478
495
|
if (bound === card.size) this.card2conjunction(card);
|
|
479
496
|
else if (card.size === 1) this.card2disjunction(card);
|
|
@@ -30,7 +30,7 @@ import { getConcat, mkSeqApp } from "./seq-decl-plugin";
|
|
|
30
30
|
import type { EqPair } from "./seq-rewriter";
|
|
31
31
|
import { type DecomposedEq, type DepEq, type Ne, TheorySeqState } from "./theory-seq-state";
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
interface DepState {
|
|
34
34
|
dep: Dependency;
|
|
35
35
|
isChanged: boolean;
|
|
36
36
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type AstManager,
|
|
3
|
-
OP_ADD,
|
|
4
3
|
OP_GE,
|
|
5
4
|
OP_LE,
|
|
6
5
|
OP_SEQ_CONCAT,
|
|
@@ -53,7 +52,7 @@ export interface Ne {
|
|
|
53
52
|
dep: Dependency;
|
|
54
53
|
}
|
|
55
54
|
|
|
56
|
-
|
|
55
|
+
interface Nc {
|
|
57
56
|
contains: number;
|
|
58
57
|
lengthGreater: Literal;
|
|
59
58
|
dep: Dependency;
|
|
@@ -64,7 +63,7 @@ interface ExprDep {
|
|
|
64
63
|
dep: Dependency;
|
|
65
64
|
}
|
|
66
65
|
|
|
67
|
-
|
|
66
|
+
class ScopedVector<T> {
|
|
68
67
|
items: T[] = [];
|
|
69
68
|
private undoIndexes: number[] = [];
|
|
70
69
|
private undoValues: T[] = [];
|
|
@@ -146,10 +145,6 @@ class SolutionMap {
|
|
|
146
145
|
private deps: Dependency[] = [];
|
|
147
146
|
private limits: number[] = [];
|
|
148
147
|
|
|
149
|
-
get isEmpty() {
|
|
150
|
-
return this.map.size === 0;
|
|
151
|
-
}
|
|
152
|
-
|
|
153
148
|
private reducesTo(input: number, expr: number) {
|
|
154
149
|
let current = input;
|
|
155
150
|
while (current !== expr) {
|
|
@@ -237,10 +232,6 @@ class ExclusionTable {
|
|
|
237
232
|
|
|
238
233
|
constructor(private manager: AstManager) {}
|
|
239
234
|
|
|
240
|
-
get isEmpty() {
|
|
241
|
-
return this.table.size === 0;
|
|
242
|
-
}
|
|
243
|
-
|
|
244
235
|
private getKey(first: number, second: number) {
|
|
245
236
|
return this.manager.ids[first] > this.manager.ids[second]
|
|
246
237
|
? `${second},${first}`
|
|
@@ -472,10 +463,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
472
463
|
return this.rewrite(this.mkArith(OP_SUB, [first, second]));
|
|
473
464
|
}
|
|
474
465
|
|
|
475
|
-
protected mkAdd(first: number, second: number) {
|
|
476
|
-
return this.rewrite(this.mkArith(OP_ADD, [first, second]));
|
|
477
|
-
}
|
|
478
|
-
|
|
479
466
|
protected mkLength(seq: number) {
|
|
480
467
|
return mkSeqApp(this.manager, OP_SEQ_LENGTH, [seq]);
|
|
481
468
|
}
|
|
@@ -518,12 +505,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
518
505
|
return dep;
|
|
519
506
|
}
|
|
520
507
|
|
|
521
|
-
protected addDependency(dep: Dependency, first: Enode, second: Enode) {
|
|
522
|
-
return first === second
|
|
523
|
-
? dep
|
|
524
|
-
: mkJoin(dep, this.mkAssumption({ first, second, literal: undefined }));
|
|
525
|
-
}
|
|
526
|
-
|
|
527
508
|
protected linearizeOf(dep: Dependency, eqs: Enode[], literals: Literal[]) {
|
|
528
509
|
for (const index of linearize([dep])) {
|
|
529
510
|
const assumption = this.assumptions[index];
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { Context } from "./context";
|
|
2
|
+
import { Theory } from "./theory";
|
|
3
|
+
|
|
4
|
+
export class TheoryWithoutTerms extends Theory {
|
|
5
|
+
constructor(
|
|
6
|
+
context: Context,
|
|
7
|
+
id: number,
|
|
8
|
+
readonly name: string,
|
|
9
|
+
) {
|
|
10
|
+
super(context, id);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
internalizeAtom() {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
internalizeTerm() {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
newEqEh() {}
|
|
22
|
+
|
|
23
|
+
newDiseqEh() {}
|
|
24
|
+
}
|
|
@@ -113,12 +113,12 @@ export const loadFingerprints = (table: FingerprintTable, path: string, isSafe:
|
|
|
113
113
|
table.clear();
|
|
114
114
|
(buckets !== undefined && isBlock(buckets) ? buckets.fields : [])
|
|
115
115
|
.flatMap((bucket) => readBucket(bucket).toReversed())
|
|
116
|
-
.forEach((
|
|
117
|
-
if (typeof
|
|
116
|
+
.forEach((entry) => {
|
|
117
|
+
if (typeof entry[0] !== "string" || !isBlock(entry[1]))
|
|
118
118
|
throw new TlaProofError("corrupted fingerprint file");
|
|
119
119
|
table.set(
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
entry[0],
|
|
121
|
+
entry[1].fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
|
|
122
122
|
);
|
|
123
123
|
});
|
|
124
124
|
};
|
|
@@ -226,18 +226,18 @@ export const getKnownResults = (table: FingerprintTable) => {
|
|
|
226
226
|
const storedResults = new Map<ProofAttempt, OcamlValue>();
|
|
227
227
|
const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
|
|
228
228
|
const results = new Map(
|
|
229
|
-
[...table].map((
|
|
229
|
+
[...table].map((entry) => {
|
|
230
230
|
const attempts = new Map(
|
|
231
231
|
STORED_PROVERS.flatMap((prover) => {
|
|
232
|
-
const stored =
|
|
232
|
+
const stored = entry[1][PROVERS[prover].field];
|
|
233
233
|
const result = decodeResult(prover, getField(stored, 0));
|
|
234
234
|
if (!result) return [];
|
|
235
235
|
storedResults.set(result, stored);
|
|
236
236
|
return [[prover, result]];
|
|
237
237
|
}),
|
|
238
238
|
);
|
|
239
|
-
storedRecords.set(attempts,
|
|
240
|
-
return [
|
|
239
|
+
storedRecords.set(attempts, entry[1]);
|
|
240
|
+
return [entry[0], attempts];
|
|
241
241
|
}),
|
|
242
242
|
);
|
|
243
243
|
const save = (path: string) => {
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
isNegatedRelation,
|
|
5
5
|
isRelation,
|
|
6
6
|
isMeta,
|
|
7
|
+
preunify,
|
|
7
8
|
type Expr,
|
|
8
9
|
type NegatedRelationExpr,
|
|
9
10
|
type NotExpr,
|
|
@@ -204,6 +205,29 @@ export const addReflexivity: SearchRule = (context, queue, formula, goalness) =>
|
|
|
204
205
|
return [queue, false];
|
|
205
206
|
};
|
|
206
207
|
|
|
208
|
+
export const addPreunification: SearchRule = (context, queue, formula, goalness) => {
|
|
209
|
+
const matches =
|
|
210
|
+
formula.kind === "not" && formula.args[0].kind === "app"
|
|
211
|
+
? context.index.getPositive(formula.args[0].symbol)
|
|
212
|
+
: formula.kind === "app"
|
|
213
|
+
? context.index.getNegative(formula.symbol)
|
|
214
|
+
: undefined;
|
|
215
|
+
if (matches === undefined) return [queue, false];
|
|
216
|
+
let current = queue;
|
|
217
|
+
for (let matchIndex = matches.length - 1; matchIndex >= 0; matchIndex--) {
|
|
218
|
+
const pairs = preunify(matches[matchIndex], formula);
|
|
219
|
+
for (let pairIndex = 0; pairIndex < pairs.length; pairIndex++)
|
|
220
|
+
current = makeInstance(
|
|
221
|
+
context.exprs,
|
|
222
|
+
current,
|
|
223
|
+
pairs[pairIndex][0],
|
|
224
|
+
pairs[pairIndex][1],
|
|
225
|
+
Math.min(goalness, context.index.getGoalness(matches[matchIndex])),
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
return [current, false];
|
|
229
|
+
};
|
|
230
|
+
|
|
207
231
|
export const addCongruence: SearchRule = (context, queue, formula, goalness) => {
|
|
208
232
|
const exprs = context.exprs;
|
|
209
233
|
if (formula.kind !== "not" || !isApp(formula.args[0], "=", 2)) return [queue, false];
|
package/src/prover/zenon/expr.ts
CHANGED
|
@@ -241,6 +241,27 @@ export const compareExprs = (left: Expr, right: Expr): number => {
|
|
|
241
241
|
return 0;
|
|
242
242
|
};
|
|
243
243
|
|
|
244
|
+
const NO_PAIRS: readonly [Expr, Expr][] = [];
|
|
245
|
+
|
|
246
|
+
const xpreunify = (
|
|
247
|
+
accu: readonly [Expr, Expr][],
|
|
248
|
+
left: Expr,
|
|
249
|
+
right: Expr,
|
|
250
|
+
): readonly [Expr, Expr][] | undefined => {
|
|
251
|
+
if (left === right) return accu;
|
|
252
|
+
if (left.kind === "app" && right.kind === "app" && left.symbol === right.symbol) {
|
|
253
|
+
let current: readonly [Expr, Expr][] | undefined = accu;
|
|
254
|
+
for (let index = 0; index < left.args.length && current !== undefined; index++)
|
|
255
|
+
current = xpreunify(current, left.args[index], right.args[index]);
|
|
256
|
+
return current;
|
|
257
|
+
}
|
|
258
|
+
if (left.kind === "meta") return [[left.args[0], right], ...accu];
|
|
259
|
+
if (right.kind === "meta") return [[right.args[0], left], ...accu];
|
|
260
|
+
return undefined;
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
export const preunify = (left: Expr, right: Expr) => xpreunify(NO_PAIRS, left, right) ?? NO_PAIRS;
|
|
264
|
+
|
|
244
265
|
type Substitution = [Expr, Expr][];
|
|
245
266
|
|
|
246
267
|
const lookup = (map: Substitution, variable: Expr) => map.find((pair) => pair[0] === variable)?.[1];
|
|
@@ -262,8 +262,11 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
262
262
|
const suspect = group[0];
|
|
263
263
|
const count = suspect.records.length;
|
|
264
264
|
const missing = [
|
|
265
|
-
...Array.from(
|
|
266
|
-
|
|
265
|
+
...Array.from(
|
|
266
|
+
{ length: count - suspect.cursor },
|
|
267
|
+
(_value, offset) => suspect.cursor + offset,
|
|
268
|
+
),
|
|
269
|
+
...Array.from({ length: suspect.cursor }, (_value, offset) => offset),
|
|
267
270
|
].find((index) => !suspect.records[index].isPresent);
|
|
268
271
|
if (missing === undefined) return suspect.proof;
|
|
269
272
|
suspects = [group.slice(1), ...suspects.slice(1)];
|
|
@@ -280,6 +283,8 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
280
283
|
getGoalness,
|
|
281
284
|
findPositive: (symbol: string) => withGoalness(getLatestFirst(positive, symbol)),
|
|
282
285
|
findNegative: (symbol: string) => withGoalness(getLatestFirst(negative, symbol)),
|
|
286
|
+
getPositive: (symbol: string) => positive.get(symbol),
|
|
287
|
+
getNegative: (symbol: string) => negative.get(symbol),
|
|
283
288
|
findEqualRight: (term: Expr) => getLatestFirst(equalLeftRight, term),
|
|
284
289
|
findEqualLeft: (term: Expr) => getLatestFirst(equalRightLeft, term),
|
|
285
290
|
findDisequalities: (term: Expr) => [
|
|
@@ -129,7 +129,7 @@ const getInstance = (pieces: Piece[], getValue: (piece: Progression) => number)
|
|
|
129
129
|
const expandPattern = (count: number, text: string, isReversed: boolean) => {
|
|
130
130
|
const pattern = parsePattern(text);
|
|
131
131
|
if (pattern === undefined) return undefined;
|
|
132
|
-
const positions = Array.from({ length: count }, (
|
|
132
|
+
const positions = Array.from({ length: count }, (_value, position) =>
|
|
133
133
|
isReversed ? count - 1 - position : position,
|
|
134
134
|
);
|
|
135
135
|
return positions
|
package/src/prover/zenon/isar.ts
CHANGED
|
@@ -56,7 +56,7 @@ const toBase26 = (number: number): string =>
|
|
|
56
56
|
: `${toBase26(Math.floor(number / 26))}${String.fromCharCode(97 + (number % 26))}`;
|
|
57
57
|
|
|
58
58
|
const getPairs = <Item>(items: Item[]): [Item, Item][] =>
|
|
59
|
-
Array.from({ length: Math.floor(items.length / 2) }, (
|
|
59
|
+
Array.from({ length: Math.floor(items.length / 2) }, (_value, position) => [
|
|
60
60
|
items[2 * position],
|
|
61
61
|
items[2 * position + 1],
|
|
62
62
|
]);
|
|
@@ -367,7 +367,7 @@ export const printIsar = (proof: MlProof, context: IsarContext): string | undefi
|
|
|
367
367
|
dict,
|
|
368
368
|
formulas,
|
|
369
369
|
subproof,
|
|
370
|
-
(
|
|
370
|
+
(_value, position) => `by (rule zenon_${lemma}_${position} [OF ${conclusionName}])\n`,
|
|
371
371
|
);
|
|
372
372
|
};
|
|
373
373
|
|
|
@@ -167,7 +167,7 @@ export const separate = (predefined: string[], phrases: Phrase[]) => {
|
|
|
167
167
|
...definitions.slice(previous + 1),
|
|
168
168
|
];
|
|
169
169
|
const dependencyIndex = dependencies.findIndex((candidate) => candidate[0] === symbol);
|
|
170
|
-
dependencies = dependencies.filter((
|
|
170
|
+
dependencies = dependencies.filter((_value, position) => position !== dependencyIndex);
|
|
171
171
|
multiple.unshift(symbol);
|
|
172
172
|
hypotheses.unshift(hypothesis, { formula: removed.origin, goalness: removed.goalness });
|
|
173
173
|
} else {
|
|
@@ -2,6 +2,7 @@ import type { Relations } from "./eqrel";
|
|
|
2
2
|
import {
|
|
3
3
|
addCongruence,
|
|
4
4
|
addMatches,
|
|
5
|
+
addPreunification,
|
|
5
6
|
addReflexivity,
|
|
6
7
|
addStringEqualities,
|
|
7
8
|
addSymmetricMatches,
|
|
@@ -57,7 +58,6 @@ const addExtensions: SearchRule = (context, queue, formula, goalness) => {
|
|
|
57
58
|
return [insertAll(queue, result.nodes), result.isStopped];
|
|
58
59
|
};
|
|
59
60
|
|
|
60
|
-
// Deviation from Zenon: newnodes_preunif is left out because it never adds a node.
|
|
61
61
|
const RULES: SearchRule[] = [
|
|
62
62
|
addAbsurd,
|
|
63
63
|
addClosure,
|
|
@@ -70,6 +70,7 @@ const RULES: SearchRule[] = [
|
|
|
70
70
|
addGamma,
|
|
71
71
|
addUnfold,
|
|
72
72
|
addReflexivity,
|
|
73
|
+
addPreunification,
|
|
73
74
|
addCongruence,
|
|
74
75
|
addTransitivity,
|
|
75
76
|
addSymmetricMatches,
|