tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
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 +3 -0
- package/dist/index.d.ts +3 -0
- 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 +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- 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/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- 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 +8 -7
- 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 +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.ts +2 -2
- package/src/parser.ts +151 -42
- 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 +6 -16
- 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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- 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 +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 +1 -0
- 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 +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- 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/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 +14 -18
- 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 +0 -2
- 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 +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- 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 +0 -1
- 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 +3 -16
- 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 +1 -7
- 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 +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 +0 -2
- 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 +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- 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 -9
- 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 +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- 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 +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- 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 +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 +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 +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- 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 +25 -6
- 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 +0 -2
- 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 +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- 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 +0 -1
- 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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- 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 +76 -14
- 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 +91 -55
- 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 +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- 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 +3 -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 +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- 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 +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- 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 +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- 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 -26
- 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 +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- 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 +2 -3
- 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 +45 -55
- 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 +0 -1
- 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 +33 -20
- 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 +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- 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 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- 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 +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- 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 +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- 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 +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- 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 +66 -16
- 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 +13 -52
- 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 -1
- 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 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- 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 +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- 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/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 +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- 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 +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- 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 +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- 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/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/opt_nlsat.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -34,31 +33,44 @@ const PREPROCESSOR =
|
|
|
34
33
|
"(using-params simplify :elim_and true :blast_distinct true) tseitin-cnf-core " +
|
|
35
34
|
"(using-params simplify :elim_and true :blast_distinct true))";
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
value: Anum
|
|
36
|
+
interface NlsatSupremum {
|
|
37
|
+
value: Anum;
|
|
39
38
|
lower: Rational;
|
|
40
39
|
upper: Rational;
|
|
41
|
-
isAttained: boolean;
|
|
42
|
-
isUnbounded: boolean;
|
|
43
|
-
hasSup: boolean;
|
|
44
40
|
isOpen: boolean;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
interface NlsatNoModel {
|
|
44
|
+
hasModel: false;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
interface NlsatOptimum {
|
|
48
|
+
hasModel: true;
|
|
49
|
+
model: ProtoModel;
|
|
50
|
+
value: Anum;
|
|
51
|
+
lower: Rational;
|
|
52
|
+
upper: Rational;
|
|
53
|
+
isUnbounded: boolean;
|
|
54
|
+
sup: NlsatSupremum | null;
|
|
49
55
|
}
|
|
50
56
|
|
|
51
57
|
interface NlsatOptOutcome {
|
|
52
58
|
status: number;
|
|
53
|
-
result:
|
|
59
|
+
result: NlsatNoModel | NlsatOptimum;
|
|
54
60
|
}
|
|
55
61
|
|
|
56
|
-
interface
|
|
57
|
-
status:
|
|
58
|
-
goal: Goal
|
|
62
|
+
interface PreprocessedGoal {
|
|
63
|
+
status: typeof L_TRUE;
|
|
64
|
+
goal: Goal;
|
|
59
65
|
objective: number;
|
|
60
66
|
}
|
|
61
67
|
|
|
68
|
+
interface PreprocessedNothing {
|
|
69
|
+
status: typeof L_FALSE | typeof L_UNDEF;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const NO_MODEL: NlsatNoModel = { hasModel: false };
|
|
73
|
+
|
|
62
74
|
interface Loaded {
|
|
63
75
|
solver: NlsatSolver;
|
|
64
76
|
variable: number;
|
|
@@ -175,7 +187,7 @@ export class NlsatOpt {
|
|
|
175
187
|
objective: number,
|
|
176
188
|
lower: Rational,
|
|
177
189
|
upper: Rational | null,
|
|
178
|
-
):
|
|
190
|
+
): PreprocessedGoal | PreprocessedNothing {
|
|
179
191
|
const manager = this.manager;
|
|
180
192
|
const pinned = new RefVector(manager);
|
|
181
193
|
const pin = (expr: number) => {
|
|
@@ -199,10 +211,11 @@ export class NlsatOpt {
|
|
|
199
211
|
})();
|
|
200
212
|
pinned.reset();
|
|
201
213
|
const result = goals?.length === 1 ? goals[0] : null;
|
|
202
|
-
if (result
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
214
|
+
if (result === null) return { status: L_UNDEF };
|
|
215
|
+
if (result.isInconsistent) return { status: L_FALSE };
|
|
216
|
+
return result.forms.items.some((form) => isOccurring(manager, target, form))
|
|
217
|
+
? { status: L_TRUE, goal: result, objective: target }
|
|
218
|
+
: { status: L_UNDEF };
|
|
206
219
|
}
|
|
207
220
|
|
|
208
221
|
// The objective is nlsat's first variable and its maximization target.
|
|
@@ -270,23 +283,22 @@ export class NlsatOpt {
|
|
|
270
283
|
proveUnbounded(hard: readonly number[], objective: number, lower: Rational) {
|
|
271
284
|
if (!isInNraFragment(this.manager, [...hard, objective])) return L_UNDEF;
|
|
272
285
|
const preprocessed = this.preprocess(hard, objective, lower, null);
|
|
273
|
-
if (preprocessed.status
|
|
274
|
-
if (preprocessed.goal === null) return L_UNDEF;
|
|
286
|
+
if (preprocessed.status !== L_TRUE) return preprocessed.status;
|
|
275
287
|
return this.checkLimit(preprocessed.goal, preprocessed.objective, null);
|
|
276
288
|
}
|
|
277
289
|
|
|
278
290
|
// Refuting T >= sup, at a model below an open candidate supremum, proves a strict upper bound,
|
|
279
291
|
// but not that feasible values approach it.
|
|
280
|
-
private proveStrictUpperBound(loaded: Loaded, sup: Anum, best: Anum
|
|
292
|
+
private proveStrictUpperBound(loaded: Loaded, sup: Anum, best: Anum): NlsatSupremum | null {
|
|
281
293
|
const solver = loaded.solver;
|
|
282
|
-
if (solver.am.compare(sup, best) <= 0) return;
|
|
294
|
+
if (solver.am.compare(sup, best) <= 0) return null;
|
|
283
295
|
const literal = mkLowerBound(solver, loaded.variable, sup, false);
|
|
284
|
-
if (literal === null) return;
|
|
296
|
+
if (literal === null) return null;
|
|
285
297
|
solver.mkExternalClause([literal], null);
|
|
286
|
-
if (solver.check() !== L_FALSE) return;
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
298
|
+
if (solver.check() !== L_FALSE) return null;
|
|
299
|
+
const value = solver.am.copy(sup);
|
|
300
|
+
const bracket = getBracket(solver, value);
|
|
301
|
+
return { value, lower: bracket[0], upper: bracket[1], isOpen: false };
|
|
290
302
|
}
|
|
291
303
|
|
|
292
304
|
maximize(
|
|
@@ -297,30 +309,20 @@ export class NlsatOpt {
|
|
|
297
309
|
maxRounds: number,
|
|
298
310
|
supremumRlimit: number,
|
|
299
311
|
): 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 };
|
|
312
|
+
if (!isInNraFragment(this.manager, [...hard, objective]))
|
|
313
|
+
return { status: L_UNDEF, result: NO_MODEL };
|
|
314
314
|
const preprocessed = this.preprocess(hard, objective, lower, upper);
|
|
315
|
+
if (preprocessed.status !== L_TRUE) return { status: preprocessed.status, result: NO_MODEL };
|
|
315
316
|
const goal = preprocessed.goal;
|
|
316
|
-
if (goal === null) return { status: preprocessed.status, result };
|
|
317
317
|
const loaded = this.load(goal, preprocessed.objective);
|
|
318
|
-
if (loaded === null) return { status: L_UNDEF, result };
|
|
318
|
+
if (loaded === null) return { status: L_UNDEF, result: NO_MODEL };
|
|
319
319
|
const solver = loaded.solver;
|
|
320
320
|
const am = solver.am;
|
|
321
321
|
let status = L_UNDEF;
|
|
322
322
|
let best: Anum | null = null;
|
|
323
323
|
let sup: Anum | null = null;
|
|
324
|
+
let model: ProtoModel | null = null;
|
|
325
|
+
let isUnbounded = false;
|
|
324
326
|
let unboundedRounds = 0;
|
|
325
327
|
// A round without a candidate supremum is inconclusive, since bounds through later variables
|
|
326
328
|
// reach the objective only through conflicts, so five in a row probe for a feasible ray.
|
|
@@ -330,13 +332,13 @@ export class NlsatOpt {
|
|
|
330
332
|
best = am.copy(solver.getValue(loaded.variable));
|
|
331
333
|
const found = solver.getMaxVarSup();
|
|
332
334
|
sup = found === null ? null : found.sup;
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
335
|
+
model?.decRef();
|
|
336
|
+
model = this.extractModel(loaded, goal, preprocessed.objective);
|
|
337
|
+
model.incRef();
|
|
336
338
|
if (sup === null) {
|
|
337
339
|
if (++unboundedRounds > 4) {
|
|
338
340
|
if (upper === null && this.checkLimit(goal, preprocessed.objective, null) === L_TRUE)
|
|
339
|
-
|
|
341
|
+
isUnbounded = true;
|
|
340
342
|
break;
|
|
341
343
|
}
|
|
342
344
|
} else unboundedRounds = 0;
|
|
@@ -347,20 +349,27 @@ export class NlsatOpt {
|
|
|
347
349
|
}
|
|
348
350
|
solver.mkExternalClause([literal], null);
|
|
349
351
|
}
|
|
350
|
-
if (best === null
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
result.isOpen =
|
|
352
|
+
if (best === null || model === null)
|
|
353
|
+
return { status: status === L_FALSE ? L_FALSE : L_UNDEF, result: NO_MODEL };
|
|
354
|
+
const bracket = getBracket(solver, best);
|
|
355
|
+
const certified =
|
|
356
|
+
status === L_TRUE && sup !== null ? this.proveStrictUpperBound(loaded, sup, best) : null;
|
|
357
|
+
if (certified !== null)
|
|
358
|
+
certified.isOpen =
|
|
358
359
|
this.getBoundedLimit(supremumRlimit, () =>
|
|
359
|
-
this.checkLimit(goal, preprocessed.objective,
|
|
360
|
+
this.checkLimit(goal, preprocessed.objective, certified.value),
|
|
360
361
|
) === L_TRUE;
|
|
361
362
|
return {
|
|
362
|
-
status:
|
|
363
|
-
result
|
|
363
|
+
status: status === L_FALSE || isUnbounded || certified?.isOpen === true ? L_TRUE : L_UNDEF,
|
|
364
|
+
result: {
|
|
365
|
+
hasModel: true,
|
|
366
|
+
model,
|
|
367
|
+
value: best,
|
|
368
|
+
lower: bracket[0],
|
|
369
|
+
upper: bracket[1],
|
|
370
|
+
isUnbounded,
|
|
371
|
+
sup: certified,
|
|
372
|
+
},
|
|
364
373
|
};
|
|
365
374
|
}
|
|
366
375
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtCanceledError } from "../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { type AstManager, FAMILY_ARITH, FAMILY_PB } from "./ast";
|
|
4
3
|
import { InfEps } from "./inf-eps";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -9,10 +8,9 @@ import type { ProtoModel } from "./proto-model";
|
|
|
9
8
|
import { Rational } from "./rational";
|
|
10
9
|
import { RefVector } from "./ref-vector";
|
|
11
10
|
import { SmtKernel } from "./smt-kernel";
|
|
12
|
-
import type {
|
|
11
|
+
import type { TacticEnvironment } from "./tactic";
|
|
13
12
|
|
|
14
13
|
const MODEL_BOUND_SCALE = Rational.of(10n ** 12n);
|
|
15
|
-
const DUAL_BOUND_RLIMIT = 100;
|
|
16
14
|
|
|
17
15
|
export interface MaximizeResult {
|
|
18
16
|
// The no-model path accepts the hint without validating it.
|
|
@@ -53,12 +51,14 @@ export class OptSolver {
|
|
|
53
51
|
private pinned: RefVector;
|
|
54
52
|
private isFirst = true;
|
|
55
53
|
private numScopes = 0;
|
|
54
|
+
private readonly dualBoundRlimit: number;
|
|
56
55
|
wasUnknown = false;
|
|
57
56
|
|
|
58
57
|
constructor(
|
|
59
58
|
private readonly manager: AstManager,
|
|
60
|
-
params:
|
|
59
|
+
params: TacticEnvironment,
|
|
61
60
|
) {
|
|
61
|
+
this.dualBoundRlimit = Number(params.parameters.get("opt.optsmt_dual_bound_rlimit") ?? 100);
|
|
62
62
|
// opt_solver turns relevancy off under the default case split strategy, so a decided bound,
|
|
63
63
|
// such as one optsmt made for a lower bound, reaches the arithmetic solver.
|
|
64
64
|
this.kernel = new SmtKernel(manager, {
|
|
@@ -84,7 +84,9 @@ export class OptSolver {
|
|
|
84
84
|
private get arith() {
|
|
85
85
|
const context = this.kernel.context;
|
|
86
86
|
context.registerFamily(FAMILY_ARITH);
|
|
87
|
-
|
|
87
|
+
if (context.arith === undefined)
|
|
88
|
+
throw new SmtInvariantError("get_optimizer found no arithmetic theory");
|
|
89
|
+
return context.arith;
|
|
88
90
|
}
|
|
89
91
|
|
|
90
92
|
assertExpr(expr: number) {
|
|
@@ -200,7 +202,13 @@ export class OptSolver {
|
|
|
200
202
|
if (bound !== undefined && InfEps.of(bound).compare(this.objectiveValues[index]) > 0)
|
|
201
203
|
this.objectiveValues[index] = InfEps.of(bound);
|
|
202
204
|
if (this.manager.limit.isExhausted()) return outcome;
|
|
203
|
-
if (
|
|
205
|
+
if (
|
|
206
|
+
isProbing &&
|
|
207
|
+
value.isFinite() &&
|
|
208
|
+
upper !== null &&
|
|
209
|
+
!upper.isGlobal &&
|
|
210
|
+
this.dualBoundRlimit !== 0
|
|
211
|
+
) {
|
|
204
212
|
if (this.checkUpperBound(index, upper.value) === L_FALSE) result.upperBound = upper.value;
|
|
205
213
|
if (!this.manager.limit.inc() || !this.checkBound(index, value, result)) return outcome;
|
|
206
214
|
} else if (value.isFinite()) {
|
|
@@ -224,7 +232,7 @@ export class OptSolver {
|
|
|
224
232
|
if (!(error instanceof SmtCanceledError)) throw error;
|
|
225
233
|
return L_UNDEF;
|
|
226
234
|
}
|
|
227
|
-
limit.push(
|
|
235
|
+
limit.push(this.dualBoundRlimit);
|
|
228
236
|
const result = (() => {
|
|
229
237
|
try {
|
|
230
238
|
this.assertExpr(this.mkGe(index, InfEps.of(value, Rational.one)));
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/optsmt.cpp, src/opt/opt_search.h, src/opt/opt_geometric.h), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import { type AstManager, OP_GE, OP_GT, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
5
3
|
import { InfEps, maxInfEps, minInfEps } from "./inf-eps";
|
|
@@ -162,8 +160,10 @@ export class Optsmt {
|
|
|
162
160
|
}
|
|
163
161
|
|
|
164
162
|
add(term: number) {
|
|
165
|
-
const
|
|
163
|
+
const rewriter = new Rewriter(this.manager, TACTIC_REWRITER_OPTIONS);
|
|
164
|
+
const rewritten = rewriter.rewrite(term);
|
|
166
165
|
this.objs.push(rewritten);
|
|
166
|
+
rewriter.release();
|
|
167
167
|
this.manager.decRef(rewritten);
|
|
168
168
|
this.lower.push(ObjectiveValue.minusInfinity);
|
|
169
169
|
this.upper.push(ObjectiveValue.infinity);
|
|
@@ -438,8 +438,9 @@ export class Optsmt {
|
|
|
438
438
|
this.params.supremumRlimit,
|
|
439
439
|
);
|
|
440
440
|
const result = optimized.result;
|
|
441
|
+
if (!result.hasModel) return NLSAT_NO_RESULT;
|
|
441
442
|
const model = result.model;
|
|
442
|
-
|
|
443
|
+
const certified = result.sup;
|
|
443
444
|
this.nlsatModels.push(model);
|
|
444
445
|
if (result.isUnbounded) {
|
|
445
446
|
this.model = model;
|
|
@@ -447,20 +448,20 @@ export class Optsmt {
|
|
|
447
448
|
this.upper[index] = this.lower[index];
|
|
448
449
|
return NLSAT_CERTIFIED;
|
|
449
450
|
}
|
|
450
|
-
if (
|
|
451
|
+
if (certified?.isOpen === true) {
|
|
451
452
|
// The model is a feasible witness below the limit.
|
|
452
453
|
this.model = model;
|
|
453
|
-
const lower = InfEps.of(
|
|
454
|
+
const lower = InfEps.of(certified.lower, Rational.minusOne);
|
|
454
455
|
this.setBest(index, lower);
|
|
455
|
-
this.lower[index] = new ObjectiveValue(lower,
|
|
456
|
+
this.lower[index] = new ObjectiveValue(lower, certified.value);
|
|
456
457
|
this.upper[index] = new ObjectiveValue(
|
|
457
|
-
InfEps.of(
|
|
458
|
-
|
|
458
|
+
InfEps.of(certified.upper, Rational.minusOne),
|
|
459
|
+
certified.value,
|
|
459
460
|
);
|
|
460
461
|
return NLSAT_CERTIFIED;
|
|
461
462
|
}
|
|
462
463
|
const value = InfEps.of(result.lower);
|
|
463
|
-
if (value.compare(this.getLower(index)) < 0
|
|
464
|
+
if (value.compare(this.getLower(index)) < 0) return NLSAT_NO_RESULT;
|
|
464
465
|
this.model = model;
|
|
465
466
|
this.setBest(index, value);
|
|
466
467
|
if (optimized.status === L_TRUE) {
|
|
@@ -468,7 +469,7 @@ export class Optsmt {
|
|
|
468
469
|
this.upper[index] = new ObjectiveValue(InfEps.of(result.upper), result.value);
|
|
469
470
|
return NLSAT_CERTIFIED;
|
|
470
471
|
}
|
|
471
|
-
const sup =
|
|
472
|
+
const sup = certified === null ? upper : minInfEps(InfEps.of(certified.upper), upper);
|
|
472
473
|
this.upper[index] = new ObjectiveValue(
|
|
473
474
|
sup.compare(this.getLower(index)) < 0 ? this.getLower(index) : sup,
|
|
474
475
|
);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/parallel_tactical.cpp, src/smt/smt_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import { type AstManager, OP_AND, OP_EQ, OP_ITE, OP_OR } from "./ast";
|
|
5
3
|
import { mkNot } from "./ast-util";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/pattern/pattern_inference.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -53,7 +52,7 @@ export class PatternInference {
|
|
|
53
52
|
|
|
54
53
|
private isForbidden(expr: number) {
|
|
55
54
|
const manager = this.manager;
|
|
56
|
-
if (manager.
|
|
55
|
+
if (manager.isGroundApp(expr)) return false;
|
|
57
56
|
const decl = manager.funcDecls[manager.decls[expr]];
|
|
58
57
|
if (decl.isSkolem) return true;
|
|
59
58
|
if (decl.family === FAMILY_BASIC) return decl.op !== OP_TRUE && decl.op !== OP_FALSE;
|
|
@@ -227,7 +226,7 @@ export class PatternInference {
|
|
|
227
226
|
args[index] = args[args.length - 1];
|
|
228
227
|
index--;
|
|
229
228
|
args.pop();
|
|
230
|
-
if (manager.
|
|
229
|
+
if (manager.isGroundApp(arg)) continue;
|
|
231
230
|
for (let argIndex = 0; argIndex < manager.getNumArgs(arg); argIndex++) {
|
|
232
231
|
const innerArg = manager.getArg(arg, argIndex);
|
|
233
232
|
if (manager.kinds[innerArg] !== KIND_APP) return manager.mkPattern([candidate]);
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/pb_decl_plugin.h, src/ast/pb_decl_plugin.cpp,
|
|
2
|
-
// src/ast/rewriter/pb_rewriter.cpp, src/ast/rewriter/pb_rewriter_def.h), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import {
|
|
5
2
|
type AstManager,
|
|
6
3
|
FAMILY_PB,
|
|
@@ -11,6 +8,7 @@ import {
|
|
|
11
8
|
OP_PB_LE,
|
|
12
9
|
SORT_BOOL,
|
|
13
10
|
} from "./ast";
|
|
11
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
14
12
|
import { getGcd, getLcm, Rational } from "./rational";
|
|
15
13
|
import type { Rewrite } from "./rewriter-tpl";
|
|
16
14
|
|
|
@@ -100,15 +98,15 @@ export const mkPbEq = (
|
|
|
100
98
|
return mkPbApp(manager, OP_PB_EQ, [normalized.k, ...normalized.coeffs], args);
|
|
101
99
|
};
|
|
102
100
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
101
|
+
// ast_util's mk_not and pb_util's negate.
|
|
102
|
+
const negate = (manager: AstManager, expr: number) =>
|
|
103
|
+
expr === manager.trueExpr
|
|
104
|
+
? manager.falseExpr
|
|
105
|
+
: expr === manager.falseExpr
|
|
106
|
+
? manager.trueExpr
|
|
107
|
+
: manager.isNot(expr)
|
|
108
|
+
? manager.getArg(expr, 0)
|
|
109
|
+
: manager.mkNot(expr);
|
|
112
110
|
|
|
113
111
|
const mkAnd = (manager: AstManager, args: number[]) =>
|
|
114
112
|
args.length === 0 ? manager.trueExpr : manager.mkAnd(args);
|
|
@@ -116,7 +114,7 @@ const mkAnd = (manager: AstManager, args: number[]) =>
|
|
|
116
114
|
const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
117
115
|
for (const arg of args)
|
|
118
116
|
if (manager.isNot(arg.expr)) {
|
|
119
|
-
arg.expr =
|
|
117
|
+
arg.expr = negate(manager, arg.expr);
|
|
120
118
|
bound.k = bound.k.sub(arg.coeff);
|
|
121
119
|
arg.coeff = arg.coeff.neg();
|
|
122
120
|
}
|
|
@@ -124,7 +122,8 @@ const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
|
124
122
|
if (arg.expr === manager.trueExpr) bound.k = bound.k.sub(arg.coeff);
|
|
125
123
|
return arg.expr !== manager.trueExpr && arg.expr !== manager.falseExpr;
|
|
126
124
|
});
|
|
127
|
-
|
|
125
|
+
const ids = manager.ids;
|
|
126
|
+
kept.sort((first, second) => ids[first.expr] - ids[second.expr]);
|
|
128
127
|
const coalesced: PbArg[] = [];
|
|
129
128
|
for (const arg of kept) {
|
|
130
129
|
const last = coalesced[coalesced.length - 1];
|
|
@@ -134,10 +133,6 @@ const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
|
134
133
|
args.splice(0, args.length, ...coalesced.filter((arg) => !arg.coeff.isZero()));
|
|
135
134
|
};
|
|
136
135
|
|
|
137
|
-
const L_TRUE = 1;
|
|
138
|
-
const L_FALSE = -1;
|
|
139
|
-
const L_UNDEF = 0;
|
|
140
|
-
|
|
141
136
|
const normalizePb = (manager: AstManager, args: PbArg[], bound: { k: Rational }, isEq: boolean) => {
|
|
142
137
|
let sum = Rational.zero;
|
|
143
138
|
for (const arg of args) {
|
|
@@ -213,13 +208,6 @@ const normalizePb = (manager: AstManager, args: PbArg[], bound: { k: Rational },
|
|
|
213
208
|
return L_UNDEF;
|
|
214
209
|
};
|
|
215
210
|
|
|
216
|
-
const negate = (manager: AstManager, expr: number) =>
|
|
217
|
-
expr === manager.trueExpr
|
|
218
|
-
? manager.falseExpr
|
|
219
|
-
: expr === manager.falseExpr
|
|
220
|
-
? manager.trueExpr
|
|
221
|
-
: mkNot(manager, expr);
|
|
222
|
-
|
|
223
211
|
const prune = (manager: AstManager, args: PbArg[], bound: { k: Rational }, isEq: boolean) => {
|
|
224
212
|
if (isEq) return;
|
|
225
213
|
let nlt = Rational.zero;
|
|
@@ -267,7 +255,7 @@ export const mkPbAppCore = (
|
|
|
267
255
|
const size = vec.length;
|
|
268
256
|
if (isEq) {
|
|
269
257
|
if (size === 0) return k.isZero() ? manager.trueExpr : manager.falseExpr;
|
|
270
|
-
if (k.isZero()) return
|
|
258
|
+
if (k.isZero()) return negate(manager, manager.mkOr(exprs));
|
|
271
259
|
if (k.equals(Rational.one) && isAllUnit && size === 1) return exprs[0];
|
|
272
260
|
if (slack.equals(k)) return mkAnd(manager, exprs);
|
|
273
261
|
return mkPbEq(manager, coeffs, exprs, k);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -232,7 +231,7 @@ export class PolyRewriter {
|
|
|
232
231
|
}
|
|
233
232
|
|
|
234
233
|
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
235
|
-
if (args.length < 2) return undefined;
|
|
234
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
236
235
|
const manager = this.manager;
|
|
237
236
|
if (
|
|
238
237
|
this.options.isHoistIte === true &&
|
|
@@ -387,7 +386,7 @@ export class PolyRewriter {
|
|
|
387
386
|
}
|
|
388
387
|
|
|
389
388
|
mkMul(args: number[]): number | Rewrite | undefined {
|
|
390
|
-
if (args.length < 2) return undefined;
|
|
389
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
391
390
|
this.currSort = this.manager.sorts[args[0]];
|
|
392
391
|
const isFlatMonomial =
|
|
393
392
|
args.length === 2 &&
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/probe.cpp, src/tactic/arith/probe_arith.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtParseError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -154,8 +152,8 @@ const mkNonQffp = (isLra: boolean) => (manager: AstManager, expr: number) => {
|
|
|
154
152
|
return isLra ? sort !== SORT_REAL : !(sort === SORT_REAL && manager.isNumeral(expr));
|
|
155
153
|
};
|
|
156
154
|
|
|
157
|
-
//
|
|
158
|
-
//
|
|
155
|
+
// Z3 rejects every application of the basic family before it would accept one, so the goal must not
|
|
156
|
+
// have a Boolean connective.
|
|
159
157
|
const isNonFpQfnra = (manager: AstManager, expr: number) => {
|
|
160
158
|
if (!isApp(manager, expr)) return true;
|
|
161
159
|
const family = manager.getFamily(expr);
|
|
@@ -267,7 +265,7 @@ const mkNonNira =
|
|
|
267
265
|
const divisor = manager.getArg(expr, 1);
|
|
268
266
|
if (isLinear)
|
|
269
267
|
return !manager.isNumeral(divisor) || manager.getRationalValue(divisor).isZero();
|
|
270
|
-
return !manager.
|
|
268
|
+
return !manager.isGroundApp(manager.getArg(expr, 0)) || !manager.isGroundApp(divisor);
|
|
271
269
|
}
|
|
272
270
|
if (op === OP_IS_INT) return isReal;
|
|
273
271
|
if (op === OP_TO_INT || op === OP_TO_REAL) return false;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/propagate_values_tactic.cpp, src/ast/shared_occs.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, KIND_QUANTIFIER, OP_EQ, type AstManager } from "./ast";
|
|
3
2
|
import { type Dependency, type Goal, joinDependencies } from "./goal";
|
|
4
3
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
@@ -23,6 +22,10 @@ const getSharedOccs = (manager: AstManager, forms: number[]) => {
|
|
|
23
22
|
export const propagateValues = (manager: AstManager, goal: Goal, maxRounds = 4) => {
|
|
24
23
|
goal.depth++;
|
|
25
24
|
if (goal.isInconsistent) return;
|
|
25
|
+
if (goal.isProofsEnabled) {
|
|
26
|
+
goal.elimRedundancies();
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
26
29
|
const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
27
30
|
const substitution = new Map<number, number>();
|
|
28
31
|
const dependencies = new Map<number, Dependency | undefined>();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/proto_model/proto_model.cpp, src/model/func_interp.cpp, src/model/value_factory.cpp, src/model/model_core.cpp, src/model/datatype_factory.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { TermEnumeration } from "./term-enumeration";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -144,7 +143,7 @@ export class FuncInterp {
|
|
|
144
143
|
const manager = this.manager;
|
|
145
144
|
if (manager.getOp(expr) !== OP_ITE) return undefined;
|
|
146
145
|
const condition = manager.getArg(expr, 0);
|
|
147
|
-
if (!manager.
|
|
146
|
+
if (!manager.isGroundApp(manager.getArg(expr, 1)) || this.arity === 0) return undefined;
|
|
148
147
|
if (this.arity === 1 && manager.getOp(condition) !== OP_EQ) return undefined;
|
|
149
148
|
if (
|
|
150
149
|
this.arity > 1 &&
|
|
@@ -189,7 +188,7 @@ export class FuncInterp {
|
|
|
189
188
|
|
|
190
189
|
isConstant() {
|
|
191
190
|
const elseExpr = this.elseExpr;
|
|
192
|
-
if (elseExpr === null || !this.manager.
|
|
191
|
+
if (elseExpr === null || !this.manager.isGroundApp(elseExpr)) return false;
|
|
193
192
|
return this.entries.every((entry) => entry.result === elseExpr);
|
|
194
193
|
}
|
|
195
194
|
|
|
@@ -211,7 +210,7 @@ export class FuncInterp {
|
|
|
211
210
|
compress() {
|
|
212
211
|
const manager = this.manager;
|
|
213
212
|
const elseExpr = this.elseExpr;
|
|
214
|
-
if (elseExpr === null || this.entries.length === 0 || !manager.
|
|
213
|
+
if (elseExpr === null || this.entries.length === 0 || !manager.isGroundApp(elseExpr)) return;
|
|
215
214
|
const kept = this.entries.filter((entry) => {
|
|
216
215
|
if (entry.result !== elseExpr) return true;
|
|
217
216
|
this.releaseEntry(entry);
|
|
@@ -252,10 +251,10 @@ export class FuncInterp {
|
|
|
252
251
|
if (elseExpr === null) return undefined;
|
|
253
252
|
const domain = manager.funcDecls[decl].domain;
|
|
254
253
|
const isGround =
|
|
255
|
-
manager.
|
|
254
|
+
manager.isGroundApp(elseExpr) &&
|
|
256
255
|
this.entries.every(
|
|
257
256
|
(entry) =>
|
|
258
|
-
manager.
|
|
257
|
+
manager.isGroundApp(entry.result) && entry.args.every((arg) => manager.isGroundApp(arg)),
|
|
259
258
|
);
|
|
260
259
|
if (!isGround) {
|
|
261
260
|
const interp = this.getInterp();
|