tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- 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 +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/nlsat_explain.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { AlgebraicManager, Anum } from "./algebraic";
|
|
3
2
|
import {
|
|
4
3
|
type AtomTable,
|
|
@@ -9,12 +8,14 @@ import {
|
|
|
9
8
|
TRUE_BOOL_VAR,
|
|
10
9
|
TRUE_LITERAL,
|
|
11
10
|
} from "./atoms";
|
|
12
|
-
import {
|
|
11
|
+
import { type CellInterval, Levelwise, releaseIntervals, TodoSet } from "./levelwise";
|
|
13
12
|
import {
|
|
14
13
|
NULL_VAR,
|
|
15
14
|
type Polynomial,
|
|
16
15
|
type PolynomialCache,
|
|
17
16
|
type PolynomialManager,
|
|
17
|
+
PolynomialRef,
|
|
18
|
+
PolynomialRefVector,
|
|
18
19
|
} from "./polynomial";
|
|
19
20
|
import { type IneqAtom, type IneqKind, type RootKind, isIneqAtom } from "./types";
|
|
20
21
|
|
|
@@ -65,9 +66,13 @@ const getKindForSign = (sign: number): IneqKind => (sign === 0 ? "EQ" : sign < 0
|
|
|
65
66
|
export class Explain {
|
|
66
67
|
private result: ScopedLiterals | null = null;
|
|
67
68
|
private added = new Set<number>();
|
|
69
|
+
private ps: PolynomialRefVector;
|
|
70
|
+
private factors: PolynomialRefVector;
|
|
71
|
+
private factorsSave: PolynomialRefVector;
|
|
68
72
|
private todo: TodoSet;
|
|
69
|
-
private lowerStagePolys: Polynomial[] = [];
|
|
70
73
|
private core: ScopedLiterals;
|
|
74
|
+
private lowerStagePolys: PolynomialRefVector;
|
|
75
|
+
private lastLwsInputPolys: PolynomialRefVector;
|
|
71
76
|
private isAddAllCoeffs = false;
|
|
72
77
|
|
|
73
78
|
isFullDimensional = false;
|
|
@@ -79,8 +84,13 @@ export class Explain {
|
|
|
79
84
|
private cache: PolynomialCache,
|
|
80
85
|
private context: ExplainContext,
|
|
81
86
|
) {
|
|
82
|
-
this.
|
|
87
|
+
this.ps = new PolynomialRefVector(pm);
|
|
88
|
+
this.factors = new PolynomialRefVector(pm);
|
|
89
|
+
this.factorsSave = new PolynomialRefVector(pm);
|
|
90
|
+
this.todo = new TodoSet(cache, true);
|
|
83
91
|
this.core = new ScopedLiterals(context.atoms);
|
|
92
|
+
this.lowerStagePolys = new PolynomialRefVector(pm);
|
|
93
|
+
this.lastLwsInputPolys = new PolynomialRefVector(pm);
|
|
84
94
|
}
|
|
85
95
|
|
|
86
96
|
private getSign(polynomial: Polynomial) {
|
|
@@ -102,16 +112,18 @@ export class Explain {
|
|
|
102
112
|
this.result = null;
|
|
103
113
|
}
|
|
104
114
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
return isIneqAtom(atom) ? atom.polynomials : [atom.polynomial];
|
|
109
|
-
});
|
|
115
|
+
reset() {
|
|
116
|
+
this.resetResult();
|
|
117
|
+
this.core.reset();
|
|
110
118
|
}
|
|
111
119
|
|
|
112
|
-
private
|
|
113
|
-
|
|
114
|
-
|
|
120
|
+
private collectPolys(literals: readonly number[], ps: PolynomialRefVector) {
|
|
121
|
+
ps.reset();
|
|
122
|
+
for (const literal of literals) {
|
|
123
|
+
const atom = this.getAtom(literal);
|
|
124
|
+
if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) ps.push(polynomial);
|
|
125
|
+
else ps.push(atom.polynomial);
|
|
126
|
+
}
|
|
115
127
|
}
|
|
116
128
|
|
|
117
129
|
private findSectionRoot(polynomial: Polynomial, variable: number) {
|
|
@@ -129,104 +141,153 @@ export class Explain {
|
|
|
129
141
|
}
|
|
130
142
|
|
|
131
143
|
private addZeroAssumption(polynomial: Polynomial) {
|
|
132
|
-
const
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
144
|
+
const q = new PolynomialRef(this.pm);
|
|
145
|
+
try {
|
|
146
|
+
this.pm.squareFree(polynomial, q);
|
|
147
|
+
if (this.pm.isConst(q.get())) return;
|
|
148
|
+
const variable = this.pm.maxVar(q.get());
|
|
149
|
+
const index = this.findSectionRoot(q.get(), variable);
|
|
150
|
+
if (index !== null) this.addRootLiteral("ROOT_EQ", variable, index, q.get());
|
|
151
|
+
} finally {
|
|
152
|
+
q.reset();
|
|
153
|
+
}
|
|
137
154
|
}
|
|
138
155
|
|
|
139
|
-
private
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
this.addZeroAssumption(lc);
|
|
157
|
-
return this.pm.zero;
|
|
156
|
+
private addAssumption(kind: IneqKind, polynomial: Polynomial, isNeg = false) {
|
|
157
|
+
const boolVar = this.context.atoms.mkIneqAtom(kind, [polynomial], [false]);
|
|
158
|
+
this.addLiteral(2 * boolVar + (isNeg ? 0 : 1));
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
private elimVanishing(p: PolynomialRef) {
|
|
162
|
+
const pm = this.pm;
|
|
163
|
+
let variable = pm.maxVar(p.get());
|
|
164
|
+
let degree = pm.degree(p.get(), variable);
|
|
165
|
+
const lc = new PolynomialRef(pm);
|
|
166
|
+
const reduct = new PolynomialRef(pm);
|
|
167
|
+
try {
|
|
168
|
+
while (true) {
|
|
169
|
+
if (pm.isConst(p.get())) return;
|
|
170
|
+
if (degree === 0) {
|
|
171
|
+
variable = pm.maxVar(p.get());
|
|
172
|
+
degree = pm.degree(p.get(), variable);
|
|
158
173
|
}
|
|
159
|
-
|
|
160
|
-
|
|
174
|
+
if (pm.isNonzeroConstCoeff(p.get(), variable, degree)) return;
|
|
175
|
+
lc.set(pm.coeffWithReduct(p.get(), variable, degree, reduct));
|
|
176
|
+
this.insertFreshFactorsInTodo(lc);
|
|
177
|
+
if (!pm.isZero(lc.get()) && this.getSign(lc.get()) !== 0) return;
|
|
178
|
+
if (degree === 0) {
|
|
179
|
+
p.set(pm.zero);
|
|
180
|
+
if (this.isAddAllCoeffs) {
|
|
181
|
+
this.addZeroAssumption(lc.get());
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
this.isAddAllCoeffs = true;
|
|
185
|
+
throw new AddAllCoeffsRestart();
|
|
186
|
+
}
|
|
187
|
+
this.addZeroAssumption(lc.get());
|
|
188
|
+
degree--;
|
|
189
|
+
p.copy(reduct);
|
|
161
190
|
}
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
191
|
+
} finally {
|
|
192
|
+
reduct.reset();
|
|
193
|
+
lc.reset();
|
|
165
194
|
}
|
|
166
195
|
}
|
|
167
196
|
|
|
168
|
-
private elimVanishingAll(
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
197
|
+
private elimVanishingAll(ps: PolynomialRefVector) {
|
|
198
|
+
const size = ps.size;
|
|
199
|
+
const p = new PolynomialRef(this.pm);
|
|
200
|
+
try {
|
|
201
|
+
let kept = 0;
|
|
202
|
+
for (let index = 0; index < size; index++) {
|
|
203
|
+
p.set(ps.get(index));
|
|
204
|
+
this.elimVanishing(p);
|
|
205
|
+
if (!this.pm.isConst(p.get())) ps.set(kept++, p.get());
|
|
206
|
+
}
|
|
207
|
+
ps.shrink(kept);
|
|
208
|
+
} finally {
|
|
209
|
+
p.reset();
|
|
210
|
+
}
|
|
172
211
|
}
|
|
173
212
|
|
|
174
|
-
private insertFreshFactorsInTodo(
|
|
175
|
-
if (this.pm.isConst(
|
|
176
|
-
|
|
177
|
-
if (this.pm.isConst(p)) return
|
|
213
|
+
private insertFreshFactorsInTodo(p: PolynomialRef) {
|
|
214
|
+
if (this.pm.isConst(p.get())) return;
|
|
215
|
+
this.elimVanishing(p);
|
|
216
|
+
if (this.pm.isConst(p.get())) return;
|
|
178
217
|
if (!this.isFactoring) {
|
|
179
|
-
this.todo.insert(p);
|
|
180
|
-
return
|
|
218
|
+
this.todo.insert(p.get());
|
|
219
|
+
return;
|
|
181
220
|
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
221
|
+
const saved = this.factorsSave.size;
|
|
222
|
+
this.factorsSave.append(this.factors);
|
|
223
|
+
const f = new PolynomialRef(this.pm);
|
|
224
|
+
try {
|
|
225
|
+
this.cache.factor(p.get(), this.factors);
|
|
226
|
+
for (let index = 0; index < this.factors.size; index++) {
|
|
227
|
+
f.set(this.factors.get(index));
|
|
228
|
+
this.elimVanishing(f);
|
|
229
|
+
if (!this.pm.isConst(f.get())) this.todo.insert(f.get());
|
|
230
|
+
}
|
|
231
|
+
} finally {
|
|
232
|
+
f.reset();
|
|
233
|
+
this.factors.reset();
|
|
234
|
+
for (let index = saved; index < this.factorsSave.size; index++)
|
|
235
|
+
this.factors.push(this.factorsSave.get(index));
|
|
236
|
+
this.factorsSave.shrink(saved);
|
|
185
237
|
}
|
|
186
|
-
return p;
|
|
187
238
|
}
|
|
188
239
|
|
|
189
240
|
private normalizeLiteral(literal: number, max: number) {
|
|
190
241
|
if (literal >> 1 === TRUE_BOOL_VAR) return literal;
|
|
191
242
|
const atom = this.getAtom(literal);
|
|
192
243
|
if (!isIneqAtom(atom)) return literal;
|
|
244
|
+
const pm = this.pm;
|
|
193
245
|
const isNeg = (literal & 1) === 1;
|
|
194
|
-
const
|
|
246
|
+
const ps = new PolynomialRefVector(pm);
|
|
195
247
|
const isEven: boolean[] = [];
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
if (
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
248
|
+
const p = new PolynomialRef(pm);
|
|
249
|
+
try {
|
|
250
|
+
let atomSign = 1;
|
|
251
|
+
let isNormalized = false;
|
|
252
|
+
for (let index = 0; index < atom.polynomials.length; index++) {
|
|
253
|
+
p.set(atom.polynomials[index]);
|
|
254
|
+
if (pm.maxVar(p.get()) === max) this.elimVanishing(p);
|
|
255
|
+
if (pm.isConst(p.get()) || pm.maxVar(p.get()) < max) {
|
|
256
|
+
const sign = this.getSign(p.get());
|
|
257
|
+
if (!pm.isConst(p.get())) {
|
|
258
|
+
this.lowerStagePolys.push(p.get());
|
|
259
|
+
if (sign === 0) this.addAssumption("EQ", p.get());
|
|
260
|
+
else if (atom.isEven[index]) this.addAssumption("EQ", p.get(), true);
|
|
261
|
+
else this.addAssumption(getKindForSign(sign), p.get());
|
|
262
|
+
}
|
|
263
|
+
if (sign === 0) return (atom.kind === "EQ") !== isNeg ? TRUE_LITERAL : FALSE_LITERAL;
|
|
264
|
+
if (sign < 0 && !atom.isEven[index]) atomSign = -atomSign;
|
|
265
|
+
isNormalized = true;
|
|
266
|
+
continue;
|
|
207
267
|
}
|
|
208
|
-
if (
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
continue;
|
|
268
|
+
if (p.get() !== atom.polynomials[index]) isNormalized = true;
|
|
269
|
+
isEven.push(atom.isEven[index]);
|
|
270
|
+
ps.push(p.get());
|
|
212
271
|
}
|
|
213
|
-
if (
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
272
|
+
if (ps.size === 0) {
|
|
273
|
+
const isTrue =
|
|
274
|
+
atom.kind === "EQ" ? false : atom.kind === "LT" ? atomSign < 0 : atomSign > 0;
|
|
275
|
+
return isTrue !== isNeg ? TRUE_LITERAL : FALSE_LITERAL;
|
|
276
|
+
}
|
|
277
|
+
if (!isNormalized) return literal;
|
|
278
|
+
const kind = atomSign < 0 ? flipKind(atom.kind) : atom.kind;
|
|
279
|
+
return this.context.atoms.mkIneqLiteral(kind, ps.items, isEven) ^ (isNeg ? 1 : 0);
|
|
280
|
+
} finally {
|
|
281
|
+
p.reset();
|
|
282
|
+
ps.reset();
|
|
220
283
|
}
|
|
221
|
-
if (!isNormalized) return literal;
|
|
222
|
-
const kind = atomSign < 0 ? flipKind(atom.kind) : atom.kind;
|
|
223
|
-
return this.context.atoms.mkIneqLiteral(kind, polynomials, isEven) ^ (isNeg ? 1 : 0);
|
|
224
284
|
}
|
|
225
285
|
|
|
226
286
|
private normalizeCore(core: ScopedLiterals, max: number) {
|
|
287
|
+
const size = core.size;
|
|
227
288
|
let kept = 0;
|
|
228
|
-
for (
|
|
229
|
-
const normalized = this.normalizeLiteral(
|
|
289
|
+
for (let index = 0; index < size; index++) {
|
|
290
|
+
const normalized = this.normalizeLiteral(core.literals[index], max);
|
|
230
291
|
if (normalized === TRUE_LITERAL) continue;
|
|
231
292
|
if (normalized === FALSE_LITERAL) {
|
|
232
293
|
core.reset();
|
|
@@ -243,81 +304,93 @@ export class Explain {
|
|
|
243
304
|
newLiteral.set(literal);
|
|
244
305
|
return;
|
|
245
306
|
}
|
|
307
|
+
const pm = this.pm;
|
|
246
308
|
const isNeg = (literal & 1) === 1;
|
|
247
|
-
const factors: Polynomial[] = [];
|
|
248
|
-
const isEven: boolean[] = [];
|
|
249
309
|
let atomSign = 1;
|
|
250
310
|
let isModified = false;
|
|
311
|
+
const newFactors = new PolynomialRefVector(pm);
|
|
312
|
+
const newFactorsEven: boolean[] = [];
|
|
313
|
+
const newFactor = new PolynomialRef(pm);
|
|
251
314
|
const addLcCondition = (steps: number, isFactorEven: boolean) => {
|
|
252
315
|
if (info.isLcConst) return;
|
|
253
316
|
if (steps % 2 === 0 || isFactorEven || atom.kind === "EQ") addLcDiseq(info);
|
|
254
317
|
else addLcIneq(info);
|
|
255
318
|
};
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
319
|
+
try {
|
|
320
|
+
for (let index = 0; index < atom.polynomials.length; index++) {
|
|
321
|
+
const factor = atom.polynomials[index];
|
|
322
|
+
const isFactorEven = atom.isEven[index];
|
|
323
|
+
if (pm.degree(factor, info.variable) < info.degree) {
|
|
324
|
+
newFactors.push(factor);
|
|
325
|
+
newFactorsEven.push(isFactorEven);
|
|
326
|
+
continue;
|
|
327
|
+
}
|
|
328
|
+
isModified = true;
|
|
329
|
+
const steps = pm.pseudoRemainder(factor, info.eq, info.variable, newFactor);
|
|
330
|
+
if (steps % 2 === 1 && !isFactorEven && info.lcSign < 0) atomSign = -atomSign;
|
|
331
|
+
if (pm.isConst(newFactor.get())) {
|
|
332
|
+
const sign = this.getSign(newFactor.get());
|
|
333
|
+
if (sign === 0) {
|
|
334
|
+
newLiteral.set((atom.kind === "EQ") !== isNeg ? TRUE_LITERAL : FALSE_LITERAL);
|
|
335
|
+
if (!info.isLcConst) addLcDiseq(info);
|
|
336
|
+
return;
|
|
337
|
+
}
|
|
338
|
+
addLcCondition(steps, isFactorEven);
|
|
339
|
+
if (sign < 0 && !isFactorEven) atomSign = -atomSign;
|
|
340
|
+
continue;
|
|
341
|
+
}
|
|
342
|
+
newFactors.push(newFactor.get());
|
|
343
|
+
newFactorsEven.push(isFactorEven);
|
|
344
|
+
addLcCondition(steps, isFactorEven);
|
|
262
345
|
}
|
|
263
|
-
isModified
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
const remainder = division.remainder;
|
|
267
|
-
if (!this.pm.isConst(remainder)) {
|
|
268
|
-
factors.push(remainder);
|
|
269
|
-
isEven.push(isFactorEven);
|
|
270
|
-
addLcCondition(division.steps, isFactorEven);
|
|
271
|
-
continue;
|
|
346
|
+
if (!isModified) {
|
|
347
|
+
newLiteral.set(literal);
|
|
348
|
+
return;
|
|
272
349
|
}
|
|
273
|
-
const
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
350
|
+
const kind = atomSign < 0 ? flipKind(atom.kind) : atom.kind;
|
|
351
|
+
newLiteral.set(
|
|
352
|
+
this.context.atoms.mkIneqLiteral(kind, newFactors.items, newFactorsEven) ^ (isNeg ? 1 : 0),
|
|
353
|
+
);
|
|
354
|
+
// Z3's null_var is the largest unsigned, so true and false never count as lower stage.
|
|
355
|
+
const maxVar = this.context.atoms.getMaxVar(newLiteral.literal);
|
|
356
|
+
if (maxVar === NULL_VAR || maxVar >= max) {
|
|
357
|
+
newLiteral.set(this.normalizeLiteral(newLiteral.literal, max));
|
|
277
358
|
return;
|
|
278
359
|
}
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
newLiteral.
|
|
284
|
-
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
// Z3's null_var is the largest unsigned, so true and false never count as lower stage.
|
|
289
|
-
const maxVar = this.context.atoms.getMaxVar(newLiteral.literal);
|
|
290
|
-
if (maxVar === NULL_VAR || maxVar >= max) {
|
|
291
|
-
newLiteral.set(this.normalizeLiteral(newLiteral.literal, max));
|
|
292
|
-
return;
|
|
293
|
-
}
|
|
294
|
-
if (this.context.getValue(newLiteral.literal) === 1) {
|
|
295
|
-
newLiteral.set(literal);
|
|
296
|
-
return;
|
|
360
|
+
if (this.context.getValue(newLiteral.literal) === 1) {
|
|
361
|
+
newLiteral.set(literal);
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
this.addLiteral(newLiteral.literal);
|
|
365
|
+
newLiteral.set(TRUE_LITERAL);
|
|
366
|
+
} finally {
|
|
367
|
+
newFactor.reset();
|
|
368
|
+
newFactors.reset();
|
|
297
369
|
}
|
|
298
|
-
this.addLiteral(newLiteral.literal);
|
|
299
|
-
newLiteral.set(TRUE_LITERAL);
|
|
300
370
|
}
|
|
301
371
|
|
|
302
372
|
private simplifyWithEq(core: ScopedLiterals, eq: Polynomial, max: number) {
|
|
303
373
|
const variable = this.pm.maxVar(eq);
|
|
304
374
|
const degree = this.pm.degree(eq, variable);
|
|
305
|
-
const
|
|
306
|
-
const info = {
|
|
307
|
-
eq,
|
|
308
|
-
variable,
|
|
309
|
-
degree,
|
|
310
|
-
lc,
|
|
311
|
-
lcSign: this.getSign(lc),
|
|
312
|
-
isLcConst: this.pm.isConst(lc),
|
|
313
|
-
isLcAdded: false,
|
|
314
|
-
isLcIneqAdded: false,
|
|
315
|
-
};
|
|
375
|
+
const lcEq = new PolynomialRef(this.pm);
|
|
316
376
|
const newLiteral = new ScopedLiteral(this.context.atoms);
|
|
317
377
|
try {
|
|
378
|
+
lcEq.set(this.pm.coeff(eq, variable, degree));
|
|
379
|
+
const info = {
|
|
380
|
+
eq,
|
|
381
|
+
variable,
|
|
382
|
+
degree,
|
|
383
|
+
lc: lcEq.get(),
|
|
384
|
+
lcSign: this.getSign(lcEq.get()),
|
|
385
|
+
isLcConst: this.pm.isConst(lcEq.get()),
|
|
386
|
+
isLcAdded: false,
|
|
387
|
+
isLcIneqAdded: false,
|
|
388
|
+
};
|
|
389
|
+
const size = core.size;
|
|
318
390
|
let isModified = false;
|
|
319
391
|
let kept = 0;
|
|
320
|
-
for (
|
|
392
|
+
for (let index = 0; index < size; index++) {
|
|
393
|
+
const literal = core.literals[index];
|
|
321
394
|
newLiteral.set(TRUE_LITERAL);
|
|
322
395
|
this.simplifyLiteral(literal, info, max, newLiteral);
|
|
323
396
|
if (newLiteral.literal === literal) {
|
|
@@ -340,6 +413,7 @@ export class Explain {
|
|
|
340
413
|
return isModified;
|
|
341
414
|
} finally {
|
|
342
415
|
newLiteral.set(TRUE_LITERAL);
|
|
416
|
+
lcEq.reset();
|
|
343
417
|
}
|
|
344
418
|
}
|
|
345
419
|
|
|
@@ -366,8 +440,7 @@ export class Explain {
|
|
|
366
440
|
const atom = this.getAtom(literal);
|
|
367
441
|
if (!isIneqAtom(atom)) continue;
|
|
368
442
|
for (const factor of atom.polynomials) {
|
|
369
|
-
const
|
|
370
|
-
for (const variable of variables) {
|
|
443
|
+
for (const variable of this.pm.getVars(factor)) {
|
|
371
444
|
if (variable >= max) continue;
|
|
372
445
|
const eq = this.context.var2eq[variable] ?? null;
|
|
373
446
|
if (eq === null) continue;
|
|
@@ -395,122 +468,210 @@ export class Explain {
|
|
|
395
468
|
}
|
|
396
469
|
|
|
397
470
|
private addRootLiteral(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
471
|
+
const pr = new PolynomialRef(this.pm);
|
|
472
|
+
pr.set(polynomial);
|
|
473
|
+
try {
|
|
474
|
+
if (
|
|
475
|
+
this.mkLinearRoot(kind, variable, polynomial) ||
|
|
476
|
+
this.mkQuadraticRoot(kind, variable, index, polynomial)
|
|
477
|
+
)
|
|
478
|
+
return;
|
|
479
|
+
const boolVar = this.context.atoms.mkRootAtom(kind, variable, index, polynomial);
|
|
480
|
+
this.addLiteral(2 * boolVar + 1);
|
|
481
|
+
} finally {
|
|
482
|
+
pr.reset();
|
|
483
|
+
}
|
|
402
484
|
}
|
|
403
485
|
|
|
404
486
|
private mkLinearRoot(kind: RootKind, variable: number, polynomial: Polynomial) {
|
|
487
|
+
if (this.pm.degree(polynomial, variable) !== 1) return false;
|
|
405
488
|
const coeff = this.pm.getConstCoeff(polynomial, variable, 1);
|
|
406
|
-
if (
|
|
489
|
+
if (coeff === null) return false;
|
|
407
490
|
this.addLinearRoot(kind, polynomial, coeff < 0n);
|
|
408
491
|
return true;
|
|
409
492
|
}
|
|
410
493
|
|
|
411
|
-
private addLinearRoot(kind: RootKind, polynomial: Polynomial, isNegated: boolean) {
|
|
412
|
-
const ineq = ROOT_TO_INEQ[kind];
|
|
413
|
-
this.addAssumption(ineq.kind, isNegated ? this.pm.neg(polynomial) : polynomial, ineq.isNeg);
|
|
414
|
-
}
|
|
415
|
-
|
|
416
494
|
private mkPlinearRoot(kind: RootKind, variable: number, polynomial: Polynomial) {
|
|
417
495
|
if (this.pm.degree(polynomial, variable) !== 1) return false;
|
|
418
|
-
const
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
496
|
+
const c = new PolynomialRef(this.pm);
|
|
497
|
+
try {
|
|
498
|
+
c.set(this.pm.coeff(polynomial, variable, 1));
|
|
499
|
+
const sign = this.getSign(c.get());
|
|
500
|
+
if (sign === 0) return false;
|
|
501
|
+
this.ensureSign(c);
|
|
502
|
+
this.addLinearRoot(kind, polynomial, sign < 0);
|
|
503
|
+
return true;
|
|
504
|
+
} finally {
|
|
505
|
+
c.reset();
|
|
506
|
+
}
|
|
424
507
|
}
|
|
425
508
|
|
|
426
509
|
private mkQuadraticRoot(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
const
|
|
431
|
-
const
|
|
432
|
-
const
|
|
433
|
-
const
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
510
|
+
const pm = this.pm;
|
|
511
|
+
if (pm.degree(polynomial, variable) !== 2) return false;
|
|
512
|
+
if (index !== 1 && index !== 2) return false;
|
|
513
|
+
const a = new PolynomialRef(pm);
|
|
514
|
+
const b = new PolynomialRef(pm);
|
|
515
|
+
const c = new PolynomialRef(pm);
|
|
516
|
+
const q = new PolynomialRef(pm);
|
|
517
|
+
const pDiff = new PolynomialRef(pm);
|
|
518
|
+
const yy = new PolynomialRef(pm);
|
|
519
|
+
const pr = new PolynomialRef(pm);
|
|
520
|
+
const first = new PolynomialRef(pm);
|
|
521
|
+
const second = new PolynomialRef(pm);
|
|
522
|
+
const third = new PolynomialRef(pm);
|
|
523
|
+
try {
|
|
524
|
+
a.set(pm.coeff(polynomial, variable, 2));
|
|
525
|
+
b.set(pm.coeff(polynomial, variable, 1));
|
|
526
|
+
c.set(pm.coeff(polynomial, variable, 0));
|
|
527
|
+
first.set(pm.mul(b.get(), b.get()));
|
|
528
|
+
second.set(pm.mulConst(4n, a.get()));
|
|
529
|
+
third.set(pm.mul(second.get(), c.get()));
|
|
530
|
+
q.set(pm.sub(first.get(), third.get()));
|
|
531
|
+
third.reset();
|
|
532
|
+
second.reset();
|
|
533
|
+
first.reset();
|
|
534
|
+
yy.set(pm.mkVar(variable));
|
|
535
|
+
first.set(pm.mulConst(2n, a.get()));
|
|
536
|
+
second.set(pm.mul(first.get(), yy.get()));
|
|
537
|
+
pDiff.set(pm.add(second.get(), b.get()));
|
|
538
|
+
second.reset();
|
|
539
|
+
first.reset();
|
|
540
|
+
pDiff.set(pm.normalize(pDiff.get()));
|
|
541
|
+
const discriminantSign = this.ensureSignQuad(q);
|
|
542
|
+
if (discriminantSign < 0) return false;
|
|
543
|
+
if (this.ensureSignQuad(a) === 0) {
|
|
544
|
+
first.set(pm.mul(b.get(), yy.get()));
|
|
545
|
+
q.set(pm.add(first.get(), c.get()));
|
|
546
|
+
first.reset();
|
|
547
|
+
return this.mkPlinearRoot(kind, variable, q.get());
|
|
548
|
+
}
|
|
549
|
+
this.ensureSign(pDiff);
|
|
550
|
+
if (discriminantSign > 0) {
|
|
551
|
+
pr.set(polynomial);
|
|
552
|
+
this.ensureSign(pr);
|
|
553
|
+
}
|
|
554
|
+
return true;
|
|
555
|
+
} finally {
|
|
556
|
+
third.reset();
|
|
557
|
+
second.reset();
|
|
558
|
+
first.reset();
|
|
559
|
+
pr.reset();
|
|
560
|
+
yy.reset();
|
|
561
|
+
pDiff.reset();
|
|
562
|
+
q.reset();
|
|
563
|
+
c.reset();
|
|
564
|
+
b.reset();
|
|
565
|
+
a.reset();
|
|
566
|
+
}
|
|
440
567
|
}
|
|
441
568
|
|
|
442
|
-
private ensureSign(
|
|
443
|
-
if (this.pm.isConst(
|
|
444
|
-
this.addAssumption(getKindForSign(this.getSign(
|
|
445
|
-
this.insertFreshFactorsInTodo(
|
|
569
|
+
private ensureSign(p: PolynomialRef) {
|
|
570
|
+
if (this.pm.isConst(p.get())) return;
|
|
571
|
+
this.addAssumption(getKindForSign(this.getSign(p.get())), p.get());
|
|
572
|
+
this.insertFreshFactorsInTodo(p);
|
|
446
573
|
}
|
|
447
574
|
|
|
448
|
-
private ensureSignQuad(
|
|
449
|
-
const sign = this.getSign(
|
|
450
|
-
if (!this.pm.isConst(
|
|
451
|
-
this.addAssumption(getKindForSign(sign),
|
|
452
|
-
this.insertFreshFactorsInTodo(
|
|
575
|
+
private ensureSignQuad(p: PolynomialRef) {
|
|
576
|
+
const sign = this.getSign(p.get());
|
|
577
|
+
if (!this.pm.isConst(p.get())) {
|
|
578
|
+
this.addAssumption(getKindForSign(sign), p.get());
|
|
579
|
+
this.insertFreshFactorsInTodo(p);
|
|
453
580
|
}
|
|
454
581
|
return sign;
|
|
455
582
|
}
|
|
456
583
|
|
|
457
|
-
private
|
|
458
|
-
const
|
|
584
|
+
private addLinearRoot(kind: RootKind, polynomial: Polynomial, isNegated: boolean) {
|
|
585
|
+
const pPrime = new PolynomialRef(this.pm);
|
|
586
|
+
pPrime.set(polynomial);
|
|
587
|
+
if (isNegated) pPrime.set(this.pm.neg(pPrime.get()));
|
|
588
|
+
const ineq = ROOT_TO_INEQ[kind];
|
|
589
|
+
this.addAssumption(ineq.kind, pPrime.get(), ineq.isNeg);
|
|
590
|
+
pPrime.reset();
|
|
591
|
+
}
|
|
592
|
+
|
|
593
|
+
private levelwiseSingleCell(ps: PolynomialRefVector, maxVar: number, isLinear: boolean) {
|
|
594
|
+
this.lastLwsInputPolys.reset();
|
|
595
|
+
for (let index = 0; index < ps.size; index++) this.lastLwsInputPolys.push(ps.get(index));
|
|
596
|
+
const levelwise = new Levelwise(
|
|
459
597
|
this.pm,
|
|
460
598
|
this.am,
|
|
461
599
|
this.cache,
|
|
462
|
-
|
|
600
|
+
ps,
|
|
463
601
|
maxVar,
|
|
464
602
|
this.context.sample,
|
|
465
603
|
isLinear,
|
|
466
604
|
);
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
605
|
+
let cell: CellInterval[] = [];
|
|
606
|
+
try {
|
|
607
|
+
cell = levelwise.singleCell();
|
|
608
|
+
const isFull = this.isFullDimensional;
|
|
609
|
+
for (const interval of cell) {
|
|
610
|
+
if (interval.isSection) {
|
|
611
|
+
const lower = interval.lower.get();
|
|
612
|
+
this.addRootLiteral("ROOT_EQ", this.pm.maxVar(lower), interval.lowerIndex, lower);
|
|
613
|
+
continue;
|
|
614
|
+
}
|
|
615
|
+
const lower = interval.lower.getOrNull();
|
|
616
|
+
const upper = interval.upper.getOrNull();
|
|
617
|
+
if (lower !== null)
|
|
618
|
+
this.addRootLiteral(
|
|
619
|
+
isFull ? "ROOT_GE" : "ROOT_GT",
|
|
620
|
+
this.pm.maxVar(lower),
|
|
621
|
+
interval.lowerIndex,
|
|
622
|
+
lower,
|
|
623
|
+
);
|
|
624
|
+
if (upper !== null)
|
|
625
|
+
this.addRootLiteral(
|
|
626
|
+
isFull ? "ROOT_LE" : "ROOT_LT",
|
|
627
|
+
this.pm.maxVar(upper),
|
|
628
|
+
interval.upperIndex,
|
|
629
|
+
upper,
|
|
630
|
+
);
|
|
473
631
|
}
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
this.pm.maxVar(interval.lower),
|
|
478
|
-
interval.lowerIndex,
|
|
479
|
-
interval.lower,
|
|
480
|
-
);
|
|
481
|
-
if (interval.upper !== null)
|
|
482
|
-
this.addRootLiteral(
|
|
483
|
-
isFull ? "ROOT_LE" : "ROOT_LT",
|
|
484
|
-
this.pm.maxVar(interval.upper),
|
|
485
|
-
interval.upperIndex,
|
|
486
|
-
interval.upper,
|
|
487
|
-
);
|
|
632
|
+
} finally {
|
|
633
|
+
releaseIntervals(cell);
|
|
634
|
+
levelwise.release();
|
|
488
635
|
}
|
|
489
636
|
}
|
|
490
637
|
|
|
491
|
-
private project(
|
|
492
|
-
if (
|
|
638
|
+
private project(ps: PolynomialRefVector, maxVar: number) {
|
|
639
|
+
if (ps.size === 0) return;
|
|
493
640
|
this.todo.reset();
|
|
494
|
-
|
|
495
|
-
|
|
641
|
+
const p = new PolynomialRef(this.pm);
|
|
642
|
+
try {
|
|
643
|
+
for (let index = 0; index < ps.size; index++) {
|
|
644
|
+
p.set(ps.get(index));
|
|
645
|
+
this.insertFreshFactorsInTodo(p);
|
|
646
|
+
p.reset();
|
|
647
|
+
}
|
|
648
|
+
} finally {
|
|
649
|
+
p.reset();
|
|
650
|
+
}
|
|
651
|
+
ps.reset();
|
|
652
|
+
for (const polynomial of this.todo.set.items) ps.push(polynomial);
|
|
653
|
+
this.levelwiseSingleCell(ps, maxVar, false);
|
|
496
654
|
}
|
|
497
655
|
|
|
498
|
-
private
|
|
656
|
+
private main(literals: readonly number[]) {
|
|
499
657
|
if (literals.length === 0) return;
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
658
|
+
this.collectPolys(literals, this.ps);
|
|
659
|
+
for (let index = 0; index < this.lowerStagePolys.size; index++)
|
|
660
|
+
this.ps.push(this.lowerStagePolys.get(index));
|
|
661
|
+
const maxVar = this.pm.getMaxVarOfPolys(this.ps.items);
|
|
662
|
+
this.elimVanishingAll(this.ps);
|
|
663
|
+
this.project(this.ps, maxVar);
|
|
503
664
|
}
|
|
504
665
|
|
|
505
666
|
private process(literals: readonly number[]) {
|
|
506
|
-
this.lowerStagePolys
|
|
667
|
+
this.lowerStagePolys.reset();
|
|
507
668
|
const core = this.core;
|
|
508
669
|
core.reset();
|
|
509
670
|
for (const literal of literals) core.push(literal);
|
|
510
671
|
const max = this.context.atoms.getMaxVarOfLiterals(literals);
|
|
511
672
|
this.normalizeCore(core, max);
|
|
512
673
|
this.simplifyCore(core, max);
|
|
513
|
-
this.
|
|
674
|
+
this.main(core.literals);
|
|
514
675
|
core.reset();
|
|
515
676
|
}
|
|
516
677
|
|
|
@@ -559,9 +720,9 @@ export class Explain {
|
|
|
559
720
|
if (isContaining) kept.push(literal);
|
|
560
721
|
else this.addLiteral(literal ^ 1);
|
|
561
722
|
}
|
|
562
|
-
|
|
563
|
-
if (
|
|
564
|
-
const maxVar = this.pm.getMaxVarOfPolys(
|
|
723
|
+
this.collectPolys(kept, this.ps);
|
|
724
|
+
if (this.ps.size > 0) {
|
|
725
|
+
const maxVar = this.pm.getMaxVarOfPolys(this.ps.items);
|
|
565
726
|
if (maxVar !== variable) {
|
|
566
727
|
const renaming = Array.from({ length: this.context.getNumVars() }, (_value, index) =>
|
|
567
728
|
index === variable ? maxVar : index === maxVar ? variable : index,
|
|
@@ -569,7 +730,8 @@ export class Explain {
|
|
|
569
730
|
this.context.reorder(renaming);
|
|
570
731
|
isReordered = true;
|
|
571
732
|
}
|
|
572
|
-
this.
|
|
733
|
+
this.elimVanishingAll(this.ps);
|
|
734
|
+
this.project(this.ps, maxVar);
|
|
573
735
|
this.resetResult();
|
|
574
736
|
if (isReordered) this.context.restoreOrder();
|
|
575
737
|
}
|
|
@@ -587,11 +749,11 @@ export class Explain {
|
|
|
587
749
|
|
|
588
750
|
computeLinearExplanation(literals: readonly number[], result: ScopedLiterals) {
|
|
589
751
|
this.result = result;
|
|
590
|
-
this.lowerStagePolys = [];
|
|
591
|
-
const polynomials = this.collectPolys(literals);
|
|
592
752
|
try {
|
|
593
|
-
|
|
594
|
-
|
|
753
|
+
this.lowerStagePolys.reset();
|
|
754
|
+
this.collectPolys(literals, this.ps);
|
|
755
|
+
if (this.ps.size === 0) return;
|
|
756
|
+
this.levelwiseSingleCell(this.ps, this.pm.getMaxVarOfPolys(this.ps.items) + 1, true);
|
|
595
757
|
} finally {
|
|
596
758
|
this.resetResult();
|
|
597
759
|
}
|