tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +3 -6
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +1 -4
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +2 -3
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
|
|
1
|
+
// A statement that discards its result builds a term that upstream builds and never uses, so the
|
|
2
|
+
// terms after it get the ids Z3 gives them.
|
|
3
|
+
import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
|
|
3
4
|
import {
|
|
4
5
|
type AstManager,
|
|
5
6
|
OP_BADD,
|
|
@@ -103,15 +104,15 @@ export class Fpa2BvConverter {
|
|
|
103
104
|
manager.decDeclRef(entry[0]);
|
|
104
105
|
manager.decRef(entry[1]);
|
|
105
106
|
}
|
|
107
|
+
for (const entry of this.uf2BvUf) {
|
|
108
|
+
manager.decDeclRef(entry[0]);
|
|
109
|
+
manager.decDeclRef(entry[1]);
|
|
110
|
+
}
|
|
106
111
|
for (const entry of this.minMaxUfs) {
|
|
107
112
|
manager.decDeclRef(entry[0]);
|
|
108
113
|
manager.decRef(entry[1][0]);
|
|
109
114
|
manager.decRef(entry[1][1]);
|
|
110
115
|
}
|
|
111
|
-
for (const entry of this.uf2BvUf) {
|
|
112
|
-
manager.decDeclRef(entry[0]);
|
|
113
|
-
manager.decDeclRef(entry[1]);
|
|
114
|
-
}
|
|
115
116
|
this.constants.clear();
|
|
116
117
|
this.rmConstants.clear();
|
|
117
118
|
this.minMaxUfs.clear();
|
|
@@ -1413,10 +1414,12 @@ export class Fpa2BvConverter {
|
|
|
1413
1414
|
if (manager.getOp(x) !== OP_NUM) return this.mkToFpSymbolicReal(sort, rm, x);
|
|
1414
1415
|
const value = manager.getRationalValue(x);
|
|
1415
1416
|
if (value.isZero()) return this.mkPzero(sort);
|
|
1416
|
-
if (manager.isBvNumeral(rm))
|
|
1417
|
+
if (manager.isBvNumeral(rm)) {
|
|
1418
|
+
const mode = Number(manager.getBvNumeralValue(rm));
|
|
1417
1419
|
return this.mkFpOfMpf(
|
|
1418
|
-
mpfFromRational(ebits, sbits,
|
|
1420
|
+
mpfFromRational(ebits, sbits, mode > BV_RM_TO_ZERO ? BV_RM_TO_ZERO : mode, 0n, value),
|
|
1419
1421
|
);
|
|
1422
|
+
}
|
|
1420
1423
|
const rmNta = this.mkIsRm(rm, BV_RM_TIES_TO_AWAY);
|
|
1421
1424
|
const rmNte = this.mkIsRm(rm, BV_RM_TIES_TO_EVEN);
|
|
1422
1425
|
const rmTp = this.mkIsRm(rm, BV_RM_TO_POSITIVE);
|
|
@@ -1437,6 +1440,8 @@ export class Fpa2BvConverter {
|
|
|
1437
1440
|
const manager = this.manager;
|
|
1438
1441
|
const ebits = manager.getEbits(sort);
|
|
1439
1442
|
const sbits = manager.getSbits(sort);
|
|
1443
|
+
// Deviation from Z3: it runs out of memory from an exponent width of 31, where this gives up as at a resource limit.
|
|
1444
|
+
if (ebits > 30) throw new SmtCanceledError();
|
|
1440
1445
|
const x =
|
|
1441
1446
|
manager.sorts[input] === SORT_INT ? manager.mkApp(OP_TO_REAL, [input], SORT_REAL) : input;
|
|
1442
1447
|
const real = (op: number, ...args: number[]) => manager.mkApp(op, args, SORT_REAL);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/fpa/fpa2bv_tactic.cpp, src/tactic/fpa/fpa2bv_model_converter.cpp,
|
|
2
|
-
// src/ast/fpa/bv2fpa_converter.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import type { AstManager } from "./ast";
|
|
4
2
|
import { TACTIC_ARITH_OPTIONS } from "./arith-rewriter";
|
|
5
3
|
import { convertMinMaxSpecials, convertUf2BvUf } from "./bv2fpa-converter";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/goal.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_AND, OP_NOT, OP_OR, SORT_BOOL, type AstManager } from "./ast";
|
|
3
2
|
import type { ProtoModel } from "./proto-model";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -44,7 +43,7 @@ interface Polarized {
|
|
|
44
43
|
isPositive: boolean;
|
|
45
44
|
}
|
|
46
45
|
|
|
47
|
-
|
|
46
|
+
const PRECISE = 0;
|
|
48
47
|
export const UNDER = 1;
|
|
49
48
|
export const OVER = 2;
|
|
50
49
|
const UNDER_OVER = 3;
|
|
@@ -83,6 +82,8 @@ export class Goal {
|
|
|
83
82
|
model: ProtoModel | undefined;
|
|
84
83
|
isProofsEnabled = false;
|
|
85
84
|
isCoresEnabled = false;
|
|
85
|
+
// As in Z3, it isn't copied with the goal.
|
|
86
|
+
reasonUnknown = "";
|
|
86
87
|
|
|
87
88
|
constructor(readonly manager: AstManager) {
|
|
88
89
|
this.forms = new RefVector(manager);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/tactic/goal2nlsat.cpp, src/ast/expr2polynomial.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -24,9 +22,10 @@ import {
|
|
|
24
22
|
SORT_INT,
|
|
25
23
|
SORT_REAL,
|
|
26
24
|
} from "./ast";
|
|
27
|
-
import {
|
|
25
|
+
import { Expr2Polynomial } from "./expr2polynomial";
|
|
28
26
|
import { getLcm } from "./rational";
|
|
29
27
|
import { flipKind } from "./nlsat/atoms";
|
|
28
|
+
import { Factors, type Polynomial, PolynomialRef } from "./nlsat/polynomial";
|
|
30
29
|
import type { NlsatSolver } from "./nlsat/solver";
|
|
31
30
|
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
32
31
|
import type { IneqKind } from "./nlsat/types";
|
|
@@ -41,38 +40,54 @@ export const goal2nlsat = (
|
|
|
41
40
|
isFactoring = true,
|
|
42
41
|
) => {
|
|
43
42
|
const pm = solver.pm;
|
|
43
|
+
const expr2poly = new Expr2Polynomial(manager, pm, t2x, (isInt) => solver.mkVar(isInt));
|
|
44
44
|
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
const factorAtom = (polynomial: Polynomial, kind: IneqKind) => {
|
|
46
|
+
const factors = new Factors(pm);
|
|
47
|
+
pm.factor(polynomial, factors);
|
|
48
|
+
const literal = solver.mkIneqLiteral(
|
|
49
|
+
factors.constant < 0n ? flipKind(kind) : kind,
|
|
50
|
+
factors.factors,
|
|
51
|
+
factors.degrees.map((degree) => degree % 2 === 0),
|
|
52
|
+
);
|
|
53
|
+
factors.reset();
|
|
54
|
+
return literal;
|
|
52
55
|
};
|
|
53
56
|
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
const rhs = toPolynomial(manager, pm, manager.getArg(atom, 1), mkVar);
|
|
57
|
-
const lcm = getLcm(lhs.denominator, rhs.denominator);
|
|
58
|
-
const polynomial = pm.addmul(
|
|
59
|
-
lcm / lhs.denominator,
|
|
60
|
-
lhs.polynomial,
|
|
61
|
-
-(lcm / rhs.denominator),
|
|
62
|
-
rhs.polynomial,
|
|
63
|
-
);
|
|
57
|
+
const processIneqPolynomial = (p: PolynomialRef, kind: IneqKind) => {
|
|
58
|
+
const polynomial = p.get();
|
|
64
59
|
if (pm.isConst(polynomial)) {
|
|
65
60
|
const sign = pm.isZero(polynomial) ? 0 : polynomial.as[0] > 0n ? 1 : -1;
|
|
66
61
|
const isTrue = kind === "EQ" ? sign === 0 : kind === "LT" ? sign < 0 : sign > 0;
|
|
67
62
|
return isTrue ? 0 : 1;
|
|
68
63
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
64
|
+
return isFactoring
|
|
65
|
+
? factorAtom(polynomial, kind)
|
|
66
|
+
: solver.mkIneqLiteral(kind, [polynomial], [false]);
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
const processIneq = (atom: number, kind: IneqKind) => {
|
|
70
|
+
const first = new PolynomialRef(pm);
|
|
71
|
+
const second = new PolynomialRef(pm);
|
|
72
|
+
const p = new PolynomialRef(pm);
|
|
73
|
+
const firstDenominator = expr2poly.toPolynomial(manager.getArg(atom, 0), first);
|
|
74
|
+
const secondDenominator = expr2poly.toPolynomial(manager.getArg(atom, 1), second);
|
|
75
|
+
const lcm = getLcm(firstDenominator, secondDenominator);
|
|
76
|
+
p.set(
|
|
77
|
+
pm.addmulTerms(
|
|
78
|
+
lcm / firstDenominator,
|
|
79
|
+
pm.unit,
|
|
80
|
+
first.get(),
|
|
81
|
+
-(lcm / secondDenominator),
|
|
82
|
+
pm.unit,
|
|
83
|
+
second.get(),
|
|
84
|
+
),
|
|
75
85
|
);
|
|
86
|
+
const literal = processIneqPolynomial(p, kind);
|
|
87
|
+
p.reset();
|
|
88
|
+
second.reset();
|
|
89
|
+
first.reset();
|
|
90
|
+
return literal;
|
|
76
91
|
};
|
|
77
92
|
|
|
78
93
|
const processBoolVar = (atom: number) => {
|
|
@@ -131,20 +146,29 @@ export const goal2nlsat = (
|
|
|
131
146
|
// The polynomial conversion treats a transcendental application, argument included, as one
|
|
132
147
|
// variable, so its argument gets a variable here, through an equation unless it is one already.
|
|
133
148
|
const mkArgVar = (term: number) => {
|
|
134
|
-
const
|
|
135
|
-
const
|
|
149
|
+
const p = new PolynomialRef(pm);
|
|
150
|
+
const denominator = expr2poly.toPolynomial(term, p);
|
|
151
|
+
const polynomial = p.get();
|
|
136
152
|
const monomial = polynomial.ms[0];
|
|
137
153
|
if (
|
|
138
|
-
|
|
154
|
+
denominator === 1n &&
|
|
139
155
|
polynomial.ms.length === 1 &&
|
|
140
156
|
polynomial.as[0] === 1n &&
|
|
141
157
|
monomial.size === 1 &&
|
|
142
158
|
monomial.degrees[0] === 1
|
|
143
|
-
)
|
|
159
|
+
) {
|
|
160
|
+
p.reset();
|
|
144
161
|
return monomial.vars[0];
|
|
162
|
+
}
|
|
145
163
|
const variable = solver.mkVar(false);
|
|
146
|
-
const
|
|
147
|
-
|
|
164
|
+
const vp = new PolynomialRef(pm);
|
|
165
|
+
const equation = new PolynomialRef(pm);
|
|
166
|
+
vp.set(pm.mkVar(variable));
|
|
167
|
+
equation.set(pm.addmulTerms(denominator, pm.unit, vp.get(), -1n, pm.unit, polynomial));
|
|
168
|
+
solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation.get()], [false])], null);
|
|
169
|
+
equation.reset();
|
|
170
|
+
vp.reset();
|
|
171
|
+
p.reset();
|
|
148
172
|
return variable;
|
|
149
173
|
};
|
|
150
174
|
|
|
@@ -176,6 +200,7 @@ export const goal2nlsat = (
|
|
|
176
200
|
}
|
|
177
201
|
}
|
|
178
202
|
if (piVar !== undefined) solver.transcendentals.addPi(piVar);
|
|
203
|
+
expr2poly.release();
|
|
179
204
|
};
|
|
180
205
|
|
|
181
206
|
const hasTermIte = (manager: AstManager, form: number) => {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// infinity * oo + value + epsilon * ε, ordered lexicographically.
|
|
1
|
+
// A value infinity * oo + value + epsilon * ε, ordered lexicographically.
|
|
3
2
|
import { Rational } from "./rational";
|
|
4
3
|
|
|
5
4
|
export class InfEps {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_context.h, src/smt/smt_internalizer.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
@@ -6,10 +5,18 @@ import {
|
|
|
6
5
|
FAMILY_USER,
|
|
7
6
|
KIND_APP,
|
|
8
7
|
KIND_QUANTIFIER,
|
|
8
|
+
OP_ADD,
|
|
9
9
|
OP_AND,
|
|
10
|
+
OP_BADD,
|
|
11
|
+
OP_BAND,
|
|
12
|
+
OP_BMUL,
|
|
13
|
+
OP_BOR,
|
|
14
|
+
OP_BXNOR,
|
|
15
|
+
OP_BXOR,
|
|
10
16
|
OP_EQ,
|
|
11
17
|
OP_IMPLIES,
|
|
12
18
|
OP_ITE,
|
|
19
|
+
OP_MUL,
|
|
13
20
|
OP_NOT,
|
|
14
21
|
OP_OR,
|
|
15
22
|
OP_XOR,
|
|
@@ -36,6 +43,7 @@ import {
|
|
|
36
43
|
NO_ENODES,
|
|
37
44
|
UnitResolutionJustification,
|
|
38
45
|
} from "./enode";
|
|
46
|
+
import { isCommutativeDecl } from "./euf/egraph";
|
|
39
47
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
40
48
|
import {
|
|
41
49
|
BoolVar,
|
|
@@ -84,6 +92,26 @@ export const BV_THEORY = 1 << 31;
|
|
|
84
92
|
export const UNDO_ADD_EQ = 8;
|
|
85
93
|
export const UNDO_TH_VAR = 9;
|
|
86
94
|
|
|
95
|
+
// func_decl_info::is_flat_associative of a commutative declaration. cg_table::mk_table_for gives
|
|
96
|
+
// such a declaration the n-ary table, not the binary commutative one.
|
|
97
|
+
const isFlatAssociativeDecl = (manager: AstManager, decl: number) => {
|
|
98
|
+
switch (manager.funcDecls[decl].op) {
|
|
99
|
+
case OP_AND:
|
|
100
|
+
case OP_OR:
|
|
101
|
+
case OP_ADD:
|
|
102
|
+
case OP_MUL:
|
|
103
|
+
case OP_BADD:
|
|
104
|
+
case OP_BMUL:
|
|
105
|
+
case OP_BAND:
|
|
106
|
+
case OP_BOR:
|
|
107
|
+
case OP_BXOR:
|
|
108
|
+
case OP_BXNOR:
|
|
109
|
+
return true;
|
|
110
|
+
default:
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
};
|
|
114
|
+
|
|
87
115
|
interface NewEq {
|
|
88
116
|
lhs: Enode;
|
|
89
117
|
rhs: Enode;
|
|
@@ -306,7 +334,13 @@ export abstract class Internalizer {
|
|
|
306
334
|
}
|
|
307
335
|
|
|
308
336
|
findCongruent(decl: number, args: Enode[]) {
|
|
309
|
-
return this.cgTable.findFor(
|
|
337
|
+
return this.cgTable.findFor(
|
|
338
|
+
decl,
|
|
339
|
+
args,
|
|
340
|
+
args.length === 2 &&
|
|
341
|
+
isCommutativeDecl(this.manager, decl) &&
|
|
342
|
+
!isFlatAssociativeDecl(this.manager, decl),
|
|
343
|
+
);
|
|
310
344
|
}
|
|
311
345
|
|
|
312
346
|
isDiseq(first: Enode, second: Enode, isCheckingValues = true) {
|
|
@@ -552,15 +586,19 @@ export abstract class Internalizer {
|
|
|
552
586
|
const moreArgs: Enode[] = numArgs > 2 ? [] : NO_ENODES;
|
|
553
587
|
for (let index = 2; index < numArgs; index++) moreArgs.push(this.getArgEnode(expr, index));
|
|
554
588
|
const isEq = !isSuppressingArgs && manager.getOp(expr) === OP_EQ;
|
|
589
|
+
const decl = manager.decls[expr];
|
|
590
|
+
const isCommutative = isEq || (numArgs === 2 && isCommutativeDecl(manager, decl));
|
|
555
591
|
const node = new Enode(
|
|
556
592
|
expr,
|
|
557
|
-
|
|
593
|
+
decl,
|
|
558
594
|
numArgs,
|
|
559
595
|
numArgs > 0 ? this.getArgEnode(expr, 0) : null,
|
|
560
596
|
numArgs > 1 ? this.getArgEnode(expr, 1) : null,
|
|
561
597
|
moreArgs,
|
|
562
598
|
generation,
|
|
563
599
|
isEq,
|
|
600
|
+
isCommutative,
|
|
601
|
+
isEq || (isCommutative && !isFlatAssociativeDecl(manager, decl)),
|
|
564
602
|
manager.sorts[expr] === SORT_BOOL,
|
|
565
603
|
isMergeTf,
|
|
566
604
|
isCgcEnabled,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/lia2pb_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -18,7 +17,7 @@ import {
|
|
|
18
17
|
isArithSort,
|
|
19
18
|
} from "./ast";
|
|
20
19
|
import { BoundManager } from "./bound-manager";
|
|
21
|
-
import type
|
|
20
|
+
import { type Definition, type Dependency, type Goal, joinDependencies } from "./goal";
|
|
22
21
|
import { Rational } from "./rational";
|
|
23
22
|
import { RefVector } from "./ref-vector";
|
|
24
23
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
@@ -38,7 +37,8 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
38
37
|
if (goal.isProofsEnabled) throw new SmtTacticError("lia2pb does not support proof production");
|
|
39
38
|
if (goal.isInconsistent) return;
|
|
40
39
|
const bounds = new BoundManager(manager);
|
|
41
|
-
for (
|
|
40
|
+
for (let index = 0; index < goal.forms.size; index++)
|
|
41
|
+
bounds.add(goal.forms.items[index], goal.getDependency(index));
|
|
42
42
|
const getTargetUpper = (expr: number) => {
|
|
43
43
|
if (!manager.isUninterpretedConst(expr)) return undefined;
|
|
44
44
|
const lower = bounds.lowers.get(expr);
|
|
@@ -101,6 +101,7 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
101
101
|
const terms = new RefVector(manager);
|
|
102
102
|
const definitions: Definition[] = [];
|
|
103
103
|
const substitution = new Map<number, number>();
|
|
104
|
+
const substitutionDependencies = new Map<number, Dependency | undefined>();
|
|
104
105
|
const zero = manager.mkNumeral(0n);
|
|
105
106
|
const one = manager.mkNumeral(1n);
|
|
106
107
|
terms.push(zero);
|
|
@@ -124,14 +125,26 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
|
|
|
124
125
|
const def = manager.mkApp(OP_ADD, args, SORT_INT);
|
|
125
126
|
terms.push(def);
|
|
126
127
|
substitution.set(variable, def);
|
|
128
|
+
substitutionDependencies.set(
|
|
129
|
+
variable,
|
|
130
|
+
joinDependencies(
|
|
131
|
+
bounds.lowerDependencies.get(variable),
|
|
132
|
+
bounds.upperDependencies.get(variable),
|
|
133
|
+
),
|
|
134
|
+
);
|
|
127
135
|
definitions.push({ decl: manager.decls[variable], def });
|
|
128
136
|
}
|
|
129
137
|
const rewriter = new Rewriter(manager, options.rewriter);
|
|
130
|
-
rewriter.setSubstitution(substitution);
|
|
138
|
+
rewriter.setSubstitution(substitution, substitutionDependencies);
|
|
131
139
|
const size = goal.forms.size;
|
|
132
140
|
for (let index = 0; !goal.isInconsistent && index < size; index++) {
|
|
133
141
|
const rewritten = rewriter.rewrite(goal.forms.items[index]);
|
|
134
|
-
goal.update(
|
|
142
|
+
goal.update(
|
|
143
|
+
index,
|
|
144
|
+
rewritten,
|
|
145
|
+
joinDependencies(rewriter.usedDependencies, goal.getDependency(index)),
|
|
146
|
+
);
|
|
147
|
+
rewriter.usedDependencies = undefined;
|
|
135
148
|
manager.decRef(rewritten);
|
|
136
149
|
}
|
|
137
150
|
rewriter.release();
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/smtlogics/*.cpp, src/tactic/portfolio/default_tactic.cpp,
|
|
2
|
-
// src/tactic/ufbv/ufbv_tactic.cpp, src/nlsat/tactic/qfnra_nlsat_tactic.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
|
-
|
|
5
1
|
interface QfnraSolver {
|
|
6
2
|
simpleCheck: number;
|
|
7
3
|
heuristic?: number;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/bound_analyzer_on_row.h, src/math/lp/lp_bound_propagator.h, src/math/lp/implied_bound.h, and propagate_bounds_for_touched_rows in src/math/lp/lar_solver.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
4
3
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "../array";
|
|
3
2
|
|
|
4
3
|
export class IndexedUintSet {
|
|
@@ -160,7 +159,7 @@ interface HashLink<V> {
|
|
|
160
159
|
}
|
|
161
160
|
|
|
162
161
|
interface HashNode<V> extends HashLink<V> {
|
|
163
|
-
|
|
162
|
+
value: V;
|
|
164
163
|
}
|
|
165
164
|
|
|
166
165
|
const constrainHash = (hash: number, count: number) =>
|
|
@@ -198,6 +197,12 @@ export class UnorderedUintMap<V> {
|
|
|
198
197
|
for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
|
|
199
198
|
}
|
|
200
199
|
|
|
200
|
+
set(key: number, value: V) {
|
|
201
|
+
const node = this.nodes.get(key);
|
|
202
|
+
if (node === undefined) this.insert(key, value);
|
|
203
|
+
else node.value = value;
|
|
204
|
+
}
|
|
205
|
+
|
|
201
206
|
insert(key: number, value: V) {
|
|
202
207
|
const node: HashNode<V> = { key, value, next: null };
|
|
203
208
|
const count = this.buckets.length;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
|
|
2
|
-
// src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
|
|
6
3
|
import type { LpSettings } from "./lp-settings";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
|
|
2
|
-
// Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
|
|
3
|
-
// so an extracted common factor may list its variables in another order.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import {
|
|
6
3
|
type Nex,
|
|
@@ -147,7 +144,7 @@ export class CrossNested {
|
|
|
147
144
|
private getVarsFromOccurencesMap() {
|
|
148
145
|
const occurences = this.nexCreator.occurencesMap;
|
|
149
146
|
const isRandomBit = this.nextRandom() % 2 === 1;
|
|
150
|
-
return
|
|
147
|
+
return Array.from(occurences, (entry) => entry[0]).sort((first, second) => {
|
|
151
148
|
const firstOcc = occurences.get(first);
|
|
152
149
|
const secondOcc = occurences.get(second);
|
|
153
150
|
if (firstOcc === undefined || secondOcc === undefined) return 0;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
|
|
2
|
-
// src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import { type Dependency, linearize, mkJoin } from "./dependency";
|
|
6
3
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/dioph_eq.cpp, src/math/lp/var_register.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
5
3
|
import { IndexedUintSet, UnorderedUintMap } from "./containers";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf_cutter.cpp, and get_equality_and_right_side_for_term_on_current_x in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import type { Dependency } from "./dependency";
|
|
4
3
|
import { GeneralMatrix, getDeterminantOfRectangularMatrix, getHermiteNormalForm } from "./hnf";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf.h, src/math/lp/general_matrix.h,
|
|
2
|
-
// src/math/lp/permutation_matrix.h, and the extended gcd of src/util/mpz.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
|
|
6
3
|
export const getRemainder = (first: Rational, second: Rational) =>
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_cube.cpp, and tighten_term_bounds_by_delta and round_to_integer_solution in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
4
3
|
import { LP_FEASIBLE, LP_OPTIMAL, LP_UNBOUNDED } from "./core-solver";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_solver.cpp, src/math/lp/int_gcd_test.cpp,
|
|
2
|
-
// src/math/lp/int_branch.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
4
2
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
5
3
|
import { DiophantineSolver } from "./dioph-eq";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_solver.h, src/math/lp/lar_solver.cpp, src/math/lp/column.h, src/math/lp/var_register.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
3
2
|
import { Rational } from "../rational";
|
|
4
3
|
import { IndexedUintSet, StackedVector } from "./containers";
|
|
@@ -628,7 +627,7 @@ export class LarSolver {
|
|
|
628
627
|
}
|
|
629
628
|
|
|
630
629
|
hasIntVar() {
|
|
631
|
-
return this.localIsInt.
|
|
630
|
+
return this.localIsInt.includes(true);
|
|
632
631
|
}
|
|
633
632
|
|
|
634
633
|
// Columns added after the backup get basic values from their rows, as the tableau requires.
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (maximize_term and its helpers in src/math/lp/lar_solver.cpp, and the tableau part
|
|
2
|
-
// of src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_def.h,
|
|
3
|
-
// src/math/lp/lp_primal_core_solver_tableau_def.h), MIT license, see z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import {
|
|
6
3
|
COLUMN_BOXED,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
2
|
+
import { UnorderedUintMap } from "./containers";
|
|
3
3
|
import {
|
|
4
4
|
type Nex,
|
|
5
5
|
type NexMul,
|
|
@@ -25,8 +25,8 @@ interface MapEntry<Value> {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
export class NexCreator {
|
|
28
|
-
readonly occurencesMap = new
|
|
29
|
-
readonly powers = new
|
|
28
|
+
readonly occurencesMap = new UnorderedUintMap<Occ>();
|
|
29
|
+
readonly powers = new UnorderedUintMap<number>();
|
|
30
30
|
private activeVarsWeights: number[] = [];
|
|
31
31
|
|
|
32
32
|
setNumberOfVars(count: number) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
2
|
+
import type { UnorderedUintMap } from "./containers";
|
|
3
3
|
|
|
4
4
|
interface NexScalar {
|
|
5
5
|
readonly kind: "scalar";
|
|
@@ -64,7 +64,7 @@ export const isALinearTerm = (sum: NexSum) => {
|
|
|
64
64
|
return numberOfNonScalars > 1;
|
|
65
65
|
};
|
|
66
66
|
|
|
67
|
-
export const getPowersFromMul = (mul: NexMul, powers:
|
|
67
|
+
export const getPowersFromMul = (mul: NexMul, powers: UnorderedUintMap<number>) => {
|
|
68
68
|
powers.clear();
|
|
69
69
|
for (const child of mul.children)
|
|
70
70
|
if (child.expr.kind === "var") powers.set(child.expr.variable, child.power);
|