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,8 +1,7 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
// Of Z3's nlsat parameters only seed and factor are ported, so nlsat_simplify and the bounds of
|
|
2
|
+
// eliminated variables are not. The search counts its steps against the resource limit, but not the
|
|
3
|
+
// memory, which Z3 also bounds by max_memory.
|
|
4
|
+
import { SmtInvariantError } from "../../../../errors";
|
|
6
5
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
7
6
|
import { type Dependency, linearize, mkJoin, mkLeaf } from "../lp/dependency";
|
|
8
7
|
import { RandomGen } from "../random-gen";
|
|
@@ -12,8 +11,14 @@ import { AlgebraicManager, Anum } from "./algebraic";
|
|
|
12
11
|
import { AtomTable, FALSE_LITERAL, ScopedLiterals, TRUE_LITERAL } from "./atoms";
|
|
13
12
|
import { Evaluator } from "./evaluator";
|
|
14
13
|
import { Explain } from "./explain";
|
|
15
|
-
import type { IntervalSet } from "./interval-set";
|
|
16
|
-
import {
|
|
14
|
+
import type { IntervalSet, IntervalSetManager } from "./interval-set";
|
|
15
|
+
import {
|
|
16
|
+
NULL_VAR,
|
|
17
|
+
type Polynomial,
|
|
18
|
+
PolynomialCache,
|
|
19
|
+
PolynomialManager,
|
|
20
|
+
PolynomialRef,
|
|
21
|
+
} from "./polynomial";
|
|
17
22
|
import { NlsatTranscendentals } from "./transcendentals";
|
|
18
23
|
import { type Clause, type IneqAtom, type IneqKind, isIneqAtom, type RootKind } from "./types";
|
|
19
24
|
|
|
@@ -36,30 +41,18 @@ type Trail =
|
|
|
36
41
|
| { kind: "eq"; old: IneqAtom | null };
|
|
37
42
|
|
|
38
43
|
export class NlsatSolver {
|
|
39
|
-
readonly pm
|
|
40
|
-
readonly am
|
|
41
|
-
private cache
|
|
44
|
+
readonly pm: PolynomialManager;
|
|
45
|
+
readonly am: AlgebraicManager;
|
|
46
|
+
private cache: PolynomialCache;
|
|
42
47
|
private bvalues: number[] = [];
|
|
43
48
|
private levels: number[] = [];
|
|
44
49
|
private justifications: (Justification | null)[] = [];
|
|
45
50
|
private bwatches: Clause[][] = [];
|
|
46
51
|
private isDead: boolean[] = [];
|
|
47
|
-
readonly atoms
|
|
48
|
-
onMk: (boolVar) => {
|
|
49
|
-
this.bvalues[boolVar] = L_UNDEF;
|
|
50
|
-
this.levels[boolVar] = Infinity;
|
|
51
|
-
this.justifications[boolVar] = null;
|
|
52
|
-
this.bwatches[boolVar] = [];
|
|
53
|
-
this.isDead[boolVar] = false;
|
|
54
|
-
},
|
|
55
|
-
onDelete: (boolVar) => {
|
|
56
|
-
this.isDead[boolVar] = true;
|
|
57
|
-
this.bvalues[boolVar] = L_UNDEF;
|
|
58
|
-
},
|
|
59
|
-
});
|
|
52
|
+
readonly atoms: AtomTable;
|
|
60
53
|
private assignment: (Anum | undefined)[] = [];
|
|
61
|
-
private evaluator
|
|
62
|
-
private ism
|
|
54
|
+
private evaluator: Evaluator;
|
|
55
|
+
private ism: IntervalSetManager;
|
|
63
56
|
private clauses: Clause[] = [];
|
|
64
57
|
private learned: Clause[] = [];
|
|
65
58
|
private nextClauseId = 0;
|
|
@@ -69,24 +62,16 @@ export class NlsatSolver {
|
|
|
69
62
|
private var2eq: (IneqAtom | null)[] = [];
|
|
70
63
|
private perm: number[] = [];
|
|
71
64
|
private invPerm: number[] = [];
|
|
72
|
-
readonly explain
|
|
73
|
-
|
|
74
|
-
sample: this.assignment,
|
|
75
|
-
getValue: (literal) => this.value(literal),
|
|
76
|
-
var2eq: this.var2eq,
|
|
77
|
-
getNumVars: () => this.isInt.length,
|
|
78
|
-
reorder: (permutation) => this.reorder(permutation),
|
|
79
|
-
restoreOrder: () => this.restoreOrder(),
|
|
80
|
-
});
|
|
81
|
-
readonly transcendentals = new NlsatTranscendentals(this);
|
|
65
|
+
readonly explain: Explain;
|
|
66
|
+
readonly transcendentals: NlsatTranscendentals;
|
|
82
67
|
private bk = 0;
|
|
83
68
|
private xk = NULL_VAR;
|
|
84
69
|
private scopeLevel = 0;
|
|
85
70
|
private trail: Trail[] = [];
|
|
86
71
|
private marks: boolean[] = [];
|
|
87
72
|
private markCount = 0;
|
|
88
|
-
private lemma
|
|
89
|
-
private lazyClause
|
|
73
|
+
private lemma: ScopedLiterals;
|
|
74
|
+
private lazyClause: ScopedLiterals;
|
|
90
75
|
private lemmaAssumptions: Dependency = null;
|
|
91
76
|
private randomSeed = 0;
|
|
92
77
|
private isReordered = false;
|
|
@@ -103,12 +88,37 @@ export class NlsatSolver {
|
|
|
103
88
|
irrationalAssignments: 0,
|
|
104
89
|
};
|
|
105
90
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
91
|
+
constructor(private limit: ResourceLimit) {
|
|
92
|
+
this.pm = new PolynomialManager(limit);
|
|
93
|
+
this.am = new AlgebraicManager(limit);
|
|
94
|
+
this.cache = new PolynomialCache(this.pm);
|
|
95
|
+
this.atoms = new AtomTable(this.pm, this.cache, {
|
|
96
|
+
onMk: (boolVar) => {
|
|
97
|
+
this.bvalues[boolVar] = L_UNDEF;
|
|
98
|
+
this.levels[boolVar] = Infinity;
|
|
99
|
+
this.justifications[boolVar] = null;
|
|
100
|
+
this.bwatches[boolVar] = [];
|
|
101
|
+
this.isDead[boolVar] = false;
|
|
102
|
+
},
|
|
103
|
+
onDelete: (boolVar) => {
|
|
104
|
+
this.isDead[boolVar] = true;
|
|
105
|
+
this.bvalues[boolVar] = L_UNDEF;
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
this.evaluator = new Evaluator(this.pm, this.am, this.assignment);
|
|
109
|
+
this.ism = this.evaluator.ism;
|
|
110
|
+
this.explain = new Explain(this.pm, this.am, this.cache, {
|
|
111
|
+
atoms: this.atoms,
|
|
112
|
+
sample: this.assignment,
|
|
113
|
+
getValue: (literal) => this.value(literal),
|
|
114
|
+
var2eq: this.var2eq,
|
|
115
|
+
getNumVars: () => this.isInt.length,
|
|
116
|
+
reorder: (permutation) => this.reorder(permutation),
|
|
117
|
+
restoreOrder: () => this.restoreOrder(),
|
|
118
|
+
});
|
|
119
|
+
this.transcendentals = new NlsatTranscendentals(this);
|
|
120
|
+
this.lemma = new ScopedLiterals(this.atoms);
|
|
121
|
+
this.lazyClause = new ScopedLiterals(this.atoms);
|
|
112
122
|
this.mkClause([TRUE_LITERAL], false, null);
|
|
113
123
|
}
|
|
114
124
|
|
|
@@ -118,12 +128,6 @@ export class NlsatSolver {
|
|
|
118
128
|
this.explain.isFactoring = isFactoring;
|
|
119
129
|
}
|
|
120
130
|
|
|
121
|
-
private checkpoint() {
|
|
122
|
-
this.steps++;
|
|
123
|
-
if ((this.limit !== null && !this.limit.inc()) || this.steps > this.budget)
|
|
124
|
-
throw new SmtCanceledError();
|
|
125
|
-
}
|
|
126
|
-
|
|
127
131
|
mkVar(isInt: boolean) {
|
|
128
132
|
const variable = this.isInt.length;
|
|
129
133
|
this.isInt.push(isInt);
|
|
@@ -402,10 +406,12 @@ export class NlsatSolver {
|
|
|
402
406
|
let selectedSet: IntervalSet | null = null;
|
|
403
407
|
const xkSet = this.infeasible[this.xk];
|
|
404
408
|
for (const [index, literal] of clause.literals.entries()) {
|
|
405
|
-
this.checkpoint();
|
|
409
|
+
this.limit.checkpoint();
|
|
406
410
|
if (this.value(literal) === L_FALSE) continue;
|
|
407
411
|
if (this.value(literal) === L_TRUE) return true;
|
|
408
|
-
const atom = this.atoms.getAtom(literal)
|
|
412
|
+
const atom = this.atoms.getAtom(literal);
|
|
413
|
+
if (atom === null)
|
|
414
|
+
throw new SmtInvariantError("a literal of an arithmetic clause has no atom");
|
|
409
415
|
const set = this.evaluator.infeasibleIntervals(atom, (literal & 1) === 1, clause);
|
|
410
416
|
if (set === null) {
|
|
411
417
|
this.propagate(literal, null);
|
|
@@ -488,7 +494,7 @@ export class NlsatSolver {
|
|
|
488
494
|
} else this.newStage();
|
|
489
495
|
if (this.bk === NULL_BOOL_VAR && this.xk >= this.isInt.length) return L_TRUE;
|
|
490
496
|
while (true) {
|
|
491
|
-
this.checkpoint();
|
|
497
|
+
this.limit.checkpoint();
|
|
492
498
|
const conflict = this.processClauses(
|
|
493
499
|
this.xk === NULL_VAR ? this.bwatches[this.bk] : this.watches[this.xk],
|
|
494
500
|
);
|
|
@@ -508,7 +514,7 @@ export class NlsatSolver {
|
|
|
508
514
|
private gc() {
|
|
509
515
|
if (this.learned.length <= 4 * this.clauses.length) return;
|
|
510
516
|
this.resetWatches();
|
|
511
|
-
this.atoms.reinitCache();
|
|
517
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
512
518
|
let kept = 0;
|
|
513
519
|
for (const [index, clause] of this.learned.entries()) {
|
|
514
520
|
if (index - kept < this.clauses.length && clause.literals.length > 1 && !clause.isActive)
|
|
@@ -575,12 +581,14 @@ export class NlsatSolver {
|
|
|
575
581
|
}
|
|
576
582
|
this.initSearch();
|
|
577
583
|
for (const bound of bounds) {
|
|
584
|
+
const p = new PolynomialRef(this.pm);
|
|
578
585
|
this.lemma.reset();
|
|
579
|
-
|
|
580
|
-
this.lemma.push(this.mkIneqLiteral("GT", [
|
|
581
|
-
|
|
582
|
-
this.lemma.push(this.mkIneqLiteral("LT", [
|
|
586
|
+
p.set(this.pm.mkLinear([1n], [bound[0]], -bound[1].num));
|
|
587
|
+
this.lemma.push(this.mkIneqLiteral("GT", [p.get()], [false]) ^ 1);
|
|
588
|
+
p.set(this.pm.mkLinear([1n], [bound[0]], -bound[1].num - 1n));
|
|
589
|
+
this.lemma.push(this.mkIneqLiteral("LT", [p.get()], [false]) ^ 1);
|
|
583
590
|
this.mkClause(this.lemma.literals, true, null);
|
|
591
|
+
p.reset();
|
|
584
592
|
}
|
|
585
593
|
}
|
|
586
594
|
}
|
|
@@ -657,11 +665,10 @@ export class NlsatSolver {
|
|
|
657
665
|
for (let index = 0; index < sorted.length; index++) clauses[index] = sorted[index];
|
|
658
666
|
}
|
|
659
667
|
|
|
660
|
-
private projectModel() {
|
|
661
|
-
const cube = new ScopedLiterals(this.atoms);
|
|
668
|
+
private projectModel(cube: ScopedLiterals) {
|
|
662
669
|
const seen = new Set<number>();
|
|
663
670
|
for (const clause of this.clauses) {
|
|
664
|
-
this.checkpoint();
|
|
671
|
+
this.limit.checkpoint();
|
|
665
672
|
const witness = clause.literals.find((literal) => this.value(literal) === L_TRUE);
|
|
666
673
|
if (witness === undefined) throw new SmtInvariantError("nlsat's model falsifies a clause");
|
|
667
674
|
if (this.atoms.getAtom(witness) === null || seen.has(witness >> 1)) continue;
|
|
@@ -670,15 +677,17 @@ export class NlsatSolver {
|
|
|
670
677
|
}
|
|
671
678
|
// Strict sector bounds keep every point of the projection extensible.
|
|
672
679
|
this.explain.isFullDimensional = false;
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
680
|
+
const projected = new ScopedLiterals(this.atoms);
|
|
681
|
+
try {
|
|
682
|
+
for (let variable = this.isInt.length - 1; variable >= 1 && cube.size > 0; variable--) {
|
|
683
|
+
this.limit.checkpoint();
|
|
684
|
+
projected.reset();
|
|
685
|
+
this.explain.projectVariable(variable, cube.literals, projected);
|
|
686
|
+
[cube.literals, projected.literals] = [projected.literals, cube.literals];
|
|
687
|
+
}
|
|
688
|
+
} finally {
|
|
679
689
|
projected.reset();
|
|
680
690
|
}
|
|
681
|
-
return cube;
|
|
682
691
|
}
|
|
683
692
|
|
|
684
693
|
private getCubeSup(cube: ScopedLiterals) {
|
|
@@ -707,38 +716,48 @@ export class NlsatSolver {
|
|
|
707
716
|
try {
|
|
708
717
|
if (limit !== null) {
|
|
709
718
|
const isRational = this.am.isRational(limit);
|
|
710
|
-
const
|
|
719
|
+
const p = new PolynomialRef(this.pm);
|
|
720
|
+
p.set(this.pm.toPolynomial(this.am.getPolynomial(limit), variable));
|
|
711
721
|
const upper = isRational
|
|
712
|
-
? this.mkIneqLiteral("LT", [
|
|
713
|
-
: 2 * this.mkRootAtom("ROOT_LT", variable, this.am.getRootIndex(limit),
|
|
722
|
+
? this.mkIneqLiteral("LT", [p.get()], [false])
|
|
723
|
+
: 2 * this.mkRootAtom("ROOT_LT", variable, this.am.getRootIndex(limit), p.get());
|
|
714
724
|
this.mkExternalClause([upper], tag);
|
|
725
|
+
p.reset();
|
|
715
726
|
}
|
|
716
727
|
while (true) {
|
|
717
|
-
this.checkpoint();
|
|
728
|
+
this.limit.checkpoint();
|
|
718
729
|
const status = this.check();
|
|
719
730
|
if (status !== L_TRUE) return status;
|
|
720
|
-
const cube = this.
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
731
|
+
const cube = new ScopedLiterals(this.atoms);
|
|
732
|
+
try {
|
|
733
|
+
this.projectModel(cube);
|
|
734
|
+
const sup = this.getCubeSup(cube);
|
|
735
|
+
if (
|
|
736
|
+
limit === null
|
|
737
|
+
? sup === null
|
|
738
|
+
: sup !== null && !sup.isAttained && this.am.compare(sup.sup, limit) === 0
|
|
739
|
+
)
|
|
740
|
+
return L_TRUE;
|
|
741
|
+
this.mkExternalClause(
|
|
742
|
+
cube.literals.map((literal) => literal ^ 1),
|
|
743
|
+
tag,
|
|
744
|
+
);
|
|
745
|
+
} finally {
|
|
746
|
+
cube.reset();
|
|
747
|
+
}
|
|
733
748
|
}
|
|
734
749
|
} finally {
|
|
735
|
-
this.maxVar = savedMaxVar;
|
|
736
750
|
this.retract(tag);
|
|
751
|
+
this.maxVar = savedMaxVar;
|
|
737
752
|
}
|
|
738
753
|
}
|
|
739
754
|
|
|
740
755
|
retract(tag: number, maxLemmas = Infinity) {
|
|
741
756
|
this.initSearch();
|
|
757
|
+
this.explain.reset();
|
|
758
|
+
this.lemma.reset();
|
|
759
|
+
this.lazyClause.reset();
|
|
760
|
+
this.lemmaAssumptions = null;
|
|
742
761
|
const isKept = (clause: Clause) => {
|
|
743
762
|
const isFound = linearize([clause.assumptions]).includes(tag);
|
|
744
763
|
if (isFound) this.delClause(clause);
|
|
@@ -748,7 +767,7 @@ export class NlsatSolver {
|
|
|
748
767
|
this.learned = this.learned.filter(isKept);
|
|
749
768
|
if (this.learned.length <= maxLemmas) return;
|
|
750
769
|
this.learned.sort((first, second) => first.literals.length - second.literals.length);
|
|
751
|
-
for (const clause of this.learned.splice(maxLemmas)) this.delClause(clause);
|
|
770
|
+
for (const clause of this.learned.splice(maxLemmas).reverse()) this.delClause(clause);
|
|
752
771
|
}
|
|
753
772
|
|
|
754
773
|
// Like Z3, only a falsified clause restores the assignment.
|
|
@@ -789,10 +808,10 @@ export class NlsatSolver {
|
|
|
789
808
|
}
|
|
790
809
|
|
|
791
810
|
private processAntecedent(antecedent: number) {
|
|
792
|
-
this.checkpoint();
|
|
811
|
+
this.limit.checkpoint();
|
|
793
812
|
const boolVar = antecedent >> 1;
|
|
794
813
|
if (this.getAssignedValue(antecedent) === L_UNDEF) {
|
|
795
|
-
this.checkpoint();
|
|
814
|
+
this.limit.checkpoint();
|
|
796
815
|
if (!this.marks[boolVar]) {
|
|
797
816
|
this.marks[boolVar] = true;
|
|
798
817
|
this.lemma.push(antecedent);
|
|
@@ -820,7 +839,7 @@ export class NlsatSolver {
|
|
|
820
839
|
this.lazyClause.reset();
|
|
821
840
|
this.explain.computeConflictExplanation(literals, this.lazyClause);
|
|
822
841
|
for (const literal of literals) this.lazyClause.push(literal ^ 1);
|
|
823
|
-
this.checkpoint();
|
|
842
|
+
this.limit.checkpoint();
|
|
824
843
|
this.resolveLiterals(boolVar, this.lazyClause.literals);
|
|
825
844
|
for (const clause of clauses)
|
|
826
845
|
this.lemmaAssumptions = mkJoin(clause.assumptions, this.lemmaAssumptions);
|
|
@@ -861,7 +880,7 @@ export class NlsatSolver {
|
|
|
861
880
|
let isDecision = false;
|
|
862
881
|
while (true) {
|
|
863
882
|
while (this.markCount > 0) {
|
|
864
|
-
this.checkpoint();
|
|
883
|
+
this.limit.checkpoint();
|
|
865
884
|
const entry = this.trail[top - 1];
|
|
866
885
|
if (entry.kind === "assignment" && this.marks[entry.boolVar]) {
|
|
867
886
|
const boolVar = entry.boolVar;
|
|
@@ -995,7 +1014,7 @@ export class NlsatSolver {
|
|
|
995
1014
|
else this.learned[kept++] = clause;
|
|
996
1015
|
}
|
|
997
1016
|
this.learned.length = kept;
|
|
998
|
-
this.atoms.reinitCache();
|
|
1017
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
999
1018
|
this.resetWatches();
|
|
1000
1019
|
const assignment: (Anum | undefined)[] = [];
|
|
1001
1020
|
for (const [variable, value] of this.assignment.entries())
|
|
@@ -1008,15 +1027,9 @@ export class NlsatSolver {
|
|
|
1008
1027
|
for (const [variable, isIntVariable] of isInt.entries())
|
|
1009
1028
|
this.isInt[permutation[variable]] = isIntVariable;
|
|
1010
1029
|
this.invPerm = invPerm;
|
|
1011
|
-
|
|
1012
|
-
for (const atom of this.atoms.atoms) {
|
|
1013
|
-
if (atom === null) continue;
|
|
1014
|
-
if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) polynomials.add(polynomial);
|
|
1015
|
-
else polynomials.add(atom.polynomial);
|
|
1016
|
-
}
|
|
1017
|
-
this.pm.rename(permutation, polynomials);
|
|
1030
|
+
this.pm.rename(permutation);
|
|
1018
1031
|
this.transcendentals.rename(permutation);
|
|
1019
|
-
this.atoms.reinitCache();
|
|
1032
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
1020
1033
|
this.setAssignment(assignment);
|
|
1021
1034
|
this.reattachArithClauses(this.clauses);
|
|
1022
1035
|
this.reattachArithClauses(this.learned);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
// it in the last bit.
|
|
1
|
+
// Z3 evaluates with the platform's libm, and V8's Math functions can differ from it in the last
|
|
2
|
+
// bit.
|
|
4
3
|
import {
|
|
5
4
|
OP_ACOS,
|
|
6
5
|
OP_ACOSH,
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/nlsat_transcendentals.h, src/nlsat/nlsat_transcendentals.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { Anum } from "./algebraic";
|
|
5
|
-
import { NULL_VAR } from "./polynomial";
|
|
3
|
+
import { NULL_VAR, PolynomialRef } from "./polynomial";
|
|
6
4
|
import type { NlsatSolver } from "./solver";
|
|
7
5
|
import {
|
|
8
6
|
getAtanTaylorBracket,
|
|
@@ -51,8 +49,11 @@ export class NlsatTranscendentals {
|
|
|
51
49
|
}
|
|
52
50
|
|
|
53
51
|
private mkBoundLiteral(variable: number, kind: "LT" | "GT", bound: Rational) {
|
|
54
|
-
const
|
|
55
|
-
|
|
52
|
+
const p = new PolynomialRef(this.solver.pm);
|
|
53
|
+
p.set(this.solver.pm.mkLinear([bound.den], [variable], -bound.num));
|
|
54
|
+
const literal = this.solver.mkIneqLiteral(kind, [p.get()], [false]);
|
|
55
|
+
p.reset();
|
|
56
|
+
return literal;
|
|
56
57
|
}
|
|
57
58
|
|
|
58
59
|
// first * firstCoeff + second * secondCoeff kind bound.
|
|
@@ -65,12 +66,17 @@ export class NlsatTranscendentals {
|
|
|
65
66
|
bound: Rational,
|
|
66
67
|
) {
|
|
67
68
|
const den = Rational.of(getLcm(firstCoeff.den, getLcm(secondCoeff.den, bound.den)));
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
const p = new PolynomialRef(this.solver.pm);
|
|
70
|
+
p.set(
|
|
71
|
+
this.solver.pm.mkLinear(
|
|
72
|
+
[firstCoeff.mul(den).num, secondCoeff.mul(den).num],
|
|
73
|
+
[first, second],
|
|
74
|
+
bound.mul(den).neg().num,
|
|
75
|
+
),
|
|
72
76
|
);
|
|
73
|
-
|
|
77
|
+
const literal = this.solver.mkIneqLiteral(kind, [p.get()], [false]);
|
|
78
|
+
p.reset();
|
|
79
|
+
return literal;
|
|
74
80
|
}
|
|
75
81
|
|
|
76
82
|
private mkClause(literals: readonly number[]) {
|
|
@@ -162,16 +168,32 @@ export class NlsatTranscendentals {
|
|
|
162
168
|
|
|
163
169
|
private addIdentityAxiom(kind: "sin" | "sinh" | "tanh", first: number, second: number) {
|
|
164
170
|
const pm = this.solver.pm;
|
|
165
|
-
const
|
|
166
|
-
const
|
|
167
|
-
const
|
|
168
|
-
const
|
|
171
|
+
const v1 = new PolynomialRef(pm);
|
|
172
|
+
const v2 = new PolynomialRef(pm);
|
|
173
|
+
const v1sq = new PolynomialRef(pm);
|
|
174
|
+
const v2sq = new PolynomialRef(pm);
|
|
175
|
+
const eq = new PolynomialRef(pm);
|
|
176
|
+
const product = new PolynomialRef(pm);
|
|
177
|
+
const difference = new PolynomialRef(pm);
|
|
178
|
+
v1.set(pm.mkVar(first));
|
|
179
|
+
v2.set(pm.mkVar(second));
|
|
180
|
+
v1sq.set(pm.mul(v1.get(), v1.get()));
|
|
181
|
+
v2sq.set(pm.mul(v2.get(), v2.get()));
|
|
182
|
+
if (kind === "tanh") product.set(pm.mul(v1sq.get(), v2sq.get()));
|
|
183
|
+
difference.set(
|
|
169
184
|
kind === "sin"
|
|
170
|
-
? pm.
|
|
171
|
-
: kind === "sinh"
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
185
|
+
? pm.add(v1sq.get(), v2sq.get())
|
|
186
|
+
: pm.sub(v1sq.get(), kind === "sinh" ? v2sq.get() : product.get()),
|
|
187
|
+
);
|
|
188
|
+
eq.set(pm.sub(difference.get(), pm.one));
|
|
189
|
+
difference.reset();
|
|
190
|
+
product.reset();
|
|
191
|
+
this.mkClause([this.solver.mkIneqLiteral("EQ", [eq.get()], [false])]);
|
|
192
|
+
eq.reset();
|
|
193
|
+
v2sq.reset();
|
|
194
|
+
v1sq.reset();
|
|
195
|
+
v2.reset();
|
|
196
|
+
v1.reset();
|
|
175
197
|
}
|
|
176
198
|
|
|
177
199
|
// Exact Taylor brackets: exp, log and atan are increasing where their series apply, and the
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/polynomial/upolynomial_factorization{.cpp,_int.h}, the factorization
|
|
2
|
-
// in src/math/polynomial/upolynomial.cpp, src/util/prime_generator.cpp and mpz_manager::root),
|
|
3
|
-
// MIT license, see z3-license.txt.
|
|
4
1
|
import { type Upolynomial, UpolynomialManager } from "./upolynomial";
|
|
5
2
|
|
|
6
3
|
const UINT_MAX = 4294967295;
|
|
@@ -224,7 +221,7 @@ const henselLiftOnce = (
|
|
|
224
221
|
r: bigint,
|
|
225
222
|
polynomials: { u: Upolynomial; a: Upolynomial; v: Upolynomial; b: Upolynomial; c: Upolynomial },
|
|
226
223
|
) => {
|
|
227
|
-
const zr = new UpolynomialManager(r);
|
|
224
|
+
const zr = new UpolynomialManager(z.limit, r);
|
|
228
225
|
const f = zr.set(z.divConst(z.sub(polynomials.c, z.mul(polynomials.a, polynomials.b)), b));
|
|
229
226
|
const division = zr.divRem(zr.mul(polynomials.v, f), polynomials.a);
|
|
230
227
|
const t = zr.add(zr.mul(polynomials.u, f), zr.mul(polynomials.b, division.quotient));
|
|
@@ -242,13 +239,14 @@ const henselLiftQuadratic = (
|
|
|
242
239
|
b: Upolynomial,
|
|
243
240
|
e: number,
|
|
244
241
|
) => {
|
|
245
|
-
const zp = new UpolynomialManager(zpe.zp);
|
|
242
|
+
const zp = new UpolynomialManager(z.limit, zpe.zp);
|
|
246
243
|
const ext = zp.extGcd(a, b);
|
|
247
244
|
let u = ext.u;
|
|
248
245
|
let v = ext.v;
|
|
249
246
|
let currentA = [...a];
|
|
250
247
|
let currentB = [...b];
|
|
251
248
|
for (let k = 1; k < e; k *= 2) {
|
|
249
|
+
z.limit.checkpoint();
|
|
252
250
|
const modulus = zpe.zp as bigint;
|
|
253
251
|
const lifted = henselLiftOnce(z, modulus, modulus, {
|
|
254
252
|
u,
|
|
@@ -454,12 +452,13 @@ export const factorSquareFree = (
|
|
|
454
452
|
fPp = fPp.map((coeff) => -coeff);
|
|
455
453
|
if (k % 2 === 1) fs.constant = -fs.constant;
|
|
456
454
|
}
|
|
457
|
-
const zp = new UpolynomialManager(2n);
|
|
455
|
+
const zp = new UpolynomialManager(z.limit, 2n);
|
|
458
456
|
let zpFs = mkFactors();
|
|
459
457
|
let zpFsPrime = 2n;
|
|
460
458
|
let degreeSet = [true];
|
|
461
459
|
const getNextPrime = mkPrimeIterator();
|
|
462
460
|
for (let trials = 0; trials <= params.primeTrials;) {
|
|
461
|
+
z.limit.checkpoint();
|
|
463
462
|
const nextPrime = getNextPrime();
|
|
464
463
|
if (nextPrime > params.maxPrime) {
|
|
465
464
|
pushFactor(z, fs, fPp, k);
|
|
@@ -491,7 +490,7 @@ export const factorSquareFree = (
|
|
|
491
490
|
}
|
|
492
491
|
}
|
|
493
492
|
zp.setZp(zpFsPrime);
|
|
494
|
-
const zpe = new UpolynomialManager(zpFsPrime);
|
|
493
|
+
const zpe = new UpolynomialManager(z.limit, zpFsPrime);
|
|
495
494
|
const zpeFs = henselLiftFactors(z, fPp, zp, zpFs, getMignotteBound(fPp, zpFsPrime), zpe);
|
|
496
495
|
let leading = zpe.normalizeNumeral(fPp[fPp.length - 1]);
|
|
497
496
|
fPp = z.mulConst(fPp, leading);
|
|
@@ -500,6 +499,7 @@ export const factorSquareFree = (
|
|
|
500
499
|
let result = true;
|
|
501
500
|
let isRemoving = false;
|
|
502
501
|
for (let counter = 1; iterator.next(isRemoving); counter++) {
|
|
502
|
+
z.limit.checkpoint();
|
|
503
503
|
if (counter > params.maxSearchSize) {
|
|
504
504
|
result = false;
|
|
505
505
|
break;
|
|
@@ -587,6 +587,7 @@ export const factorUpolynomial = (
|
|
|
587
587
|
let isComplete = true;
|
|
588
588
|
let product = z.exactDiv(primitive, square) as bigint[];
|
|
589
589
|
for (let multiplicity = 1; product.length > 1; multiplicity++) {
|
|
590
|
+
z.limit.checkpoint();
|
|
590
591
|
const next = z.gcd(product, square);
|
|
591
592
|
const factor = z.exactDiv(product, next) as bigint[];
|
|
592
593
|
if (factor.length > 1) {
|