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,7 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_basics_lemmas.h, src/math/lp/nla_basics_lemmas.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
3
|
+
import { NULL_LPVAR } from "./lar-solver";
|
|
5
4
|
import { LarTerm } from "./lar-term";
|
|
6
5
|
import type { NlaCore } from "./nla-core";
|
|
7
6
|
import type { Factorization } from "./nla-factorization";
|
|
@@ -307,8 +306,52 @@ export class Basics {
|
|
|
307
306
|
);
|
|
308
307
|
}
|
|
309
308
|
|
|
310
|
-
|
|
309
|
+
private basicLemmaForMonNeutralMonicToFactorModelBased(
|
|
310
|
+
rooted: Monic,
|
|
311
|
+
factorization: Factorization,
|
|
312
|
+
) {
|
|
313
|
+
const core = this.core;
|
|
314
|
+
const monicVar = core.emons.get(rooted.variable).variable;
|
|
315
|
+
const absMonicValue = core.val(monicVar).abs();
|
|
316
|
+
if (absMonicValue.isZero()) return;
|
|
317
|
+
let sameAbsVar = NULL_LPVAR;
|
|
318
|
+
let nonUnitVar = NULL_LPVAR;
|
|
319
|
+
let isAllInt = true;
|
|
320
|
+
for (const factor of factorization.factors) {
|
|
321
|
+
const lpVar = factor.variable;
|
|
322
|
+
isAllInt &&= core.varIsInt(lpVar);
|
|
323
|
+
// Z3 tests the factor's variable against null_lpvar, which never holds, so the lemma never fires.
|
|
324
|
+
if (lpVar === NULL_LPVAR && core.valFactor(factor).abs().equals(absMonicValue))
|
|
325
|
+
sameAbsVar = lpVar;
|
|
326
|
+
else if (!core.valFactor(factor).abs().equals(Rational.one)) nonUnitVar = lpVar;
|
|
327
|
+
}
|
|
328
|
+
if (sameAbsVar === NULL_LPVAR || nonUnitVar === NULL_LPVAR) return;
|
|
329
|
+
if (!isAllInt && factorization.factors.length > 2) return;
|
|
330
|
+
const lemma = new LemmaBuilder(core);
|
|
331
|
+
lemma.addIneq(mkIneq(monicVar, KIND_EQ, 0));
|
|
332
|
+
lemma.addIneq(
|
|
333
|
+
mkIneq(
|
|
334
|
+
new LarTerm([
|
|
335
|
+
[sameAbsVar, Rational.one],
|
|
336
|
+
[
|
|
337
|
+
monicVar,
|
|
338
|
+
core.val(sameAbsVar).equals(core.val(monicVar).neg())
|
|
339
|
+
? Rational.one
|
|
340
|
+
: Rational.minusOne,
|
|
341
|
+
],
|
|
342
|
+
]),
|
|
343
|
+
KIND_NE,
|
|
344
|
+
0,
|
|
345
|
+
),
|
|
346
|
+
);
|
|
347
|
+
lemma.addIneq(mkIneq(nonUnitVar, KIND_EQ, 1));
|
|
348
|
+
lemma.addIneq(mkIneq(nonUnitVar, KIND_EQ, -1));
|
|
349
|
+
lemma.explainMonic(rooted);
|
|
350
|
+
lemma.explainFactorization(factorization);
|
|
351
|
+
}
|
|
352
|
+
|
|
311
353
|
private basicLemmaForMonNeutralModelBased(rooted: Monic, factorization: Factorization) {
|
|
354
|
+
this.basicLemmaForMonNeutralMonicToFactorModelBased(rooted, factorization);
|
|
312
355
|
if (factorization.mon !== null)
|
|
313
356
|
this.basicLemmaForMonNeutralFromFactorsToMonicModelBasedFm(factorization.mon);
|
|
314
357
|
else this.basicLemmaForMonNeutralFromFactorsToMonicModelBased(rooted, factorization);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
import { SmtInvariantError } from "../../../../errors";
|
|
2
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
3
|
-
import
|
|
3
|
+
import { ResourceLimit } from "../rlimit";
|
|
4
4
|
import { Rational } from "../rational";
|
|
5
5
|
import { IndexedUintSet } from "./containers";
|
|
6
6
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
@@ -144,6 +144,7 @@ export class NlaCore {
|
|
|
144
144
|
private readonly patcher: Patcher;
|
|
145
145
|
private readonly horner: Horner;
|
|
146
146
|
readonly grobner: Grobner;
|
|
147
|
+
readonly nraLimit = new ResourceLimit(Infinity);
|
|
147
148
|
readonly nra = new NraSolver(this);
|
|
148
149
|
readonly transcendentals = new NlaTranscendentals(this);
|
|
149
150
|
isUsingNraModel = false;
|
|
@@ -151,6 +152,9 @@ export class NlaCore {
|
|
|
151
152
|
private checkAssignmentFailCount = 0;
|
|
152
153
|
private squeezeSchedule = new SqueezeSchedule();
|
|
153
154
|
isRelevant: (lpVar: number) => boolean = () => true;
|
|
155
|
+
addMulDefHook: (vars: number[]) => number = () => {
|
|
156
|
+
throw new SmtInvariantError("nla has no hook to define a product");
|
|
157
|
+
};
|
|
154
158
|
|
|
155
159
|
constructor(
|
|
156
160
|
readonly lra: LarSolver,
|
|
@@ -345,6 +349,12 @@ export class NlaCore {
|
|
|
345
349
|
this.monicsWithChangedBounds.add(lpVar);
|
|
346
350
|
}
|
|
347
351
|
|
|
352
|
+
addMulDef(vars: number[]) {
|
|
353
|
+
const lpVar = this.addMulDefHook(vars);
|
|
354
|
+
this.addMonic(lpVar, vars);
|
|
355
|
+
return lpVar;
|
|
356
|
+
}
|
|
357
|
+
|
|
348
358
|
checkMonic(monic: Monic) {
|
|
349
359
|
const value = this.lra.getValue(monic.variable);
|
|
350
360
|
if (this.lra.isInt(monic.variable) && !value.x.isInt()) return true;
|
|
@@ -758,7 +768,9 @@ export class NlaCore {
|
|
|
758
768
|
NLA_PARAMS.nraCheckAssignment &&
|
|
759
769
|
this.checkAssignmentFailCount < NLA_PARAMS.nraCheckAssignmentMaxFail
|
|
760
770
|
) {
|
|
771
|
+
this.limit.pushChild(this.nraLimit);
|
|
761
772
|
result = this.nra.checkAssignment();
|
|
773
|
+
this.limit.popChild(this.nraLimit);
|
|
762
774
|
if (result !== L_TRUE) this.checkAssignmentFailCount++;
|
|
763
775
|
}
|
|
764
776
|
if (hasNoEffect() && this.shouldRunBoundedNlsat()) result = this.boundedNlsat();
|
|
@@ -778,10 +790,12 @@ export class NlaCore {
|
|
|
778
790
|
result = this.boundedNlsat();
|
|
779
791
|
}
|
|
780
792
|
if (hasNoEffect() && NLA_PARAMS.nra && level >= 2) {
|
|
781
|
-
|
|
793
|
+
this.limit.pushChild(this.nraLimit);
|
|
794
|
+
result = this.nra.check(Infinity);
|
|
795
|
+
this.limit.popChild(this.nraLimit);
|
|
782
796
|
stats.nraCalls++;
|
|
783
797
|
}
|
|
784
|
-
if (result === L_UNDEF && !hasNoEffect()) result = L_FALSE;
|
|
798
|
+
if (result === L_UNDEF && !hasNoEffect() && this.limit.inc()) result = L_FALSE;
|
|
785
799
|
stats.nlaLemmas += this.lemmas.length;
|
|
786
800
|
return result;
|
|
787
801
|
}
|
|
@@ -791,10 +805,15 @@ export class NlaCore {
|
|
|
791
805
|
}
|
|
792
806
|
|
|
793
807
|
private boundedNlsat() {
|
|
794
|
-
const
|
|
795
|
-
|
|
808
|
+
const rlimitBudget = 100000;
|
|
809
|
+
this.limit.pushChild(this.nraLimit);
|
|
810
|
+
this.nraLimit.push(rlimitBudget);
|
|
811
|
+
const result = this.nra.check(100);
|
|
812
|
+
const rlimitConsumed = this.nraLimit.count;
|
|
813
|
+
this.nraLimit.pop();
|
|
814
|
+
this.limit.popChild(this.nraLimit);
|
|
796
815
|
this.stats.nraCalls++;
|
|
797
|
-
this.nlsatBackoff.update(result === L_FALSE ||
|
|
816
|
+
this.nlsatBackoff.update(result === L_FALSE || rlimitConsumed < rlimitBudget / 10);
|
|
798
817
|
if (result === L_TRUE) this.clear();
|
|
799
818
|
return result;
|
|
800
819
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_divisions.h, src/math/lp/nla_divisions.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { getEuclideanDiv, Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { NULL_LPVAR } from "./lar-solver";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/monic.h, src/math/lp/emonics.h, src/math/lp/emonics.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { getSignedVarVar, isSignedVarNegated, negateSignedVar, type VarEqs } from "./nla-var-eqs";
|
|
3
2
|
import { TrailStack, UnionFind } from "./union-find";
|
|
4
3
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_grobner.h, src/math/lp/nla_grobner.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// Deviation from Z3: its nlsat conflict check (is_nla_conflict) is not ported.
|
|
3
1
|
import { PddMemoryOutError } from "../../../../errors";
|
|
4
2
|
import { getEuclideanMod, getGcd, getLcm, Rational } from "../rational";
|
|
5
3
|
import { KIND_EQ, KIND_GE, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
@@ -225,8 +223,12 @@ export class Grobner {
|
|
|
225
223
|
if (!poly.isOffset()) return false;
|
|
226
224
|
const variable = poly.var();
|
|
227
225
|
if (this.core.varIsFixed(variable)) return false;
|
|
228
|
-
const
|
|
229
|
-
const
|
|
226
|
+
const hi = poly.hi();
|
|
227
|
+
const coeff = hi.val();
|
|
228
|
+
hi.release();
|
|
229
|
+
const lo = poly.lo();
|
|
230
|
+
const offset = lo.val().neg();
|
|
231
|
+
lo.release();
|
|
230
232
|
const lcm = getRationalLcm(getDenominator(coeff), getDenominator(offset));
|
|
231
233
|
const ineq = mkIneq(new LarTerm([[variable, coeff.mul(lcm)]]), KIND_EQ, offset.mul(lcm));
|
|
232
234
|
return this.addLemmaUnlessHolds(equation, ineq);
|
|
@@ -240,31 +242,49 @@ export class Grobner {
|
|
|
240
242
|
|
|
241
243
|
private propagateFactorizationOf(equation: Equation) {
|
|
242
244
|
const factors = equation.poly.varFactors();
|
|
243
|
-
if (factors.vars.length === 0 || !factors.poly.isLinear())
|
|
245
|
+
if (factors.vars.length === 0 || !factors.poly.isLinear()) {
|
|
246
|
+
factors.poly.release();
|
|
247
|
+
return false;
|
|
248
|
+
}
|
|
244
249
|
const linear = this.linearToTerm(factors.poly);
|
|
245
250
|
const ineqs = factors.vars.map((variable) => mkIneq(variable, KIND_EQ, 0));
|
|
246
251
|
ineqs.push(mkIneq(linear.term, KIND_EQ, linear.offset.neg()));
|
|
247
|
-
if (ineqs.some((ineq) => this.core.ineqHolds(ineq)))
|
|
252
|
+
if (ineqs.some((ineq) => this.core.ineqHolds(ineq))) {
|
|
253
|
+
factors.poly.release();
|
|
254
|
+
return false;
|
|
255
|
+
}
|
|
248
256
|
const lemma = this.addDependencies(new LemmaBuilder(this.core), equation);
|
|
249
257
|
for (const ineq of ineqs) lemma.addIneq(ineq);
|
|
258
|
+
factors.poly.release();
|
|
250
259
|
return true;
|
|
251
260
|
}
|
|
252
261
|
|
|
253
262
|
private linearToTerm(poly: Pdd): LinearTerm {
|
|
263
|
+
const termPoly = poly.copy();
|
|
254
264
|
let lcm = Rational.one;
|
|
255
|
-
|
|
256
|
-
while (!
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
265
|
+
const lcmPoly = termPoly.copy();
|
|
266
|
+
while (!lcmPoly.isVal()) {
|
|
267
|
+
const hi = lcmPoly.hi();
|
|
268
|
+
lcm = getRationalLcm(lcm, getDenominator(hi.val()));
|
|
269
|
+
hi.release();
|
|
270
|
+
const lo = lcmPoly.lo();
|
|
271
|
+
lcmPoly.assign(lo);
|
|
272
|
+
lo.release();
|
|
273
|
+
}
|
|
274
|
+
lcm = getRationalLcm(getDenominator(lcmPoly.val()), lcm);
|
|
261
275
|
const term = new LarTerm();
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
term.addMonomial(lcm.mul(
|
|
265
|
-
|
|
276
|
+
while (!termPoly.isVal()) {
|
|
277
|
+
const hi = termPoly.hi();
|
|
278
|
+
term.addMonomial(lcm.mul(hi.val()), termPoly.var());
|
|
279
|
+
hi.release();
|
|
280
|
+
const lo = termPoly.lo();
|
|
281
|
+
termPoly.assign(lo);
|
|
282
|
+
lo.release();
|
|
266
283
|
}
|
|
267
|
-
|
|
284
|
+
const offset = lcm.mul(termPoly.val());
|
|
285
|
+
lcmPoly.release();
|
|
286
|
+
termPoly.release();
|
|
287
|
+
return { term, offset };
|
|
268
288
|
}
|
|
269
289
|
|
|
270
290
|
private getValue(poly: Pdd) {
|
|
@@ -279,42 +299,61 @@ export class Grobner {
|
|
|
279
299
|
}
|
|
280
300
|
|
|
281
301
|
private propagateGcdTestOf(equation: Equation) {
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
const failsGcdTest = (substituted: Pdd) => {
|
|
292
|
-
let gcd = Rational.zero;
|
|
293
|
-
let constant = Rational.zero;
|
|
294
|
-
for (const value of substituted.coefficients()) {
|
|
295
|
-
if (value.isConstant) {
|
|
296
|
-
constant = constant.add(value.coeff);
|
|
297
|
-
continue;
|
|
298
|
-
}
|
|
299
|
-
gcd = getRationalGcd(gcd, value.coeff);
|
|
300
|
-
if (gcd.equals(Rational.one)) return false;
|
|
301
|
-
}
|
|
302
|
-
return !constant.isZero() && !divides(gcd, constant);
|
|
303
|
-
};
|
|
304
|
-
for (const entry of powers) {
|
|
305
|
-
if (entry.degree > 4) continue;
|
|
306
|
-
const scaled = manager.mkVar(entry.var).mul(manager.mkVal(Rational.fromNumber(entry.degree)));
|
|
307
|
-
let isGcdFailing = true;
|
|
308
|
-
for (let residue = 0; isGcdFailing && residue < entry.degree; residue++) {
|
|
309
|
-
const replacement = scaled.add(manager.mkVal(Rational.fromNumber(residue)));
|
|
310
|
-
if (!failsGcdTest(poly.substPdd(entry.var, replacement))) isGcdFailing = false;
|
|
302
|
+
const poly = equation.poly.copy();
|
|
303
|
+
try {
|
|
304
|
+
if (poly.isLinear() || poly.isVal() || !this.isIntPoly(poly)) return false;
|
|
305
|
+
if (this.getValue(poly).isZero()) return false;
|
|
306
|
+
const powers = poly.getPowers();
|
|
307
|
+
if (powers.length === 0) return false;
|
|
308
|
+
let lcm = Rational.one;
|
|
309
|
+
for (const value of poly.coefficients()) {
|
|
310
|
+
lcm = getRationalLcm(lcm, getDenominator(value.coeff));
|
|
311
311
|
}
|
|
312
|
-
if (
|
|
313
|
-
|
|
314
|
-
|
|
312
|
+
if (!lcm.equals(Rational.one)) poly.mulAssign(lcm);
|
|
313
|
+
const manager = this.manager;
|
|
314
|
+
const failsGcdTest = (substituted: Pdd) => {
|
|
315
|
+
let gcd = Rational.zero;
|
|
316
|
+
let constant = Rational.zero;
|
|
317
|
+
for (const value of substituted.coefficients()) {
|
|
318
|
+
if (value.isConstant) {
|
|
319
|
+
constant = constant.add(value.coeff);
|
|
320
|
+
continue;
|
|
321
|
+
}
|
|
322
|
+
gcd = getRationalGcd(gcd, value.coeff);
|
|
323
|
+
if (gcd.equals(Rational.one)) return false;
|
|
324
|
+
}
|
|
325
|
+
return !constant.isZero() && !divides(gcd, constant);
|
|
326
|
+
};
|
|
327
|
+
for (const entry of powers) {
|
|
328
|
+
if (entry.degree > 4) continue;
|
|
329
|
+
const variable = manager.mkVar(entry.var);
|
|
330
|
+
const degree = manager.mkVal(Rational.fromNumber(entry.degree));
|
|
331
|
+
const scaled = variable.mul(degree);
|
|
332
|
+
degree.release();
|
|
333
|
+
variable.release();
|
|
334
|
+
try {
|
|
335
|
+
let isGcdFailing = true;
|
|
336
|
+
for (let residue = 0; isGcdFailing && residue < entry.degree; residue++) {
|
|
337
|
+
const residuePdd = manager.mkVal(Rational.fromNumber(residue));
|
|
338
|
+
const replacement = scaled.add(residuePdd);
|
|
339
|
+
residuePdd.release();
|
|
340
|
+
const substituted = poly.substPdd(entry.var, replacement);
|
|
341
|
+
if (!failsGcdTest(substituted)) isGcdFailing = false;
|
|
342
|
+
substituted.release();
|
|
343
|
+
replacement.release();
|
|
344
|
+
}
|
|
345
|
+
if (isGcdFailing) {
|
|
346
|
+
this.addDependencies(new LemmaBuilder(this.core), equation);
|
|
347
|
+
return true;
|
|
348
|
+
}
|
|
349
|
+
} finally {
|
|
350
|
+
scaled.release();
|
|
351
|
+
}
|
|
315
352
|
}
|
|
353
|
+
return false;
|
|
354
|
+
} finally {
|
|
355
|
+
poly.release();
|
|
316
356
|
}
|
|
317
|
-
return false;
|
|
318
357
|
}
|
|
319
358
|
|
|
320
359
|
private propagateQuotientsOf(equation: Equation) {
|
|
@@ -331,11 +370,18 @@ export class Grobner {
|
|
|
331
370
|
if (this.propagateModResidue(equation)) return true;
|
|
332
371
|
let isLemmaFound = false;
|
|
333
372
|
for (const variable of nlVars) {
|
|
334
|
-
const
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
373
|
+
const lc = this.manager.zero();
|
|
374
|
+
const rest = this.manager.zero();
|
|
375
|
+
poly.factor(variable, 1, lc, rest);
|
|
376
|
+
if (rest.isLinear()) {
|
|
377
|
+
if (!lcm.equals(Rational.one)) {
|
|
378
|
+
lc.mulAssign(lcm);
|
|
379
|
+
rest.mulAssign(lcm);
|
|
380
|
+
}
|
|
381
|
+
if (this.addQuotientLemma(equation, variable, lc, rest)) isLemmaFound = true;
|
|
382
|
+
}
|
|
383
|
+
rest.release();
|
|
384
|
+
lc.release();
|
|
339
385
|
}
|
|
340
386
|
return isLemmaFound;
|
|
341
387
|
}
|
|
@@ -749,28 +795,38 @@ export class Grobner {
|
|
|
749
795
|
}
|
|
750
796
|
|
|
751
797
|
private getTermPdd(term: LarTerm, ref: DepRef) {
|
|
752
|
-
|
|
753
|
-
for (const entry of term.coeffs)
|
|
798
|
+
const result = this.manager.mkVal(Rational.zero);
|
|
799
|
+
for (const entry of term.coeffs) {
|
|
800
|
+
const expr = this.getPddExpr(entry[1], entry[0], ref);
|
|
801
|
+
result.addAssign(expr);
|
|
802
|
+
expr.release();
|
|
803
|
+
}
|
|
754
804
|
return result;
|
|
755
805
|
}
|
|
756
806
|
|
|
757
807
|
private getPddExpr(coeff: Rational, lpVar: number, ref: DepRef) {
|
|
758
808
|
const core = this.core;
|
|
759
|
-
|
|
809
|
+
const result = this.manager.mkVal(coeff);
|
|
760
810
|
const vars = [lpVar];
|
|
761
811
|
const zeroRef = { dep: ref.dep };
|
|
762
812
|
for (let current = vars.pop(); current !== undefined; current = vars.pop()) {
|
|
763
813
|
if (NLA_PARAMS.grobnerSubsFixed > 0 && core.varIsFixedToZero(current)) {
|
|
764
|
-
|
|
814
|
+
const fixed = this.manager.mkVal(this.getValOfFixedVarWithDeps(current, zeroRef));
|
|
815
|
+
result.assign(fixed);
|
|
816
|
+
fixed.release();
|
|
765
817
|
ref.dep = zeroRef.dep;
|
|
766
818
|
return result;
|
|
767
819
|
}
|
|
768
820
|
if (NLA_PARAMS.grobnerSubsFixed === 1 && core.varIsFixed(current)) {
|
|
769
|
-
result
|
|
821
|
+
result.mulAssign(this.getValOfFixedVarWithDeps(current, ref));
|
|
770
822
|
} else if (this.expandsTerms && core.lra.hasTerm(current)) {
|
|
771
|
-
|
|
823
|
+
const termPdd = this.getTermPdd(core.lra.getTerm(current), ref);
|
|
824
|
+
result.mulAssign(termPdd);
|
|
825
|
+
termPdd.release();
|
|
772
826
|
} else if (!core.isMonicVar(current)) {
|
|
773
|
-
|
|
827
|
+
const variable = this.manager.mkVar(current);
|
|
828
|
+
result.mulAssign(variable);
|
|
829
|
+
variable.release();
|
|
774
830
|
} else {
|
|
775
831
|
vars.push(...core.emons.get(current).vars);
|
|
776
832
|
}
|
|
@@ -778,17 +834,20 @@ export class Grobner {
|
|
|
778
834
|
return result;
|
|
779
835
|
}
|
|
780
836
|
|
|
781
|
-
private getSolvedForm(poly: Pdd) {
|
|
837
|
+
private getSolvedForm(poly: Pdd, solution: Pdd) {
|
|
782
838
|
if (!poly.isLinear()) return null;
|
|
839
|
+
solution.assign(poly);
|
|
783
840
|
let numLo = 0;
|
|
784
841
|
let numHi = 0;
|
|
785
842
|
let lo = 0;
|
|
786
843
|
let hi = 0;
|
|
787
844
|
let loCoeff = Rational.zero;
|
|
788
845
|
let hiCoeff = Rational.zero;
|
|
789
|
-
|
|
790
|
-
const variable =
|
|
791
|
-
const
|
|
846
|
+
while (!solution.isVal()) {
|
|
847
|
+
const variable = solution.var();
|
|
848
|
+
const hiPoly = solution.hi();
|
|
849
|
+
const value = hiPoly.val();
|
|
850
|
+
hiPoly.release();
|
|
792
851
|
const type = this.core.lra.core.getColumnType(variable);
|
|
793
852
|
if (type === COLUMN_LOWER || type === COLUMN_UPPER) {
|
|
794
853
|
if (value.isPositive() === (type === COLUMN_LOWER)) {
|
|
@@ -804,51 +863,68 @@ export class Grobner {
|
|
|
804
863
|
return null;
|
|
805
864
|
}
|
|
806
865
|
if (numLo > 1 && numHi > 1) return null;
|
|
866
|
+
const loPoly = solution.lo();
|
|
867
|
+
solution.assign(loPoly);
|
|
868
|
+
loPoly.release();
|
|
807
869
|
}
|
|
808
870
|
const isLo = numLo === 1 && numHi > 1;
|
|
809
871
|
if (!isLo && !(numHi === 1 && numLo > 1)) return null;
|
|
810
872
|
const variable = isLo ? lo : hi;
|
|
811
873
|
const coeff = isLo ? loCoeff : hiCoeff;
|
|
812
|
-
const
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
874
|
+
const variablePdd = this.manager.mkVar(variable);
|
|
875
|
+
const scaled = variablePdd.mul(coeff);
|
|
876
|
+
const difference = scaled.sub(poly);
|
|
877
|
+
solution.assign(difference);
|
|
878
|
+
difference.release();
|
|
879
|
+
scaled.release();
|
|
880
|
+
variablePdd.release();
|
|
881
|
+
if (!coeff.equals(Rational.one)) solution.mulAssign(Rational.one.div(coeff));
|
|
882
|
+
return variable;
|
|
817
883
|
}
|
|
818
884
|
|
|
819
885
|
private addEq(poly: Pdd, dep: Dependency) {
|
|
820
|
-
const
|
|
821
|
-
const
|
|
822
|
-
|
|
823
|
-
|
|
886
|
+
const solution = this.manager.zero();
|
|
887
|
+
const simplifiedDep = this.solver.simplify(poly, dep);
|
|
888
|
+
const variable = this.getSolvedForm(poly, solution);
|
|
889
|
+
if (variable === null) this.solver.add(poly, simplifiedDep);
|
|
890
|
+
else this.solver.addSubst(variable, solution, simplifiedDep);
|
|
891
|
+
solution.release();
|
|
824
892
|
}
|
|
825
893
|
|
|
826
894
|
private addFixedMonic(lpVar: number) {
|
|
827
895
|
const ref: DepRef = { dep: null };
|
|
828
|
-
|
|
896
|
+
const product = this.manager.mkVal(Rational.one);
|
|
829
897
|
for (const factor of this.core.emons.get(lpVar).vars) {
|
|
830
|
-
|
|
898
|
+
const expr = this.getPddExpr(Rational.one, factor, ref);
|
|
899
|
+
product.mulAssign(expr);
|
|
900
|
+
expr.release();
|
|
831
901
|
}
|
|
832
|
-
product
|
|
902
|
+
product.subAssign(this.getValOfFixedVarWithDeps(lpVar, ref));
|
|
833
903
|
this.addEq(product, ref.dep);
|
|
904
|
+
product.release();
|
|
834
905
|
}
|
|
835
906
|
|
|
836
907
|
private addRow(row: RowCell[]) {
|
|
837
908
|
const ref: DepRef = { dep: null };
|
|
838
|
-
|
|
839
|
-
for (const cell of row)
|
|
909
|
+
const sum = this.manager.mkVal(Rational.zero);
|
|
910
|
+
for (const cell of row) {
|
|
911
|
+
const expr = this.getPddExpr(cell.coeff, cell.column, ref);
|
|
912
|
+
sum.addAssign(expr);
|
|
913
|
+
expr.release();
|
|
914
|
+
}
|
|
840
915
|
this.addEq(sum, ref.dep);
|
|
916
|
+
sum.release();
|
|
841
917
|
}
|
|
842
918
|
|
|
843
919
|
private setLevel2var() {
|
|
844
920
|
const core = this.core;
|
|
845
921
|
const count = core.lra.getColumnCount();
|
|
846
|
-
const weights = Array.from({ length: count }, (
|
|
922
|
+
const weights = Array.from({ length: count }, (_value, lpVar) => core.getVarWeight(lpVar));
|
|
847
923
|
for (let lpVar = 0; lpVar < count; lpVar++) {
|
|
848
924
|
if (!core.isMonicVar(lpVar) || !core.toRefine.has(lpVar)) continue;
|
|
849
925
|
for (const factor of core.emons.get(lpVar).vars) weights[factor] += 6;
|
|
850
926
|
}
|
|
851
|
-
const level2var = Array.from({ length: count }, (
|
|
927
|
+
const level2var = Array.from({ length: count }, (_value, lpVar) => lpVar).sort(
|
|
852
928
|
(first, second) => weights[first] - weights[second] || first - second,
|
|
853
929
|
);
|
|
854
930
|
this.manager.reset(level2var);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/horner.h, src/math/lp/horner.cpp, and nexvar, create_sum_from_row,
|
|
2
|
-
// and add_deps_of_fixed from src/math/lp/nla_common.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { CrossNested } from "./cross-nested";
|
|
5
3
|
import { type Dependency, mkJoin } from "./dependency";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/monomial_bounds.{h,cpp}, src/util/mpq.h root), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { type ConstraintKind, KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
5
3
|
import {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_monotone_lemmas.h, src/math/lp/nla_monotone_lemmas.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
4
3
|
import { type NlaCore } from "./nla-core";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_order_lemmas.h, src/math/lp/nla_order_lemmas.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { LarTerm } from "./lar-term";
|