tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- 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 +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- 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 +45 -20
- 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 +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- 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 +13 -7
- 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 +4 -11
- 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 +26 -7
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- 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 +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- 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 +18 -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 +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- 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 +59 -10
- 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 +66 -11
- 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 +167 -85
- 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 +220 -0
- 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 +324 -0
- 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 +163 -99
- 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 +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- 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 +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- 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 +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- 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 +20 -5
- package/src/prover/zenon/parse.ts +6 -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 +7 -5
- 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 +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_solver.cpp, src/math/lp/int_gcd_test.cpp,
|
|
2
|
-
// src/math/lp/int_branch.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
4
2
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
5
3
|
import { DiophantineSolver } from "./dioph-eq";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_solver.h, src/math/lp/lar_solver.cpp, src/math/lp/column.h, src/math/lp/var_register.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
3
2
|
import { Rational } from "../rational";
|
|
4
3
|
import { IndexedUintSet, StackedVector } from "./containers";
|
|
@@ -131,6 +130,18 @@ export class LarSolver {
|
|
|
131
130
|
return this.localIsInt[column];
|
|
132
131
|
}
|
|
133
132
|
|
|
133
|
+
getLowerBoundOf(column: number) {
|
|
134
|
+
return column < this.columns.length && this.columns[column].lowerWitness !== null
|
|
135
|
+
? this.core.lowerBounds[column]
|
|
136
|
+
: undefined;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
getUpperBoundOf(column: number) {
|
|
140
|
+
return column < this.columns.length && this.columns[column].upperWitness !== null
|
|
141
|
+
? this.core.upperBounds[column]
|
|
142
|
+
: undefined;
|
|
143
|
+
}
|
|
144
|
+
|
|
134
145
|
isBase(column: number) {
|
|
135
146
|
return this.core.isBase(column);
|
|
136
147
|
}
|
|
@@ -229,6 +240,15 @@ export class LarSolver {
|
|
|
229
240
|
}
|
|
230
241
|
}
|
|
231
242
|
|
|
243
|
+
areEqual(first: number, second: number) {
|
|
244
|
+
const term = new LarTerm([
|
|
245
|
+
[first, Rational.one],
|
|
246
|
+
[second, Rational.minusOne],
|
|
247
|
+
]);
|
|
248
|
+
this.substKnownTerms(term);
|
|
249
|
+
return term.size === 0;
|
|
250
|
+
}
|
|
251
|
+
|
|
232
252
|
addTerm(coeffs: [number, Rational][], external: number) {
|
|
233
253
|
const term = new LarTerm(coeffs);
|
|
234
254
|
this.substKnownTerms(term);
|
|
@@ -352,9 +372,10 @@ export class LarSolver {
|
|
|
352
372
|
return { kind, bound };
|
|
353
373
|
}
|
|
354
374
|
|
|
355
|
-
|
|
375
|
+
// A non-zero eps makes the bound rhs + eps*delta.
|
|
376
|
+
mkVarBound(column: number, kind: ConstraintKind, rhs: Rational, eps = Rational.zero) {
|
|
356
377
|
const adjusted = this.adjustBoundForInt(column, kind, rhs);
|
|
357
|
-
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound));
|
|
378
|
+
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound, eps));
|
|
358
379
|
}
|
|
359
380
|
|
|
360
381
|
constraintIsRedundant(index: number) {
|
|
@@ -530,7 +551,7 @@ export class LarSolver {
|
|
|
530
551
|
for (const column of toRemove) this.fixedBaseVarSet.delete(column);
|
|
531
552
|
}
|
|
532
553
|
|
|
533
|
-
|
|
554
|
+
removeFromBasis(column: number) {
|
|
534
555
|
const core = this.core;
|
|
535
556
|
for (const cell of core.matrix.rows[core.heading[column]]) {
|
|
536
557
|
if (cell.column === column || this.isFixed(cell.column)) continue;
|
|
@@ -605,6 +626,21 @@ export class LarSolver {
|
|
|
605
626
|
}
|
|
606
627
|
}
|
|
607
628
|
|
|
629
|
+
hasIntVar() {
|
|
630
|
+
return this.localIsInt.includes(true);
|
|
631
|
+
}
|
|
632
|
+
|
|
633
|
+
// Columns added after the backup get basic values from their rows, as the tableau requires.
|
|
634
|
+
restoreX() {
|
|
635
|
+
const core = this.core;
|
|
636
|
+
const isGrown = core.getBackupSize() < core.getColumnCount();
|
|
637
|
+
core.restoreX();
|
|
638
|
+
if (!isGrown) return;
|
|
639
|
+
for (let rowIndex = 0; rowIndex < this.getRowCount(); rowIndex++)
|
|
640
|
+
core.x[core.basis[rowIndex]] = this.getBasicVarValueFromRow(rowIndex);
|
|
641
|
+
this.moveNonBasicColumnsToBounds();
|
|
642
|
+
}
|
|
643
|
+
|
|
608
644
|
hasInfInt() {
|
|
609
645
|
for (let column = 0; column < this.getColumnCount(); column++)
|
|
610
646
|
if (this.isInt(column) && !this.core.x[column].isInt()) return true;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (maximize_term and its helpers in src/math/lp/lar_solver.cpp, and the tableau part
|
|
2
|
-
// of src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_def.h,
|
|
3
|
-
// src/math/lp/lp_primal_core_solver_tableau_def.h), MIT license, see z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import {
|
|
6
3
|
COLUMN_BOXED,
|
|
@@ -15,6 +12,7 @@ import {
|
|
|
15
12
|
LP_OPTIMAL,
|
|
16
13
|
LP_UNBOUNDED,
|
|
17
14
|
} from "./core-solver";
|
|
15
|
+
import { type Dependency, mkJoin } from "./dependency";
|
|
18
16
|
import type { LarSolver } from "./lar-solver";
|
|
19
17
|
import { LarTerm } from "./lar-term";
|
|
20
18
|
import { Impq } from "./numeric-pair";
|
|
@@ -304,19 +302,70 @@ const maximizeTermOnFeasibleRSolver = (solver: LarSolver, term: LarTerm) => {
|
|
|
304
302
|
core.reducedCosts = undefined;
|
|
305
303
|
const status = core.status;
|
|
306
304
|
core.status = LP_OPTIMAL;
|
|
307
|
-
return status === LP_UNBOUNDED || status === LP_CANCELLED
|
|
305
|
+
return status === LP_UNBOUNDED || status === LP_CANCELLED
|
|
306
|
+
? undefined
|
|
307
|
+
: { value: term.apply(core.x), reducedCosts };
|
|
308
308
|
};
|
|
309
309
|
|
|
310
|
-
|
|
310
|
+
// Every column with a positive reduced cost sits at its upper bound, and every column with a
|
|
311
|
+
// negative one at its lower bound, so those bounds prove the maximum.
|
|
312
|
+
const getDependenciesOfMaximum = (solver: LarSolver, reducedCosts: readonly Rational[]) => {
|
|
313
|
+
let dependency: Dependency = null;
|
|
314
|
+
for (const [column, reducedCost] of reducedCosts.entries()) {
|
|
315
|
+
if (reducedCost.isZero()) continue;
|
|
316
|
+
dependency = mkJoin(
|
|
317
|
+
dependency,
|
|
318
|
+
reducedCost.isPositive() ? solver.getUpperWitness(column) : solver.getLowerWitness(column),
|
|
319
|
+
);
|
|
320
|
+
}
|
|
321
|
+
return dependency;
|
|
322
|
+
};
|
|
323
|
+
|
|
324
|
+
// Integer columns that maximization left fractional move out of the basis, if they can.
|
|
325
|
+
const adjustIntegerColumns = (solver: LarSolver, term: LarTerm, previous: Impq, maximum: Impq) => {
|
|
326
|
+
const core = solver.core;
|
|
327
|
+
const restore = () => {
|
|
328
|
+
core.restoreX();
|
|
329
|
+
return { status: LP_FEASIBLE, value: previous };
|
|
330
|
+
};
|
|
331
|
+
let isChanged = false;
|
|
332
|
+
for (let column = 0; column < core.x.length; column++) {
|
|
333
|
+
if (!solver.isInt(column) || core.x[column].isInt()) continue;
|
|
334
|
+
if (solver.isBase(column) && !solver.removeFromBasis(column)) return restore();
|
|
335
|
+
if (!core.x[column].isInt()) return restore();
|
|
336
|
+
isChanged = true;
|
|
337
|
+
}
|
|
338
|
+
const changed = isChanged ? term.apply(core.x) : maximum;
|
|
339
|
+
const isWorse = changed.compare(previous) < 0;
|
|
340
|
+
if (isWorse) core.restoreX();
|
|
341
|
+
const value = isWorse ? previous : changed;
|
|
342
|
+
if (!value.equals(maximum)) return { status: LP_FEASIBLE, value };
|
|
343
|
+
solver.status = LP_OPTIMAL;
|
|
344
|
+
return { status: LP_OPTIMAL, value };
|
|
345
|
+
};
|
|
346
|
+
|
|
347
|
+
export const maximizeTerm = (
|
|
348
|
+
solver: LarSolver,
|
|
349
|
+
column: number,
|
|
350
|
+
isFixingIntCols = false,
|
|
351
|
+
isComputingDependencies = false,
|
|
352
|
+
) => {
|
|
311
353
|
const term = solver.hasTerm(column)
|
|
312
354
|
? solver.getTerm(column)
|
|
313
355
|
: new LarTerm([[column, Rational.one]]);
|
|
314
|
-
|
|
356
|
+
solver.core.backupX();
|
|
357
|
+
const previous = term.apply(solver.core.x);
|
|
315
358
|
const maximum = maximizeTermOnFeasibleRSolver(solver, term);
|
|
316
359
|
if (maximum === undefined) {
|
|
317
|
-
solver.core.
|
|
318
|
-
return
|
|
360
|
+
solver.core.restoreX();
|
|
361
|
+
return { status: LP_UNBOUNDED, value: Impq.zero, dependency: null };
|
|
319
362
|
}
|
|
320
|
-
|
|
321
|
-
|
|
363
|
+
const dependency = isComputingDependencies
|
|
364
|
+
? getDependenciesOfMaximum(solver, maximum.reducedCosts)
|
|
365
|
+
: null;
|
|
366
|
+
if (!isFixingIntCols) {
|
|
367
|
+
solver.status = LP_OPTIMAL;
|
|
368
|
+
return { status: LP_OPTIMAL, value: maximum.value, dependency };
|
|
369
|
+
}
|
|
370
|
+
return { ...adjustIntegerColumns(solver, term, previous, maximum.value), dependency };
|
|
322
371
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
2
|
+
import { UnorderedUintMap } from "./containers";
|
|
3
3
|
import {
|
|
4
4
|
type Nex,
|
|
5
5
|
type NexMul,
|
|
@@ -25,8 +25,8 @@ interface MapEntry<Value> {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
export class NexCreator {
|
|
28
|
-
readonly occurencesMap = new
|
|
29
|
-
readonly powers = new
|
|
28
|
+
readonly occurencesMap = new UnorderedUintMap<Occ>();
|
|
29
|
+
readonly powers = new UnorderedUintMap<number>();
|
|
30
30
|
private activeVarsWeights: number[] = [];
|
|
31
31
|
|
|
32
32
|
setNumberOfVars(count: number) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
2
|
+
import type { UnorderedUintMap } from "./containers";
|
|
3
3
|
|
|
4
4
|
interface NexScalar {
|
|
5
5
|
readonly kind: "scalar";
|
|
@@ -64,7 +64,7 @@ export const isALinearTerm = (sum: NexSum) => {
|
|
|
64
64
|
return numberOfNonScalars > 1;
|
|
65
65
|
};
|
|
66
66
|
|
|
67
|
-
export const getPowersFromMul = (mul: NexMul, powers:
|
|
67
|
+
export const getPowersFromMul = (mul: NexMul, powers: UnorderedUintMap<number>) => {
|
|
68
68
|
powers.clear();
|
|
69
69
|
for (const child of mul.children)
|
|
70
70
|
if (child.expr.kind === "var") powers.set(child.expr.variable, child.power);
|
|
@@ -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";
|
|
@@ -22,6 +22,7 @@ import { MonomialBounds } from "./nla-monomial-bounds";
|
|
|
22
22
|
import { Monotone } from "./nla-monotone";
|
|
23
23
|
import { Order } from "./nla-order";
|
|
24
24
|
import { Patcher } from "./nla-patcher";
|
|
25
|
+
import { checkPower } from "./nla-powers";
|
|
25
26
|
import { Tangents } from "./nla-tangents";
|
|
26
27
|
import { NlaThrottle } from "./nla-throttle";
|
|
27
28
|
import {
|
|
@@ -32,6 +33,7 @@ import {
|
|
|
32
33
|
mkIneq,
|
|
33
34
|
negateKind,
|
|
34
35
|
} from "./nla-types";
|
|
36
|
+
import { NlaTranscendentals } from "./nla-transcendentals";
|
|
35
37
|
import { NraSolver } from "./nra-solver";
|
|
36
38
|
import { getSignedVarVar, isSignedVarNegated, mkSignedVar, VarEqs } from "./nla-var-eqs";
|
|
37
39
|
|
|
@@ -142,12 +144,17 @@ export class NlaCore {
|
|
|
142
144
|
private readonly patcher: Patcher;
|
|
143
145
|
private readonly horner: Horner;
|
|
144
146
|
readonly grobner: Grobner;
|
|
147
|
+
readonly nraLimit = new ResourceLimit(Infinity);
|
|
145
148
|
readonly nra = new NraSolver(this);
|
|
149
|
+
readonly transcendentals = new NlaTranscendentals(this);
|
|
146
150
|
isUsingNraModel = false;
|
|
147
151
|
private nlsatBackoff: Backoff;
|
|
148
152
|
private checkAssignmentFailCount = 0;
|
|
149
153
|
private squeezeSchedule = new SqueezeSchedule();
|
|
150
154
|
isRelevant: (lpVar: number) => boolean = () => true;
|
|
155
|
+
addMulDefHook: (vars: number[]) => number = () => {
|
|
156
|
+
throw new SmtInvariantError("nla has no hook to define a product");
|
|
157
|
+
};
|
|
151
158
|
|
|
152
159
|
constructor(
|
|
153
160
|
readonly lra: LarSolver,
|
|
@@ -342,6 +349,12 @@ export class NlaCore {
|
|
|
342
349
|
this.monicsWithChangedBounds.add(lpVar);
|
|
343
350
|
}
|
|
344
351
|
|
|
352
|
+
addMulDef(vars: number[]) {
|
|
353
|
+
const lpVar = this.addMulDefHook(vars);
|
|
354
|
+
this.addMonic(lpVar, vars);
|
|
355
|
+
return lpVar;
|
|
356
|
+
}
|
|
357
|
+
|
|
345
358
|
checkMonic(monic: Monic) {
|
|
346
359
|
const value = this.lra.getValue(monic.variable);
|
|
347
360
|
if (this.lra.isInt(monic.variable) && !value.x.isInt()) return true;
|
|
@@ -349,6 +362,7 @@ export class NlaCore {
|
|
|
349
362
|
}
|
|
350
363
|
|
|
351
364
|
hasRelevantMonomial() {
|
|
365
|
+
if (!this.transcendentals.isEmpty) return true;
|
|
352
366
|
return this.emons.monics.some((monic) => this.isRelevant(monic.variable));
|
|
353
367
|
}
|
|
354
368
|
|
|
@@ -555,6 +569,12 @@ export class NlaCore {
|
|
|
555
569
|
return this.lra.settings.isCanceled();
|
|
556
570
|
}
|
|
557
571
|
|
|
572
|
+
checkPower(result: number, base: number, exponent: number) {
|
|
573
|
+
this.clear();
|
|
574
|
+
if (this.lra.isFeasible()) this.lra.getRidOfInfEps();
|
|
575
|
+
return checkPower(this, result, base, exponent);
|
|
576
|
+
}
|
|
577
|
+
|
|
558
578
|
checkBoundedDivisions() {
|
|
559
579
|
this.clear();
|
|
560
580
|
this.divisions.checkBoundedDivisions();
|
|
@@ -657,7 +677,29 @@ export class NlaCore {
|
|
|
657
677
|
|
|
658
678
|
private onToRefineEmpty() {
|
|
659
679
|
this.squeezeSchedule.onNothingToRefine();
|
|
660
|
-
return
|
|
680
|
+
return this.checkTranscendentalsAndFinish();
|
|
681
|
+
}
|
|
682
|
+
|
|
683
|
+
// The applications of transcendental functions still need checking when the monomials hold. A
|
|
684
|
+
// failure of the check needs nlsat, and a model of nlsat that is not tight enough is unknown.
|
|
685
|
+
private checkTranscendentalsAndFinish() {
|
|
686
|
+
const transcendentals = this.transcendentals;
|
|
687
|
+
if (transcendentals.isEmpty) return L_TRUE;
|
|
688
|
+
const numFailures = transcendentals.numFailures;
|
|
689
|
+
transcendentals.check();
|
|
690
|
+
if (this.lemmas.length > 0 || this.literals.length > 0) return L_FALSE;
|
|
691
|
+
const isFailed = transcendentals.numFailures > numFailures;
|
|
692
|
+
let isRunningNlsat = this.shouldRunBoundedNlsat() && transcendentals.numFailures > 0;
|
|
693
|
+
if (isFailed && !isRunningNlsat) {
|
|
694
|
+
if (!NLA_PARAMS.nra) return L_UNDEF;
|
|
695
|
+
isRunningNlsat = true;
|
|
696
|
+
}
|
|
697
|
+
if (!isRunningNlsat) return L_TRUE;
|
|
698
|
+
const result = this.boundedNlsat();
|
|
699
|
+
if (result === L_FALSE) return L_FALSE;
|
|
700
|
+
if (result === L_TRUE && transcendentals.isNraModelValid()) return L_TRUE;
|
|
701
|
+
if (result === L_TRUE) this.setUseNraModel(false);
|
|
702
|
+
return L_UNDEF;
|
|
661
703
|
}
|
|
662
704
|
|
|
663
705
|
check(level: number) {
|
|
@@ -719,17 +761,19 @@ export class NlaCore {
|
|
|
719
761
|
);
|
|
720
762
|
if (this.isCanceled()) return L_UNDEF;
|
|
721
763
|
if (this.lemmas.length > 0 || this.literals.length > 0 || this.isCheckFeasible) return L_FALSE;
|
|
722
|
-
if (this.isNlaSatisfied) return
|
|
764
|
+
if (this.isNlaSatisfied) return this.checkTranscendentalsAndFinish();
|
|
765
|
+
if (hasNoEffect() && !this.transcendentals.isEmpty) this.transcendentals.check();
|
|
723
766
|
if (
|
|
724
767
|
hasNoEffect() &&
|
|
725
768
|
NLA_PARAMS.nraCheckAssignment &&
|
|
726
769
|
this.checkAssignmentFailCount < NLA_PARAMS.nraCheckAssignmentMaxFail
|
|
727
770
|
) {
|
|
771
|
+
this.limit.pushChild(this.nraLimit);
|
|
728
772
|
result = this.nra.checkAssignment();
|
|
773
|
+
this.limit.popChild(this.nraLimit);
|
|
729
774
|
if (result !== L_TRUE) this.checkAssignmentFailCount++;
|
|
730
775
|
}
|
|
731
|
-
if (hasNoEffect() &&
|
|
732
|
-
result = this.boundedNlsat();
|
|
776
|
+
if (hasNoEffect() && this.shouldRunBoundedNlsat()) result = this.boundedNlsat();
|
|
733
777
|
if (hasNoEffect()) this.basics.basicLemma(true);
|
|
734
778
|
if (hasNoEffect() && isDelayingBounds) this.basics.basicLemma(false);
|
|
735
779
|
if (hasNoEffect() && isDelayingBounds) this.addBounds();
|
|
@@ -746,19 +790,30 @@ export class NlaCore {
|
|
|
746
790
|
result = this.boundedNlsat();
|
|
747
791
|
}
|
|
748
792
|
if (hasNoEffect() && NLA_PARAMS.nra && level >= 2) {
|
|
749
|
-
|
|
793
|
+
this.limit.pushChild(this.nraLimit);
|
|
794
|
+
result = this.nra.check(Infinity);
|
|
795
|
+
this.limit.popChild(this.nraLimit);
|
|
750
796
|
stats.nraCalls++;
|
|
751
797
|
}
|
|
752
|
-
if (result === L_UNDEF && !hasNoEffect()) result = L_FALSE;
|
|
798
|
+
if (result === L_UNDEF && !hasNoEffect() && this.limit.inc()) result = L_FALSE;
|
|
753
799
|
stats.nlaLemmas += this.lemmas.length;
|
|
754
800
|
return result;
|
|
755
801
|
}
|
|
756
802
|
|
|
803
|
+
private shouldRunBoundedNlsat() {
|
|
804
|
+
return NLA_PARAMS.nra && this.nlsatBackoff.shouldRun();
|
|
805
|
+
}
|
|
806
|
+
|
|
757
807
|
private boundedNlsat() {
|
|
758
|
-
const
|
|
759
|
-
|
|
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);
|
|
760
815
|
this.stats.nraCalls++;
|
|
761
|
-
this.nlsatBackoff.update(result === L_FALSE ||
|
|
816
|
+
this.nlsatBackoff.update(result === L_FALSE || rlimitConsumed < rlimitBudget / 10);
|
|
762
817
|
if (result === L_TRUE) this.clear();
|
|
763
818
|
return result;
|
|
764
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
|
|