tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,18 +1,16 @@
|
|
|
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";
|
|
6
|
-
import { AlgebraicManager } from "./nlsat/algebraic";
|
|
5
|
+
import type { AlgebraicManager } from "./nlsat/algebraic";
|
|
7
6
|
import type { ParetoSolver } from "./opt-pareto";
|
|
8
7
|
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.
|
|
@@ -42,7 +40,6 @@ export const getModelValueBound = (
|
|
|
42
40
|
|
|
43
41
|
export class OptSolver {
|
|
44
42
|
private readonly kernel: SmtKernel;
|
|
45
|
-
private readonly am = new AlgebraicManager();
|
|
46
43
|
private model: ProtoModel | null = null;
|
|
47
44
|
private objectiveVars: number[] = [];
|
|
48
45
|
private objectiveValues: InfEps[] = [];
|
|
@@ -53,12 +50,14 @@ export class OptSolver {
|
|
|
53
50
|
private pinned: RefVector;
|
|
54
51
|
private isFirst = true;
|
|
55
52
|
private numScopes = 0;
|
|
53
|
+
private readonly dualBoundRlimit: number;
|
|
56
54
|
wasUnknown = false;
|
|
57
55
|
|
|
58
56
|
constructor(
|
|
59
57
|
private readonly manager: AstManager,
|
|
60
|
-
params:
|
|
58
|
+
params: TacticEnvironment,
|
|
61
59
|
) {
|
|
60
|
+
this.dualBoundRlimit = Number(params.parameters.get("opt.optsmt_dual_bound_rlimit") ?? 100);
|
|
62
61
|
// opt_solver turns relevancy off under the default case split strategy, so a decided bound,
|
|
63
62
|
// such as one optsmt made for a lower bound, reaches the arithmetic solver.
|
|
64
63
|
this.kernel = new SmtKernel(manager, {
|
|
@@ -84,7 +83,9 @@ export class OptSolver {
|
|
|
84
83
|
private get arith() {
|
|
85
84
|
const context = this.kernel.context;
|
|
86
85
|
context.registerFamily(FAMILY_ARITH);
|
|
87
|
-
|
|
86
|
+
if (context.arith === undefined)
|
|
87
|
+
throw new SmtInvariantError("get_optimizer found no arithmetic theory");
|
|
88
|
+
return context.arith;
|
|
88
89
|
}
|
|
89
90
|
|
|
90
91
|
assertExpr(expr: number) {
|
|
@@ -128,6 +129,10 @@ export class OptSolver {
|
|
|
128
129
|
return this.kernel.context.unsatCore;
|
|
129
130
|
}
|
|
130
131
|
|
|
132
|
+
get reasonUnknown() {
|
|
133
|
+
return this.kernel.context.getLastFailureMessage();
|
|
134
|
+
}
|
|
135
|
+
|
|
131
136
|
findMutexes(vars: readonly number[]) {
|
|
132
137
|
const mutexes = this.kernel.context.findMutexes(vars);
|
|
133
138
|
for (const mutex of mutexes) for (const literal of mutex) this.pinned.push(literal);
|
|
@@ -163,7 +168,7 @@ export class OptSolver {
|
|
|
163
168
|
|
|
164
169
|
private getModelValueLowerBound(model: ProtoModel, index: number) {
|
|
165
170
|
const value = model.eval(this.objectiveTerms[index], false);
|
|
166
|
-
const bound = getModelValueBound(this.manager, this.am, value, true);
|
|
171
|
+
const bound = getModelValueBound(this.manager, this.manager.am, value, true);
|
|
167
172
|
this.manager.decRef(value);
|
|
168
173
|
return bound;
|
|
169
174
|
}
|
|
@@ -200,7 +205,13 @@ export class OptSolver {
|
|
|
200
205
|
if (bound !== undefined && InfEps.of(bound).compare(this.objectiveValues[index]) > 0)
|
|
201
206
|
this.objectiveValues[index] = InfEps.of(bound);
|
|
202
207
|
if (this.manager.limit.isExhausted()) return outcome;
|
|
203
|
-
if (
|
|
208
|
+
if (
|
|
209
|
+
isProbing &&
|
|
210
|
+
value.isFinite() &&
|
|
211
|
+
upper !== null &&
|
|
212
|
+
!upper.isGlobal &&
|
|
213
|
+
this.dualBoundRlimit !== 0
|
|
214
|
+
) {
|
|
204
215
|
if (this.checkUpperBound(index, upper.value) === L_FALSE) result.upperBound = upper.value;
|
|
205
216
|
if (!this.manager.limit.inc() || !this.checkBound(index, value, result)) return outcome;
|
|
206
217
|
} else if (value.isFinite()) {
|
|
@@ -224,7 +235,7 @@ export class OptSolver {
|
|
|
224
235
|
if (!(error instanceof SmtCanceledError)) throw error;
|
|
225
236
|
return L_UNDEF;
|
|
226
237
|
}
|
|
227
|
-
limit.push(
|
|
238
|
+
limit.push(this.dualBoundRlimit);
|
|
228
239
|
const result = (() => {
|
|
229
240
|
try {
|
|
230
241
|
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";
|
|
@@ -19,7 +17,7 @@ const UNBOUNDED_CHECK_RLIMIT = 100000;
|
|
|
19
17
|
const UNBOUNDED_CHECK_ROUNDS = 8;
|
|
20
18
|
const MAX_ONE_SIDED_ROUNDS = 16;
|
|
21
19
|
|
|
22
|
-
|
|
20
|
+
interface OptsmtHost {
|
|
23
21
|
getBaseModel(): ProtoModel | null;
|
|
24
22
|
setModel(model: ProtoModel | null): void;
|
|
25
23
|
}
|
|
@@ -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,9 +1,5 @@
|
|
|
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
|
-
FAMILY_PB,
|
|
7
3
|
OP_AT_LEAST_K,
|
|
8
4
|
OP_AT_MOST_K,
|
|
9
5
|
OP_PB_EQ,
|
|
@@ -11,6 +7,7 @@ import {
|
|
|
11
7
|
OP_PB_LE,
|
|
12
8
|
SORT_BOOL,
|
|
13
9
|
} from "./ast";
|
|
10
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
14
11
|
import { getGcd, getLcm, Rational } from "./rational";
|
|
15
12
|
import type { Rewrite } from "./rewriter-tpl";
|
|
16
13
|
|
|
@@ -21,8 +18,6 @@ interface PbArg {
|
|
|
21
18
|
coeff: Rational;
|
|
22
19
|
}
|
|
23
20
|
|
|
24
|
-
export const isPb = (manager: AstManager, expr: number) => manager.getFamily(expr) === FAMILY_PB;
|
|
25
|
-
|
|
26
21
|
export const getPbK = (manager: AstManager, decl: number) => manager.getPbParameters(decl)[0];
|
|
27
22
|
|
|
28
23
|
export const getPbCoeff = (manager: AstManager, decl: number, index: number) => {
|
|
@@ -33,7 +28,7 @@ export const getPbCoeff = (manager: AstManager, decl: number, index: number) =>
|
|
|
33
28
|
};
|
|
34
29
|
|
|
35
30
|
export const hasUnitCoefficients = (manager: AstManager, decl: number) =>
|
|
36
|
-
manager.funcDecls[decl].domain.every((
|
|
31
|
+
manager.funcDecls[decl].domain.every((_value, index) =>
|
|
37
32
|
getPbCoeff(manager, decl, index).equals(Rational.one),
|
|
38
33
|
);
|
|
39
34
|
|
|
@@ -100,15 +95,15 @@ export const mkPbEq = (
|
|
|
100
95
|
return mkPbApp(manager, OP_PB_EQ, [normalized.k, ...normalized.coeffs], args);
|
|
101
96
|
};
|
|
102
97
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
98
|
+
// ast_util's mk_not and pb_util's negate.
|
|
99
|
+
const negate = (manager: AstManager, expr: number) =>
|
|
100
|
+
expr === manager.trueExpr
|
|
101
|
+
? manager.falseExpr
|
|
102
|
+
: expr === manager.falseExpr
|
|
103
|
+
? manager.trueExpr
|
|
104
|
+
: manager.isNot(expr)
|
|
105
|
+
? manager.getArg(expr, 0)
|
|
106
|
+
: manager.mkNot(expr);
|
|
112
107
|
|
|
113
108
|
const mkAnd = (manager: AstManager, args: number[]) =>
|
|
114
109
|
args.length === 0 ? manager.trueExpr : manager.mkAnd(args);
|
|
@@ -116,7 +111,7 @@ const mkAnd = (manager: AstManager, args: number[]) =>
|
|
|
116
111
|
const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
117
112
|
for (const arg of args)
|
|
118
113
|
if (manager.isNot(arg.expr)) {
|
|
119
|
-
arg.expr =
|
|
114
|
+
arg.expr = negate(manager, arg.expr);
|
|
120
115
|
bound.k = bound.k.sub(arg.coeff);
|
|
121
116
|
arg.coeff = arg.coeff.neg();
|
|
122
117
|
}
|
|
@@ -124,7 +119,8 @@ const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
|
124
119
|
if (arg.expr === manager.trueExpr) bound.k = bound.k.sub(arg.coeff);
|
|
125
120
|
return arg.expr !== manager.trueExpr && arg.expr !== manager.falseExpr;
|
|
126
121
|
});
|
|
127
|
-
|
|
122
|
+
const ids = manager.ids;
|
|
123
|
+
kept.sort((first, second) => ids[first.expr] - ids[second.expr]);
|
|
128
124
|
const coalesced: PbArg[] = [];
|
|
129
125
|
for (const arg of kept) {
|
|
130
126
|
const last = coalesced[coalesced.length - 1];
|
|
@@ -134,10 +130,6 @@ const unique = (manager: AstManager, args: PbArg[], bound: { k: Rational }) => {
|
|
|
134
130
|
args.splice(0, args.length, ...coalesced.filter((arg) => !arg.coeff.isZero()));
|
|
135
131
|
};
|
|
136
132
|
|
|
137
|
-
const L_TRUE = 1;
|
|
138
|
-
const L_FALSE = -1;
|
|
139
|
-
const L_UNDEF = 0;
|
|
140
|
-
|
|
141
133
|
const normalizePb = (manager: AstManager, args: PbArg[], bound: { k: Rational }, isEq: boolean) => {
|
|
142
134
|
let sum = Rational.zero;
|
|
143
135
|
for (const arg of args) {
|
|
@@ -213,13 +205,6 @@ const normalizePb = (manager: AstManager, args: PbArg[], bound: { k: Rational },
|
|
|
213
205
|
return L_UNDEF;
|
|
214
206
|
};
|
|
215
207
|
|
|
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
208
|
const prune = (manager: AstManager, args: PbArg[], bound: { k: Rational }, isEq: boolean) => {
|
|
224
209
|
if (isEq) return;
|
|
225
210
|
let nlt = Rational.zero;
|
|
@@ -267,7 +252,7 @@ export const mkPbAppCore = (
|
|
|
267
252
|
const size = vec.length;
|
|
268
253
|
if (isEq) {
|
|
269
254
|
if (size === 0) return k.isZero() ? manager.trueExpr : manager.falseExpr;
|
|
270
|
-
if (k.isZero()) return
|
|
255
|
+
if (k.isZero()) return negate(manager, manager.mkOr(exprs));
|
|
271
256
|
if (k.equals(Rational.one) && isAllUnit && size === 1) return exprs[0];
|
|
272
257
|
if (slack.equals(k)) return mkAnd(manager, exprs);
|
|
273
258
|
return mkPbEq(manager, coeffs, exprs, k);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see z3-license.txt.
|
|
2
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
KIND_APP,
|
|
@@ -44,6 +42,7 @@ import {
|
|
|
44
42
|
SORT_INT,
|
|
45
43
|
} from "./ast";
|
|
46
44
|
import { isAstLess } from "./ast-lt";
|
|
45
|
+
import { ObjHashtable } from "./hashtable";
|
|
47
46
|
import { Rational } from "./rational";
|
|
48
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
49
48
|
|
|
@@ -232,18 +231,7 @@ export class PolyRewriter {
|
|
|
232
231
|
}
|
|
233
232
|
|
|
234
233
|
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
235
|
-
if (args.length < 2) return undefined;
|
|
236
|
-
const manager = this.manager;
|
|
237
|
-
if (
|
|
238
|
-
this.options.isHoistIte === true &&
|
|
239
|
-
args.some(
|
|
240
|
-
(arg) =>
|
|
241
|
-
manager.getOp(arg) === OP_ITE ||
|
|
242
|
-
(this.isAdd(arg) &&
|
|
243
|
-
manager.getArgs(arg).some((inner) => manager.getOp(inner) === OP_ITE)),
|
|
244
|
-
)
|
|
245
|
-
)
|
|
246
|
-
throw new SmtUnsupportedError("hoisting an if-then-else out of a sum");
|
|
234
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
247
235
|
this.currSort = this.manager.sorts[args[0]];
|
|
248
236
|
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
249
237
|
return this.mkNflatAdd(args);
|
|
@@ -301,24 +289,29 @@ export class PolyRewriter {
|
|
|
301
289
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
302
290
|
}
|
|
303
291
|
}
|
|
304
|
-
return this.
|
|
292
|
+
return this.hoist(
|
|
305
293
|
this.mkAddApp(
|
|
306
294
|
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
307
295
|
),
|
|
308
296
|
);
|
|
309
297
|
}
|
|
310
|
-
if (isOrdered && this.options.isHoistMul !== true) {
|
|
298
|
+
if (isOrdered && this.options.isHoistMul !== true && this.options.isHoistIte !== true) {
|
|
311
299
|
if (numCoeffs === 0) return undefined;
|
|
312
300
|
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
313
301
|
return undefined;
|
|
314
302
|
}
|
|
315
303
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
316
304
|
for (const arg of args) if (!this.isNumeral(arg)) newArgs.push(arg);
|
|
317
|
-
return this.
|
|
305
|
+
return this.hoist(
|
|
318
306
|
this.mkAddApp(isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1)),
|
|
319
307
|
);
|
|
320
308
|
}
|
|
321
309
|
|
|
310
|
+
private hoist(sum: number): number | Rewrite {
|
|
311
|
+
const hoisted = this.hoistMultiplication(sum) ?? this.hoistIte(sum);
|
|
312
|
+
return hoisted === undefined ? sum : this.reduce(hoisted, Infinity);
|
|
313
|
+
}
|
|
314
|
+
|
|
322
315
|
// TO_BUFFER: the first argument takes the place of the term, and the others go at the end.
|
|
323
316
|
private getFlatArgs(expr: number, isSplit: (expr: number) => boolean) {
|
|
324
317
|
const manager = this.manager;
|
|
@@ -336,8 +329,8 @@ export class PolyRewriter {
|
|
|
336
329
|
return buffer;
|
|
337
330
|
}
|
|
338
331
|
|
|
339
|
-
private hoistMultiplication(sum: number)
|
|
340
|
-
if (this.options.isHoistMul !== true) return
|
|
332
|
+
private hoistMultiplication(sum: number) {
|
|
333
|
+
if (this.options.isHoistMul !== true) return undefined;
|
|
341
334
|
const isMul = (expr: number) => this.isMul(expr);
|
|
342
335
|
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
343
336
|
const isValid = adds.map(() => true);
|
|
@@ -373,7 +366,69 @@ export class PolyRewriter {
|
|
|
373
366
|
isChanged = true;
|
|
374
367
|
break;
|
|
375
368
|
}
|
|
376
|
-
return isChanged ? this.
|
|
369
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
private hoistIte(sum: number) {
|
|
373
|
+
if (this.options.isHoistIte !== true) return undefined;
|
|
374
|
+
const manager = this.manager;
|
|
375
|
+
const shared = new ObjHashtable((expr) => manager.hashes[expr]);
|
|
376
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
377
|
+
let isChanged = false;
|
|
378
|
+
for (let index = 0; index < adds.length; index++) {
|
|
379
|
+
const add = adds[index];
|
|
380
|
+
if (manager.getOp(add) !== OP_ITE) continue;
|
|
381
|
+
shared.clear();
|
|
382
|
+
if (!this.collectSharedSummands(add, shared)) continue;
|
|
383
|
+
const summands = [this.applyHoist(add, shared)];
|
|
384
|
+
for (const summand of shared) summands.push(summand);
|
|
385
|
+
const hoisted = this.mkAddApp(summands);
|
|
386
|
+
if (hoisted === add) continue;
|
|
387
|
+
adds[index] = hoisted;
|
|
388
|
+
isChanged = true;
|
|
389
|
+
}
|
|
390
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
private collectSharedSummands(expr: number, shared: ObjHashtable): boolean {
|
|
394
|
+
const manager = this.manager;
|
|
395
|
+
if (manager.getOp(expr) === OP_ITE)
|
|
396
|
+
return (
|
|
397
|
+
this.collectSharedSummands(manager.getArg(expr, 1), shared) &&
|
|
398
|
+
this.collectSharedSummands(manager.getArg(expr, 2), shared)
|
|
399
|
+
);
|
|
400
|
+
if (this.isNumeral(expr) && this.getValue(expr).isInt()) return false;
|
|
401
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
402
|
+
if (shared.size === 0)
|
|
403
|
+
for (let index = 0; index < summands.length; index++) shared.add(summands[index]);
|
|
404
|
+
else {
|
|
405
|
+
const removed: number[] = [];
|
|
406
|
+
for (const summand of shared) if (!summands.includes(summand)) removed.push(summand);
|
|
407
|
+
for (let index = removed.length - 1; index >= 0; index--) shared.delete(removed[index]);
|
|
408
|
+
}
|
|
409
|
+
if (shared.size === 0) return false;
|
|
410
|
+
for (let index = 1; index < summands.length; index++)
|
|
411
|
+
if (summands.lastIndexOf(summands[index], index - 1) !== -1) return false;
|
|
412
|
+
return true;
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
private applyHoist(expr: number, shared: ObjHashtable): number {
|
|
416
|
+
const manager = this.manager;
|
|
417
|
+
if (manager.getOp(expr) === OP_ITE) {
|
|
418
|
+
const thenExpr = this.applyHoist(manager.getArg(expr, 1), shared);
|
|
419
|
+
const elseExpr = this.applyHoist(manager.getArg(expr, 2), shared);
|
|
420
|
+
return manager.mkApp(
|
|
421
|
+
OP_ITE,
|
|
422
|
+
[manager.getArg(expr, 0), thenExpr, elseExpr],
|
|
423
|
+
manager.sorts[expr],
|
|
424
|
+
);
|
|
425
|
+
}
|
|
426
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
427
|
+
let size = 0;
|
|
428
|
+
for (let index = 0; index < summands.length; index++)
|
|
429
|
+
if (!shared.has(summands[index])) summands[size++] = summands[index];
|
|
430
|
+
summands.length = size;
|
|
431
|
+
return this.mkAddApp(summands);
|
|
377
432
|
}
|
|
378
433
|
|
|
379
434
|
private growStamps(expr: number) {
|
|
@@ -387,7 +442,7 @@ export class PolyRewriter {
|
|
|
387
442
|
}
|
|
388
443
|
|
|
389
444
|
mkMul(args: number[]): number | Rewrite | undefined {
|
|
390
|
-
if (args.length < 2) return undefined;
|
|
445
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
391
446
|
this.currSort = this.manager.sorts[args[0]];
|
|
392
447
|
const isFlatMonomial =
|
|
393
448
|
args.length === 2 &&
|