tla-ts 0.0.9 → 0.0.10-dev.094b9b512
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/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +40 -37
- package/dist/deciders.js +47 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- 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 +2658 -410
- package/dist/prove.js +2657 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +208 -54
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +18 -43
- package/src/obligations/anonymize.ts +119 -90
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +2 -2
- package/src/obligations/expression.ts +38 -25
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +67 -63
- package/src/obligations/index.ts +38 -20
- package/src/obligations/levels.ts +28 -17
- package/src/obligations/module.ts +29 -54
- package/src/obligations/normalize.ts +31 -36
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +53 -25
- package/src/obligations/printer.ts +90 -57
- package/src/obligations/proof.ts +4 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +58 -62
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +51 -27
- package/src/obligations/substitution.ts +2 -4
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +961 -387
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +19 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -62
- package/src/prover/isabelle/isar/attrib.ts +219 -0
- package/src/prover/isabelle/isar/context.ts +336 -0
- package/src/prover/isabelle/isar/induct.ts +392 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +513 -225
- package/src/prover/isabelle/isar/proof.ts +569 -23
- package/src/prover/isabelle/isar/rule-cases.ts +234 -0
- package/src/prover/isabelle/isar/theory.ts +490 -89
- package/src/prover/isabelle/isar/toplevel.ts +341 -0
- package/src/prover/isabelle/isar/type-check.ts +100 -37
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +59 -60
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +96 -44
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +2 -8
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +16 -15
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +32 -73
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +28 -15
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +18 -24
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +29 -20
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +32 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +137 -83
- package/src/prover/prep/normalize.ts +38 -36
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +371 -132
- package/src/prover/ptl/decide.ts +104 -44
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +61 -29
- package/src/prover/smt/data.ts +497 -387
- package/src/prover/smt/encode.ts +156 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1025 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +63 -0
- package/src/prover/smt/solver/ackr-helper.ts +182 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +112 -0
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/add-bounds-tactic.ts +60 -0
- package/src/prover/smt/solver/aig-tactic.ts +43 -0
- package/src/prover/smt/solver/aig.ts +890 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -48
- package/src/prover/smt/solver/arith-terms.ts +123 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +176 -0
- package/src/prover/smt/solver/array-rewriter.ts +312 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -57
- package/src/prover/smt/solver/ast-lt.ts +166 -21
- package/src/prover/smt/solver/ast-util.ts +161 -7
- package/src/prover/smt/solver/ast.ts +1466 -178
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +591 -0
- package/src/prover/smt/solver/bit-blaster.ts +874 -0
- package/src/prover/smt/solver/bound-manager.ts +186 -0
- package/src/prover/smt/solver/bound-simplifier.ts +602 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +500 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +339 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +97 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1905 -0
- package/src/prover/smt/solver/bv1-blast.ts +224 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +175 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +545 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +534 -0
- package/src/prover/smt/solver/card2bv.ts +112 -0
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +28 -34
- package/src/prover/smt/solver/check-logic.ts +326 -0
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +280 -0
- package/src/prover/smt/solver/conflict-resolution.ts +79 -12
- package/src/prover/smt/solver/context.ts +510 -175
- package/src/prover/smt/solver/ctx-simplify.ts +34 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +124 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +575 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +83 -0
- package/src/prover/smt/solver/demodulator.ts +789 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +68 -0
- package/src/prover/smt/solver/der.ts +40 -30
- package/src/prover/smt/solver/diff-neq.ts +207 -0
- package/src/prover/smt/solver/distribute-forall.ts +67 -0
- package/src/prover/smt/solver/dom-simplify.ts +513 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +267 -0
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +130 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +558 -0
- package/src/prover/smt/solver/enode.ts +93 -22
- package/src/prover/smt/solver/eq2bv-tactic.ts +219 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +404 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +659 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +895 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +528 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +419 -0
- package/src/prover/smt/solver/euf/array-solver.ts +308 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +164 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +750 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +451 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +620 -0
- package/src/prover/smt/solver/euf/egraph.ts +885 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1203 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +333 -0
- package/src/prover/smt/solver/euf/mam.ts +1094 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +900 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +299 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +343 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +31 -0
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -6
- package/src/prover/smt/solver/expr2polynomial.ts +147 -0
- package/src/prover/smt/solver/factor.ts +152 -0
- package/src/prover/smt/solver/fd-solver.ts +269 -0
- package/src/prover/smt/solver/fingerprints.ts +16 -26
- package/src/prover/smt/solver/fix-dl-var.ts +149 -0
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/fm-tactic.ts +873 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +619 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +641 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2246 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +75 -0
- package/src/prover/smt/solver/goal.ts +177 -28
- package/src/prover/smt/solver/goal2nlsat.ts +191 -0
- package/src/prover/smt/solver/guard-set.ts +220 -0
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +27 -23
- package/src/prover/smt/solver/inf-eps.ts +64 -0
- package/src/prover/smt/solver/inj-axiom.ts +102 -0
- package/src/prover/smt/solver/internalizer.ts +72 -130
- package/src/prover/smt/solver/lackr.ts +383 -0
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/lia2card.ts +269 -0
- package/src/prover/smt/solver/lia2pb.ts +141 -0
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/logic-tactics.ts +349 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +24 -27
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +18 -39
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -82
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +79 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +69 -132
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +24 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +184 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +293 -0
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +30 -54
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +6 -5
- package/src/prover/smt/solver/macro-finder.ts +533 -0
- package/src/prover/smt/solver/mam-compiler.ts +117 -126
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +29 -0
- package/src/prover/smt/solver/max-cliques.ts +107 -0
- package/src/prover/smt/solver/maxcore.ts +318 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +9 -20
- package/src/prover/smt/solver/maxlex.ts +123 -0
- package/src/prover/smt/solver/maxsmt-base.ts +99 -0
- package/src/prover/smt/solver/maxsmt.ts +93 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +477 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +102 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +49 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +624 -0
- package/src/prover/smt/solver/model-based-opt.ts +845 -0
- package/src/prover/smt/solver/model-checker.ts +20 -62
- package/src/prover/smt/solver/model-evaluator.ts +186 -39
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +57 -40
- package/src/prover/smt/solver/model-macro-solver.ts +58 -111
- package/src/prover/smt/solver/model-printer.ts +215 -0
- package/src/prover/smt/solver/mpf.ts +712 -0
- package/src/prover/smt/solver/mus.ts +52 -0
- package/src/prover/smt/solver/muz/dl-context.ts +362 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +98 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +305 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +427 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +278 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +158 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +303 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +127 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +460 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +192 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +179 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1395 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +41 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +244 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +133 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +344 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +309 -0
- package/src/prover/smt/solver/muz/substitution.ts +154 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +286 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +179 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +61 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +10 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +48 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +30 -160
- package/src/prover/smt/solver/nlsat/solver.ts +227 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +311 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +369 -0
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nlsat-tactic.ts +83 -0
- package/src/prover/smt/solver/nnf.ts +108 -60
- package/src/prover/smt/solver/normalize-bounds.ts +54 -0
- package/src/prover/smt/solver/occf.ts +98 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +366 -0
- package/src/prover/smt/solver/opt-pareto.ts +284 -0
- package/src/prover/smt/solver/opt-preprocess.ts +102 -0
- package/src/prover/smt/solver/opt-solver.ts +300 -0
- package/src/prover/smt/solver/opt-value.ts +56 -0
- package/src/prover/smt/solver/optsmt.ts +691 -0
- package/src/prover/smt/solver/parallel-tactic.ts +301 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -23
- package/src/prover/smt/solver/pb-rewriter.ts +296 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +542 -0
- package/src/prover/smt/solver/poly-rewriter.ts +203 -77
- package/src/prover/smt/solver/probes.ts +514 -0
- package/src/prover/smt/solver/propagate-values.ts +34 -30
- package/src/prover/smt/solver/proto-model.ts +648 -63
- package/src/prover/smt/solver/pull-quant.ts +29 -23
- package/src/prover/smt/solver/purify-arith.ts +598 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1099 -0
- package/src/prover/smt/solver/qe-lite-der.ts +3 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +5 -28
- package/src/prover/smt/solver/qe-lite.ts +40 -49
- package/src/prover/smt/solver/qe-mbp.ts +281 -0
- package/src/prover/smt/solver/qe.ts +1508 -0
- package/src/prover/smt/solver/qel.ts +26 -0
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/qsat.ts +840 -0
- package/src/prover/smt/solver/quant-hoist.ts +195 -0
- package/src/prover/smt/solver/quant-tactics.ts +18 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +9 -23
- package/src/prover/smt/solver/quasi-macros.ts +254 -0
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +29 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +248 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +108 -0
- package/src/prover/smt/solver/reduce-args.ts +226 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +120 -0
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +3 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +49 -129
- package/src/prover/smt/solver/rewriter.ts +478 -120
- package/src/prover/smt/solver/rlimit.ts +27 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +314 -0
- package/src/prover/smt/solver/sat/big.ts +178 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +79 -0
- package/src/prover/smt/solver/sat/clause.ts +221 -0
- package/src/prover/smt/solver/sat/cleaner.ts +96 -0
- package/src/prover/smt/solver/sat/config.ts +125 -0
- package/src/prover/smt/solver/sat/consequences.ts +204 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +144 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +528 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +388 -0
- package/src/prover/smt/solver/sat/model-converter.ts +156 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +264 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1553 -0
- package/src/prover/smt/solver/sat/probing.ts +169 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +171 -0
- package/src/prover/smt/solver/sat/scc.ts +143 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1662 -0
- package/src/prover/smt/solver/sat/solver.ts +2128 -0
- package/src/prover/smt/solver/sat/var-queue.ts +119 -0
- package/src/prover/smt/solver/sat/watch-list.ts +136 -0
- package/src/prover/smt/solver/search-tree.ts +285 -0
- package/src/prover/smt/solver/seq-axioms.ts +1013 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +823 -0
- package/src/prover/smt/solver/seq-derive.ts +1303 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +238 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +440 -0
- package/src/prover/smt/solver/seq-factory.ts +91 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +225 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1296 -0
- package/src/prover/smt/solver/seq-re-util.ts +777 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +145 -0
- package/src/prover/smt/solver/seq-regex-live.ts +202 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +100 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2407 -0
- package/src/prover/smt/solver/seq-skolem.ts +318 -0
- package/src/prover/smt/solver/seq-subset.ts +166 -0
- package/src/prover/smt/solver/seq-view-witness.ts +355 -0
- package/src/prover/smt/solver/smt-consequences.ts +299 -0
- package/src/prover/smt/solver/smt-kernel.ts +85 -0
- package/src/prover/smt/solver/smt-logics.ts +67 -0
- package/src/prover/smt/solver/smt-setup.ts +492 -0
- package/src/prover/smt/solver/smt2-printer.ts +767 -0
- package/src/prover/smt/solver/smtlib-parser.ts +2423 -270
- package/src/prover/smt/solver/smtlib-script.ts +1493 -0
- package/src/prover/smt/solver/solve-eqs.ts +931 -0
- package/src/prover/smt/solver/solver.ts +120 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +319 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/tactic.ts +1936 -0
- package/src/prover/smt/solver/term-enumeration.ts +206 -0
- package/src/prover/smt/solver/theory-array.ts +1275 -0
- package/src/prover/smt/solver/theory-bv.ts +1239 -0
- package/src/prover/smt/solver/theory-char.ts +356 -0
- package/src/prover/smt/solver/theory-datatype.ts +599 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +422 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +56 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -10
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +87 -53
- package/src/prover/smt/solver/theory-lra-model.ts +24 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +25 -40
- package/src/prover/smt/solver/theory-lra-state.ts +7 -27
- package/src/prover/smt/solver/theory-lra.ts +194 -8
- package/src/prover/smt/solver/theory-pb.ts +932 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +59 -0
- package/src/prover/smt/solver/theory-recfun.ts +308 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +871 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1375 -0
- package/src/prover/smt/solver/theory-seq-state.ts +880 -0
- package/src/prover/smt/solver/theory-seq.ts +984 -0
- package/src/prover/smt/solver/theory.ts +175 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +487 -0
- package/src/prover/smt/solver/var-subst.ts +33 -35
- package/src/prover/smt/table.ts +1 -9
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -15
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +20 -14
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +10 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +11 -33
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +88 -57
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/tlaps-module.ts +0 -510
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
// Ported from Z3 (src/nlsat/nlsat_solver.cpp, src/nlsat/nlsat_scoped_literal_vector.h,
|
|
2
|
-
// src/util/id_gen.h), MIT license, see z3-license.txt.
|
|
3
|
-
// reference counts. An atom whose count drops to zero is deleted and its Boolean variable reused,
|
|
4
|
-
// last freed first, so literals are numbered as in Z3. Boolean variable 0 is true and has no atom.
|
|
2
|
+
// src/util/id_gen.h), MIT license, see z3-license.txt.
|
|
5
3
|
import {
|
|
6
4
|
NULL_VAR,
|
|
7
5
|
type Polynomial,
|
|
8
6
|
type PolynomialCache,
|
|
9
7
|
type PolynomialManager,
|
|
10
8
|
} from "./polynomial";
|
|
11
|
-
import
|
|
9
|
+
import {
|
|
10
|
+
type Atom,
|
|
11
|
+
type IneqAtom,
|
|
12
|
+
type IneqKind,
|
|
13
|
+
type RootAtom,
|
|
14
|
+
type RootKind,
|
|
15
|
+
isIneqAtom,
|
|
16
|
+
} from "./types";
|
|
12
17
|
|
|
13
18
|
export const TRUE_BOOL_VAR = 0;
|
|
14
19
|
export const TRUE_LITERAL = 0;
|
|
@@ -18,7 +23,6 @@ const FLIPPED_KIND: Record<IneqKind, IneqKind> = { EQ: "EQ", LT: "GT", GT: "LT"
|
|
|
18
23
|
|
|
19
24
|
export const flipKind = (kind: IneqKind) => FLIPPED_KIND[kind];
|
|
20
25
|
|
|
21
|
-
// What the solver keeps per Boolean variable, reset when a variable is made or deleted.
|
|
22
26
|
interface BoolVarHooks {
|
|
23
27
|
onMk: (boolVar: number) => void;
|
|
24
28
|
onDelete: (boolVar: number) => void;
|
|
@@ -30,8 +34,7 @@ export class AtomTable {
|
|
|
30
34
|
private nextBoolVar = 0;
|
|
31
35
|
private freeBoolVars: number[] = [];
|
|
32
36
|
private ineqAtoms = new Map<string, IneqAtom>();
|
|
33
|
-
// Keyed by the variable at creation:
|
|
34
|
-
// key alone.
|
|
37
|
+
// Keyed by the variable at creation: Z3's root atom table also ignores renamed variables.
|
|
35
38
|
private rootAtoms = new Map<string, RootAtom>();
|
|
36
39
|
private rootKeys = new Map<number, string>();
|
|
37
40
|
|
|
@@ -43,7 +46,6 @@ export class AtomTable {
|
|
|
43
46
|
this.mkBoolVar();
|
|
44
47
|
}
|
|
45
48
|
|
|
46
|
-
// mk_bool_var_core with id_gen: the last freed variable first.
|
|
47
49
|
mkBoolVar() {
|
|
48
50
|
const boolVar = this.freeBoolVars.pop() ?? this.nextBoolVar++;
|
|
49
51
|
this.atoms[boolVar] = null;
|
|
@@ -52,21 +54,18 @@ export class AtomTable {
|
|
|
52
54
|
return boolVar;
|
|
53
55
|
}
|
|
54
56
|
|
|
55
|
-
// degree: the degree of the atom's maximal variable.
|
|
56
57
|
getDegree(atom: Atom) {
|
|
57
|
-
if (!(
|
|
58
|
+
if (!isIneqAtom(atom)) return this.pm.degree(atom.polynomial, atom.maxVar);
|
|
58
59
|
let max = 0;
|
|
59
60
|
for (const polynomial of atom.polynomials)
|
|
60
61
|
max = Math.max(max, this.pm.degree(polynomial, atom.maxVar));
|
|
61
62
|
return max;
|
|
62
63
|
}
|
|
63
64
|
|
|
64
|
-
// reinit_cache: each polynomial back in the cache after a reset, and the maximal variables after
|
|
65
|
-
// a renaming.
|
|
66
65
|
reinitCache() {
|
|
67
66
|
for (const atom of this.atoms) {
|
|
68
|
-
if (atom === null
|
|
69
|
-
if (
|
|
67
|
+
if (atom === null) continue;
|
|
68
|
+
if (isIneqAtom(atom)) {
|
|
70
69
|
let max = 0;
|
|
71
70
|
for (const polynomial of atom.polynomials) {
|
|
72
71
|
this.cache.mkUnique(polynomial);
|
|
@@ -88,6 +87,15 @@ export class AtomTable {
|
|
|
88
87
|
return this.getAtom(literal)?.maxVar ?? NULL_VAR;
|
|
89
88
|
}
|
|
90
89
|
|
|
90
|
+
getMaxVarOfLiterals(literals: readonly number[]) {
|
|
91
|
+
let result = NULL_VAR;
|
|
92
|
+
for (const literal of literals) {
|
|
93
|
+
const atom = this.getAtom(literal);
|
|
94
|
+
if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
|
|
95
|
+
}
|
|
96
|
+
return result;
|
|
97
|
+
}
|
|
98
|
+
|
|
91
99
|
incRef(literal: number) {
|
|
92
100
|
const boolVar = literal >> 1;
|
|
93
101
|
if (this.atoms[boolVar] === null || this.atoms[boolVar] === undefined) return;
|
|
@@ -99,7 +107,7 @@ export class AtomTable {
|
|
|
99
107
|
const atom = this.atoms[boolVar];
|
|
100
108
|
if (atom === null || atom === undefined) return;
|
|
101
109
|
if (--this.refCounts[boolVar] > 0) return;
|
|
102
|
-
if (
|
|
110
|
+
if (isIneqAtom(atom)) this.ineqAtoms.delete(this.getIneqKey(atom));
|
|
103
111
|
else {
|
|
104
112
|
this.rootAtoms.delete(this.rootKeys.get(boolVar)!);
|
|
105
113
|
this.rootKeys.delete(boolVar);
|
|
@@ -117,8 +125,6 @@ export class AtomTable {
|
|
|
117
125
|
return `${atom.kind},${atom.maxVar},${atom.index},${atom.polynomial.id}`;
|
|
118
126
|
}
|
|
119
127
|
|
|
120
|
-
// mk_ineq_atom: each factor sign-normalized and hash-consed, the kind flipped when an odd
|
|
121
|
-
// factor changed sign.
|
|
122
128
|
mkIneqAtom(kind: IneqKind, polynomials: readonly Polynomial[], isEven: readonly boolean[]) {
|
|
123
129
|
let sign = 1;
|
|
124
130
|
let maxVar = NULL_VAR;
|
|
@@ -129,7 +135,7 @@ export class AtomTable {
|
|
|
129
135
|
if (variable > maxVar || maxVar === NULL_VAR) maxVar = variable;
|
|
130
136
|
return this.cache.mkUnique(normalized);
|
|
131
137
|
});
|
|
132
|
-
const atom
|
|
138
|
+
const atom = {
|
|
133
139
|
kind: sign < 0 ? flipKind(kind) : kind,
|
|
134
140
|
boolVar: 0,
|
|
135
141
|
maxVar,
|
|
@@ -145,7 +151,6 @@ export class AtomTable {
|
|
|
145
151
|
return atom.boolVar;
|
|
146
152
|
}
|
|
147
153
|
|
|
148
|
-
// mk_ineq_literal: true or false for a product of constants.
|
|
149
154
|
mkIneqLiteral(kind: IneqKind, polynomials: readonly Polynomial[], isEven: readonly boolean[]) {
|
|
150
155
|
let constant = 1n;
|
|
151
156
|
let isConst = true;
|
|
@@ -173,9 +178,8 @@ export class AtomTable {
|
|
|
173
178
|
return 2 * this.mkIneqAtom(kind, polynomials, isEven);
|
|
174
179
|
}
|
|
175
180
|
|
|
176
|
-
// mk_root_atom: p sign-normalized, which keeps its roots, and hash-consed.
|
|
177
181
|
mkRootAtom(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
178
|
-
const atom
|
|
182
|
+
const atom = {
|
|
179
183
|
kind,
|
|
180
184
|
boolVar: 0,
|
|
181
185
|
maxVar: variable,
|
|
@@ -193,7 +197,6 @@ export class AtomTable {
|
|
|
193
197
|
}
|
|
194
198
|
}
|
|
195
199
|
|
|
196
|
-
// scoped_literal_vector: literals that hold a reference to their atoms.
|
|
197
200
|
export class ScopedLiterals {
|
|
198
201
|
literals: number[] = [];
|
|
199
202
|
|
|
@@ -224,7 +227,6 @@ export class ScopedLiterals {
|
|
|
224
227
|
}
|
|
225
228
|
}
|
|
226
229
|
|
|
227
|
-
// scoped_literal: a literal that holds a reference to its atom.
|
|
228
230
|
export class ScopedLiteral {
|
|
229
231
|
literal = TRUE_LITERAL;
|
|
230
232
|
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/nlsat_evaluator.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// at the assignment, and computes the intervals of the maximal variable of an atom that falsify a
|
|
3
|
-
// literal at the values of the variables below it. The assignment is the solver's, shared and
|
|
4
|
-
// refined in place.
|
|
1
|
+
// Ported from Z3 (src/nlsat/nlsat_evaluator.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import type { Anum, AlgebraicManager } from "./algebraic";
|
|
6
3
|
import { type IntervalSet, IntervalSetManager } from "./interval-set";
|
|
7
4
|
import type { Polynomial, PolynomialManager } from "./polynomial";
|
|
8
5
|
import { type Atom, type Clause, type IneqAtom, type RootAtom, isIneqAtom } from "./types";
|
|
9
6
|
|
|
10
|
-
// Z3's LINEAR_SEARCH_THRESHOLD.
|
|
11
7
|
const LINEAR_SEARCH_THRESHOLD = 8;
|
|
12
8
|
|
|
13
9
|
interface Section {
|
|
@@ -21,8 +17,6 @@ interface PolynomialInfo {
|
|
|
21
17
|
firstSign: number;
|
|
22
18
|
}
|
|
23
19
|
|
|
24
|
-
// sign_table: the roots of the factors of an atom merged into one sorted list of sections. Cell 2i
|
|
25
|
-
// is the sector below sorted section i, cell 2i + 1 the section itself.
|
|
26
20
|
class SignTable {
|
|
27
21
|
private sections: Section[] = [];
|
|
28
22
|
private sortedSections: number[] = [];
|
|
@@ -55,9 +49,9 @@ class SignTable {
|
|
|
55
49
|
section.position = sorted.length - 1;
|
|
56
50
|
sortedIndex++;
|
|
57
51
|
} else {
|
|
58
|
-
const
|
|
59
|
-
sorted.push(
|
|
60
|
-
sectionIds.push(
|
|
52
|
+
const newSectionId = this.mkSection(roots[rootIndex], sorted.length);
|
|
53
|
+
sorted.push(newSectionId);
|
|
54
|
+
sectionIds.push(newSectionId);
|
|
61
55
|
rootIndex++;
|
|
62
56
|
}
|
|
63
57
|
}
|
|
@@ -66,9 +60,9 @@ class SignTable {
|
|
|
66
60
|
sorted.push(this.sortedSections[sortedIndex]);
|
|
67
61
|
}
|
|
68
62
|
for (; rootIndex < roots.length; rootIndex++) {
|
|
69
|
-
const
|
|
70
|
-
sorted.push(
|
|
71
|
-
sectionIds.push(
|
|
63
|
+
const newSectionId = this.mkSection(roots[rootIndex], sorted.length);
|
|
64
|
+
sorted.push(newSectionId);
|
|
65
|
+
sectionIds.push(newSectionId);
|
|
72
66
|
}
|
|
73
67
|
this.sortedSections = sorted;
|
|
74
68
|
return sectionIds;
|
|
@@ -114,7 +108,6 @@ class SignTable {
|
|
|
114
108
|
return this.polynomialSigns[info.firstSign + index];
|
|
115
109
|
}
|
|
116
110
|
|
|
117
|
-
// sign_at: the sign of the infoId-th polynomial in the cell.
|
|
118
111
|
signAt(infoId: number, cell: number) {
|
|
119
112
|
const info = this.infos[infoId];
|
|
120
113
|
const rootCount = info.rootCount;
|
|
@@ -215,7 +208,6 @@ export class Evaluator {
|
|
|
215
208
|
table.add(signed.roots, signed.signs);
|
|
216
209
|
}
|
|
217
210
|
|
|
218
|
-
// The maximal runs of cells where the literal is false, as a union of intervals.
|
|
219
211
|
private getIneqInfeasibleIntervals(atom: IneqAtom, isNeg: boolean, clause: Clause | null) {
|
|
220
212
|
const table = new SignTable(this.am);
|
|
221
213
|
for (const polynomial of atom.polynomials) this.addToTable(polynomial, atom.maxVar, table);
|
|
@@ -279,7 +271,7 @@ export class Evaluator {
|
|
|
279
271
|
if (atom.index > roots.length)
|
|
280
272
|
return isNeg ? null : this.ism.mk(true, null, true, null, justification, clause);
|
|
281
273
|
const root = roots[atom.index - 1];
|
|
282
|
-
const
|
|
274
|
+
const mkInterval = (
|
|
283
275
|
isLowerOpen: boolean,
|
|
284
276
|
lower: Anum | null,
|
|
285
277
|
isUpperOpen: boolean,
|
|
@@ -288,16 +280,19 @@ export class Evaluator {
|
|
|
288
280
|
switch (atom.kind) {
|
|
289
281
|
case "ROOT_EQ":
|
|
290
282
|
return isNeg
|
|
291
|
-
?
|
|
292
|
-
: this.ism.mkUnion(
|
|
283
|
+
? mkInterval(false, root, false, root)
|
|
284
|
+
: this.ism.mkUnion(
|
|
285
|
+
mkInterval(true, null, true, root),
|
|
286
|
+
mkInterval(true, root, true, null),
|
|
287
|
+
);
|
|
293
288
|
case "ROOT_LT":
|
|
294
|
-
return isNeg ?
|
|
289
|
+
return isNeg ? mkInterval(true, null, true, root) : mkInterval(false, root, true, null);
|
|
295
290
|
case "ROOT_GT":
|
|
296
|
-
return isNeg ?
|
|
291
|
+
return isNeg ? mkInterval(true, root, true, null) : mkInterval(true, null, false, root);
|
|
297
292
|
case "ROOT_LE":
|
|
298
|
-
return isNeg ?
|
|
293
|
+
return isNeg ? mkInterval(true, null, false, root) : mkInterval(true, root, true, null);
|
|
299
294
|
case "ROOT_GE":
|
|
300
|
-
return isNeg ?
|
|
295
|
+
return isNeg ? mkInterval(false, root, true, null) : mkInterval(true, null, true, root);
|
|
301
296
|
}
|
|
302
297
|
}
|
|
303
298
|
}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/nlsat_explain.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// literals that is infeasible at the sample: the literals of a lemma that exclude a cell around
|
|
3
|
-
// the sample in which the set stays infeasible. Only Z3's default nlsat parameters are ported:
|
|
4
|
-
// simplify_conflicts and factor on, minimize_conflicts, add_all_coeffs and zero_disc off, and lws
|
|
5
|
-
// on. So the cell always comes from the levelwise construction, and Z3's fallback projection
|
|
6
|
-
// (project with cac_add_cell_lits, add_lcs and the psc_* helpers) is not ported.
|
|
1
|
+
// Ported from Z3 (src/nlsat/nlsat_explain.cpp), MIT license, see z3-license.txt.
|
|
7
2
|
import type { AlgebraicManager, Anum } from "./algebraic";
|
|
8
3
|
import {
|
|
9
4
|
type AtomTable,
|
|
@@ -23,22 +18,18 @@ import {
|
|
|
23
18
|
} from "./polynomial";
|
|
24
19
|
import { type IneqAtom, type IneqKind, type RootKind, isIneqAtom } from "./types";
|
|
25
20
|
|
|
26
|
-
// The solver state an explanation reads.
|
|
27
21
|
interface ExplainContext {
|
|
28
22
|
atoms: AtomTable;
|
|
29
|
-
// sample(): the solver's assignment, refined in place.
|
|
30
23
|
sample: (Anum | undefined)[];
|
|
31
|
-
// value(l): l_true, l_false or l_undef, as 1, -1 and 0.
|
|
32
24
|
getValue: (literal: number) => number;
|
|
33
|
-
// m_var2eq: the equation of least degree assigned for each variable.
|
|
34
25
|
var2eq: (IneqAtom | null)[];
|
|
26
|
+
getNumVars: () => number;
|
|
27
|
+
reorder: (permutation: readonly number[]) => void;
|
|
28
|
+
restoreOrder: () => void;
|
|
35
29
|
}
|
|
36
30
|
|
|
37
|
-
// add_all_coeffs_restart: every coefficient of a polynomial vanished, so the explanation starts
|
|
38
|
-
// over adding all coefficients.
|
|
39
31
|
class AddAllCoeffsRestart {}
|
|
40
32
|
|
|
41
|
-
// eq_info: an equation used to rewrite the core, and what its leading coefficient must satisfy.
|
|
42
33
|
interface EqInfo {
|
|
43
34
|
eq: Polynomial;
|
|
44
35
|
variable: number;
|
|
@@ -79,9 +70,8 @@ export class Explain {
|
|
|
79
70
|
private core: ScopedLiterals;
|
|
80
71
|
private isAddAllCoeffs = false;
|
|
81
72
|
|
|
82
|
-
// m_full_dimensional: the solver sets it when every clause is full dimensional, and the cell
|
|
83
|
-
// bounds are then closed.
|
|
84
73
|
isFullDimensional = false;
|
|
74
|
+
isFactoring = true;
|
|
85
75
|
|
|
86
76
|
constructor(
|
|
87
77
|
private pm: PolynomialManager,
|
|
@@ -119,31 +109,11 @@ export class Explain {
|
|
|
119
109
|
});
|
|
120
110
|
}
|
|
121
111
|
|
|
122
|
-
private getMaxVarOfPolys(polynomials: readonly Polynomial[]) {
|
|
123
|
-
let result = NULL_VAR;
|
|
124
|
-
for (const polynomial of polynomials) {
|
|
125
|
-
const variable = this.pm.maxVar(polynomial);
|
|
126
|
-
if (result === NULL_VAR || variable > result) result = variable;
|
|
127
|
-
}
|
|
128
|
-
return result;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
private getMaxVarOfLiterals(literals: readonly number[]) {
|
|
132
|
-
let result = NULL_VAR;
|
|
133
|
-
for (const literal of literals) {
|
|
134
|
-
const atom = this.context.atoms.getAtom(literal);
|
|
135
|
-
if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
|
|
136
|
-
}
|
|
137
|
-
return result;
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
// add_assumption: the negation of p kind 0, or of p != 0 when isNeg, into the lemma.
|
|
141
112
|
private addAssumption(kind: IneqKind, polynomial: Polynomial, isNeg = false) {
|
|
142
113
|
const boolVar = this.context.atoms.mkIneqAtom(kind, [polynomial], [false]);
|
|
143
114
|
this.addLiteral(2 * boolVar + (isNeg ? 0 : 1));
|
|
144
115
|
}
|
|
145
116
|
|
|
146
|
-
// find_cell_roots for one polynomial: the root equal to the sample of its maximal variable.
|
|
147
117
|
private findSectionRoot(polynomial: Polynomial, variable: number) {
|
|
148
118
|
const value = this.context.sample[variable]!;
|
|
149
119
|
const values = this.context.sample.map((current, index) =>
|
|
@@ -158,8 +128,6 @@ export class Explain {
|
|
|
158
128
|
return null;
|
|
159
129
|
}
|
|
160
130
|
|
|
161
|
-
// add_zero_assumption: p vanishes at the sample, so the sample lies on a root of its square-free
|
|
162
|
-
// part, which becomes a section literal.
|
|
163
131
|
private addZeroAssumption(polynomial: Polynomial) {
|
|
164
132
|
const squareFree = this.pm.squareFree(polynomial);
|
|
165
133
|
if (this.pm.isConst(squareFree)) return;
|
|
@@ -168,8 +136,6 @@ export class Explain {
|
|
|
168
136
|
if (index !== null) this.addRootLiteral("ROOT_EQ", variable, index, squareFree);
|
|
169
137
|
}
|
|
170
138
|
|
|
171
|
-
// elim_vanishing: p without its leading coefficients that vanish at the sample, each of which
|
|
172
|
-
// becomes an assumption. Zero when all do.
|
|
173
139
|
private elimVanishing(polynomial: Polynomial) {
|
|
174
140
|
let p = polynomial;
|
|
175
141
|
let variable = this.pm.maxVar(p);
|
|
@@ -181,8 +147,7 @@ export class Explain {
|
|
|
181
147
|
degree = this.pm.degree(p, variable);
|
|
182
148
|
}
|
|
183
149
|
if (this.pm.isNonzeroConstCoeff(p, variable, degree)) return p;
|
|
184
|
-
// Z3
|
|
185
|
-
// its own vanishing coefficients, which equals it given the assumptions that removed them.
|
|
150
|
+
// Z3's insert_fresh_factors_in_todo writes lc back without its vanishing coefficients.
|
|
186
151
|
const lc = this.insertFreshFactorsInTodo(this.pm.coeff(p, variable, degree));
|
|
187
152
|
const reduct = this.pm.reduct(p, variable, degree);
|
|
188
153
|
if (!this.pm.isZero(lc) && this.getSign(lc) !== 0) return p;
|
|
@@ -206,12 +171,14 @@ export class Explain {
|
|
|
206
171
|
.filter((polynomial) => !this.pm.isConst(polynomial));
|
|
207
172
|
}
|
|
208
173
|
|
|
209
|
-
// insert_fresh_factors_in_todo: the factors of p, without their vanishing coefficients. Returns
|
|
210
|
-
// p without its vanishing coefficients, which Z3 writes back to its argument.
|
|
211
174
|
private insertFreshFactorsInTodo(polynomial: Polynomial) {
|
|
212
175
|
if (this.pm.isConst(polynomial)) return polynomial;
|
|
213
176
|
const p = this.elimVanishing(polynomial);
|
|
214
177
|
if (this.pm.isConst(p)) return p;
|
|
178
|
+
if (!this.isFactoring) {
|
|
179
|
+
this.todo.insert(p);
|
|
180
|
+
return p;
|
|
181
|
+
}
|
|
215
182
|
for (const factor of this.cache.factor(p)) {
|
|
216
183
|
const reduced = this.elimVanishing(factor);
|
|
217
184
|
if (!this.pm.isConst(reduced)) this.todo.insert(reduced);
|
|
@@ -219,8 +186,6 @@ export class Explain {
|
|
|
219
186
|
return p;
|
|
220
187
|
}
|
|
221
188
|
|
|
222
|
-
// normalize: the literal without the vanishing coefficients of max and the factors of lower
|
|
223
|
-
// stages, which become assumptions. True or false when nothing is left.
|
|
224
189
|
private normalizeLiteral(literal: number, max: number) {
|
|
225
190
|
if (literal >> 1 === TRUE_BOOL_VAR) return literal;
|
|
226
191
|
const atom = this.getAtom(literal);
|
|
@@ -272,8 +237,6 @@ export class Explain {
|
|
|
272
237
|
core.shrink(kept);
|
|
273
238
|
}
|
|
274
239
|
|
|
275
|
-
// simplify(l, info, max, new_lit): rewrites the factors of degree at least the equation's by
|
|
276
|
-
// their pseudo-remainders, recording the condition on the equation's leading coefficient.
|
|
277
240
|
private simplifyLiteral(literal: number, info: EqInfo, max: number, newLiteral: ScopedLiteral) {
|
|
278
241
|
const atom = this.getAtom(literal);
|
|
279
242
|
if (!isIneqAtom(atom) || (atom.polynomials.length === 1 && atom.polynomials[0] === info.eq)) {
|
|
@@ -336,13 +299,11 @@ export class Explain {
|
|
|
336
299
|
newLiteral.set(TRUE_LITERAL);
|
|
337
300
|
}
|
|
338
301
|
|
|
339
|
-
// simplify(C, eq, max): the core rewritten by eq. Like Z3's scoped_literal, newLiteral keeps a
|
|
340
|
-
// reference until the next literal or the end, also when an elimination restarts.
|
|
341
302
|
private simplifyWithEq(core: ScopedLiterals, eq: Polynomial, max: number) {
|
|
342
303
|
const variable = this.pm.maxVar(eq);
|
|
343
304
|
const degree = this.pm.degree(eq, variable);
|
|
344
305
|
const lc = this.pm.coeff(eq, variable, degree);
|
|
345
|
-
const info
|
|
306
|
+
const info = {
|
|
346
307
|
eq,
|
|
347
308
|
variable,
|
|
348
309
|
degree,
|
|
@@ -382,7 +343,6 @@ export class Explain {
|
|
|
382
343
|
}
|
|
383
344
|
}
|
|
384
345
|
|
|
385
|
-
// select_eq: the positive single-factor odd equation of least degree in max.
|
|
386
346
|
private selectEq(core: ScopedLiterals, max: number) {
|
|
387
347
|
let result: Polynomial | null = null;
|
|
388
348
|
let minDegree = Infinity;
|
|
@@ -401,8 +361,6 @@ export class Explain {
|
|
|
401
361
|
return result;
|
|
402
362
|
}
|
|
403
363
|
|
|
404
|
-
// select_lower_stage_eq: an assigned equation of a lower variable with a constant leading
|
|
405
|
-
// coefficient that can rewrite a literal of the core.
|
|
406
364
|
private selectLowerStageEq(core: ScopedLiterals, max: number) {
|
|
407
365
|
for (const literal of core.literals) {
|
|
408
366
|
const atom = this.getAtom(literal);
|
|
@@ -436,8 +394,6 @@ export class Explain {
|
|
|
436
394
|
}
|
|
437
395
|
}
|
|
438
396
|
|
|
439
|
-
// add_root_literal: the negation of y kind root[i](p), as an inequality when p is linear or
|
|
440
|
-
// quadratic in y, else as a root atom.
|
|
441
397
|
private addRootLiteral(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
442
398
|
if (this.mkLinearRoot(kind, variable, polynomial)) return;
|
|
443
399
|
if (this.mkQuadraticRoot(kind, variable, index, polynomial)) return;
|
|
@@ -457,7 +413,6 @@ export class Explain {
|
|
|
457
413
|
this.addAssumption(ineq.kind, isNegated ? this.pm.neg(polynomial) : polynomial, ineq.isNeg);
|
|
458
414
|
}
|
|
459
415
|
|
|
460
|
-
// mk_plinear_root: a root of p linear in y whose coefficient keeps its sign.
|
|
461
416
|
private mkPlinearRoot(kind: RootKind, variable: number, polynomial: Polynomial) {
|
|
462
417
|
if (this.pm.degree(polynomial, variable) !== 1) return false;
|
|
463
418
|
const coeff = this.pm.coeff(polynomial, variable, 1);
|
|
@@ -468,8 +423,6 @@ export class Explain {
|
|
|
468
423
|
return true;
|
|
469
424
|
}
|
|
470
425
|
|
|
471
|
-
// mk_quadratic_root: by Thom's lemma, the signs of the discriminant, the leading coefficient, the
|
|
472
|
-
// derivative and p characterize the sample's position among the roots of a quadratic.
|
|
473
426
|
private mkQuadraticRoot(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
474
427
|
if (this.pm.degree(polynomial, variable) !== 2 || (index !== 1 && index !== 2)) return false;
|
|
475
428
|
const a = this.pm.coeff(polynomial, variable, 2);
|
|
@@ -501,7 +454,6 @@ export class Explain {
|
|
|
501
454
|
return sign;
|
|
502
455
|
}
|
|
503
456
|
|
|
504
|
-
// levelwise_single_cell: the literals that bound the cell.
|
|
505
457
|
private addCellLiterals(polynomials: readonly Polynomial[], maxVar: number, isLinear: boolean) {
|
|
506
458
|
const cell = getSingleCell(
|
|
507
459
|
this.pm,
|
|
@@ -536,7 +488,6 @@ export class Explain {
|
|
|
536
488
|
}
|
|
537
489
|
}
|
|
538
490
|
|
|
539
|
-
// project: the factors of the polynomials, then the cell around the sample.
|
|
540
491
|
private project(polynomials: readonly Polynomial[], maxVar: number) {
|
|
541
492
|
if (polynomials.length === 0) return;
|
|
542
493
|
this.todo.reset();
|
|
@@ -547,28 +498,27 @@ export class Explain {
|
|
|
547
498
|
private explainCore(literals: readonly number[]) {
|
|
548
499
|
if (literals.length === 0) return;
|
|
549
500
|
const polynomials = [...this.collectPolys(literals), ...this.lowerStagePolys];
|
|
550
|
-
const maxVar = this.getMaxVarOfPolys(polynomials);
|
|
501
|
+
const maxVar = this.pm.getMaxVarOfPolys(polynomials);
|
|
551
502
|
this.project(this.elimVanishingAll(polynomials), maxVar);
|
|
552
503
|
}
|
|
553
504
|
|
|
554
|
-
// process2: with simplify_conflicts, the core normalized and rewritten by its equations first.
|
|
555
|
-
// As in Z3, a restart leaves the core holding its literals until the next attempt.
|
|
556
505
|
private process(literals: readonly number[]) {
|
|
557
506
|
this.lowerStagePolys = [];
|
|
558
507
|
const core = this.core;
|
|
559
508
|
core.reset();
|
|
560
509
|
for (const literal of literals) core.push(literal);
|
|
561
|
-
const max = this.getMaxVarOfLiterals(literals);
|
|
510
|
+
const max = this.context.atoms.getMaxVarOfLiterals(literals);
|
|
562
511
|
this.normalizeCore(core, max);
|
|
563
512
|
this.simplifyCore(core, max);
|
|
564
513
|
this.explainCore(core.literals);
|
|
565
514
|
core.reset();
|
|
566
515
|
}
|
|
567
516
|
|
|
568
|
-
// compute_conflict_explanation: the literals, appended to result, that with the negations of
|
|
569
|
-
// literals make a valid lemma.
|
|
570
517
|
computeConflictExplanation(literals: readonly number[], result: ScopedLiterals) {
|
|
571
|
-
if (
|
|
518
|
+
if (
|
|
519
|
+
this.context.atoms.getMaxVarOfLiterals(literals) === 0 &&
|
|
520
|
+
this.context.sample[0] === undefined
|
|
521
|
+
) {
|
|
572
522
|
result.reset();
|
|
573
523
|
return;
|
|
574
524
|
}
|
|
@@ -592,14 +542,56 @@ export class Explain {
|
|
|
592
542
|
}
|
|
593
543
|
}
|
|
594
544
|
|
|
595
|
-
|
|
545
|
+
projectVariable(variable: number, literals: readonly number[], result: ScopedLiterals) {
|
|
546
|
+
const base = result.size;
|
|
547
|
+
while (true) {
|
|
548
|
+
let isReordered = false;
|
|
549
|
+
this.result = result;
|
|
550
|
+
try {
|
|
551
|
+
const kept: number[] = [];
|
|
552
|
+
for (const literal of literals) {
|
|
553
|
+
const atom = this.context.atoms.getAtom(literal);
|
|
554
|
+
const polynomials =
|
|
555
|
+
atom === null ? [] : isIneqAtom(atom) ? atom.polynomials : [atom.polynomial];
|
|
556
|
+
const isContaining =
|
|
557
|
+
(atom !== null && !isIneqAtom(atom) && atom.maxVar === variable) ||
|
|
558
|
+
polynomials.some((polynomial) => this.pm.getVars(polynomial).includes(variable));
|
|
559
|
+
if (isContaining) kept.push(literal);
|
|
560
|
+
else this.addLiteral(literal ^ 1);
|
|
561
|
+
}
|
|
562
|
+
const polynomials = this.collectPolys(kept);
|
|
563
|
+
if (polynomials.length > 0) {
|
|
564
|
+
const maxVar = this.pm.getMaxVarOfPolys(polynomials);
|
|
565
|
+
if (maxVar !== variable) {
|
|
566
|
+
const renaming = Array.from({ length: this.context.getNumVars() }, (_value, index) =>
|
|
567
|
+
index === variable ? maxVar : index === maxVar ? variable : index,
|
|
568
|
+
);
|
|
569
|
+
this.context.reorder(renaming);
|
|
570
|
+
isReordered = true;
|
|
571
|
+
}
|
|
572
|
+
this.project(this.elimVanishingAll(polynomials), maxVar);
|
|
573
|
+
this.resetResult();
|
|
574
|
+
if (isReordered) this.context.restoreOrder();
|
|
575
|
+
}
|
|
576
|
+
break;
|
|
577
|
+
} catch (error) {
|
|
578
|
+
if (!(error instanceof AddAllCoeffsRestart)) throw error;
|
|
579
|
+
if (isReordered) this.context.restoreOrder();
|
|
580
|
+
result.shrink(base);
|
|
581
|
+
} finally {
|
|
582
|
+
this.resetResult();
|
|
583
|
+
}
|
|
584
|
+
}
|
|
585
|
+
for (let index = 0; index < result.size; index++) result.set(index, result.literals[index] ^ 1);
|
|
586
|
+
}
|
|
587
|
+
|
|
596
588
|
computeLinearExplanation(literals: readonly number[], result: ScopedLiterals) {
|
|
597
589
|
this.result = result;
|
|
598
590
|
this.lowerStagePolys = [];
|
|
599
591
|
const polynomials = this.collectPolys(literals);
|
|
600
592
|
try {
|
|
601
593
|
if (polynomials.length > 0)
|
|
602
|
-
this.addCellLiterals(polynomials, this.getMaxVarOfPolys(polynomials) + 1, true);
|
|
594
|
+
this.addCellLiterals(polynomials, this.pm.getMaxVarOfPolys(polynomials) + 1, true);
|
|
603
595
|
} finally {
|
|
604
596
|
this.resetResult();
|
|
605
597
|
}
|