tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- 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/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- 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 +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- 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 +0 -2
- 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 +224 -82
- 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 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- 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 +0 -2
- 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 +0 -2
- 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/methods.ts +50 -3
- 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/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 +0 -1
- 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 +3 -6
- 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 +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- 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 +1 -4
- 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 +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- 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 +0 -1
- 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 +16 -3
- 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-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- 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 +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- 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 +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- 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 +21 -97
- 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 +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- 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 +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- 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 +0 -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 +0 -1
- 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 +0 -4
- 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 +0 -1
- 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 +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- 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 +9 -2
- 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 +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- 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 +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- 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 -2
- 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 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- 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 +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- 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 +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- 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 +112 -99
- 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 +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- 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 +15 -10
- 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 +0 -1
- 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 +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- 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 +0 -1
- 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 +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -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 +13 -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 +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- 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 +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- 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 +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- 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 +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- 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 +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- 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 +31 -34
- 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 +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- 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 +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- 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 -26
- 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 +2 -3
- package/src/prover/smt/table.ts +3 -2
- 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 +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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,12 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
// src/math/polynomial/polynomial_primes.h), MIT license, see z3-license.txt.
|
|
3
|
-
import { SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { getGcd, Rational } from "../rational";
|
|
3
|
+
import type { ResourceLimit } from "../rlimit";
|
|
5
4
|
import { getLog2, Mpbq, refineLower, refineUpper } from "./mpbq";
|
|
6
5
|
|
|
7
6
|
export type Upolynomial = readonly bigint[];
|
|
8
7
|
|
|
9
|
-
const BIG_PRIMES = [
|
|
8
|
+
export const BIG_PRIMES = [
|
|
10
9
|
39103, 39107, 39113, 39119, 39133, 39139, 39157, 39161, 39163, 39181, 39191, 39199, 39209, 39217,
|
|
11
10
|
39227, 39229, 39233, 39239, 39241, 39251, 39293, 39301, 39313, 39317, 39323, 39341, 39343, 39359,
|
|
12
11
|
39367, 39371, 39373, 39383, 39397, 39409, 39419, 39439, 39443, 39451, 39461, 39499, 39503, 39509,
|
|
@@ -28,12 +27,12 @@ const BIG_PRIMES = [
|
|
|
28
27
|
|
|
29
28
|
const getSign = (value: bigint) => (value > 0n ? 1 : value < 0n ? -1 : 0);
|
|
30
29
|
|
|
31
|
-
|
|
30
|
+
const floorDiv = (dividend: bigint, divisor: bigint) => {
|
|
32
31
|
const quotient = dividend / divisor;
|
|
33
32
|
return dividend % divisor !== 0n && dividend < 0n !== divisor < 0n ? quotient - 1n : quotient;
|
|
34
33
|
};
|
|
35
34
|
|
|
36
|
-
const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
35
|
+
export const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
37
36
|
let [oldR, r] = [first, second];
|
|
38
37
|
let [oldS, s] = [1n, 0n];
|
|
39
38
|
let [oldT, t] = [0n, 1n];
|
|
@@ -75,7 +74,10 @@ interface DrsFrame {
|
|
|
75
74
|
export class UpolynomialManager {
|
|
76
75
|
private isPrimeModulus = true;
|
|
77
76
|
|
|
78
|
-
constructor(
|
|
77
|
+
constructor(
|
|
78
|
+
readonly limit: ResourceLimit,
|
|
79
|
+
private modulus: bigint | null = null,
|
|
80
|
+
) {}
|
|
79
81
|
|
|
80
82
|
get zp() {
|
|
81
83
|
return this.modulus;
|
|
@@ -172,12 +174,15 @@ export class UpolynomialManager {
|
|
|
172
174
|
mul(first: Upolynomial, second: Upolynomial) {
|
|
173
175
|
if (first.length === 0 || second.length === 0) return [];
|
|
174
176
|
const result = Array.from({ length: first.length + second.length - 1 }, () => 0n);
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
177
|
+
const outer = first.length < second.length ? second : first;
|
|
178
|
+
const inner = first.length < second.length ? first : second;
|
|
179
|
+
for (let index = 0; index < outer.length; index++) {
|
|
180
|
+
this.limit.checkpoint();
|
|
181
|
+
if (outer[index] === 0n) continue;
|
|
182
|
+
for (let other = 0; other < inner.length; other++)
|
|
183
|
+
if (inner[other] !== 0n)
|
|
179
184
|
result[index + other] = this.normalizeNumeral(
|
|
180
|
-
result[index + other] +
|
|
185
|
+
result[index + other] + outer[index] * inner[other],
|
|
181
186
|
);
|
|
182
187
|
}
|
|
183
188
|
return trim(result);
|
|
@@ -233,8 +238,10 @@ export class UpolynomialManager {
|
|
|
233
238
|
const quotient = Array.from({ length: quotientSize }, () => 0n);
|
|
234
239
|
const leading = divisor[divisor.length - 1];
|
|
235
240
|
let power = 0;
|
|
236
|
-
while (
|
|
241
|
+
while (true) {
|
|
242
|
+
this.limit.checkpoint();
|
|
237
243
|
const size = remainder.length;
|
|
244
|
+
if (size < divisor.length) return { quotient: trim(quotient), remainder, power };
|
|
238
245
|
const shift = size - divisor.length;
|
|
239
246
|
if (isField) {
|
|
240
247
|
const ratio = this.divNumeral(remainder[size - 1], leading);
|
|
@@ -259,7 +266,6 @@ export class UpolynomialManager {
|
|
|
259
266
|
remainder.length = size - 1;
|
|
260
267
|
trim(remainder);
|
|
261
268
|
}
|
|
262
|
-
return { quotient: trim(quotient), remainder, power };
|
|
263
269
|
}
|
|
264
270
|
|
|
265
271
|
div(dividend: Upolynomial, divisor: Upolynomial) {
|
|
@@ -273,8 +279,9 @@ export class UpolynomialManager {
|
|
|
273
279
|
const isField = this.isField;
|
|
274
280
|
const leading = divisor[divisor.length - 1];
|
|
275
281
|
let power = 0;
|
|
276
|
-
while (
|
|
282
|
+
while (this.limit.inc()) {
|
|
277
283
|
const size = remainder.length;
|
|
284
|
+
if (size < divisor.length) break;
|
|
278
285
|
const shift = size - divisor.length;
|
|
279
286
|
if (isField) {
|
|
280
287
|
const ratio = this.divNumeral(remainder[size - 1], leading);
|
|
@@ -359,13 +366,16 @@ export class UpolynomialManager {
|
|
|
359
366
|
if (second.length === 0) return this.flipSignIfLmNeg(this.set(first));
|
|
360
367
|
let a = this.set(first);
|
|
361
368
|
let b = this.set(second);
|
|
362
|
-
while (
|
|
369
|
+
while (this.limit.inc()) {
|
|
370
|
+
if (b.length === 0) {
|
|
371
|
+
const normalized = this.normalize(a);
|
|
372
|
+
return this.isField ? this.mkMonic(normalized) : this.flipSignIfLmNeg(normalized);
|
|
373
|
+
}
|
|
363
374
|
const remainder = this.normalize(this.rem(a, b));
|
|
364
375
|
a = b;
|
|
365
376
|
b = remainder;
|
|
366
377
|
}
|
|
367
|
-
|
|
368
|
-
return this.isField ? this.mkMonic(normalized) : this.flipSignIfLmNeg(normalized);
|
|
378
|
+
throw new SmtCanceledError();
|
|
369
379
|
}
|
|
370
380
|
|
|
371
381
|
private combineImages(image: Upolynomial, prime: bigint, combined: Upolynomial, bound: bigint) {
|
|
@@ -499,6 +509,7 @@ export class UpolynomialManager {
|
|
|
499
509
|
let previous = 0;
|
|
500
510
|
let changes = 0;
|
|
501
511
|
for (let index = 0; index < work.length; index++) {
|
|
512
|
+
this.limit.checkpoint();
|
|
502
513
|
let position = 1;
|
|
503
514
|
for (; position < work.length - index; position++) work[position] += work[position - 1];
|
|
504
515
|
const current = getSign(work[position - 1]);
|
|
@@ -515,9 +526,11 @@ export class UpolynomialManager {
|
|
|
515
526
|
translate(coeffs: Upolynomial) {
|
|
516
527
|
const result = [...coeffs];
|
|
517
528
|
const degree = result.length - 1;
|
|
518
|
-
for (let step = 1; step <= degree; step++)
|
|
529
|
+
for (let step = 1; step <= degree; step++) {
|
|
530
|
+
this.limit.checkpoint();
|
|
519
531
|
for (let index = degree - step; index <= degree - 1; index++)
|
|
520
532
|
result[index] += result[index + 1];
|
|
533
|
+
}
|
|
521
534
|
return result;
|
|
522
535
|
}
|
|
523
536
|
|
|
@@ -526,6 +539,7 @@ export class UpolynomialManager {
|
|
|
526
539
|
const result = this.composeAnPxDivA(coeffs, value.den);
|
|
527
540
|
const degree = result.length - 1;
|
|
528
541
|
for (let step = 1; step <= degree; step++) {
|
|
542
|
+
this.limit.checkpoint();
|
|
529
543
|
result[degree - step] += value.num * result[degree - step + 1];
|
|
530
544
|
for (let index = degree - step + 1; index <= degree - 1; index++)
|
|
531
545
|
result[index] = result[index] * value.den + value.num * result[index + 1];
|
|
@@ -698,6 +712,7 @@ export class UpolynomialManager {
|
|
|
698
712
|
this.pushChildFrames(this.div(coeffs, twoXMinusOne), frames);
|
|
699
713
|
} else this.pushChildFrames(coeffs, frames);
|
|
700
714
|
while (frames.length > 0) {
|
|
715
|
+
this.limit.checkpoint();
|
|
701
716
|
const frame = frames[frames.length - 1];
|
|
702
717
|
if (!frame.isFirst) {
|
|
703
718
|
frames.pop();
|
|
@@ -760,11 +775,12 @@ export class UpolynomialManager {
|
|
|
760
775
|
}
|
|
761
776
|
|
|
762
777
|
private sturmSeqCore(sequence: bigint[][]) {
|
|
763
|
-
while (
|
|
778
|
+
while (this.limit.inc()) {
|
|
764
779
|
const remainder = this.srem(sequence[sequence.length - 2], sequence[sequence.length - 1]);
|
|
765
780
|
if (remainder.length === 0) return sequence;
|
|
766
781
|
sequence.push(this.normalize(remainder));
|
|
767
782
|
}
|
|
783
|
+
return sequence;
|
|
768
784
|
}
|
|
769
785
|
|
|
770
786
|
sturmSeq(coeffs: Upolynomial) {
|
|
@@ -776,6 +792,7 @@ export class UpolynomialManager {
|
|
|
776
792
|
}
|
|
777
793
|
|
|
778
794
|
isolating2refinable(coeffs: Upolynomial, lower: Mpbq, upper: Mpbq): Refinement {
|
|
795
|
+
this.limit.checkpoint();
|
|
779
796
|
const signLower = this.evalSignAtBq(coeffs, lower);
|
|
780
797
|
const signUpper = this.evalSignAtBq(coeffs, upper);
|
|
781
798
|
if (signLower !== 0 && signUpper !== 0) return { isInterval: true, lower, upper };
|
|
@@ -784,6 +801,7 @@ export class UpolynomialManager {
|
|
|
784
801
|
let b = upper;
|
|
785
802
|
let newA = a.add(b).div2();
|
|
786
803
|
while (true) {
|
|
804
|
+
this.limit.checkpoint();
|
|
787
805
|
const signNewA = this.evalSignAtBq(coeffs, newA);
|
|
788
806
|
if (signNewA !== signUpper) return { isInterval: signNewA !== 0, lower: newA, upper: b };
|
|
789
807
|
b = newA;
|
|
@@ -795,6 +813,7 @@ export class UpolynomialManager {
|
|
|
795
813
|
let b = upper;
|
|
796
814
|
let newB = a.add(b).div2();
|
|
797
815
|
while (true) {
|
|
816
|
+
this.limit.checkpoint();
|
|
798
817
|
const signNewB = this.evalSignAtBq(coeffs, newB);
|
|
799
818
|
if (signNewB !== signLower)
|
|
800
819
|
return signNewB === 0
|
|
@@ -814,6 +833,7 @@ export class UpolynomialManager {
|
|
|
814
833
|
let newA1 = a1.add(b1).div2();
|
|
815
834
|
let newB2 = a2.add(b2).div2();
|
|
816
835
|
while (true) {
|
|
836
|
+
this.limit.checkpoint();
|
|
817
837
|
const signNewA1 = this.evalSignAtBq(coeffs, newA1);
|
|
818
838
|
if (signNewA1 === 0) return { isInterval: false, lower: newA1, upper };
|
|
819
839
|
if (signNewA1 === -signB1) return { isInterval: true, lower: newA1, upper: b1 };
|
|
@@ -840,6 +860,7 @@ export class UpolynomialManager {
|
|
|
840
860
|
const signLower = this.evalSignAtBq(coeffs, lower);
|
|
841
861
|
let current: Refinement = { isInterval: true, lower, upper };
|
|
842
862
|
while (true) {
|
|
863
|
+
this.limit.checkpoint();
|
|
843
864
|
if (current.upper.sub(current.lower).isLessThanOneDiv2k(precision)) return current;
|
|
844
865
|
current = this.refineCore(coeffs, signLower, current.lower, current.upper);
|
|
845
866
|
if (!current.isInterval) return current;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/tactic/nlsat_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import { type AstManager, FAMILY_ARITH, KIND_APP, OP_ATAN2, OP_PI, SORT_INT } from "./ast";
|
|
4
3
|
import type { Goal } from "./goal";
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// z3-license.txt. MaxSMT runs on the SMT core.
|
|
1
|
+
// MaxSMT runs on the SMT core.
|
|
3
2
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
3
|
import {
|
|
5
4
|
type AstManager,
|
|
@@ -23,7 +22,7 @@ import { mkBvApp } from "./bv-decl-plugin";
|
|
|
23
22
|
import { Goal } from "./goal";
|
|
24
23
|
import { getPbSum } from "./lia2card";
|
|
25
24
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
26
|
-
import type { MaxsatContext, MaxsatParams } from "./maxsmt-base";
|
|
25
|
+
import type { MaxsatContext, MaxsatParams, MaxsatSolver } from "./maxsmt-base";
|
|
27
26
|
import { Maxsmt } from "./maxsmt";
|
|
28
27
|
import { isInNraFragment } from "./opt-nlsat";
|
|
29
28
|
import { canReuseNlsatSolver, giaPareto, ParetoNlsatSolver, type ParetoSolver } from "./opt-pareto";
|
|
@@ -226,6 +225,11 @@ export class OptContext {
|
|
|
226
225
|
return pareto;
|
|
227
226
|
}
|
|
228
227
|
|
|
228
|
+
getReasonUnknown() {
|
|
229
|
+
if (this.reasonUnknown !== "") return this.reasonUnknown;
|
|
230
|
+
return (this.satSolver ?? this.optSolver)?.reasonUnknown ?? "unknown";
|
|
231
|
+
}
|
|
232
|
+
|
|
229
233
|
optimize(hard: readonly number[], options: OptOptions) {
|
|
230
234
|
if (this.pareto !== null) return this.executePareto();
|
|
231
235
|
if (this.boxIndex !== -1) {
|
|
@@ -245,19 +249,20 @@ export class OptContext {
|
|
|
245
249
|
private getMaxsatContext(optSolver: OptSolver, options: OptOptions): MaxsatContext {
|
|
246
250
|
const getSolver = () => this.satSolver ?? optSolver;
|
|
247
251
|
const isSatEnabled = () => this.satSolver !== null;
|
|
252
|
+
const solver: MaxsatSolver = {
|
|
253
|
+
assertExpr: (expr) => getSolver().assertExpr(expr),
|
|
254
|
+
checkSat: (assumptions) => getSolver().check(assumptions),
|
|
255
|
+
getModel: () => getSolver().getModel(),
|
|
256
|
+
getUnsatCore: () => getSolver().getUnsatCore(),
|
|
257
|
+
findMutexes: (vars) => ({ status: L_TRUE, mutexes: getSolver().findMutexes(vars) }),
|
|
258
|
+
};
|
|
248
259
|
return {
|
|
249
260
|
manager: this.manager,
|
|
250
261
|
params: options.maxsat,
|
|
251
262
|
get isSatEnabled() {
|
|
252
263
|
return isSatEnabled();
|
|
253
264
|
},
|
|
254
|
-
getSolver: () =>
|
|
255
|
-
assertExpr: (expr) => getSolver().assertExpr(expr),
|
|
256
|
-
checkSat: (assumptions) => getSolver().check(assumptions),
|
|
257
|
-
getModel: () => getSolver().getModel(),
|
|
258
|
-
getUnsatCore: () => getSolver().getUnsatCore(),
|
|
259
|
-
findMutexes: (vars) => ({ status: L_TRUE, mutexes: getSolver().findMutexes(vars) }),
|
|
260
|
-
}),
|
|
265
|
+
getSolver: () => solver,
|
|
261
266
|
getBaseModel: () => this.rawModel,
|
|
262
267
|
hide: (decl) => {
|
|
263
268
|
this.hiddenDecls.push(decl);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/opt_nlsat.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -20,7 +19,8 @@ import {
|
|
|
20
19
|
import { Goal } from "./goal";
|
|
21
20
|
import { goal2nlsat } from "./goal2nlsat";
|
|
22
21
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
23
|
-
import {
|
|
22
|
+
import type { AlgebraicManager, Anum } from "./nlsat/algebraic";
|
|
23
|
+
import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
24
24
|
import { NlsatSolver } from "./nlsat/solver";
|
|
25
25
|
import { ProtoModel } from "./proto-model";
|
|
26
26
|
import { Rational } from "./rational";
|
|
@@ -34,31 +34,44 @@ const PREPROCESSOR =
|
|
|
34
34
|
"(using-params simplify :elim_and true :blast_distinct true) tseitin-cnf-core " +
|
|
35
35
|
"(using-params simplify :elim_and true :blast_distinct true))";
|
|
36
36
|
|
|
37
|
-
|
|
38
|
-
value: Anum
|
|
37
|
+
interface NlsatSupremum {
|
|
38
|
+
value: Anum;
|
|
39
39
|
lower: Rational;
|
|
40
40
|
upper: Rational;
|
|
41
|
-
isAttained: boolean;
|
|
42
|
-
isUnbounded: boolean;
|
|
43
|
-
hasSup: boolean;
|
|
44
41
|
isOpen: boolean;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
interface NlsatNoModel {
|
|
45
|
+
hasModel: false;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
interface NlsatOptimum {
|
|
49
|
+
hasModel: true;
|
|
50
|
+
model: ProtoModel;
|
|
51
|
+
value: Anum;
|
|
52
|
+
lower: Rational;
|
|
53
|
+
upper: Rational;
|
|
54
|
+
isUnbounded: boolean;
|
|
55
|
+
sup: NlsatSupremum | null;
|
|
49
56
|
}
|
|
50
57
|
|
|
51
58
|
interface NlsatOptOutcome {
|
|
52
59
|
status: number;
|
|
53
|
-
result:
|
|
60
|
+
result: NlsatNoModel | NlsatOptimum;
|
|
54
61
|
}
|
|
55
62
|
|
|
56
|
-
interface
|
|
57
|
-
status:
|
|
58
|
-
goal: Goal
|
|
63
|
+
interface PreprocessedGoal {
|
|
64
|
+
status: typeof L_TRUE;
|
|
65
|
+
goal: Goal;
|
|
59
66
|
objective: number;
|
|
60
67
|
}
|
|
61
68
|
|
|
69
|
+
interface PreprocessedNothing {
|
|
70
|
+
status: typeof L_FALSE | typeof L_UNDEF;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
const NO_MODEL: NlsatNoModel = { hasModel: false };
|
|
74
|
+
|
|
62
75
|
interface Loaded {
|
|
63
76
|
solver: NlsatSolver;
|
|
64
77
|
variable: number;
|
|
@@ -85,10 +98,16 @@ export const isInNraFragment = (manager: AstManager, exprs: readonly number[]) =
|
|
|
85
98
|
return true;
|
|
86
99
|
};
|
|
87
100
|
|
|
88
|
-
const getCoarseInterval = (
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
101
|
+
const getCoarseInterval = (
|
|
102
|
+
manager: AstManager,
|
|
103
|
+
am: AlgebraicManager,
|
|
104
|
+
value: Anum,
|
|
105
|
+
): [Rational, Rational] => {
|
|
106
|
+
const pm = new PolynomialManager(manager.limit);
|
|
107
|
+
const p = new PolynomialRef(pm);
|
|
108
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), 0));
|
|
109
|
+
const roots = am.isolateRoots(pm, p.get(), []);
|
|
110
|
+
p.reset();
|
|
92
111
|
const index = roots.findIndex((root) => am.compare(root, value) === 0);
|
|
93
112
|
const lower = index === 0 ? am.intLt(value) : am.select(roots[index - 1], value);
|
|
94
113
|
const upper = index + 1 === roots.length ? am.intGt(value) : am.select(value, roots[index + 1]);
|
|
@@ -96,8 +115,7 @@ const getCoarseInterval = (solver: NlsatSolver, value: Anum): [Rational, Rationa
|
|
|
96
115
|
};
|
|
97
116
|
|
|
98
117
|
export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) => {
|
|
99
|
-
const
|
|
100
|
-
const am = solver.am;
|
|
118
|
+
const am = manager.am;
|
|
101
119
|
if (am.isRational(value))
|
|
102
120
|
return manager.mkApp(OP_EQ, [term, manager.mkRealNumeral(am.toRational(value))], SORT_BOOL);
|
|
103
121
|
const coeffs = am.getPolynomial(value);
|
|
@@ -113,7 +131,7 @@ export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) =>
|
|
|
113
131
|
SORT_REAL,
|
|
114
132
|
);
|
|
115
133
|
}
|
|
116
|
-
const [lower, upper] = getCoarseInterval(
|
|
134
|
+
const [lower, upper] = getCoarseInterval(manager, am, value);
|
|
117
135
|
return manager.mkApp(
|
|
118
136
|
OP_AND,
|
|
119
137
|
[
|
|
@@ -140,19 +158,24 @@ const isOccurring = (manager: AstManager, target: number, expr: number) => {
|
|
|
140
158
|
const mkLowerBound = (solver: NlsatSolver, variable: number, value: Anum, isStrict: boolean) => {
|
|
141
159
|
const am = solver.am;
|
|
142
160
|
const pm = solver.pm;
|
|
161
|
+
const p = new PolynomialRef(pm);
|
|
143
162
|
if (am.isRational(value)) {
|
|
144
163
|
const rational = am.toRational(value);
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
? solver.mkIneqLiteral("GT", [
|
|
148
|
-
: solver.mkIneqLiteral("LT", [
|
|
164
|
+
p.set(pm.mkLinear([rational.den], [variable], -rational.num));
|
|
165
|
+
const literal = isStrict
|
|
166
|
+
? solver.mkIneqLiteral("GT", [p.get()], [false])
|
|
167
|
+
: solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1;
|
|
168
|
+
p.reset();
|
|
169
|
+
return literal;
|
|
149
170
|
}
|
|
150
|
-
|
|
151
|
-
const index = am
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
171
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), variable));
|
|
172
|
+
const index = am.isolateRoots(pm, p.get(), []).findIndex((root) => am.compare(root, value) === 0);
|
|
173
|
+
const literal =
|
|
174
|
+
index === -1
|
|
175
|
+
? null
|
|
176
|
+
: 2 * solver.mkRootAtom(isStrict ? "ROOT_GT" : "ROOT_GE", variable, index + 1, p.get());
|
|
177
|
+
p.reset();
|
|
178
|
+
return literal;
|
|
156
179
|
};
|
|
157
180
|
|
|
158
181
|
const getBracket = (solver: NlsatSolver, value: Anum): [Rational, Rational] => {
|
|
@@ -175,7 +198,7 @@ export class NlsatOpt {
|
|
|
175
198
|
objective: number,
|
|
176
199
|
lower: Rational,
|
|
177
200
|
upper: Rational | null,
|
|
178
|
-
):
|
|
201
|
+
): PreprocessedGoal | PreprocessedNothing {
|
|
179
202
|
const manager = this.manager;
|
|
180
203
|
const pinned = new RefVector(manager);
|
|
181
204
|
const pin = (expr: number) => {
|
|
@@ -199,10 +222,11 @@ export class NlsatOpt {
|
|
|
199
222
|
})();
|
|
200
223
|
pinned.reset();
|
|
201
224
|
const result = goals?.length === 1 ? goals[0] : null;
|
|
202
|
-
if (result
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
225
|
+
if (result === null) return { status: L_UNDEF };
|
|
226
|
+
if (result.isInconsistent) return { status: L_FALSE };
|
|
227
|
+
return result.forms.items.some((form) => isOccurring(manager, target, form))
|
|
228
|
+
? { status: L_TRUE, goal: result, objective: target }
|
|
229
|
+
: { status: L_UNDEF };
|
|
206
230
|
}
|
|
207
231
|
|
|
208
232
|
// The objective is nlsat's first variable and its maximization target.
|
|
@@ -270,23 +294,22 @@ export class NlsatOpt {
|
|
|
270
294
|
proveUnbounded(hard: readonly number[], objective: number, lower: Rational) {
|
|
271
295
|
if (!isInNraFragment(this.manager, [...hard, objective])) return L_UNDEF;
|
|
272
296
|
const preprocessed = this.preprocess(hard, objective, lower, null);
|
|
273
|
-
if (preprocessed.status
|
|
274
|
-
if (preprocessed.goal === null) return L_UNDEF;
|
|
297
|
+
if (preprocessed.status !== L_TRUE) return preprocessed.status;
|
|
275
298
|
return this.checkLimit(preprocessed.goal, preprocessed.objective, null);
|
|
276
299
|
}
|
|
277
300
|
|
|
278
301
|
// Refuting T >= sup, at a model below an open candidate supremum, proves a strict upper bound,
|
|
279
302
|
// but not that feasible values approach it.
|
|
280
|
-
private proveStrictUpperBound(loaded: Loaded, sup: Anum, best: Anum
|
|
303
|
+
private proveStrictUpperBound(loaded: Loaded, sup: Anum, best: Anum): NlsatSupremum | null {
|
|
281
304
|
const solver = loaded.solver;
|
|
282
|
-
if (solver.am.compare(sup, best) <= 0) return;
|
|
305
|
+
if (solver.am.compare(sup, best) <= 0) return null;
|
|
283
306
|
const literal = mkLowerBound(solver, loaded.variable, sup, false);
|
|
284
|
-
if (literal === null) return;
|
|
307
|
+
if (literal === null) return null;
|
|
285
308
|
solver.mkExternalClause([literal], null);
|
|
286
|
-
if (solver.check() !== L_FALSE) return;
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
309
|
+
if (solver.check() !== L_FALSE) return null;
|
|
310
|
+
const value = solver.am.copy(sup);
|
|
311
|
+
const bracket = getBracket(solver, value);
|
|
312
|
+
return { value, lower: bracket[0], upper: bracket[1], isOpen: false };
|
|
290
313
|
}
|
|
291
314
|
|
|
292
315
|
maximize(
|
|
@@ -297,30 +320,20 @@ export class NlsatOpt {
|
|
|
297
320
|
maxRounds: number,
|
|
298
321
|
supremumRlimit: number,
|
|
299
322
|
): NlsatOptOutcome {
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
lower: Rational.zero,
|
|
303
|
-
upper: Rational.zero,
|
|
304
|
-
isAttained: false,
|
|
305
|
-
isUnbounded: false,
|
|
306
|
-
hasSup: false,
|
|
307
|
-
isOpen: false,
|
|
308
|
-
sup: null,
|
|
309
|
-
supLower: Rational.zero,
|
|
310
|
-
supUpper: Rational.zero,
|
|
311
|
-
model: null,
|
|
312
|
-
};
|
|
313
|
-
if (!isInNraFragment(this.manager, [...hard, objective])) return { status: L_UNDEF, result };
|
|
323
|
+
if (!isInNraFragment(this.manager, [...hard, objective]))
|
|
324
|
+
return { status: L_UNDEF, result: NO_MODEL };
|
|
314
325
|
const preprocessed = this.preprocess(hard, objective, lower, upper);
|
|
326
|
+
if (preprocessed.status !== L_TRUE) return { status: preprocessed.status, result: NO_MODEL };
|
|
315
327
|
const goal = preprocessed.goal;
|
|
316
|
-
if (goal === null) return { status: preprocessed.status, result };
|
|
317
328
|
const loaded = this.load(goal, preprocessed.objective);
|
|
318
|
-
if (loaded === null) return { status: L_UNDEF, result };
|
|
329
|
+
if (loaded === null) return { status: L_UNDEF, result: NO_MODEL };
|
|
319
330
|
const solver = loaded.solver;
|
|
320
331
|
const am = solver.am;
|
|
321
332
|
let status = L_UNDEF;
|
|
322
333
|
let best: Anum | null = null;
|
|
323
334
|
let sup: Anum | null = null;
|
|
335
|
+
let model: ProtoModel | null = null;
|
|
336
|
+
let isUnbounded = false;
|
|
324
337
|
let unboundedRounds = 0;
|
|
325
338
|
// A round without a candidate supremum is inconclusive, since bounds through later variables
|
|
326
339
|
// reach the objective only through conflicts, so five in a row probe for a feasible ray.
|
|
@@ -330,13 +343,13 @@ export class NlsatOpt {
|
|
|
330
343
|
best = am.copy(solver.getValue(loaded.variable));
|
|
331
344
|
const found = solver.getMaxVarSup();
|
|
332
345
|
sup = found === null ? null : found.sup;
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
346
|
+
model?.decRef();
|
|
347
|
+
model = this.extractModel(loaded, goal, preprocessed.objective);
|
|
348
|
+
model.incRef();
|
|
336
349
|
if (sup === null) {
|
|
337
350
|
if (++unboundedRounds > 4) {
|
|
338
351
|
if (upper === null && this.checkLimit(goal, preprocessed.objective, null) === L_TRUE)
|
|
339
|
-
|
|
352
|
+
isUnbounded = true;
|
|
340
353
|
break;
|
|
341
354
|
}
|
|
342
355
|
} else unboundedRounds = 0;
|
|
@@ -347,20 +360,27 @@ export class NlsatOpt {
|
|
|
347
360
|
}
|
|
348
361
|
solver.mkExternalClause([literal], null);
|
|
349
362
|
}
|
|
350
|
-
if (best === null
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
result.isOpen =
|
|
363
|
+
if (best === null || model === null)
|
|
364
|
+
return { status: status === L_FALSE ? L_FALSE : L_UNDEF, result: NO_MODEL };
|
|
365
|
+
const bracket = getBracket(solver, best);
|
|
366
|
+
const certified =
|
|
367
|
+
status === L_TRUE && sup !== null ? this.proveStrictUpperBound(loaded, sup, best) : null;
|
|
368
|
+
if (certified !== null)
|
|
369
|
+
certified.isOpen =
|
|
358
370
|
this.getBoundedLimit(supremumRlimit, () =>
|
|
359
|
-
this.checkLimit(goal, preprocessed.objective,
|
|
371
|
+
this.checkLimit(goal, preprocessed.objective, certified.value),
|
|
360
372
|
) === L_TRUE;
|
|
361
373
|
return {
|
|
362
|
-
status:
|
|
363
|
-
result
|
|
374
|
+
status: status === L_FALSE || isUnbounded || certified?.isOpen === true ? L_TRUE : L_UNDEF,
|
|
375
|
+
result: {
|
|
376
|
+
hasModel: true,
|
|
377
|
+
model,
|
|
378
|
+
value: best,
|
|
379
|
+
lower: bracket[0],
|
|
380
|
+
upper: bracket[1],
|
|
381
|
+
isUnbounded,
|
|
382
|
+
sup: certified,
|
|
383
|
+
},
|
|
364
384
|
};
|
|
365
385
|
}
|
|
366
386
|
}
|