tla-ts 0.0.10-dev.37a75eb5b → 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 +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- 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 +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- 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 +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- 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 +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -60
- 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/parser.ts +110 -111
- 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 +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- 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 +65 -14
- 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 +3 -9
- 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/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- 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/core-solver.ts +12 -8
- 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/nla-grobner.ts +2 -2
- 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/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 +14 -42
- 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 +1 -4
- 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 +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- 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 +16 -7
- 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 +4 -3
- 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/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 +7 -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 +15 -6
- 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 +1 -1
- 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 +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- 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 +342 -196
- 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-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/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 +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- 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 +283 -126
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -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 +26 -10
- package/src/tlc/trace-spec.ts +9 -22
- 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
|
@@ -97,8 +97,7 @@ class TargetFinder {
|
|
|
97
97
|
if (this.isArithApp(expr)) return this.processArith(expr, false);
|
|
98
98
|
this.todo.push(expr);
|
|
99
99
|
this.visited.add(expr);
|
|
100
|
-
|
|
101
|
-
const current = this.todo.pop() as number;
|
|
100
|
+
for (let current = this.todo.pop(); current !== undefined; current = this.todo.pop()) {
|
|
102
101
|
const isProcessed =
|
|
103
102
|
manager.kinds[current] !== KIND_APP
|
|
104
103
|
? false
|
|
@@ -214,6 +214,7 @@ export class Fpa2BvRewriter extends RewriterTpl {
|
|
|
214
214
|
isSwapped ? args[1] : args[2],
|
|
215
215
|
);
|
|
216
216
|
}
|
|
217
|
+
// Deviation from Z3: mk_sub hands mk_add a rounding mode under bv2rm, so fpa2bv fails on fp.sub.
|
|
217
218
|
case OP_FPA_SUB:
|
|
218
219
|
return converter.mkSub(sort, getRm(), args[1], args[2]);
|
|
219
220
|
case OP_FPA_NEG:
|
|
@@ -20,7 +20,6 @@ export const joinDependencies = (
|
|
|
20
20
|
? first
|
|
21
21
|
: { value: -1, children: [first, second] };
|
|
22
22
|
|
|
23
|
-
// Breadth first and once per node, so a value that two leaves hold is listed twice.
|
|
24
23
|
export const getDependencyValues = (dependency: Dependency | undefined) => {
|
|
25
24
|
if (dependency === undefined) return [];
|
|
26
25
|
const todo = [dependency];
|
|
@@ -35,7 +34,7 @@ export const getDependencyValues = (dependency: Dependency | undefined) => {
|
|
|
35
34
|
todo.push(child);
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
|
-
return values;
|
|
37
|
+
return [...new Set(values)];
|
|
39
38
|
};
|
|
40
39
|
|
|
41
40
|
interface Polarized {
|
|
@@ -43,7 +42,7 @@ interface Polarized {
|
|
|
43
42
|
isPositive: boolean;
|
|
44
43
|
}
|
|
45
44
|
|
|
46
|
-
|
|
45
|
+
const PRECISE = 0;
|
|
47
46
|
export const UNDER = 1;
|
|
48
47
|
export const OVER = 2;
|
|
49
48
|
const UNDER_OVER = 3;
|
|
@@ -81,6 +80,7 @@ export class Goal {
|
|
|
81
80
|
converters: (HiddenDecl | Definitions | ModelConversion)[] = [];
|
|
82
81
|
model: ProtoModel | undefined;
|
|
83
82
|
isProofsEnabled = false;
|
|
83
|
+
isModelsEnabled = true;
|
|
84
84
|
isCoresEnabled = false;
|
|
85
85
|
// As in Z3, it isn't copied with the goal.
|
|
86
86
|
reasonUnknown = "";
|
|
@@ -105,6 +105,7 @@ export class Goal {
|
|
|
105
105
|
this.precision = getPrecisionUnion(source.precision, this.precision);
|
|
106
106
|
this.converters = source.converters;
|
|
107
107
|
this.isProofsEnabled = source.isProofsEnabled;
|
|
108
|
+
this.isModelsEnabled = source.isModelsEnabled;
|
|
108
109
|
this.isCoresEnabled = source.isCoresEnabled;
|
|
109
110
|
}
|
|
110
111
|
|
|
@@ -172,7 +172,7 @@ export abstract class Internalizer {
|
|
|
172
172
|
falseEnode: Enode;
|
|
173
173
|
protected generation = 0;
|
|
174
174
|
protected cachedGeneration = new Map<number, number>();
|
|
175
|
-
|
|
175
|
+
protected randomSeed = 0;
|
|
176
176
|
isSearching = false;
|
|
177
177
|
config = DEFAULT_CONFIG;
|
|
178
178
|
|
|
@@ -19,7 +19,8 @@ const QFLIA_PREAMBLE =
|
|
|
19
19
|
":lia2card.max_range 1 :lia2card.max_ite_nesting 1) elim-uncnstr)";
|
|
20
20
|
|
|
21
21
|
const getNoCutSmt = (seed: number) =>
|
|
22
|
-
`(using-params smt :smt.logic QF_LIA :arith.branch_cut_ratio 10000000
|
|
22
|
+
`(using-params smt :auto_config false :smt.logic QF_LIA :arith.branch_cut_ratio 10000000 ` +
|
|
23
|
+
`:random_seed ${seed})`;
|
|
23
24
|
|
|
24
25
|
const LIA2SAT =
|
|
25
26
|
"(and-then (fail-if is-unbounded) (fail-if produce-proofs) (fail-if produce-unsat-cores) " +
|
|
@@ -42,7 +43,8 @@ const PB =
|
|
|
42
43
|
|
|
43
44
|
const BOUNDED =
|
|
44
45
|
`(and-then (fail-if is-unbounded) (or-else (try-for ${getNoCutSmt(100)} 5000) (try-for ` +
|
|
45
|
-
"(using-params smt :arith.branch_cut_ratio 10000000 :random_seed 200
|
|
46
|
+
"(using-params smt :auto_config false :arith.branch_cut_ratio 10000000 :random_seed 200 " +
|
|
47
|
+
":relevancy 0) 5000) " +
|
|
46
48
|
`(try-for ${getNoCutSmt(300)} 15000)) fail-if-undecided)`;
|
|
47
49
|
|
|
48
50
|
const QFLIA =
|
|
@@ -81,8 +83,8 @@ const getQfnraSolver = (solver: QfnraSolver) =>
|
|
|
81
83
|
`${solver.simpleCheck})`,
|
|
82
84
|
...(solver.heuristic === undefined ? [] : [`(try-for ${QFNRA_NLSAT} ${solver.heuristic})`]),
|
|
83
85
|
...solver.orders.map(
|
|
84
|
-
(
|
|
85
|
-
`(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${
|
|
86
|
+
(order) =>
|
|
87
|
+
`(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${order[0]}) ${order[1]})`,
|
|
86
88
|
),
|
|
87
89
|
`(using-params smt :use_ls true :ls_time ${solver.ls})`,
|
|
88
90
|
`(and-then (try-for (using-params smt :arith.greatest_error_pivot true) ${solver.smt}) ` +
|
|
@@ -223,7 +225,8 @@ const UFBV_PREPROCESSOR =
|
|
|
223
225
|
`(and-then ${DER_FP} simplify) simplify)`;
|
|
224
226
|
|
|
225
227
|
const UFBV =
|
|
226
|
-
`(using-params (and-then (repeat ${UFBV_PREPROCESSOR} 2) smt
|
|
228
|
+
`(using-params (and-then (repeat ${UFBV_PREPROCESSOR} 2) (using-params smt :auto_config false)) ` +
|
|
229
|
+
":mbqi true " +
|
|
227
230
|
":mbqi.max_iterations 4294967295 :elim_and true)";
|
|
228
231
|
|
|
229
232
|
const QFBV_PREAMBLE =
|
|
@@ -256,6 +259,12 @@ export const QFUFBV_ACKR_PREAMBLE =
|
|
|
256
259
|
":pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000 " +
|
|
257
260
|
":ite_extra_rules true :mul2concat true :flat_and_or false))";
|
|
258
261
|
|
|
262
|
+
const QFUFBV =
|
|
263
|
+
"(using-params (and-then (and-then (using-params simplify :flat_and_or false) (using-params " +
|
|
264
|
+
"propagate-values :flat_and_or false) solve-eqs elim-uncnstr (if-no-proofs (if-no-unsat-cores " +
|
|
265
|
+
"reduce-args)) (if-no-proofs (if-no-unsat-cores reduce-bv-size)) max-bv-sharing (if-no-proofs " +
|
|
266
|
+
"(if-no-unsat-cores ackermannize_bv))) (if is-qfbv qfbv smt)) :elim_and true :blast_distinct true)";
|
|
267
|
+
|
|
259
268
|
const QFAUFLIA =
|
|
260
269
|
"(and-then (using-params (and-then simplify propagate-values solve-eqs elim-uncnstr simplify) " +
|
|
261
270
|
":elim_and true :som true :sort_store true) (using-params smt :array.simplify false))";
|
|
@@ -302,6 +311,7 @@ export const LOGIC_TACTICS: ReadonlyMap<string, string> = new Map([
|
|
|
302
311
|
["bv", UFBV],
|
|
303
312
|
["qfbv", QFBV],
|
|
304
313
|
["qfaufbv", QFAUFBV],
|
|
314
|
+
["qfufbv", QFUFBV],
|
|
305
315
|
["qfauflia", QFAUFLIA],
|
|
306
316
|
["qfuf", QFUF],
|
|
307
317
|
["qffp", QFFP],
|
|
@@ -426,11 +426,16 @@ export class CoreSolver {
|
|
|
426
426
|
this.status = LP_INFEASIBLE;
|
|
427
427
|
return;
|
|
428
428
|
}
|
|
429
|
-
|
|
429
|
+
const entering = enteringCell.column;
|
|
430
|
+
const matrix = this.matrix;
|
|
431
|
+
if (
|
|
432
|
+
this.settings.isCanceled(
|
|
433
|
+
matrix.rows[this.heading[leaving]].length * matrix.columns[entering].length,
|
|
434
|
+
)
|
|
435
|
+
) {
|
|
430
436
|
this.status = LP_CANCELLED;
|
|
431
437
|
return;
|
|
432
438
|
}
|
|
433
|
-
const entering = enteringCell.column;
|
|
434
439
|
const newValue = this.getValForLeaving(leaving);
|
|
435
440
|
const theta = this.x[leaving].sub(newValue).div(enteringCell.coeff);
|
|
436
441
|
this.x[leaving] = newValue;
|
|
@@ -461,12 +466,11 @@ export class CoreSolver {
|
|
|
461
466
|
return;
|
|
462
467
|
}
|
|
463
468
|
this.oneIterationTableauRows();
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
);
|
|
469
|
+
if (this.settings.isCanceled()) {
|
|
470
|
+
this.status = LP_CANCELLED;
|
|
471
|
+
break;
|
|
472
|
+
}
|
|
473
|
+
} while (this.status !== LP_OPTIMAL && this.status !== LP_INFEASIBLE && !this.isFeasible());
|
|
470
474
|
}
|
|
471
475
|
|
|
472
476
|
solve() {
|
|
@@ -100,7 +100,7 @@ export class LarSolver {
|
|
|
100
100
|
onAddTerm: ((term: LarTerm) => void) | undefined;
|
|
101
101
|
onColumnBoundUpdate: ((column: number) => void) | undefined;
|
|
102
102
|
|
|
103
|
-
constructor(isCanceled: () => boolean) {
|
|
103
|
+
constructor(isCanceled: (cost?: number) => boolean) {
|
|
104
104
|
this.settings = new LpSettings(isCanceled);
|
|
105
105
|
this.core = new CoreSolver(this.settings);
|
|
106
106
|
this.core.touchedRows = this.touchedRows;
|
|
@@ -54,7 +54,7 @@ export class LpSettings {
|
|
|
54
54
|
nraCalls: 0,
|
|
55
55
|
};
|
|
56
56
|
readonly maxRowLengthForBoundPropagation = 300;
|
|
57
|
-
|
|
57
|
+
isPropagatingEqs = true;
|
|
58
58
|
readonly intFindCubePeriod = 4;
|
|
59
59
|
readonly lcubeFlips = 16;
|
|
60
60
|
readonly hnfCutPeriod = 4;
|
|
@@ -68,7 +68,11 @@ export class LpSettings {
|
|
|
68
68
|
readonly isDioIgnoringBigNums = true;
|
|
69
69
|
readonly dioUndoMaxWork = 1000000;
|
|
70
70
|
|
|
71
|
-
constructor(readonly isCanceled: () => boolean) {}
|
|
71
|
+
constructor(readonly isCanceled: (cost?: number) => boolean) {}
|
|
72
|
+
|
|
73
|
+
setRandomSeed(seed: number) {
|
|
74
|
+
this.random = new RandomGen(seed);
|
|
75
|
+
}
|
|
72
76
|
|
|
73
77
|
getRandomNext(bound?: number) {
|
|
74
78
|
const value = this.random.next();
|
|
@@ -919,12 +919,12 @@ export class Grobner {
|
|
|
919
919
|
private setLevel2var() {
|
|
920
920
|
const core = this.core;
|
|
921
921
|
const count = core.lra.getColumnCount();
|
|
922
|
-
const weights = Array.from({ length: count }, (
|
|
922
|
+
const weights = Array.from({ length: count }, (_value, lpVar) => core.getVarWeight(lpVar));
|
|
923
923
|
for (let lpVar = 0; lpVar < count; lpVar++) {
|
|
924
924
|
if (!core.isMonicVar(lpVar) || !core.toRefine.has(lpVar)) continue;
|
|
925
925
|
for (const factor of core.emons.get(lpVar).vars) weights[factor] += 6;
|
|
926
926
|
}
|
|
927
|
-
const level2var = Array.from({ length: count }, (
|
|
927
|
+
const level2var = Array.from({ length: count }, (_value, lpVar) => lpVar).sort(
|
|
928
928
|
(first, second) => weights[first] - weights[second] || first - second,
|
|
929
929
|
);
|
|
930
930
|
this.manager.reset(level2var);
|
|
@@ -76,7 +76,7 @@ export class PddManager {
|
|
|
76
76
|
private freezeValue = Rational.zero;
|
|
77
77
|
|
|
78
78
|
constructor(numVars: number) {
|
|
79
|
-
this.initNodes(Array.from({ length: numVars }, (
|
|
79
|
+
this.initNodes(Array.from({ length: numVars }, (_value, index) => index));
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
reset(level2var: number[]) {
|
|
@@ -309,8 +309,7 @@ export class PddManager {
|
|
|
309
309
|
if (this.level(this.firstLeading(q)) > this.level(p)) return p;
|
|
310
310
|
break;
|
|
311
311
|
}
|
|
312
|
-
// Z3's op_entry equality compares the cached first operand with the new second one, so
|
|
313
|
-
// only an operation on two equal operands finds its cached result.
|
|
312
|
+
// Z3's op_entry equality compares the cached first operand with the new second one, so only equal operands hit.
|
|
314
313
|
// Deviation from Z3: on a hash collision Z3 returns that result for unequal operands too.
|
|
315
314
|
const isCached = p === q;
|
|
316
315
|
if (isCached) {
|
|
@@ -274,10 +274,11 @@ export class Maxcore extends MaxsmtSolverBase {
|
|
|
274
274
|
const upper = this.getCost(model);
|
|
275
275
|
if (upper.compare(this.upper) > 0) return;
|
|
276
276
|
if (!this.context.verifyModel(this.index, model, upper)) return;
|
|
277
|
+
const numAssertions = this.solver.getNumAssertions();
|
|
277
278
|
this.model = model;
|
|
278
279
|
this.context.modelUpdated(model);
|
|
279
280
|
for (const soft of this.soft) soft.value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
280
|
-
this.upper = upper;
|
|
281
|
+
if (numAssertions === this.solver.getNumAssertions()) this.upper = upper;
|
|
281
282
|
}
|
|
282
283
|
|
|
283
284
|
private removeSoft(core: readonly number[]) {
|
|
@@ -10,6 +10,7 @@ export interface MaxsatSolver {
|
|
|
10
10
|
checkSat(assumptions: readonly number[]): number;
|
|
11
11
|
getModel(): ProtoModel | null;
|
|
12
12
|
getUnsatCore(): readonly number[];
|
|
13
|
+
getNumAssertions(): number;
|
|
13
14
|
findMutexes(vars: readonly number[]): { status: number; mutexes: number[][] };
|
|
14
15
|
}
|
|
15
16
|
|
|
@@ -55,7 +55,7 @@ class AuxContext {
|
|
|
55
55
|
const context = this.context;
|
|
56
56
|
context.popToBaseLevel();
|
|
57
57
|
const result = context.checkResearching(this.asserted, []);
|
|
58
|
-
return result === L_TRUE ? context.
|
|
58
|
+
return result === L_TRUE ? context.getSatModel() : result === L_FALSE ? "unsat" : "unknown";
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
|
|
@@ -64,6 +64,8 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
64
64
|
this.rewriter = new Rewriter(manager, {
|
|
65
65
|
...TACTIC_REWRITER_OPTIONS,
|
|
66
66
|
bv: { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0, isMkbv2num: true },
|
|
67
|
+
isExpandingSelects: true,
|
|
68
|
+
isKeepingDistinct: true,
|
|
67
69
|
});
|
|
68
70
|
this.rewriter.releaseResult = () => this.setLastResult(-1);
|
|
69
71
|
}
|
|
@@ -2,7 +2,7 @@ import { FAMILY_BASIC, FAMILY_USER, SORT_BOOL } from "./ast";
|
|
|
2
2
|
import type { Context } from "./context";
|
|
3
3
|
import { Enode } from "./enode";
|
|
4
4
|
import { FuncInterp, ProtoModel } from "./proto-model";
|
|
5
|
-
import type { DependentValue } from "./theory";
|
|
5
|
+
import type { DependentValue, ExtraFreshValue } from "./theory";
|
|
6
6
|
|
|
7
7
|
export interface GeneratedModel {
|
|
8
8
|
model: ProtoModel;
|
|
@@ -19,6 +19,9 @@ const isIncludedFuncInterp = (context: Context, decl: number) => {
|
|
|
19
19
|
return context.getTheory(family)?.includeFuncInterp(decl) ?? true;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
|
+
const GREY = 1;
|
|
23
|
+
const BLACK = 2;
|
|
24
|
+
|
|
22
25
|
export const mkModel = (context: Context): GeneratedModel => {
|
|
23
26
|
const manager = context.manager;
|
|
24
27
|
const model = new ProtoModel(manager);
|
|
@@ -34,58 +37,95 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
34
37
|
context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr,
|
|
35
38
|
);
|
|
36
39
|
}
|
|
37
|
-
const
|
|
38
|
-
const
|
|
39
|
-
const
|
|
40
|
+
const roots: Enode[] = [];
|
|
41
|
+
const procs = new Map<Enode, number | DependentValue>();
|
|
42
|
+
const freshRoots = new Set<Enode>();
|
|
43
|
+
const extraFreshValues = new Set<ExtraFreshValue>();
|
|
40
44
|
for (const node of context.enodes) {
|
|
41
45
|
if (node.root !== node) continue;
|
|
42
46
|
const expr = node.owner;
|
|
43
47
|
if (!context.isRelevant(expr) && !manager.isValue(expr)) continue;
|
|
48
|
+
roots.push(node);
|
|
44
49
|
const sort = manager.sorts[expr];
|
|
45
50
|
const theory = context.getTheory(manager.getSortFamily(sort));
|
|
46
51
|
if (sort === SORT_BOOL)
|
|
47
|
-
|
|
48
|
-
else if (manager.isModelValue(expr))
|
|
52
|
+
procs.set(node, context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr);
|
|
53
|
+
else if (manager.isModelValue(expr)) procs.set(node, expr);
|
|
49
54
|
else if (theory !== undefined && theory.buildModels()) {
|
|
50
|
-
const
|
|
51
|
-
if (
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
const proc = node.getThVar(theory.id) < 0 ? undefined : theory.mkValue(node);
|
|
56
|
+
if (proc === undefined) {
|
|
57
|
+
const freshValue: ExtraFreshValue = { sort, value: undefined };
|
|
58
|
+
freshRoots.add(node);
|
|
59
|
+
extraFreshValues.add(freshValue);
|
|
60
|
+
procs.set(node, { dependencies: [freshValue], mkValue: (values) => values[0] });
|
|
61
|
+
} else {
|
|
62
|
+
if (typeof proc !== "number")
|
|
63
|
+
for (const dependency of proc.dependencies)
|
|
64
|
+
if (!(dependency instanceof Enode)) extraFreshValues.add(dependency);
|
|
65
|
+
procs.set(node, proc);
|
|
66
|
+
}
|
|
67
|
+
} else procs.set(node, model.getFreshValue(sort) ?? model.getSomeValue(sort));
|
|
59
68
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
root2value.set(node, value);
|
|
67
|
-
return value;
|
|
69
|
+
const colors = new Map<Enode | ExtraFreshValue, number>();
|
|
70
|
+
const traversedSorts = new Set<number>();
|
|
71
|
+
const sortedSources: (Enode | ExtraFreshValue)[] = [];
|
|
72
|
+
const todo: (Enode | ExtraFreshValue)[] = [];
|
|
73
|
+
const visitChild = (source: Enode | ExtraFreshValue) => {
|
|
74
|
+
if (!colors.has(source)) todo.push(source);
|
|
68
75
|
};
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
if (
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
76
|
+
const processSource = (source: Enode | ExtraFreshValue) => {
|
|
77
|
+
if (colors.get(source) === BLACK) return;
|
|
78
|
+
todo.push(source);
|
|
79
|
+
while (todo.length > 0) {
|
|
80
|
+
const current = todo[todo.length - 1];
|
|
81
|
+
const color = colors.get(current);
|
|
82
|
+
if (color === BLACK) todo.pop();
|
|
83
|
+
else if (color === GREY) {
|
|
84
|
+
colors.set(current, BLACK);
|
|
85
|
+
sortedSources.push(current);
|
|
86
|
+
} else {
|
|
87
|
+
colors.set(current, GREY);
|
|
88
|
+
if (current instanceof Enode) {
|
|
89
|
+
const proc = procs.get(current);
|
|
90
|
+
if (proc !== undefined && typeof proc !== "number")
|
|
91
|
+
for (const dependency of proc.dependencies)
|
|
92
|
+
visitChild(dependency instanceof Enode ? dependency.root : dependency);
|
|
93
|
+
} else if (!traversedSorts.has(current.sort)) {
|
|
94
|
+
for (const root of roots)
|
|
95
|
+
if (manager.sorts[root.owner] === current.sort && !freshRoots.has(root))
|
|
96
|
+
visitChild(root);
|
|
97
|
+
traversedSorts.add(current.sort);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
86
101
|
};
|
|
87
|
-
for (const
|
|
88
|
-
for (const
|
|
102
|
+
for (const freshValue of extraFreshValues) processSource(freshValue);
|
|
103
|
+
for (const root of freshRoots) processSource(root);
|
|
104
|
+
for (const root of roots) processSource(root);
|
|
105
|
+
const root2value = new Map<Enode, number>();
|
|
106
|
+
for (const source of sortedSources) {
|
|
107
|
+
if (!(source instanceof Enode)) {
|
|
108
|
+
source.value = model.getFreshValue(source.sort) ?? undefined;
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
const expr = source.owner;
|
|
112
|
+
const sort = manager.sorts[expr];
|
|
113
|
+
const proc = procs.get(source) ?? model.getFreshValue(sort) ?? model.getSomeValue(sort);
|
|
114
|
+
const value = manager.isValue(expr)
|
|
115
|
+
? expr
|
|
116
|
+
: typeof proc === "number"
|
|
117
|
+
? proc
|
|
118
|
+
: proc.mkValue(
|
|
119
|
+
proc.dependencies.map((dependency) =>
|
|
120
|
+
dependency instanceof Enode
|
|
121
|
+
? (root2value.get(dependency.root) ??
|
|
122
|
+
model.getSomeValue(manager.sorts[dependency.owner]))
|
|
123
|
+
: (dependency.value ?? model.getSomeValue(dependency.sort)),
|
|
124
|
+
),
|
|
125
|
+
);
|
|
126
|
+
model.registerValue(value);
|
|
127
|
+
root2value.set(source, value);
|
|
128
|
+
}
|
|
89
129
|
const getValue = (node: Enode) =>
|
|
90
130
|
root2value.get(node.root) ?? model.getSomeValue(manager.sorts[node.owner]);
|
|
91
131
|
for (const node of context.enodes)
|
|
@@ -104,7 +144,9 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
104
144
|
interp = new FuncInterp(manager, node.numArgs);
|
|
105
145
|
model.registerFunc(node.decl, interp);
|
|
106
146
|
}
|
|
107
|
-
const args = Array.from({ length: node.numArgs }, (
|
|
147
|
+
const args = Array.from({ length: node.numArgs }, (_value, index) =>
|
|
148
|
+
getValue(node.getArg(index)),
|
|
149
|
+
);
|
|
108
150
|
if (interp.getEntry(args) === undefined) interp.insertNewEntry(args, getValue(node));
|
|
109
151
|
}
|
|
110
152
|
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]);
|
|
@@ -10,16 +10,16 @@ import {
|
|
|
10
10
|
SORT_SIZE_INFINITE,
|
|
11
11
|
} from "../ast";
|
|
12
12
|
import type { Definition } from "../goal";
|
|
13
|
-
import {
|
|
14
|
-
import { FuncInterp, type ProtoModel } from "../proto-model";
|
|
13
|
+
import type { ProtoModel } from "../proto-model";
|
|
15
14
|
import { type RewriterOptions, Rewriter } from "../rewriter";
|
|
16
15
|
import { RefVector } from "../ref-vector";
|
|
17
16
|
import { applyQeLiteToConjuncts } from "../qe-lite";
|
|
17
|
+
import { applyDefinitions } from "../tactic";
|
|
18
18
|
import { BindVariables, mkExists, type Rule, RuleManager, getUsedVars } from "./dl-rule";
|
|
19
19
|
import { RuleSet } from "./dl-rule-set";
|
|
20
20
|
import { RuleProperties } from "./rule-properties";
|
|
21
21
|
|
|
22
|
-
const ENGINE_DATALOG = 0;
|
|
22
|
+
export const ENGINE_DATALOG = 0;
|
|
23
23
|
export const ENGINE_SPACER = 1;
|
|
24
24
|
const ENGINE_BMC = 2;
|
|
25
25
|
const ENGINE_QBMC = 3;
|
|
@@ -63,40 +63,6 @@ export class FpParams {
|
|
|
63
63
|
|
|
64
64
|
export type ModelConverter = (model: ProtoModel) => ProtoModel;
|
|
65
65
|
|
|
66
|
-
// generic_model_converter::operator() over predicates, where a definition of -1 hides the
|
|
67
|
-
// declaration.
|
|
68
|
-
const applyDefinitions = (definitions: readonly Definition[], model: ProtoModel) => {
|
|
69
|
-
const manager = model.manager;
|
|
70
|
-
let evaluator = new ModelEvaluator(manager, model);
|
|
71
|
-
evaluator.setModelCompletion(true);
|
|
72
|
-
for (let index = definitions.length - 1; index >= 0; index--) {
|
|
73
|
-
const definition = definitions[index];
|
|
74
|
-
if (definition.def === -1) {
|
|
75
|
-
model.unregisterDecl(definition.decl);
|
|
76
|
-
continue;
|
|
77
|
-
}
|
|
78
|
-
const value = evaluator.rewrite(definition.def);
|
|
79
|
-
const arity = manager.funcDecls[definition.decl].domain.length;
|
|
80
|
-
const oldInterp = model.funcInterps.get(definition.decl);
|
|
81
|
-
const old = arity === 0 ? model.constInterps.get(definition.decl) : oldInterp?.elseExpr;
|
|
82
|
-
if (old !== value) {
|
|
83
|
-
if (arity === 0) model.registerConst(definition.decl, value);
|
|
84
|
-
else {
|
|
85
|
-
const interp = new FuncInterp(manager, arity);
|
|
86
|
-
interp.setElse(value);
|
|
87
|
-
model.registerFunc(definition.decl, interp);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
manager.decRef(value);
|
|
91
|
-
if (old === value || (arity === 0 ? old === undefined : oldInterp === undefined)) continue;
|
|
92
|
-
evaluator.release();
|
|
93
|
-
evaluator = new ModelEvaluator(manager, model);
|
|
94
|
-
evaluator.setModelCompletion(true);
|
|
95
|
-
}
|
|
96
|
-
evaluator.release();
|
|
97
|
-
return model;
|
|
98
|
-
};
|
|
99
|
-
|
|
100
66
|
export interface Engine {
|
|
101
67
|
query(query: number): number;
|
|
102
68
|
getModel(): ProtoModel;
|
|
@@ -112,7 +78,7 @@ export class DatalogContext {
|
|
|
112
78
|
private isBindingVariables = true;
|
|
113
79
|
ruleSet: RuleSet;
|
|
114
80
|
private ruleFmls: number[] = [];
|
|
115
|
-
private ruleNames: string[] = [];
|
|
81
|
+
private ruleNames: (string | undefined)[] = [];
|
|
116
82
|
private ruleFmlsHead = 0;
|
|
117
83
|
readonly background: number[] = [];
|
|
118
84
|
private isClosed = false;
|
|
@@ -181,7 +147,7 @@ export class DatalogContext {
|
|
|
181
147
|
return result;
|
|
182
148
|
}
|
|
183
149
|
|
|
184
|
-
addRule(fml: number, name
|
|
150
|
+
addRule(fml: number, name?: string) {
|
|
185
151
|
this.manager.incRef(fml);
|
|
186
152
|
this.ruleFmls.push(fml);
|
|
187
153
|
this.ruleNames.push(name);
|
|
@@ -217,7 +183,13 @@ export class DatalogContext {
|
|
|
217
183
|
const properties = this.ruleProperties;
|
|
218
184
|
switch (this.getEngine()) {
|
|
219
185
|
case ENGINE_DATALOG:
|
|
220
|
-
|
|
186
|
+
properties.collect(rules);
|
|
187
|
+
properties.checkQuantifierFree();
|
|
188
|
+
properties.checkUninterpretedFree();
|
|
189
|
+
properties.checkNestedFree();
|
|
190
|
+
properties.checkInfiniteSorts();
|
|
191
|
+
properties.checkBackgroundFree();
|
|
192
|
+
break;
|
|
221
193
|
case ENGINE_SPACER:
|
|
222
194
|
properties.collect(rules);
|
|
223
195
|
properties.checkExistentialTail();
|
|
@@ -368,7 +340,7 @@ export class DatalogContext {
|
|
|
368
340
|
: mkExists(
|
|
369
341
|
manager,
|
|
370
342
|
[...domain].reverse(),
|
|
371
|
-
domain.map((
|
|
343
|
+
domain.map((_value, index) => String(index)).reverse(),
|
|
372
344
|
atom,
|
|
373
345
|
);
|
|
374
346
|
manager.incRef(query);
|
|
@@ -401,7 +373,7 @@ export class DatalogContext {
|
|
|
401
373
|
...conjs.items.map((conj) => this.ruleManager.ensureApp(conj)),
|
|
402
374
|
];
|
|
403
375
|
const isNegated = tail.map(
|
|
404
|
-
(
|
|
376
|
+
(_value, index) => index < rule.uninterpretedSize && rule.isNegated[index],
|
|
405
377
|
);
|
|
406
378
|
const reduced = this.ruleManager.mk(rule.head, tail, isNegated, rule.name);
|
|
407
379
|
conjs.reset();
|
|
@@ -91,7 +91,7 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
91
91
|
newTail.push(rule.tail[index]);
|
|
92
92
|
newNegated.push(false);
|
|
93
93
|
}
|
|
94
|
-
result.addRule(this.context.ruleManager.mk(rule.head, newTail, newNegated,
|
|
94
|
+
result.addRule(this.context.ruleManager.mk(rule.head, newTail, newNegated, undefined, false));
|
|
95
95
|
}
|
|
96
96
|
if (result.rules.length === source.rules.length) return undefined;
|
|
97
97
|
result.close();
|