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
|
@@ -104,7 +104,9 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
104
104
|
interp = new FuncInterp(manager, node.numArgs);
|
|
105
105
|
model.registerFunc(node.decl, interp);
|
|
106
106
|
}
|
|
107
|
-
const args = Array.from({ length: node.numArgs }, (
|
|
107
|
+
const args = Array.from({ length: node.numArgs }, (_value, index) =>
|
|
108
|
+
getValue(node.getArg(index)),
|
|
109
|
+
);
|
|
108
110
|
if (interp.getEntry(args) === undefined) interp.insertNewEntry(args, getValue(node));
|
|
109
111
|
}
|
|
110
112
|
for (const theory of context.theories) theory.finalizeModel();
|
|
@@ -44,9 +44,9 @@ const getRoot = (value: bigint) => {
|
|
|
44
44
|
return low * low === value ? { root: low, isExact: true } : { root: low + 1n, isExact: false };
|
|
45
45
|
};
|
|
46
46
|
|
|
47
|
-
|
|
47
|
+
const mkBotExp = (ebits: number) => -(2 ** (ebits - 1) - 1);
|
|
48
48
|
|
|
49
|
-
|
|
49
|
+
const mkTopExp = (ebits: number) => 2 ** (ebits - 1);
|
|
50
50
|
|
|
51
51
|
export const mkMinExp = (ebits: number) => mkBotExp(ebits) + 1;
|
|
52
52
|
|
|
@@ -98,8 +98,6 @@ export const isPzero = (value: Mpf) => !value.sign && isZero(value);
|
|
|
98
98
|
|
|
99
99
|
export const isNeg = (value: Mpf) => value.sign && !isNan(value);
|
|
100
100
|
|
|
101
|
-
export const isPos = (value: Mpf) => !value.sign && !isNan(value);
|
|
102
|
-
|
|
103
101
|
export const isDenormal = (value: Mpf) => !isZero(value) && hasBotExp(value);
|
|
104
102
|
|
|
105
103
|
export const isNormal = (value: Mpf) => !(hasTopExp(value) || isDenormal(value) || isZero(value));
|
|
@@ -10,7 +10,7 @@ export class Mus {
|
|
|
10
10
|
|
|
11
11
|
constructor(
|
|
12
12
|
private manager: AstManager,
|
|
13
|
-
private solver: MaxsatSolver,
|
|
13
|
+
private solver: Pick<MaxsatSolver, "checkSat" | "getUnsatCore">,
|
|
14
14
|
) {
|
|
15
15
|
this.lit2expr = new RefVector(manager);
|
|
16
16
|
this.trail = new RefVector(manager);
|
|
@@ -33,8 +33,7 @@ export class Mus {
|
|
|
33
33
|
return L_TRUE;
|
|
34
34
|
}
|
|
35
35
|
let unknown = [...literals];
|
|
36
|
-
|
|
37
|
-
const literal = unknown.pop() as number;
|
|
36
|
+
for (let literal = unknown.pop(); literal !== undefined; literal = unknown.pop()) {
|
|
38
37
|
const notLiteral = mkNot(this.manager, literal);
|
|
39
38
|
this.trail.push(notLiteral);
|
|
40
39
|
const status = this.solver.checkSat([...mus.items, ...unknown, notLiteral]);
|
|
@@ -38,9 +38,13 @@ const ENGINE_NAMES = new Map([
|
|
|
38
38
|
["ddnf", ENGINE_DDNF],
|
|
39
39
|
]);
|
|
40
40
|
|
|
41
|
-
//
|
|
41
|
+
// As in Z3, these are copied when the context is made, so a later fp option doesn't apply.
|
|
42
42
|
export class FpParams {
|
|
43
|
-
|
|
43
|
+
private parameters: ReadonlyMap<string, string>;
|
|
44
|
+
|
|
45
|
+
constructor(parameters: ReadonlyMap<string, string>) {
|
|
46
|
+
this.parameters = new Map(parameters);
|
|
47
|
+
}
|
|
44
48
|
|
|
45
49
|
getBool(name: string, defaultValue: boolean) {
|
|
46
50
|
const value = this.parameters.get(`fp.${name}`);
|
|
@@ -117,6 +121,7 @@ export class DatalogContext {
|
|
|
117
121
|
readonly rewriter: Rewriter;
|
|
118
122
|
// m_mc: the converters since the last query, or undefined before one.
|
|
119
123
|
modelConverters: ModelConverter[] | undefined;
|
|
124
|
+
isBounded = false;
|
|
120
125
|
|
|
121
126
|
constructor(
|
|
122
127
|
readonly manager: AstManager,
|
|
@@ -328,6 +333,7 @@ export class DatalogContext {
|
|
|
328
333
|
|
|
329
334
|
query(query: number) {
|
|
330
335
|
this.modelConverters = [];
|
|
336
|
+
this.isBounded = false;
|
|
331
337
|
this.getEngine(query);
|
|
332
338
|
this.flushAddRules();
|
|
333
339
|
return this.ensureEngine(query).query(query);
|
|
@@ -362,7 +368,7 @@ export class DatalogContext {
|
|
|
362
368
|
: mkExists(
|
|
363
369
|
manager,
|
|
364
370
|
[...domain].reverse(),
|
|
365
|
-
domain.map((
|
|
371
|
+
domain.map((_value, index) => String(index)).reverse(),
|
|
366
372
|
atom,
|
|
367
373
|
);
|
|
368
374
|
manager.incRef(query);
|
|
@@ -395,7 +401,7 @@ export class DatalogContext {
|
|
|
395
401
|
...conjs.items.map((conj) => this.ruleManager.ensureApp(conj)),
|
|
396
402
|
];
|
|
397
403
|
const isNegated = tail.map(
|
|
398
|
-
(
|
|
404
|
+
(_value, index) => index < rule.uninterpretedSize && rule.isNegated[index],
|
|
399
405
|
);
|
|
400
406
|
const reduced = this.ruleManager.mk(rule.head, tail, isNegated, rule.name);
|
|
401
407
|
conjs.reset();
|
|
@@ -213,7 +213,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
213
213
|
const manager = this.context.manager;
|
|
214
214
|
let hasOutput = false;
|
|
215
215
|
for (const [predicate, slice] of this.sliceable) {
|
|
216
|
-
const domain = manager.funcDecls[predicate].domain.filter((
|
|
216
|
+
const domain = manager.funcDecls[predicate].domain.filter((_value, index) => !slice[index]);
|
|
217
217
|
if (domain.length < slice.length) {
|
|
218
218
|
const sliced = this.context.mkFreshHeadPredicate(
|
|
219
219
|
getSymbolName(manager.funcDecls[predicate].name),
|
|
@@ -238,7 +238,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
238
238
|
const slice = this.getPredicateSlice(manager.decls[atom]);
|
|
239
239
|
return manager.mkApp(
|
|
240
240
|
sliced,
|
|
241
|
-
manager.getArgs(atom).filter((
|
|
241
|
+
manager.getArgs(atom).filter((_value, index) => !slice[index]),
|
|
242
242
|
SORT_BOOL,
|
|
243
243
|
);
|
|
244
244
|
}
|
|
@@ -303,7 +303,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
303
303
|
const domain = manager.funcDecls[predicate].domain;
|
|
304
304
|
const subst = domain
|
|
305
305
|
.map((sort, index) => manager.mkVar(index, sort))
|
|
306
|
-
.filter((
|
|
306
|
+
.filter((_value, index) => !slice[index]);
|
|
307
307
|
const interp = model.funcInterps.get(sliced);
|
|
308
308
|
if (interp === undefined) continue;
|
|
309
309
|
const oldInterp = new FuncInterp(manager, slice.length);
|
|
@@ -382,7 +382,7 @@ export class RuleManager {
|
|
|
382
382
|
return mkForall(
|
|
383
383
|
manager,
|
|
384
384
|
sorts,
|
|
385
|
-
sorts.map((
|
|
385
|
+
sorts.map((_value, index) => getVarName(index)),
|
|
386
386
|
matrix,
|
|
387
387
|
);
|
|
388
388
|
}
|
|
@@ -479,7 +479,7 @@ export class RuleManager {
|
|
|
479
479
|
const preQuant = this.pin(varSubst.apply(unboundTail, subst));
|
|
480
480
|
varSubst.release();
|
|
481
481
|
sorts.reverse();
|
|
482
|
-
const names = sorts.map((
|
|
482
|
+
const names = sorts.map((_value, index) => String(sorts.length - 1 - index));
|
|
483
483
|
const quantified = this.pin(mkExists(manager, sorts, names, preQuant));
|
|
484
484
|
let fixed = isTryingQe ? this.pin(simplifyQuantifiers(manager, quantified)) : quantified;
|
|
485
485
|
if (manager.kinds[fixed] !== KIND_APP) fixed = this.pin(manager.mkEq(fixed, manager.trueExpr));
|
|
@@ -64,7 +64,7 @@ export class HornSubsumeModelConverter {
|
|
|
64
64
|
const quantified = manager.mkQuantifier({
|
|
65
65
|
kind: QUANTIFIER_EXISTS,
|
|
66
66
|
sorts: sorts.reverse(),
|
|
67
|
-
names: sorts.map((
|
|
67
|
+
names: sorts.map((_value, index) => sorts.length - index - 1),
|
|
68
68
|
body: substituted,
|
|
69
69
|
patterns: [],
|
|
70
70
|
noPatterns: [],
|
|
@@ -138,7 +138,7 @@ class HornTactic {
|
|
|
138
138
|
);
|
|
139
139
|
if (sorts.length === 0) return formula;
|
|
140
140
|
sorts.reverse();
|
|
141
|
-
const names = sorts.map((
|
|
141
|
+
const names = sorts.map((_value, index) => String(sorts.length - index - 1));
|
|
142
142
|
const result = mkForall(manager, sorts, names, formula);
|
|
143
143
|
manager.incRef(result);
|
|
144
144
|
return result;
|
|
@@ -53,7 +53,6 @@ export class Lemma {
|
|
|
53
53
|
ctp: ProtoModel | undefined;
|
|
54
54
|
level: number;
|
|
55
55
|
bumped = 0;
|
|
56
|
-
weakness: number;
|
|
57
56
|
isBlocked = false;
|
|
58
57
|
|
|
59
58
|
constructor(
|
|
@@ -63,7 +62,6 @@ export class Lemma {
|
|
|
63
62
|
pob?: Pob,
|
|
64
63
|
) {
|
|
65
64
|
this.level = level;
|
|
66
|
-
this.weakness = pob === undefined ? 65535 : pob.weakness;
|
|
67
65
|
this.pob = pob;
|
|
68
66
|
if (body !== -1) this.body = context.normalizer.normalize(body);
|
|
69
67
|
}
|
|
@@ -298,7 +296,6 @@ class Derivation {
|
|
|
298
296
|
|
|
299
297
|
constructor(
|
|
300
298
|
readonly parent: Pob,
|
|
301
|
-
readonly rule: Rule,
|
|
302
299
|
private trans: number,
|
|
303
300
|
private evars: number[],
|
|
304
301
|
) {}
|
|
@@ -1142,6 +1139,7 @@ export class SpacerContext {
|
|
|
1142
1139
|
this.pobQueue.incLevel();
|
|
1143
1140
|
level = this.pobQueue.maxLevel;
|
|
1144
1141
|
}
|
|
1142
|
+
this.datalogContext.isBounded = true;
|
|
1145
1143
|
return L_UNDEF;
|
|
1146
1144
|
}
|
|
1147
1145
|
|
|
@@ -1372,7 +1370,7 @@ export class SpacerContext {
|
|
|
1372
1370
|
];
|
|
1373
1371
|
phi = pt.mbp(vars, phi, model, this.isUsingGroundPob);
|
|
1374
1372
|
if (this.isUsingGpdr && predicates.length > 1) return gpdrCreateSplitChildren();
|
|
1375
|
-
const derivation = new Derivation(pob,
|
|
1373
|
+
const derivation = new Derivation(pob, phi, vars);
|
|
1376
1374
|
for (let index = 0; index < predicates.length; index++) {
|
|
1377
1375
|
const premisePt = this.getPredTransformer(predicates[index]);
|
|
1378
1376
|
const summary = premisePt.getOriginSummary(
|
|
@@ -210,6 +210,7 @@ export const gpdrSolveCore = (context: SpacerContext) => {
|
|
|
210
210
|
if (reachable !== L_FALSE) return reachable;
|
|
211
211
|
if (level > 0 && context.propagate(context.expandedLevel, level)) return L_FALSE;
|
|
212
212
|
}
|
|
213
|
+
context.datalogContext.isBounded = true;
|
|
213
214
|
return L_UNDEF;
|
|
214
215
|
};
|
|
215
216
|
|
|
@@ -429,7 +429,7 @@ class Nlqsat {
|
|
|
429
429
|
|
|
430
430
|
private mkModel() {
|
|
431
431
|
const manager = this.manager;
|
|
432
|
-
const model = new ProtoModel(manager);
|
|
432
|
+
const model = new ProtoModel(manager).mkModel();
|
|
433
433
|
for (const [term, variable] of this.t2x) {
|
|
434
434
|
if (!manager.isUninterpretedConst(term) || !this.freeVars.has(term)) continue;
|
|
435
435
|
const value = this.rmodel0[variable] ?? new Anum(Rational.zero);
|