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,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/expr2polynomial.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -13,105 +12,227 @@ import {
|
|
|
13
12
|
SORT_INT,
|
|
14
13
|
SORT_REAL,
|
|
15
14
|
} from "./ast";
|
|
16
|
-
import
|
|
15
|
+
import {
|
|
16
|
+
type Polynomial,
|
|
17
|
+
type PolynomialManager,
|
|
18
|
+
PolynomialRef,
|
|
19
|
+
PolynomialRefVector,
|
|
20
|
+
} from "./nlsat/polynomial";
|
|
17
21
|
import { getLcm, Rational } from "./rational";
|
|
18
22
|
import { RefVector } from "./ref-vector";
|
|
19
23
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
24
|
+
interface Frame {
|
|
25
|
+
term: number;
|
|
26
|
+
index: number;
|
|
23
27
|
}
|
|
24
28
|
|
|
25
|
-
export
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
29
|
+
export class Expr2Polynomial {
|
|
30
|
+
private cache = new Map<number, number>();
|
|
31
|
+
private cachedDomain: RefVector;
|
|
32
|
+
private cachedPolynomials: PolynomialRefVector;
|
|
33
|
+
private cachedDenominators: bigint[] = [];
|
|
34
|
+
private frames: Frame[] = [];
|
|
35
|
+
private presult: PolynomialRefVector;
|
|
36
|
+
private dresult: bigint[] = [];
|
|
37
|
+
private var2expr: RefVector;
|
|
38
|
+
|
|
39
|
+
constructor(
|
|
40
|
+
private manager: AstManager,
|
|
41
|
+
readonly pm: PolynomialManager,
|
|
42
|
+
private t2x: Map<number, number>,
|
|
43
|
+
private mkVar: (isInt: boolean) => number,
|
|
44
|
+
) {
|
|
45
|
+
this.cachedDomain = new RefVector(manager);
|
|
46
|
+
this.cachedPolynomials = new PolynomialRefVector(pm);
|
|
47
|
+
this.presult = new PolynomialRefVector(pm);
|
|
48
|
+
this.var2expr = new RefVector(manager);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
private reset() {
|
|
52
|
+
this.frames.length = 0;
|
|
53
|
+
this.presult.reset();
|
|
54
|
+
this.dresult.length = 0;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
private cacheResult(term: number) {
|
|
58
|
+
if (this.manager.getRefCount(term) <= 1) return;
|
|
59
|
+
this.cache.set(term, this.cachedPolynomials.size);
|
|
60
|
+
this.cachedDomain.push(term);
|
|
61
|
+
this.cachedPolynomials.push(this.presult.get(this.presult.size - 1));
|
|
62
|
+
this.cachedDenominators.push(this.dresult[this.dresult.length - 1]);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
private storeResult(term: number, polynomial: Polynomial, denominator: bigint) {
|
|
66
|
+
this.presult.push(polynomial);
|
|
67
|
+
this.dresult.push(denominator);
|
|
68
|
+
this.cacheResult(term);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
private storeVarPoly(term: number) {
|
|
72
|
+
let variable = this.t2x.get(term);
|
|
73
|
+
if (variable === undefined) {
|
|
74
|
+
variable = this.mkVar(this.manager.sorts[term] === SORT_INT);
|
|
75
|
+
this.t2x.set(term, variable);
|
|
76
|
+
if (variable >= this.var2expr.size) this.var2expr.resize(variable + 1);
|
|
77
|
+
this.var2expr.set(variable, term);
|
|
78
|
+
}
|
|
79
|
+
this.storeResult(term, this.pm.mkVar(variable), 1n);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
private visitArithApp(term: number) {
|
|
83
|
+
const manager = this.manager;
|
|
84
|
+
switch (manager.getOp(term)) {
|
|
36
85
|
case OP_NUM: {
|
|
37
|
-
const value = manager.getRationalValue(
|
|
38
|
-
|
|
86
|
+
const value = manager.getRationalValue(term);
|
|
87
|
+
this.storeResult(term, this.pm.mkConst(value.num), value.den);
|
|
88
|
+
return true;
|
|
39
89
|
}
|
|
40
90
|
case OP_ADD:
|
|
41
|
-
case OP_SUB:
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
let polynomial = pm.zero;
|
|
45
|
-
for (const [index, arg] of args.entries()) {
|
|
46
|
-
const scaled = pm.mulConst(denominator / arg.denominator, arg.polynomial);
|
|
47
|
-
polynomial =
|
|
48
|
-
index === 0
|
|
49
|
-
? scaled
|
|
50
|
-
: op === OP_ADD
|
|
51
|
-
? pm.add(polynomial, scaled)
|
|
52
|
-
: pm.sub(polynomial, scaled);
|
|
53
|
-
}
|
|
54
|
-
return { polynomial, denominator };
|
|
55
|
-
}
|
|
56
|
-
case OP_MUL: {
|
|
57
|
-
let polynomial = pm.one;
|
|
58
|
-
let denominator = 1n;
|
|
59
|
-
for (const arg of manager.getArgs(expr).map(convert)) {
|
|
60
|
-
polynomial = pm.mul(polynomial, arg.polynomial);
|
|
61
|
-
denominator *= arg.denominator;
|
|
62
|
-
}
|
|
63
|
-
return { polynomial, denominator };
|
|
64
|
-
}
|
|
65
|
-
case OP_UMINUS: {
|
|
66
|
-
const arg = convert(manager.getArg(expr, 0));
|
|
67
|
-
return { polynomial: pm.neg(arg.polynomial), denominator: arg.denominator };
|
|
68
|
-
}
|
|
91
|
+
case OP_SUB:
|
|
92
|
+
case OP_MUL:
|
|
93
|
+
case OP_UMINUS:
|
|
69
94
|
case OP_TO_REAL:
|
|
70
|
-
|
|
95
|
+
this.frames.push({ term, index: 0 });
|
|
96
|
+
return false;
|
|
71
97
|
case OP_POWER: {
|
|
72
|
-
const exponent = manager.getArg(
|
|
98
|
+
const exponent = manager.getArg(term, 1);
|
|
73
99
|
const value = manager.isNumeral(exponent) ? manager.getRationalValue(exponent) : undefined;
|
|
74
|
-
if (value === undefined || !value.isInt() || value.num <= 0n || value.num > 0xffffffffn)
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
};
|
|
100
|
+
if (value === undefined || !value.isInt() || value.num <= 0n || value.num > 0xffffffffn) {
|
|
101
|
+
this.storeVarPoly(term);
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
this.frames.push({ term, index: 0 });
|
|
105
|
+
return false;
|
|
81
106
|
}
|
|
82
107
|
default:
|
|
83
|
-
|
|
108
|
+
this.storeVarPoly(term);
|
|
109
|
+
return true;
|
|
84
110
|
}
|
|
85
|
-
}
|
|
86
|
-
return convert(term);
|
|
87
|
-
};
|
|
111
|
+
}
|
|
88
112
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
113
|
+
private visit(term: number) {
|
|
114
|
+
const manager = this.manager;
|
|
115
|
+
const cached = manager.getRefCount(term) > 1 ? this.cache.get(term) : undefined;
|
|
116
|
+
if (cached !== undefined) {
|
|
117
|
+
this.presult.push(this.cachedPolynomials.get(cached));
|
|
118
|
+
this.dresult.push(this.cachedDenominators[cached]);
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
if (manager.kinds[term] !== KIND_APP || manager.getFamily(term) !== FAMILY_ARITH) {
|
|
122
|
+
this.storeVarPoly(term);
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
return this.visitArithApp(term);
|
|
126
|
+
}
|
|
92
127
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
) {
|
|
97
|
-
this.varToTerm = new RefVector(manager);
|
|
128
|
+
private pop(numArgs: number) {
|
|
129
|
+
this.presult.shrink(this.presult.size - numArgs);
|
|
130
|
+
this.dresult.length -= numArgs;
|
|
98
131
|
}
|
|
99
132
|
|
|
100
|
-
private
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
133
|
+
private processAddSub(term: number, numArgs: number, isAdd: boolean) {
|
|
134
|
+
const pm = this.pm;
|
|
135
|
+
const first = this.presult.size - numArgs;
|
|
136
|
+
const p = new PolynomialRef(pm);
|
|
137
|
+
const pAux = new PolynomialRef(pm);
|
|
138
|
+
let denominator = 1n;
|
|
139
|
+
for (let index = 0; index < numArgs; index++)
|
|
140
|
+
denominator = getLcm(denominator, this.dresult[first + index]);
|
|
141
|
+
p.set(pm.zero);
|
|
142
|
+
for (let index = 0; index < numArgs; index++) {
|
|
143
|
+
pAux.set(
|
|
144
|
+
pm.mulConst(denominator / this.dresult[first + index], this.presult.get(first + index)),
|
|
145
|
+
);
|
|
146
|
+
if (index === 0) p.copy(pAux);
|
|
147
|
+
else p.set(isAdd ? pm.add(p.get(), pAux.get()) : pm.sub(p.get(), pAux.get()));
|
|
148
|
+
}
|
|
149
|
+
this.pop(numArgs);
|
|
150
|
+
this.storeResult(term, p.get(), denominator);
|
|
151
|
+
pAux.reset();
|
|
152
|
+
p.reset();
|
|
107
153
|
}
|
|
108
154
|
|
|
109
|
-
private
|
|
110
|
-
|
|
155
|
+
private processMul(term: number, numArgs: number) {
|
|
156
|
+
const first = this.presult.size - numArgs;
|
|
157
|
+
const p = new PolynomialRef(this.pm);
|
|
158
|
+
let denominator = 1n;
|
|
159
|
+
p.set(this.pm.one);
|
|
160
|
+
for (let index = 0; index < numArgs; index++) {
|
|
161
|
+
p.set(this.pm.mul(p.get(), this.presult.get(first + index)));
|
|
162
|
+
denominator *= this.dresult[first + index];
|
|
163
|
+
}
|
|
164
|
+
this.pop(numArgs);
|
|
165
|
+
this.storeResult(term, p.get(), denominator);
|
|
166
|
+
p.reset();
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
private processUminus(term: number) {
|
|
170
|
+
const negP = new PolynomialRef(this.pm);
|
|
171
|
+
negP.set(this.pm.neg(this.presult.get(this.presult.size - 1)));
|
|
172
|
+
this.presult.shrink(this.presult.size - 1);
|
|
173
|
+
this.presult.push(negP.get());
|
|
174
|
+
this.cacheResult(term);
|
|
175
|
+
negP.reset();
|
|
111
176
|
}
|
|
112
177
|
|
|
113
|
-
|
|
114
|
-
|
|
178
|
+
private processPower(term: number, numArgs: number) {
|
|
179
|
+
const first = this.presult.size - numArgs;
|
|
180
|
+
const k = Number(this.manager.getRationalValue(this.manager.getArg(term, 1)).num);
|
|
181
|
+
const p = new PolynomialRef(this.pm);
|
|
182
|
+
this.pm.pw(this.presult.get(first), k, p);
|
|
183
|
+
const denominator = this.dresult[first] ** BigInt(k);
|
|
184
|
+
this.pop(numArgs);
|
|
185
|
+
this.storeResult(term, p.get(), denominator);
|
|
186
|
+
p.reset();
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
private processApp(term: number) {
|
|
190
|
+
const numArgs = this.manager.getNumArgs(term);
|
|
191
|
+
switch (this.manager.getOp(term)) {
|
|
192
|
+
case OP_ADD:
|
|
193
|
+
return this.processAddSub(term, numArgs, true);
|
|
194
|
+
case OP_SUB:
|
|
195
|
+
return this.processAddSub(term, numArgs, false);
|
|
196
|
+
case OP_MUL:
|
|
197
|
+
return this.processMul(term, numArgs);
|
|
198
|
+
case OP_POWER:
|
|
199
|
+
return this.processPower(term, numArgs);
|
|
200
|
+
case OP_UMINUS:
|
|
201
|
+
return this.processUminus(term);
|
|
202
|
+
default:
|
|
203
|
+
return this.cacheResult(term);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
toPolynomial(term: number, p: PolynomialRef) {
|
|
208
|
+
this.reset();
|
|
209
|
+
if (!this.visit(term)) {
|
|
210
|
+
const frames = this.frames;
|
|
211
|
+
while (frames.length > 0) {
|
|
212
|
+
const frame = frames[frames.length - 1];
|
|
213
|
+
const numArgs = this.manager.getNumArgs(frame.term);
|
|
214
|
+
let isPushed = false;
|
|
215
|
+
while (frame.index < numArgs) {
|
|
216
|
+
const arg = this.manager.getArg(frame.term, frame.index);
|
|
217
|
+
frame.index++;
|
|
218
|
+
if (!this.visit(arg)) {
|
|
219
|
+
isPushed = true;
|
|
220
|
+
break;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
if (isPushed) continue;
|
|
224
|
+
this.processApp(frame.term);
|
|
225
|
+
frames.pop();
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
p.set(this.presult.get(this.presult.size - 1));
|
|
229
|
+
const denominator = this.dresult[this.dresult.length - 1];
|
|
230
|
+
this.reset();
|
|
231
|
+
return denominator;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
private isIntVar(variable: number) {
|
|
235
|
+
return this.manager.sorts[this.var2expr.items[variable]] === SORT_INT;
|
|
115
236
|
}
|
|
116
237
|
|
|
117
238
|
toExpr(polynomial: Polynomial, isUsingPower: boolean) {
|
|
@@ -126,7 +247,7 @@ export class Expr2Polynomial {
|
|
|
126
247
|
const coeff = polynomial.as[index];
|
|
127
248
|
if (coeff !== 1n) factors.push(mkNumeral(coeff));
|
|
128
249
|
for (const [position, variable] of monomial.vars.entries()) {
|
|
129
|
-
const term = this.
|
|
250
|
+
const term = this.var2expr.items[variable];
|
|
130
251
|
const base =
|
|
131
252
|
this.isIntVar(variable) && !isInt ? manager.mkApp(OP_TO_REAL, [term], SORT_REAL) : term;
|
|
132
253
|
const degree = monomial.degrees[position];
|
|
@@ -142,6 +263,9 @@ export class Expr2Polynomial {
|
|
|
142
263
|
}
|
|
143
264
|
|
|
144
265
|
release() {
|
|
145
|
-
this.
|
|
266
|
+
this.presult.reset();
|
|
267
|
+
this.cachedPolynomials.reset();
|
|
268
|
+
this.cachedDomain.reset();
|
|
269
|
+
this.var2expr.reset();
|
|
146
270
|
}
|
|
147
271
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/factor_simplifier.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -19,7 +18,7 @@ import { runSimplifier } from "./dependent-expr-state";
|
|
|
19
18
|
import { Expr2Polynomial } from "./expr2polynomial";
|
|
20
19
|
import type { Goal } from "./goal";
|
|
21
20
|
import { getLcm, Rational } from "./rational";
|
|
22
|
-
import { PolynomialManager } from "./nlsat/polynomial";
|
|
21
|
+
import { Factors, type Polynomial, PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
23
22
|
import type { Rewrite } from "./rewriter-tpl";
|
|
24
23
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
25
24
|
|
|
@@ -38,7 +37,13 @@ class FactorRewriter extends RewriterTpl {
|
|
|
38
37
|
private isSplittingFactors: boolean,
|
|
39
38
|
) {
|
|
40
39
|
super(manager);
|
|
41
|
-
|
|
40
|
+
let variableCount = 0;
|
|
41
|
+
this.expr2poly = new Expr2Polynomial(
|
|
42
|
+
manager,
|
|
43
|
+
new PolynomialManager(manager.limit),
|
|
44
|
+
new Map(),
|
|
45
|
+
() => variableCount++,
|
|
46
|
+
);
|
|
42
47
|
}
|
|
43
48
|
|
|
44
49
|
private mkZeroFor(expr: number) {
|
|
@@ -52,20 +57,36 @@ class FactorRewriter extends RewriterTpl {
|
|
|
52
57
|
: this.manager.mkApp(OP_MUL, args, this.manager.sorts[args[0]]);
|
|
53
58
|
}
|
|
54
59
|
|
|
55
|
-
private factor(op: number, lhs: number, rhs: number)
|
|
56
|
-
const manager = this.manager;
|
|
60
|
+
private factor(op: number, lhs: number, rhs: number) {
|
|
57
61
|
const pm = this.expr2poly.pm;
|
|
58
|
-
const first =
|
|
59
|
-
const second =
|
|
60
|
-
const
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
const first = new PolynomialRef(pm);
|
|
63
|
+
const second = new PolynomialRef(pm);
|
|
64
|
+
const p = new PolynomialRef(pm);
|
|
65
|
+
const firstDenominator = this.expr2poly.toPolynomial(lhs, first);
|
|
66
|
+
const secondDenominator = this.expr2poly.toPolynomial(rhs, second);
|
|
67
|
+
const lcm = getLcm(firstDenominator, secondDenominator);
|
|
68
|
+
p.set(
|
|
69
|
+
pm.addmulTerms(
|
|
70
|
+
lcm / firstDenominator,
|
|
71
|
+
pm.unit,
|
|
72
|
+
first.get(),
|
|
73
|
+
-(lcm / secondDenominator),
|
|
74
|
+
pm.unit,
|
|
75
|
+
second.get(),
|
|
76
|
+
),
|
|
66
77
|
);
|
|
67
|
-
|
|
68
|
-
const
|
|
78
|
+
const factors = new Factors(pm);
|
|
79
|
+
const result = pm.isConst(p.get()) ? -1 : this.factorPolynomial(op, p.get(), factors);
|
|
80
|
+
factors.reset();
|
|
81
|
+
p.reset();
|
|
82
|
+
second.reset();
|
|
83
|
+
first.reset();
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
private factorPolynomial(op: number, polynomial: Polynomial, factors: Factors): number {
|
|
88
|
+
const manager = this.manager;
|
|
89
|
+
this.expr2poly.pm.factor(polynomial, factors);
|
|
69
90
|
if (factors.factors.length === 1 && factors.degrees[0] === 1) return -1;
|
|
70
91
|
const terms = factors.factors.map((factor) => this.expr2poly.toExpr(factor, true));
|
|
71
92
|
if (op === OP_EQ) {
|
|
@@ -133,17 +154,7 @@ export const factor = (manager: AstManager, goal: Goal, isSplittingFactors: bool
|
|
|
133
154
|
runSimplifier(goal, false, (state) => {
|
|
134
155
|
const rewriter = new FactorRewriter(manager, isSplittingFactors);
|
|
135
156
|
return {
|
|
136
|
-
reduce: () =>
|
|
137
|
-
let rewritten = -1;
|
|
138
|
-
state.forEachIndex((index) => {
|
|
139
|
-
const form = state.get(index);
|
|
140
|
-
const next = rewriter.rewrite(form);
|
|
141
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
142
|
-
rewritten = next;
|
|
143
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
144
|
-
});
|
|
145
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
146
|
-
},
|
|
157
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
147
158
|
release: () => {
|
|
148
159
|
rewriter.expr2poly.release();
|
|
149
160
|
rewriter.release();
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/fd_solver/fd_solver.cpp, src/tactic/fd_solver/fd_simplifier.cpp,
|
|
2
|
-
// src/solver/simplifier_solver.cpp, src/solver/solver2tactic.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { SmtCanceledError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -27,12 +24,11 @@ import { L_FALSE, L_TRUE } from "./lbool";
|
|
|
27
24
|
import { RefVector } from "./ref-vector";
|
|
28
25
|
import { Rewriter } from "./rewriter";
|
|
29
26
|
import { convertModel, getRewriterOptions } from "./tactic";
|
|
27
|
+
import { UINT_MAX } from "./sat/clause";
|
|
30
28
|
import type { SatParams } from "./sat/config";
|
|
31
29
|
import { IncSatSolver } from "./sat/inc-sat-solver";
|
|
32
30
|
import { SubstReplacer } from "./solve-eqs";
|
|
33
31
|
|
|
34
|
-
const UINT_MAX = 4294967295;
|
|
35
|
-
|
|
36
32
|
const getNumBits = (value: bigint) => {
|
|
37
33
|
let bound = 1n;
|
|
38
34
|
let numBits = 1;
|
|
@@ -231,6 +227,8 @@ export const getFdConsequences = (
|
|
|
231
227
|
result: found.result,
|
|
232
228
|
consequences,
|
|
233
229
|
model: model === null ? undefined : convertModel(fmls, model),
|
|
230
|
+
core: solver.getUnsatCore().map((dep) => assumptions[asms1.indexOf(dep)] ?? dep),
|
|
231
|
+
reasonUnknown: solver.reasonUnknown,
|
|
234
232
|
};
|
|
235
233
|
} finally {
|
|
236
234
|
solver.release();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/fix_dl_var_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -98,8 +97,7 @@ class TargetFinder {
|
|
|
98
97
|
if (this.isArithApp(expr)) return this.processArith(expr, false);
|
|
99
98
|
this.todo.push(expr);
|
|
100
99
|
this.visited.add(expr);
|
|
101
|
-
|
|
102
|
-
const current = this.todo.pop() as number;
|
|
100
|
+
for (let current = this.todo.pop(); current !== undefined; current = this.todo.pop()) {
|
|
103
101
|
const isProcessed =
|
|
104
102
|
manager.kinds[current] !== KIND_APP
|
|
105
103
|
? false
|
|
@@ -140,7 +138,7 @@ export const fixDlVar = (manager: AstManager, goal: Goal, options: RewriterOptio
|
|
|
140
138
|
const size = goal.forms.size;
|
|
141
139
|
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
142
140
|
const rewritten = rewriter.rewrite(goal.forms.items[index]);
|
|
143
|
-
goal.update(index, rewritten);
|
|
141
|
+
goal.update(index, rewritten, goal.getDependency(index));
|
|
144
142
|
manager.decRef(rewritten);
|
|
145
143
|
}
|
|
146
144
|
rewriter.release();
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/fm_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
5
4
|
FAMILY_ARITH,
|
|
6
5
|
KIND_APP,
|
|
6
|
+
KIND_QUANTIFIER,
|
|
7
7
|
OP_ADD,
|
|
8
8
|
OP_DIV,
|
|
9
9
|
OP_GE,
|
|
@@ -19,10 +19,11 @@ import {
|
|
|
19
19
|
SORT_INT,
|
|
20
20
|
SORT_REAL,
|
|
21
21
|
} from "./ast";
|
|
22
|
-
import type
|
|
22
|
+
import { type Dependency, type Goal, joinDependencies } from "./goal";
|
|
23
23
|
import type { ProtoModel } from "./proto-model";
|
|
24
24
|
import { getGcd, getLcm, Rational } from "./rational";
|
|
25
25
|
import { RefVector } from "./ref-vector";
|
|
26
|
+
import { UINT_MAX } from "./sat/clause";
|
|
26
27
|
|
|
27
28
|
export interface FmOptions {
|
|
28
29
|
isRealOnly: boolean;
|
|
@@ -43,10 +44,9 @@ interface Constraint {
|
|
|
43
44
|
c: Rational;
|
|
44
45
|
isStrict: boolean;
|
|
45
46
|
isDead: boolean;
|
|
47
|
+
dependency: Dependency | undefined;
|
|
46
48
|
}
|
|
47
49
|
|
|
48
|
-
const UINT_MAX = 4294967295;
|
|
49
|
-
|
|
50
50
|
class ConstraintSet {
|
|
51
51
|
private id2pos: number[] = [];
|
|
52
52
|
private set: Constraint[] = [];
|
|
@@ -109,6 +109,7 @@ class Fm {
|
|
|
109
109
|
private idGen = new IdGen();
|
|
110
110
|
private counter = 0;
|
|
111
111
|
private isInconsistent = false;
|
|
112
|
+
private inconsistentCore: Dependency | undefined;
|
|
112
113
|
private subTodo = new ConstraintSet();
|
|
113
114
|
readonly converter: { decl: number; clauses: RefVector }[] = [];
|
|
114
115
|
|
|
@@ -210,6 +211,7 @@ class Fm {
|
|
|
210
211
|
as: Rational[],
|
|
211
212
|
c: Rational,
|
|
212
213
|
isStrict: boolean,
|
|
214
|
+
dependency: Dependency | undefined,
|
|
213
215
|
): Constraint {
|
|
214
216
|
return {
|
|
215
217
|
id: this.idGen.mk(),
|
|
@@ -219,6 +221,7 @@ class Fm {
|
|
|
219
221
|
c,
|
|
220
222
|
isStrict,
|
|
221
223
|
isDead: false,
|
|
224
|
+
dependency,
|
|
222
225
|
};
|
|
223
226
|
}
|
|
224
227
|
|
|
@@ -309,6 +312,11 @@ class Fm {
|
|
|
309
312
|
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
310
313
|
if (visited.has(expr)) continue;
|
|
311
314
|
visited.add(expr);
|
|
315
|
+
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
316
|
+
const data = manager.getQuantifier(expr);
|
|
317
|
+
todo.push(data.body, ...data.patterns, ...data.noPatterns);
|
|
318
|
+
continue;
|
|
319
|
+
}
|
|
312
320
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
313
321
|
if (
|
|
314
322
|
manager.isUninterpretedConst(expr) &&
|
|
@@ -391,7 +399,7 @@ class Fm {
|
|
|
391
399
|
return isNegated ? -bvar : bvar;
|
|
392
400
|
}
|
|
393
401
|
|
|
394
|
-
private addConstraint(form: number) {
|
|
402
|
+
private addConstraint(form: number, dependency: Dependency | undefined) {
|
|
395
403
|
const manager = this.manager;
|
|
396
404
|
const lits: number[] = [];
|
|
397
405
|
const xs: number[] = [];
|
|
@@ -434,7 +442,7 @@ class Fm {
|
|
|
434
442
|
c = c.sub(Rational.one);
|
|
435
443
|
}
|
|
436
444
|
}
|
|
437
|
-
this.registerConstraint(this.mkConstraint(lits, xs, as, c, isStrict));
|
|
445
|
+
this.registerConstraint(this.mkConstraint(lits, xs, as, c, isStrict, dependency));
|
|
438
446
|
}
|
|
439
447
|
|
|
440
448
|
private isFalse(constraint: Constraint) {
|
|
@@ -463,7 +471,7 @@ class Fm {
|
|
|
463
471
|
this.subTodo.insert(constraint);
|
|
464
472
|
return;
|
|
465
473
|
}
|
|
466
|
-
this.goal.assert(this.toExpr(constraint));
|
|
474
|
+
this.goal.assert(this.toExpr(constraint), constraint.dependency);
|
|
467
475
|
this.delConstraint(constraint);
|
|
468
476
|
}
|
|
469
477
|
|
|
@@ -583,15 +591,17 @@ class Fm {
|
|
|
583
591
|
}
|
|
584
592
|
for (const lit of lower.lits) this.bvar2sign[Math.abs(lit)] = 0;
|
|
585
593
|
if (isTautology) return undefined;
|
|
594
|
+
const newDependency = joinDependencies(lower.dependency, upper.dependency);
|
|
586
595
|
if (
|
|
587
596
|
newLits.length === 0 &&
|
|
588
597
|
newXs.length === 0 &&
|
|
589
598
|
(newC.isNegative() || (isNewStrict && newC.isZero()))
|
|
590
599
|
) {
|
|
591
600
|
this.isInconsistent = true;
|
|
601
|
+
this.inconsistentCore = newDependency;
|
|
592
602
|
return undefined;
|
|
593
603
|
}
|
|
594
|
-
return this.mkConstraint(newLits, newXs, newAs, newC, isNewStrict);
|
|
604
|
+
return this.mkConstraint(newLits, newXs, newAs, newC, isNewStrict, newDependency);
|
|
595
605
|
}
|
|
596
606
|
|
|
597
607
|
private tryEliminate(variable: number) {
|
|
@@ -634,7 +644,7 @@ class Fm {
|
|
|
634
644
|
for (const constraint of list) {
|
|
635
645
|
if (constraint.isDead) continue;
|
|
636
646
|
constraint.isDead = true;
|
|
637
|
-
this.goal.assert(this.toExpr(constraint));
|
|
647
|
+
this.goal.assert(this.toExpr(constraint), constraint.dependency);
|
|
638
648
|
}
|
|
639
649
|
}
|
|
640
650
|
|
|
@@ -644,17 +654,18 @@ class Fm {
|
|
|
644
654
|
this.initForbiddenSet();
|
|
645
655
|
const forms = new RefVector(manager);
|
|
646
656
|
for (const form of goal.forms.items) forms.push(form);
|
|
657
|
+
const dependencies = goal.dependencies;
|
|
647
658
|
goal.reset();
|
|
648
659
|
goal.depth++;
|
|
649
|
-
for (const form of forms.items) {
|
|
660
|
+
for (const [index, form] of forms.items.entries()) {
|
|
650
661
|
if (this.isInconsistent) break;
|
|
651
|
-
if (this.isOcc(form)) this.addConstraint(form);
|
|
652
|
-
else goal.assert(form);
|
|
662
|
+
if (this.isOcc(form)) this.addConstraint(form, dependencies[index]);
|
|
663
|
+
else goal.assert(form, dependencies[index]);
|
|
653
664
|
}
|
|
654
665
|
forms.reset();
|
|
655
666
|
if (this.isInconsistent) {
|
|
656
667
|
goal.reset();
|
|
657
|
-
goal.assert(manager.falseExpr);
|
|
668
|
+
goal.assert(manager.falseExpr, this.inconsistentCore);
|
|
658
669
|
return false;
|
|
659
670
|
}
|
|
660
671
|
this.subsume();
|
|
@@ -665,7 +676,7 @@ class Fm {
|
|
|
665
676
|
this.tryEliminate(variable);
|
|
666
677
|
if (this.isInconsistent) {
|
|
667
678
|
goal.reset();
|
|
668
|
-
goal.assert(manager.falseExpr);
|
|
679
|
+
goal.assert(manager.falseExpr, this.inconsistentCore);
|
|
669
680
|
return false;
|
|
670
681
|
}
|
|
671
682
|
}
|