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,9 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
// src/util/mpbq.cpp, src/util/index_sort_with_mutations.h), MIT license, see z3-license.txt.
|
|
3
|
-
import { SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtDefaultError, SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { Rational } from "../rational";
|
|
3
|
+
import type { ResourceLimit } from "../rlimit";
|
|
5
4
|
import { getLog2, Mpbq } from "./mpbq";
|
|
6
|
-
import { PolynomialManager, type Polynomial, type ValueOps } from "./polynomial";
|
|
5
|
+
import { PolynomialManager, type Polynomial, PolynomialRef, type ValueOps } from "./polynomial";
|
|
7
6
|
import { UpolynomialManager, type Upolynomial } from "./upolynomial";
|
|
8
7
|
import { factorUpolynomial, type FactorParams } from "./upolynomial-factorization";
|
|
9
8
|
|
|
@@ -226,8 +225,8 @@ export const mergeSortIndices = (
|
|
|
226
225
|
};
|
|
227
226
|
|
|
228
227
|
export class AlgebraicManager {
|
|
229
|
-
private um
|
|
230
|
-
private pm
|
|
228
|
+
private um: UpolynomialManager;
|
|
229
|
+
private pm: PolynomialManager;
|
|
231
230
|
private anumOps: ValueOps<Anum> = {
|
|
232
231
|
fromInteger: (value) => new Anum(Rational.of(value)),
|
|
233
232
|
add: (first, second) => this.add(first, second),
|
|
@@ -235,6 +234,11 @@ export class AlgebraicManager {
|
|
|
235
234
|
power: (base, exponent) => this.power(base, exponent),
|
|
236
235
|
};
|
|
237
236
|
|
|
237
|
+
constructor(private limit: ResourceLimit) {
|
|
238
|
+
this.um = new UpolynomialManager(limit);
|
|
239
|
+
this.pm = new PolynomialManager(limit);
|
|
240
|
+
}
|
|
241
|
+
|
|
238
242
|
isZero(anum: Anum) {
|
|
239
243
|
return anum.value instanceof Rational && anum.value.isZero();
|
|
240
244
|
}
|
|
@@ -423,7 +427,7 @@ export class AlgebraicManager {
|
|
|
423
427
|
}
|
|
424
428
|
|
|
425
429
|
private sortRoots(roots: Anum[]) {
|
|
426
|
-
if (roots.length < 2) return;
|
|
430
|
+
if (!this.limit.inc() || roots.length < 2) return;
|
|
427
431
|
const sorted = mergeSortIndices(
|
|
428
432
|
roots.length,
|
|
429
433
|
(first, second) => this.compare(roots[first], roots[second]) < 0,
|
|
@@ -460,6 +464,7 @@ export class AlgebraicManager {
|
|
|
460
464
|
let highVariations = isNonPositive ? atZero : this.um.signVariationsAtPlusInf(sequence);
|
|
461
465
|
let target = isNonPositive ? rootIndex : rootIndex - nonPositiveCount;
|
|
462
466
|
while (lowVariations > highVariations + 1) {
|
|
467
|
+
this.limit.checkpoint();
|
|
463
468
|
const middle = low.add(high).div2();
|
|
464
469
|
const middleVariations = this.um.signVariationsAt(sequence, middle);
|
|
465
470
|
const leftCount = lowVariations - middleVariations;
|
|
@@ -530,29 +535,43 @@ export class AlgebraicManager {
|
|
|
530
535
|
): Anum[] {
|
|
531
536
|
if (pm.isConst(polynomial)) return [];
|
|
532
537
|
if (pm.isUnivariate(polynomial)) return this.isolateUnivariateRoots(pm.toCoeffs(polynomial));
|
|
533
|
-
const
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
538
|
+
const pPrime = new PolynomialRef(pm);
|
|
539
|
+
const q = new PolynomialRef(pm);
|
|
540
|
+
const pY = new PolynomialRef(pm);
|
|
541
|
+
try {
|
|
542
|
+
pPrime.set(pm.substituteRational(polynomial, getRationalValues(values)));
|
|
543
|
+
const reduced = pPrime.get();
|
|
544
|
+
if (pm.isConst(reduced)) return [];
|
|
545
|
+
if (pm.isUnivariate(reduced)) {
|
|
546
|
+
if (values[pm.maxVar(reduced)] !== undefined) return [];
|
|
547
|
+
return this.isolateUnivariateRoots(pm.toCoeffs(reduced));
|
|
548
|
+
}
|
|
549
|
+
const xs = this.sortByDegree(pm.getVars(reduced), values);
|
|
550
|
+
const x = xs[xs.length - 1];
|
|
551
|
+
if (values[x] !== undefined) return [];
|
|
552
|
+
q.copy(pPrime);
|
|
553
|
+
for (let index = 0; index + 1 < xs.length; index++) {
|
|
554
|
+
this.limit.checkpoint();
|
|
555
|
+
const y = xs[index];
|
|
556
|
+
pY.set(pm.toPolynomial(getCell(values[y]).p, y));
|
|
557
|
+
pm.resultant(q.get(), pY.get(), y, q);
|
|
558
|
+
if (pm.isZero(q.get())) {
|
|
559
|
+
if (isNested)
|
|
560
|
+
throw new SmtInvariantError("resultant vanished during nested isolate_roots call");
|
|
561
|
+
break;
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
if (pm.isZero(q.get())) return this.isolateVanishedRoots(pm, reduced, values, xs, x);
|
|
565
|
+
if (pm.isConst(q.get())) return [];
|
|
566
|
+
return this.isolateUnivariateRoots(pm.toCoeffs(q.get())).filter((root) => {
|
|
567
|
+
this.limit.checkpoint();
|
|
568
|
+
return this.evalSignAt(pm, reduced, getExtended(values, x, root)) === 0;
|
|
569
|
+
});
|
|
570
|
+
} finally {
|
|
571
|
+
pY.reset();
|
|
572
|
+
q.reset();
|
|
573
|
+
pPrime.reset();
|
|
552
574
|
}
|
|
553
|
-
if (isNested)
|
|
554
|
-
throw new SmtInvariantError("resultant vanished during nested isolate_roots call");
|
|
555
|
-
return this.isolateVanishedRoots(pm, reduced, values, xs, x);
|
|
556
575
|
}
|
|
557
576
|
|
|
558
577
|
private isolateVanishedRoots(
|
|
@@ -566,26 +585,50 @@ export class AlgebraicManager {
|
|
|
566
585
|
pm.evaluateWith(polynomial, this.anumOps, (variable) => getAssigned(values, variable));
|
|
567
586
|
const degree = pm.degree(reduced, x);
|
|
568
587
|
if (degree === 1) {
|
|
569
|
-
const
|
|
570
|
-
const
|
|
588
|
+
const c0 = new PolynomialRef(pm);
|
|
589
|
+
const c1 = new PolynomialRef(pm);
|
|
590
|
+
c0.set(pm.coeff(reduced, x, 0));
|
|
591
|
+
c1.set(pm.coeff(reduced, x, 1));
|
|
592
|
+
const constant = evaluate(c0.get());
|
|
593
|
+
const leading = evaluate(c1.get());
|
|
594
|
+
c1.reset();
|
|
595
|
+
c0.reset();
|
|
571
596
|
if (this.isZero(leading)) return [];
|
|
572
597
|
const root = this.div(constant, leading);
|
|
573
598
|
this.neg(root);
|
|
574
599
|
return [root];
|
|
575
600
|
}
|
|
601
|
+
const c = new PolynomialRef(pm);
|
|
576
602
|
let power = degree;
|
|
577
603
|
let leading = new Anum(Rational.zero);
|
|
578
604
|
for (; power >= 1; power--) {
|
|
579
|
-
|
|
605
|
+
c.set(pm.coeff(reduced, x, power));
|
|
606
|
+
leading = evaluate(c.get());
|
|
580
607
|
if (!this.isZero(leading)) break;
|
|
581
608
|
}
|
|
582
|
-
if (power === 0)
|
|
609
|
+
if (power === 0) {
|
|
610
|
+
c.reset();
|
|
611
|
+
return [];
|
|
612
|
+
}
|
|
583
613
|
const z = Math.max(...xs) + 1;
|
|
584
|
-
const
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
);
|
|
588
|
-
|
|
614
|
+
const q2 = new PolynomialRef(this.pm);
|
|
615
|
+
const zP = new PolynomialRef(this.pm);
|
|
616
|
+
const xiP = new PolynomialRef(this.pm);
|
|
617
|
+
const product = new PolynomialRef(this.pm);
|
|
618
|
+
q2.set(this.convert(pm, reduced, x, power - 1));
|
|
619
|
+
xiP.set(this.pm.mkVar(x, power));
|
|
620
|
+
zP.set(this.pm.mkVar(z));
|
|
621
|
+
product.set(this.pm.mul(zP.get(), xiP.get()));
|
|
622
|
+
q2.set(this.pm.add(product.get(), q2.get()));
|
|
623
|
+
product.reset();
|
|
624
|
+
try {
|
|
625
|
+
return this.isolateRoots(this.pm, q2.get(), getExtended(values, z, leading), true);
|
|
626
|
+
} finally {
|
|
627
|
+
xiP.reset();
|
|
628
|
+
zP.reset();
|
|
629
|
+
q2.reset();
|
|
630
|
+
c.reset();
|
|
631
|
+
}
|
|
589
632
|
}
|
|
590
633
|
|
|
591
634
|
private convert(pm: PolynomialManager, polynomial: Polynomial, x = -1, maxDegree = Infinity) {
|
|
@@ -619,13 +662,20 @@ export class AlgebraicManager {
|
|
|
619
662
|
if (pm.isConst(polynomial)) return result;
|
|
620
663
|
if (pm.isUnivariate(polynomial))
|
|
621
664
|
return this.isolateRootsClosestUnivariate(pm, polynomial, sample);
|
|
622
|
-
const
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
665
|
+
const pPrime = new PolynomialRef(pm);
|
|
666
|
+
let all: Anum[];
|
|
667
|
+
try {
|
|
668
|
+
pPrime.set(pm.substituteRational(polynomial, getRationalValues(values)));
|
|
669
|
+
const reduced = pPrime.get();
|
|
670
|
+
if (pm.isConst(reduced)) return result;
|
|
671
|
+
if (pm.isUnivariate(reduced)) {
|
|
672
|
+
if (values[pm.maxVar(reduced)] !== undefined) return result;
|
|
673
|
+
return this.isolateRootsClosestUnivariate(pm, reduced, sample);
|
|
674
|
+
}
|
|
675
|
+
all = this.isolateRoots(pm, polynomial, values);
|
|
676
|
+
} finally {
|
|
677
|
+
pPrime.reset();
|
|
627
678
|
}
|
|
628
|
-
const all = this.isolateRoots(pm, polynomial, values);
|
|
629
679
|
const sampleAnum = new Anum(sample);
|
|
630
680
|
let lower = -1;
|
|
631
681
|
let upper = -1;
|
|
@@ -673,37 +723,47 @@ export class AlgebraicManager {
|
|
|
673
723
|
evalSignAt(pm: PolynomialManager, polynomial: Polynomial, values: readonly (Anum | undefined)[]) {
|
|
674
724
|
while (true) {
|
|
675
725
|
const rationalValues = getRationalValues(values);
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
const
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
let
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
if (!
|
|
696
|
-
|
|
697
|
-
|
|
726
|
+
const rationalSign = pm.getRationalSign(polynomial, rationalValues);
|
|
727
|
+
if (rationalSign !== null) return rationalSign;
|
|
728
|
+
const pPrime = new PolynomialRef(pm);
|
|
729
|
+
try {
|
|
730
|
+
pPrime.set(pm.substituteRational(polynomial, rationalValues));
|
|
731
|
+
const reduced = pPrime.get();
|
|
732
|
+
if (reduced.size === 0) return 0;
|
|
733
|
+
if (pm.isConst(reduced)) return reduced.as[0] > 0n ? 1 : -1;
|
|
734
|
+
const xs = pm.getVars(reduced);
|
|
735
|
+
const getInterval = (variable: number) => {
|
|
736
|
+
const cell = getCell(values[variable]);
|
|
737
|
+
return { lower: cell.lower, upper: cell.upper };
|
|
738
|
+
};
|
|
739
|
+
const evaluate = () => pm.evaluateWith(reduced, INTERVAL_OPS, getInterval);
|
|
740
|
+
let interval: BqInterval;
|
|
741
|
+
let isRestarted = false;
|
|
742
|
+
while (true) {
|
|
743
|
+
this.limit.checkpoint();
|
|
744
|
+
interval = evaluate();
|
|
745
|
+
if (!containsZero(interval)) return interval.lower.isNeg ? -1 : 1;
|
|
746
|
+
let isRefined = false;
|
|
747
|
+
for (const variable of xs) {
|
|
748
|
+
const value = getAssigned(values, variable);
|
|
749
|
+
if (this.getCellMagnitude(getCell(value)) <= MIN_MAGNITUDE) continue;
|
|
750
|
+
if (!this.refine(value)) {
|
|
751
|
+
isRestarted = true;
|
|
752
|
+
break;
|
|
753
|
+
}
|
|
754
|
+
isRefined = true;
|
|
698
755
|
}
|
|
699
|
-
isRefined
|
|
756
|
+
if (!isRefined || isRestarted) break;
|
|
757
|
+
}
|
|
758
|
+
if (isRestarted) {
|
|
759
|
+
this.limit.checkpoint();
|
|
760
|
+
continue;
|
|
700
761
|
}
|
|
701
|
-
|
|
702
|
-
|
|
762
|
+
const sign = this.evalSignByResultant(pm, reduced, values, xs, interval, evaluate);
|
|
763
|
+
if (sign !== null) return sign;
|
|
764
|
+
} finally {
|
|
765
|
+
pPrime.reset();
|
|
703
766
|
}
|
|
704
|
-
if (isRestarted) continue;
|
|
705
|
-
const sign = this.evalSignByResultant(pm, reduced, values, xs, interval, evaluate);
|
|
706
|
-
if (sign !== null) return sign;
|
|
707
767
|
}
|
|
708
768
|
}
|
|
709
769
|
|
|
@@ -716,14 +776,23 @@ export class AlgebraicManager {
|
|
|
716
776
|
evaluate: () => BqInterval,
|
|
717
777
|
) {
|
|
718
778
|
const sorted = this.sortByDegree(xs, values);
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
const
|
|
779
|
+
const yp = new PolynomialRef(this.pm);
|
|
780
|
+
const pPrimeAux = new PolynomialRef(this.pm);
|
|
781
|
+
const r = new PolynomialRef(this.pm);
|
|
782
|
+
const qi = new PolynomialRef(this.pm);
|
|
783
|
+
yp.set(this.pm.mkVar(Math.max(...xs) + 1));
|
|
784
|
+
pPrimeAux.set(this.convert(pm, reduced));
|
|
785
|
+
r.set(this.pm.sub(yp.get(), pPrimeAux.get()));
|
|
786
|
+
for (const variable of sorted) {
|
|
787
|
+
this.limit.checkpoint();
|
|
788
|
+
qi.set(this.pm.toPolynomial(getCell(values[variable]).p, variable));
|
|
789
|
+
this.pm.resultant(r.get(), qi.get(), variable, r);
|
|
790
|
+
}
|
|
791
|
+
const k = this.um.nonzeroRootLowerBound(this.pm.toCoeffs(r.get()));
|
|
792
|
+
qi.reset();
|
|
793
|
+
r.reset();
|
|
794
|
+
pPrimeAux.reset();
|
|
795
|
+
yp.reset();
|
|
727
796
|
const bound = Mpbq.of(1n, k);
|
|
728
797
|
const isInsideBound = (interval: BqInterval) =>
|
|
729
798
|
bound.neg().compare(interval.lower) < 0 && interval.upper.compare(bound) < 0;
|
|
@@ -731,6 +800,7 @@ export class AlgebraicManager {
|
|
|
731
800
|
const saved = sorted.map((variable) => this.saveInterval(getAssigned(values, variable)));
|
|
732
801
|
let sign: number | null = null;
|
|
733
802
|
while (sign === null) {
|
|
803
|
+
this.limit.checkpoint();
|
|
734
804
|
const interval = evaluate();
|
|
735
805
|
if (!containsZero(interval)) sign = interval.lower.isNeg ? -1 : 1;
|
|
736
806
|
else if (isInsideBound(interval)) sign = 0;
|
|
@@ -860,7 +930,7 @@ export class AlgebraicManager {
|
|
|
860
930
|
|
|
861
931
|
power(anum: Anum, exponent: number): Anum {
|
|
862
932
|
if (exponent === 0) {
|
|
863
|
-
if (this.isZero(anum)) throw new
|
|
933
|
+
if (this.isZero(anum)) throw new SmtDefaultError("0^0 is indeterminate");
|
|
864
934
|
return new Anum(Rational.one);
|
|
865
935
|
}
|
|
866
936
|
if (exponent === 1) return this.copy(anum);
|
|
@@ -869,10 +939,10 @@ export class AlgebraicManager {
|
|
|
869
939
|
}
|
|
870
940
|
|
|
871
941
|
root(anum: Anum, k: number): Anum {
|
|
872
|
-
if (k === 0) throw new
|
|
942
|
+
if (k === 0) throw new SmtDefaultError("0-th root is indeterminate");
|
|
873
943
|
if (k === 1 || this.isZero(anum)) return this.copy(anum);
|
|
874
944
|
if (this.isNeg(anum) && k % 2 === 0)
|
|
875
|
-
throw new
|
|
945
|
+
throw new SmtDefaultError("even root of negative number is not real");
|
|
876
946
|
if (anum.value instanceof Rational) return this.rootRational(anum.value, k);
|
|
877
947
|
return this.mkRoot(anum, k);
|
|
878
948
|
}
|
|
@@ -891,14 +961,12 @@ export class AlgebraicManager {
|
|
|
891
961
|
// Res_y(x^k - y, p(y)) has a^(1/k) as a root.
|
|
892
962
|
private mkRoot(anum: Anum, k: number): Anum {
|
|
893
963
|
const cell = getCell(anum);
|
|
894
|
-
const
|
|
895
|
-
const factored = this.factor(
|
|
896
|
-
this.pm.toCoeffs(this.pm.resultant(x, this.pm.fromCoeffs(cell.p, Y), Y)),
|
|
897
|
-
);
|
|
964
|
+
const factored = this.factor(this.getResultantCoeffs(this.getVarDifference(k, 1), cell.p));
|
|
898
965
|
const factors = factored.factors.factors;
|
|
899
966
|
const sequences: (Upolynomial[] | null)[] = factors.map((factor) => this.um.sturmSeq(factor));
|
|
900
967
|
const saved = this.saveInterval(anum);
|
|
901
968
|
while (true) {
|
|
969
|
+
this.limit.checkpoint();
|
|
902
970
|
const interval = { lower: cell.lower.rootLower(k), upper: cell.upper.rootUpper(k) };
|
|
903
971
|
const found = this.findIsolatingFactor(factors, sequences, interval);
|
|
904
972
|
if (found !== null) {
|
|
@@ -925,8 +993,7 @@ export class AlgebraicManager {
|
|
|
925
993
|
if (anum.value instanceof Rational) return [anum.value, anum.value];
|
|
926
994
|
const cell = anum.value;
|
|
927
995
|
const refined = this.um.refineToPrecision(cell.p, cell.lower, cell.upper, precision * 4);
|
|
928
|
-
|
|
929
|
-
return [lower, refined.isInterval ? refined.upper.toRational() : lower];
|
|
996
|
+
return [refined.lower.toRational(), refined.upper.toRational()];
|
|
930
997
|
}
|
|
931
998
|
|
|
932
999
|
displayRootSmt2(anum: Anum) {
|
|
@@ -943,14 +1010,46 @@ export class AlgebraicManager {
|
|
|
943
1010
|
return (refined.isInterval ? refined.upper : refined.lower).toDecimal(precision);
|
|
944
1011
|
}
|
|
945
1012
|
|
|
1013
|
+
private getResultantCoeffs(first: PolynomialRef, p: Upolynomial) {
|
|
1014
|
+
const q = new PolynomialRef(this.pm);
|
|
1015
|
+
const r = new PolynomialRef(this.pm);
|
|
1016
|
+
q.set(this.pm.toPolynomial(p, Y));
|
|
1017
|
+
this.pm.resultant(first.get(), q.get(), Y, r);
|
|
1018
|
+
const coeffs = this.pm.toCoeffs(r.get());
|
|
1019
|
+
r.reset();
|
|
1020
|
+
q.reset();
|
|
1021
|
+
first.reset();
|
|
1022
|
+
return coeffs;
|
|
1023
|
+
}
|
|
1024
|
+
|
|
1025
|
+
private getVarDifference(xDegree: number, yDegree: number) {
|
|
1026
|
+
const x = new PolynomialRef(this.pm);
|
|
1027
|
+
const y = new PolynomialRef(this.pm);
|
|
1028
|
+
const difference = new PolynomialRef(this.pm);
|
|
1029
|
+
x.set(this.pm.mkVar(X, xDegree));
|
|
1030
|
+
y.set(this.pm.mkVar(Y, yDegree));
|
|
1031
|
+
difference.set(this.pm.sub(x.get(), y.get()));
|
|
1032
|
+
y.reset();
|
|
1033
|
+
x.reset();
|
|
1034
|
+
return difference;
|
|
1035
|
+
}
|
|
1036
|
+
|
|
946
1037
|
private getSumPolynomial(first: AlgebraicCell, second: AlgebraicCell) {
|
|
947
|
-
const
|
|
948
|
-
|
|
1038
|
+
const p = new PolynomialRef(this.pm);
|
|
1039
|
+
const composed = new PolynomialRef(this.pm);
|
|
1040
|
+
p.set(this.pm.toPolynomial(first.p, X));
|
|
1041
|
+
this.pm.composeXMinusY(p.get(), Y, composed);
|
|
1042
|
+
p.reset();
|
|
1043
|
+
return this.getResultantCoeffs(composed, second.p);
|
|
949
1044
|
}
|
|
950
1045
|
|
|
951
1046
|
private getProductPolynomial(first: AlgebraicCell, second: AlgebraicCell) {
|
|
952
|
-
const
|
|
953
|
-
|
|
1047
|
+
const p = new PolynomialRef(this.pm);
|
|
1048
|
+
const composed = new PolynomialRef(this.pm);
|
|
1049
|
+
p.set(this.pm.toPolynomial(first.p, X));
|
|
1050
|
+
composed.set(this.pm.composeXDivY(p.get(), Y));
|
|
1051
|
+
p.reset();
|
|
1052
|
+
return this.getResultantCoeffs(composed, second.p);
|
|
954
1053
|
}
|
|
955
1054
|
|
|
956
1055
|
private findIsolatingFactor(
|
|
@@ -993,6 +1092,7 @@ export class AlgebraicManager {
|
|
|
993
1092
|
const savedA = this.saveInterval(first);
|
|
994
1093
|
const savedB = this.saveInterval(second);
|
|
995
1094
|
while (true) {
|
|
1095
|
+
this.limit.checkpoint();
|
|
996
1096
|
const interval = isAdd ? INTERVAL_OPS.add(cellA, cellB) : INTERVAL_OPS.mul(cellA, cellB);
|
|
997
1097
|
const found = this.findIsolatingFactor(factors, sequences, interval);
|
|
998
1098
|
if (found !== null) {
|
|
@@ -1012,8 +1112,7 @@ export class AlgebraicManager {
|
|
|
1012
1112
|
}
|
|
1013
1113
|
|
|
1014
1114
|
private getPowerPolynomial(cell: AlgebraicCell, exponent: number) {
|
|
1015
|
-
|
|
1016
|
-
return this.pm.toCoeffs(this.pm.resultant(x, this.pm.fromCoeffs(cell.p, Y), Y));
|
|
1115
|
+
return this.getResultantCoeffs(this.getVarDifference(1, exponent), cell.p);
|
|
1017
1116
|
}
|
|
1018
1117
|
|
|
1019
1118
|
private mkPower(anum: Anum, exponent: number): Anum {
|
|
@@ -1023,6 +1122,7 @@ export class AlgebraicManager {
|
|
|
1023
1122
|
const sequences: (Upolynomial[] | null)[] = factors.map((factor) => this.um.sturmSeq(factor));
|
|
1024
1123
|
const saved = this.saveInterval(anum);
|
|
1025
1124
|
while (true) {
|
|
1125
|
+
this.limit.checkpoint();
|
|
1026
1126
|
const interval = getIntervalPower(cell, exponent);
|
|
1027
1127
|
const found = this.findIsolatingFactor(factors, sequences, interval);
|
|
1028
1128
|
if (found !== null) {
|
|
@@ -1077,12 +1177,13 @@ export class AlgebraicManager {
|
|
|
1077
1177
|
if (sign !== 0) return sign;
|
|
1078
1178
|
if (hasSameCoeffs(cellA.p, cellB.p)) return 0;
|
|
1079
1179
|
if (cellA.isMinimal && cellB.isMinimal)
|
|
1080
|
-
while (
|
|
1180
|
+
while (this.limit.inc()) {
|
|
1081
1181
|
this.refine(first);
|
|
1082
1182
|
this.refine(second);
|
|
1083
1183
|
sign = compareIntervals();
|
|
1084
1184
|
if (sign !== 0) return sign;
|
|
1085
1185
|
}
|
|
1186
|
+
if (!this.limit.inc()) throw new SmtCanceledError();
|
|
1086
1187
|
const magnitudeA = this.getCellMagnitude(cellA);
|
|
1087
1188
|
const magnitudeB = this.getCellMagnitude(cellB);
|
|
1088
1189
|
const target = Math.max(MIN_MAGNITUDE, Math.min(magnitudeA, magnitudeB));
|
|
@@ -1,13 +1,13 @@
|
|
|
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
1
|
import {
|
|
4
2
|
NULL_VAR,
|
|
5
3
|
type Polynomial,
|
|
6
4
|
type PolynomialCache,
|
|
7
5
|
type PolynomialManager,
|
|
6
|
+
PolynomialRef,
|
|
8
7
|
} from "./polynomial";
|
|
9
8
|
import {
|
|
10
9
|
type Atom,
|
|
10
|
+
type Clause,
|
|
11
11
|
type IneqAtom,
|
|
12
12
|
type IneqKind,
|
|
13
13
|
type RootAtom,
|
|
@@ -62,21 +62,27 @@ export class AtomTable {
|
|
|
62
62
|
return max;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
reinitCache() {
|
|
66
|
-
for (const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
65
|
+
reinitCache(clauses: readonly Clause[], learned: readonly Clause[]) {
|
|
66
|
+
for (const clause of clauses)
|
|
67
|
+
for (const literal of clause.literals) this.reinitAtomCache(this.atoms[literal >> 1]);
|
|
68
|
+
for (const clause of learned)
|
|
69
|
+
for (const literal of clause.literals) this.reinitAtomCache(this.atoms[literal >> 1]);
|
|
70
|
+
for (const atom of this.atoms) this.reinitAtomCache(atom);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
private reinitAtomCache(atom: Atom | null) {
|
|
74
|
+
if (atom === null) return;
|
|
75
|
+
if (isIneqAtom(atom)) {
|
|
76
|
+
let max = 0;
|
|
77
|
+
for (const polynomial of atom.polynomials) {
|
|
78
|
+
this.cache.mkUnique(polynomial);
|
|
79
|
+
max = Math.max(max, this.pm.maxVar(polynomial));
|
|
76
80
|
}
|
|
77
|
-
|
|
78
|
-
|
|
81
|
+
atom.maxVar = max;
|
|
82
|
+
return;
|
|
79
83
|
}
|
|
84
|
+
this.cache.mkUnique(atom.polynomial);
|
|
85
|
+
atom.maxVar = this.pm.maxVar(atom.polynomial);
|
|
80
86
|
}
|
|
81
87
|
|
|
82
88
|
getAtom(literal: number) {
|
|
@@ -115,6 +121,8 @@ export class AtomTable {
|
|
|
115
121
|
this.atoms[boolVar] = null;
|
|
116
122
|
this.hooks?.onDelete(boolVar);
|
|
117
123
|
this.freeBoolVars.push(boolVar);
|
|
124
|
+
if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) this.pm.decRef(polynomial);
|
|
125
|
+
else this.pm.decRef(atom.polynomial);
|
|
118
126
|
}
|
|
119
127
|
|
|
120
128
|
private getIneqKey(atom: Pick<IneqAtom, "kind" | "polynomials" | "isEven">) {
|
|
@@ -128,13 +136,15 @@ export class AtomTable {
|
|
|
128
136
|
mkIneqAtom(kind: IneqKind, polynomials: readonly Polynomial[], isEven: readonly boolean[]) {
|
|
129
137
|
let sign = 1;
|
|
130
138
|
let maxVar = NULL_VAR;
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
139
|
+
const p = new PolynomialRef(this.pm);
|
|
140
|
+
const unique: Polynomial[] = [];
|
|
141
|
+
for (let index = 0; index < polynomials.length; index++) {
|
|
142
|
+
p.set(this.pm.flipSignIfLmNeg(polynomials[index]));
|
|
143
|
+
if (p.get() !== polynomials[index] && !isEven[index]) sign = -sign;
|
|
144
|
+
const variable = this.pm.maxVar(p.get());
|
|
135
145
|
if (variable > maxVar || maxVar === NULL_VAR) maxVar = variable;
|
|
136
|
-
|
|
137
|
-
}
|
|
146
|
+
unique.push(this.cache.mkUnique(p.get()));
|
|
147
|
+
}
|
|
138
148
|
const atom = {
|
|
139
149
|
kind: sign < 0 ? flipKind(kind) : kind,
|
|
140
150
|
boolVar: 0,
|
|
@@ -144,7 +154,12 @@ export class AtomTable {
|
|
|
144
154
|
};
|
|
145
155
|
const key = this.getIneqKey(atom);
|
|
146
156
|
const existing = this.ineqAtoms.get(key);
|
|
147
|
-
if (existing !== undefined)
|
|
157
|
+
if (existing !== undefined) {
|
|
158
|
+
p.reset();
|
|
159
|
+
return existing.boolVar;
|
|
160
|
+
}
|
|
161
|
+
for (const polynomial of unique) this.pm.incRef(polynomial);
|
|
162
|
+
p.reset();
|
|
148
163
|
atom.boolVar = this.mkBoolVar();
|
|
149
164
|
this.atoms[atom.boolVar] = atom;
|
|
150
165
|
this.ineqAtoms.set(key, atom);
|
|
@@ -179,21 +194,23 @@ export class AtomTable {
|
|
|
179
194
|
}
|
|
180
195
|
|
|
181
196
|
mkRootAtom(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
182
|
-
const
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
polynomial: this.cache.mkUnique(this.pm.flipSignIfLmNeg(polynomial)),
|
|
188
|
-
};
|
|
197
|
+
const p1 = new PolynomialRef(this.pm);
|
|
198
|
+
const uniqP = new PolynomialRef(this.pm);
|
|
199
|
+
p1.set(this.pm.flipSignIfLmNeg(polynomial));
|
|
200
|
+
uniqP.set(this.cache.mkUnique(p1.get()));
|
|
201
|
+
const atom = { kind, boolVar: 0, maxVar: variable, index, polynomial: uniqP.get() };
|
|
189
202
|
const key = this.getRootKey(atom);
|
|
190
203
|
const existing = this.rootAtoms.get(key);
|
|
191
|
-
if (existing
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
204
|
+
if (existing === undefined) {
|
|
205
|
+
atom.boolVar = this.mkBoolVar();
|
|
206
|
+
this.atoms[atom.boolVar] = atom;
|
|
207
|
+
this.rootAtoms.set(key, atom);
|
|
208
|
+
this.rootKeys.set(atom.boolVar, key);
|
|
209
|
+
this.pm.incRef(atom.polynomial);
|
|
210
|
+
}
|
|
211
|
+
uniqP.reset();
|
|
212
|
+
p1.reset();
|
|
213
|
+
return existing === undefined ? atom.boolVar : existing.boolVar;
|
|
197
214
|
}
|
|
198
215
|
}
|
|
199
216
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/nlsat_evaluator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { Anum, AlgebraicManager } from "./algebraic";
|
|
3
2
|
import { type IntervalSet, IntervalSetManager } from "./interval-set";
|
|
4
3
|
import type { Polynomial, PolynomialManager } from "./polynomial";
|