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,14 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
// Deviations from Z3: unsupported nlsat input answers unknown where Z3 exits (levelwise.cpp,
|
|
4
|
-
// add_linear_approximations), check_assignment has no satisfied branch and no add_mul_def, the
|
|
5
|
-
// budget counts only nlsat's own steps, and transcendental functions are not supported.
|
|
6
|
-
import { NlsatUnsupportedError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
7
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
8
3
|
import { Rational, getLcm } from "../rational";
|
|
9
4
|
import { Anum } from "../nlsat/algebraic";
|
|
10
5
|
import { NlsatSolver } from "../nlsat/solver";
|
|
11
|
-
import type
|
|
6
|
+
import { type Polynomial, PolynomialRef, PolynomialRefVector } from "../nlsat/polynomial";
|
|
12
7
|
import { isIneqAtom } from "../nlsat/types";
|
|
13
8
|
import {
|
|
14
9
|
KIND_EQ,
|
|
@@ -20,7 +15,7 @@ import {
|
|
|
20
15
|
type LarConstraint,
|
|
21
16
|
} from "./constraints";
|
|
22
17
|
import { Explanation } from "./explanation";
|
|
23
|
-
import type
|
|
18
|
+
import { type LarSolver, NULL_LPVAR } from "./lar-solver";
|
|
24
19
|
import { LarTerm } from "./lar-term";
|
|
25
20
|
import type { NlaCore } from "./nla-core";
|
|
26
21
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
@@ -50,7 +45,12 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
50
45
|
for (const lpVar of monic.vars) getOccurrences(lpVar).monics.push(monic.variable);
|
|
51
46
|
for (const term of lra.terms)
|
|
52
47
|
for (const entry of term.coeffs) getOccurrences(entry[0]).terms.push(term.column);
|
|
53
|
-
|
|
48
|
+
// The applications of transcendental functions are neither monomials nor terms.
|
|
49
|
+
const todo = [
|
|
50
|
+
...core.transcendentals.apps.flatMap((app) => [app.arg, app.val]),
|
|
51
|
+
...core.transcendentals.atan2Apps.flatMap((app) => [app.y, app.x, app.val]),
|
|
52
|
+
...core.toRefine.elems,
|
|
53
|
+
];
|
|
54
54
|
const vars = new Set<number>();
|
|
55
55
|
const constraints = new Set<number>();
|
|
56
56
|
const monics = new Set<number>();
|
|
@@ -83,24 +83,33 @@ const hasLargeDyadicDenominator = (value: Rational) => {
|
|
|
83
83
|
return den >= 1n << 24n && (den & (den - 1n)) === 0n;
|
|
84
84
|
};
|
|
85
85
|
|
|
86
|
+
const getSortedVars = (vars: readonly number[]) =>
|
|
87
|
+
[...vars].sort((first, second) => first - second);
|
|
88
|
+
|
|
86
89
|
const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
|
|
87
90
|
constraint.isAuxiliary &&
|
|
88
91
|
(hasLargeDyadicDenominator(constraint.rhs.x) ||
|
|
89
92
|
getConstraintCoeffs(lra, constraint).some((entry) => hasLargeDyadicDenominator(entry[1])));
|
|
90
93
|
|
|
91
94
|
export class NraSolver {
|
|
92
|
-
private solver
|
|
95
|
+
private solver: NlsatSolver;
|
|
93
96
|
private values: Anum[] = [];
|
|
94
97
|
private lp2nl = new Map<number, number>();
|
|
98
|
+
private literal2constraint = new Map<number, number>();
|
|
99
|
+
private vars2mon = new Map<string, number>();
|
|
95
100
|
|
|
96
|
-
constructor(private core: NlaCore) {
|
|
101
|
+
constructor(private core: NlaCore) {
|
|
102
|
+
this.solver = new NlsatSolver(core.nraLimit);
|
|
103
|
+
}
|
|
97
104
|
|
|
98
105
|
get am() {
|
|
99
106
|
return this.solver.am;
|
|
100
107
|
}
|
|
101
108
|
|
|
102
|
-
|
|
103
|
-
|
|
109
|
+
private reset() {
|
|
110
|
+
this.solver = new NlsatSolver(this.core.nraLimit);
|
|
111
|
+
this.values = [];
|
|
112
|
+
this.lp2nl.clear();
|
|
104
113
|
}
|
|
105
114
|
|
|
106
115
|
private mkDefinitions(isIncluded: (lpVar: number) => boolean) {
|
|
@@ -108,53 +117,48 @@ export class NraSolver {
|
|
|
108
117
|
const lra = core.lra;
|
|
109
118
|
const solver = this.solver;
|
|
110
119
|
const pm = solver.pm;
|
|
111
|
-
const definitions
|
|
120
|
+
const definitions = new PolynomialRefVector(pm);
|
|
112
121
|
const denominators: bigint[] = [];
|
|
122
|
+
const p = new PolynomialRef(pm);
|
|
123
|
+
const constant = new PolynomialRef(pm);
|
|
124
|
+
const product = new PolynomialRef(pm);
|
|
113
125
|
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
114
126
|
if (!isIncluded(lpVar)) {
|
|
115
|
-
definitions.push(
|
|
127
|
+
definitions.push(pm.zero);
|
|
116
128
|
denominators.push(0n);
|
|
117
129
|
continue;
|
|
118
130
|
}
|
|
119
131
|
const variable = solver.mkVar(lra.isInt(lpVar));
|
|
120
132
|
this.lp2nl.set(lpVar, variable);
|
|
133
|
+
let denominator = 1n;
|
|
121
134
|
if (core.emons.isMonicVar(lpVar)) {
|
|
122
|
-
|
|
123
|
-
let denominator = 1n;
|
|
124
|
-
for (const factor of core.emons.get(lpVar).vars) {
|
|
135
|
+
for (const [index, factor] of core.emons.get(lpVar).vars.entries()) {
|
|
125
136
|
denominator = denominators[factor] * denominator;
|
|
126
|
-
|
|
127
|
-
definition === null ? definitions[factor] : pm.mul(definition, definitions[factor]!);
|
|
137
|
+
p.set(index === 0 ? definitions.get(factor) : pm.mul(p.get(), definitions.get(factor)));
|
|
128
138
|
}
|
|
129
|
-
|
|
130
|
-
denominators.push(denominator);
|
|
131
|
-
continue;
|
|
132
|
-
}
|
|
133
|
-
if (lra.hasTerm(lpVar)) {
|
|
139
|
+
} else if (lra.hasTerm(lpVar)) {
|
|
134
140
|
const term = [...lra.getTerm(lpVar).coeffs];
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
);
|
|
139
|
-
let definition: Polynomial | null = null;
|
|
140
|
-
for (const entry of term) {
|
|
141
|
+
for (const entry of term)
|
|
142
|
+
denominator = getLcm(entry[1].div(Rational.of(denominators[entry[0]])).den, denominator);
|
|
143
|
+
for (const [index, entry] of term.entries()) {
|
|
141
144
|
const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
|
|
142
|
-
|
|
143
|
-
|
|
145
|
+
constant.set(pm.mkConst(coeff.num));
|
|
146
|
+
product.set(pm.mul(constant.get(), definitions.get(entry[0])));
|
|
147
|
+
p.set(index === 0 ? product.get() : pm.add(p.get(), product.get()));
|
|
148
|
+
product.reset();
|
|
149
|
+
constant.reset();
|
|
144
150
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
definitions.push(pm.mkVar(variable));
|
|
150
|
-
denominators.push(1n);
|
|
151
|
+
} else p.set(pm.mkVar(variable));
|
|
152
|
+
definitions.push(p.getOrNull() ?? pm.zero);
|
|
153
|
+
denominators.push(denominator);
|
|
154
|
+
p.reset();
|
|
151
155
|
}
|
|
152
156
|
return { definitions, denominators };
|
|
153
157
|
}
|
|
154
158
|
|
|
155
159
|
private addConstraint(
|
|
156
160
|
constraintIndex: number,
|
|
157
|
-
definitions:
|
|
161
|
+
definitions: PolynomialRefVector,
|
|
158
162
|
denominators: readonly bigint[],
|
|
159
163
|
) {
|
|
160
164
|
const lra = this.core.lra;
|
|
@@ -167,33 +171,65 @@ export class NraSolver {
|
|
|
167
171
|
(result, entry) => getLcm(result, entry[1].div(Rational.of(denominators[entry[0]])).den),
|
|
168
172
|
rhs.den,
|
|
169
173
|
);
|
|
170
|
-
|
|
174
|
+
const p = new PolynomialRef(pm);
|
|
175
|
+
const poly = new PolynomialRef(pm);
|
|
176
|
+
const constant = new PolynomialRef(pm);
|
|
177
|
+
p.set(pm.mkConst(-(rhs.num * denominator) / rhs.den));
|
|
171
178
|
for (const entry of coeffs) {
|
|
172
179
|
const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
|
|
173
|
-
|
|
180
|
+
poly.set(definitions.get(entry[0]));
|
|
181
|
+
constant.set(pm.mkConst(coeff.num));
|
|
182
|
+
poly.set(pm.mul(poly.get(), constant.get()));
|
|
183
|
+
constant.reset();
|
|
184
|
+
p.set(pm.add(p.get(), poly.get()));
|
|
185
|
+
poly.reset();
|
|
174
186
|
}
|
|
175
187
|
const kind = constraint.kind;
|
|
176
188
|
const literal =
|
|
177
189
|
kind === KIND_LE
|
|
178
|
-
? solver.mkIneqLiteral("GT", [
|
|
190
|
+
? solver.mkIneqLiteral("GT", [p.get()], [false]) ^ 1
|
|
179
191
|
: kind === KIND_GE
|
|
180
|
-
? solver.mkIneqLiteral("LT", [
|
|
192
|
+
? solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1
|
|
181
193
|
: solver.mkIneqLiteral(
|
|
182
194
|
kind === KIND_LT ? "LT" : kind === KIND_GT ? "GT" : "EQ",
|
|
183
|
-
[
|
|
195
|
+
[p.get()],
|
|
184
196
|
[false],
|
|
185
197
|
);
|
|
186
198
|
solver.mkExternalClause([literal], constraintIndex);
|
|
199
|
+
p.reset();
|
|
187
200
|
return literal;
|
|
188
201
|
}
|
|
189
202
|
|
|
190
|
-
|
|
203
|
+
private getNlVar(lpVar: number) {
|
|
204
|
+
const variable = this.lp2nl.get(lpVar) ?? this.solver.mkVar(this.core.lra.isInt(lpVar));
|
|
205
|
+
this.lp2nl.set(lpVar, variable);
|
|
206
|
+
return variable;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
private registerTranscendentals() {
|
|
210
|
+
const transcendentals = this.core.transcendentals;
|
|
211
|
+
const solver = this.solver.transcendentals;
|
|
212
|
+
for (const app of transcendentals.apps)
|
|
213
|
+
solver.add(app.op, this.getNlVar(app.arg), this.getNlVar(app.val));
|
|
214
|
+
for (const app of transcendentals.atan2Apps)
|
|
215
|
+
solver.addAtan2(this.getNlVar(app.y), this.getNlVar(app.x), this.getNlVar(app.val));
|
|
216
|
+
if (transcendentals.piVar !== NULL_LPVAR) solver.addPi(this.getNlVar(transcendentals.piVar));
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
check(maxConflicts: number) {
|
|
220
|
+
try {
|
|
221
|
+
return this.checkCore(maxConflicts);
|
|
222
|
+
} catch (error) {
|
|
223
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
224
|
+
throw error;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
private checkCore(maxConflicts: number) {
|
|
191
229
|
const core = this.core;
|
|
192
230
|
const lra = core.lra;
|
|
193
|
-
this.
|
|
231
|
+
this.reset();
|
|
194
232
|
this.solver.maxConflicts = maxConflicts;
|
|
195
|
-
this.values = [];
|
|
196
|
-
this.lp2nl.clear();
|
|
197
233
|
const cone = getConeOfInfluence(core);
|
|
198
234
|
const definitions = this.mkDefinitions((lpVar) => cone.vars.has(lpVar));
|
|
199
235
|
const skipped = new Set<number>();
|
|
@@ -204,14 +240,9 @@ export class NraSolver {
|
|
|
204
240
|
}
|
|
205
241
|
this.addConstraint(constraintIndex, definitions.definitions, definitions.denominators);
|
|
206
242
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
} catch (error) {
|
|
211
|
-
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
212
|
-
throw error;
|
|
213
|
-
}
|
|
214
|
-
})();
|
|
243
|
+
definitions.definitions.reset();
|
|
244
|
+
this.registerTranscendentals();
|
|
245
|
+
const result = this.solver.check();
|
|
215
246
|
if (result === L_TRUE) {
|
|
216
247
|
this.solver.restoreOrder();
|
|
217
248
|
core.setUseNraModel(true);
|
|
@@ -299,49 +330,92 @@ export class NraSolver {
|
|
|
299
330
|
: sign === 0;
|
|
300
331
|
}
|
|
301
332
|
|
|
302
|
-
private
|
|
333
|
+
private setupAssignmentSolver() {
|
|
303
334
|
const core = this.core;
|
|
304
335
|
const lra = core.lra;
|
|
305
|
-
this.
|
|
306
|
-
this.
|
|
336
|
+
this.reset();
|
|
337
|
+
this.literal2constraint.clear();
|
|
338
|
+
this.vars2mon.clear();
|
|
307
339
|
const cone = getConeOfInfluence(core);
|
|
308
340
|
const definitions = this.mkDefinitions(() => true);
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
341
|
+
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
342
|
+
this.values.push(new Anum(core.val(lpVar)));
|
|
343
|
+
if (core.emons.isMonicVar(lpVar))
|
|
344
|
+
this.vars2mon.set(getSortedVars(core.emons.get(lpVar).vars).join(","), lpVar);
|
|
345
|
+
}
|
|
312
346
|
for (const constraintIndex of cone.constraints) {
|
|
313
347
|
const literal = this.addConstraint(
|
|
314
348
|
constraintIndex,
|
|
315
349
|
definitions.definitions,
|
|
316
350
|
definitions.denominators,
|
|
317
351
|
);
|
|
318
|
-
|
|
352
|
+
this.literal2constraint.set(literal, constraintIndex);
|
|
319
353
|
}
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
return { clause: result.clause, literalConstraints };
|
|
354
|
+
definitions.definitions.reset();
|
|
355
|
+
this.registerTranscendentals();
|
|
323
356
|
}
|
|
324
357
|
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
358
|
+
private processPolynomialCheckAssignment(
|
|
359
|
+
polynomial: Polynomial,
|
|
360
|
+
nl2lp: readonly number[],
|
|
361
|
+
term: LarTerm,
|
|
362
|
+
) {
|
|
363
|
+
let bound = Rational.zero;
|
|
364
|
+
for (let index = 0; index < polynomial.size; index++) {
|
|
365
|
+
const monomial = polynomial.ms[index];
|
|
366
|
+
const coeff = Rational.of(polynomial.as[index]);
|
|
367
|
+
// Like Z3, this drops degrees: only an axiom's ¬best can be nonlinear, and ¬cell is valid alone.
|
|
368
|
+
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
369
|
+
else if (monomial.size === 1) term.addMonomial(coeff, nl2lp[monomial.vars[0]]);
|
|
370
|
+
else {
|
|
371
|
+
const vars = getSortedVars(monomial.vars.map((variable) => nl2lp[variable]));
|
|
372
|
+
term.addMonomial(coeff, this.vars2mon.get(vars.join(",")) ?? this.core.addMulDef(vars));
|
|
332
373
|
}
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
|
|
374
|
+
}
|
|
375
|
+
return bound;
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
private reverseLp2nl() {
|
|
379
|
+
const nl2lp: number[] = [];
|
|
380
|
+
for (const entry of this.lp2nl) nl2lp[entry[1]] = entry[0];
|
|
381
|
+
return nl2lp;
|
|
382
|
+
}
|
|
383
|
+
|
|
384
|
+
checkAssignment() {
|
|
385
|
+
try {
|
|
386
|
+
return this.checkAssignmentCore();
|
|
387
|
+
} catch (error) {
|
|
388
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
389
|
+
throw error;
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
private checkAssignmentCore() {
|
|
394
|
+
const core = this.core;
|
|
395
|
+
const lra = core.lra;
|
|
396
|
+
this.setupAssignmentSolver();
|
|
397
|
+
const result = this.solver.checkAssignment(this.values);
|
|
398
|
+
if (result.result === L_TRUE) {
|
|
399
|
+
core.setUseNraModel(true);
|
|
400
|
+
lra.initModel();
|
|
401
|
+
for (const constraint of lra.constraints.constraints)
|
|
402
|
+
if (constraint.isActive && !this.isConstraintSatisfied(constraint)) return L_UNDEF;
|
|
403
|
+
for (const monic of core.emons.monics)
|
|
404
|
+
if (!this.isMonicSatisfied(monic.variable, monic.vars)) return L_UNDEF;
|
|
405
|
+
core.setUseNraModel(true);
|
|
406
|
+
}
|
|
407
|
+
if (result.result === L_FALSE) return this.addLemma(result.clause);
|
|
408
|
+
return result.result;
|
|
336
409
|
}
|
|
337
410
|
|
|
338
|
-
private addLemma(clause: number[]
|
|
411
|
+
private addLemma(clause: readonly number[]) {
|
|
339
412
|
const core = this.core;
|
|
340
413
|
const solver = this.solver;
|
|
341
|
-
const
|
|
414
|
+
const nl2lp = this.reverseLp2nl();
|
|
415
|
+
let result = L_FALSE;
|
|
342
416
|
const lemma = new LemmaBuilder(core);
|
|
343
417
|
for (const literal of clause) {
|
|
344
|
-
const constraintIndex =
|
|
418
|
+
const constraintIndex = this.literal2constraint.get(literal ^ 1);
|
|
345
419
|
if (constraintIndex !== undefined) {
|
|
346
420
|
const explanation = new Explanation();
|
|
347
421
|
explanation.push(constraintIndex);
|
|
@@ -350,23 +424,12 @@ export class NraSolver {
|
|
|
350
424
|
}
|
|
351
425
|
const atom = solver.getAtom(literal);
|
|
352
426
|
if (atom === null) throw new SmtInvariantError(`nlsat literal ${literal} has no atom`);
|
|
353
|
-
if (
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
pm.totalDegree(atom.polynomials[0]) > 1
|
|
357
|
-
) {
|
|
358
|
-
core.lemmas.pop();
|
|
359
|
-
return L_UNDEF;
|
|
427
|
+
if (!isIneqAtom(atom) || atom.polynomials.length !== 1) {
|
|
428
|
+
result = L_UNDEF;
|
|
429
|
+
break;
|
|
360
430
|
}
|
|
361
|
-
const polynomial = atom.polynomials[0];
|
|
362
431
|
const term = new LarTerm();
|
|
363
|
-
|
|
364
|
-
for (let index = 0; index < polynomial.size; index++) {
|
|
365
|
-
const monomial = polynomial.ms[index];
|
|
366
|
-
const coeff = Rational.of(polynomial.as[index]);
|
|
367
|
-
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
368
|
-
else term.addMonomial(coeff, monomial.vars[0]);
|
|
369
|
-
}
|
|
432
|
+
const bound = this.processPolynomialCheckAssignment(atom.polynomials[0], nl2lp, term);
|
|
370
433
|
const isNegated = (literal & 1) === 1;
|
|
371
434
|
const kind =
|
|
372
435
|
atom.kind === "EQ"
|
|
@@ -382,12 +445,13 @@ export class NraSolver {
|
|
|
382
445
|
: KIND_GT;
|
|
383
446
|
const ineq = mkIneq(term, kind, bound);
|
|
384
447
|
if (core.ineqHolds(ineq)) {
|
|
385
|
-
|
|
386
|
-
|
|
448
|
+
result = L_UNDEF;
|
|
449
|
+
break;
|
|
387
450
|
}
|
|
388
451
|
lemma.addIneq(ineq);
|
|
389
452
|
}
|
|
390
|
-
core.isCheckFeasible = true;
|
|
391
|
-
|
|
453
|
+
if (result === L_FALSE) core.isCheckFeasible = true;
|
|
454
|
+
if (result === L_UNDEF) core.lemmas.pop();
|
|
455
|
+
return result;
|
|
392
456
|
}
|
|
393
457
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/dd/pdd_interval.h), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
add,
|
|
4
3
|
type DepInterval,
|
|
@@ -20,8 +19,12 @@ export const getPddInterval = (
|
|
|
20
19
|
return result;
|
|
21
20
|
}
|
|
22
21
|
const varInterval = getVarInterval(poly.var(), mode);
|
|
23
|
-
const
|
|
24
|
-
const
|
|
22
|
+
const hiPoly = poly.hi();
|
|
23
|
+
const hi = getPddInterval(hiPoly, mode, getVarInterval);
|
|
24
|
+
hiPoly.release();
|
|
25
|
+
const loPoly = poly.lo();
|
|
26
|
+
const lo = getPddInterval(loPoly, mode, getVarInterval);
|
|
27
|
+
loPoly.release();
|
|
25
28
|
const product = mkDepInterval();
|
|
26
29
|
mul(hi, varInterval, product, mode);
|
|
27
30
|
add(product, lo, result, mode);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_simplifier.h, src/math/grobner/pdd_simplifier.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkJoin } from "./dependency";
|
|
2
|
+
import type { Pdd } from "./pdd";
|
|
3
3
|
import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
4
4
|
import { shrink } from "../array";
|
|
5
5
|
|
|
@@ -18,9 +18,12 @@ export class PddSimplifier {
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
private simplifyLinearStep(isBinary: boolean) {
|
|
21
|
-
const linear =
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const linear: Equation[] = [];
|
|
22
|
+
for (const equation of this.solver.toSimplify) {
|
|
23
|
+
const poly = equation.poly.copy();
|
|
24
|
+
if (isBinary ? poly.isBinary() : poly.isLinear()) linear.push(equation);
|
|
25
|
+
poly.release();
|
|
26
|
+
}
|
|
24
27
|
if (linear.length === 0) return false;
|
|
25
28
|
return this.simplifyLinear(linear);
|
|
26
29
|
}
|
|
@@ -41,8 +44,10 @@ export class PddSimplifier {
|
|
|
41
44
|
for (let index = 0, length = uses.length; index < length; index++) {
|
|
42
45
|
const target = uses[index];
|
|
43
46
|
if (source === target || solver.isTrivial(target)) continue;
|
|
44
|
-
|
|
47
|
+
const targetPoly = target.poly.copy();
|
|
48
|
+
if (!source.poly.isBinary() && !targetPoly.isLinear()) {
|
|
45
49
|
isAllReduced = false;
|
|
50
|
+
targetPoly.release();
|
|
46
51
|
continue;
|
|
47
52
|
}
|
|
48
53
|
this.removeFromUse(target, useList, variable);
|
|
@@ -58,6 +63,7 @@ export class PddSimplifier {
|
|
|
58
63
|
solver.pushEquation(TO_SIMPLIFY, target);
|
|
59
64
|
}
|
|
60
65
|
this.addToUse(target, useList);
|
|
66
|
+
targetPoly.release();
|
|
61
67
|
}
|
|
62
68
|
if (isAllReduced) linear[kept++] = source;
|
|
63
69
|
}
|
|
@@ -68,7 +74,7 @@ export class PddSimplifier {
|
|
|
68
74
|
solver.pushEquation(SOLVED, source);
|
|
69
75
|
}
|
|
70
76
|
}
|
|
71
|
-
for (const equation of trivial) solver.
|
|
77
|
+
for (const equation of trivial) solver.delEquation(equation);
|
|
72
78
|
return kept > 0 || hasConflict;
|
|
73
79
|
}
|
|
74
80
|
|
|
@@ -79,32 +85,55 @@ export class PddSimplifier {
|
|
|
79
85
|
const update = new SetUpdate(solver.toSimplify);
|
|
80
86
|
for (; update.i < update.size; update.i++) {
|
|
81
87
|
const first = update.get();
|
|
82
|
-
const poly = first.poly;
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
if (
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
first.poly
|
|
88
|
+
const poly = first.poly.copy();
|
|
89
|
+
const lo = poly.lo();
|
|
90
|
+
const second = los.get(lo.root) ?? first;
|
|
91
|
+
if (second === first) los.set(lo.root, first);
|
|
92
|
+
lo.release();
|
|
93
|
+
const secondPoly = second.poly.copy();
|
|
94
|
+
if (second !== first && this.isCcReducible(poly, secondPoly)) {
|
|
95
|
+
const difference = poly.sub(second.poly);
|
|
96
|
+
first.poly.assign(difference);
|
|
97
|
+
difference.release();
|
|
91
98
|
first.dep = mkJoin(first.dep, second.dep);
|
|
92
99
|
isReduced = true;
|
|
93
|
-
|
|
100
|
+
const isTrivial = solver.isTrivial(first);
|
|
101
|
+
if (isTrivial) solver.retire(first);
|
|
102
|
+
if (isTrivial || solver.checkConflict(first)) {
|
|
103
|
+
secondPoly.release();
|
|
104
|
+
poly.release();
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
94
107
|
}
|
|
95
108
|
update.nextj();
|
|
109
|
+
secondPoly.release();
|
|
110
|
+
poly.release();
|
|
96
111
|
}
|
|
97
112
|
update.finish();
|
|
98
113
|
return isReduced;
|
|
99
114
|
}
|
|
100
115
|
|
|
116
|
+
private isCcReducible(poly: Pdd, secondPoly: Pdd) {
|
|
117
|
+
const hi = poly.hi();
|
|
118
|
+
const secondHi = hi.isVal() ? null : secondPoly.hi();
|
|
119
|
+
const lo = secondHi === null || secondHi.isVal() ? poly.lo() : null;
|
|
120
|
+
const isReducible = lo !== null && !lo.isVal();
|
|
121
|
+
lo?.release();
|
|
122
|
+
secondHi?.release();
|
|
123
|
+
hi.release();
|
|
124
|
+
return isReducible;
|
|
125
|
+
}
|
|
126
|
+
|
|
101
127
|
private simplifyLeafStep() {
|
|
102
128
|
const solver = this.solver;
|
|
103
129
|
const useList = this.getUseList();
|
|
104
130
|
for (let index = 0; index < solver.toSimplify.length; index++) {
|
|
105
131
|
const source = solver.toSimplify[index];
|
|
106
|
-
const poly = source.poly;
|
|
107
|
-
if (poly.isVal() || !
|
|
132
|
+
const poly = source.poly.copy();
|
|
133
|
+
if (poly.isVal() || !this.isHiVal(poly)) {
|
|
134
|
+
poly.release();
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
108
137
|
const leaves = useList[poly.var()].filter(
|
|
109
138
|
(target) => target !== source && target.poly.varIsLeaf(poly.var()),
|
|
110
139
|
);
|
|
@@ -113,16 +142,18 @@ export class PddSimplifier {
|
|
|
113
142
|
const isLeadingTermChanged = solver.simplifyUsing(target, source);
|
|
114
143
|
this.addToUse(target, useList);
|
|
115
144
|
if (solver.isTrivial(target)) {
|
|
116
|
-
solver.
|
|
145
|
+
solver.delEquation(target);
|
|
117
146
|
} else if (target.poly.isVal()) {
|
|
118
147
|
solver.popEquation(target);
|
|
119
148
|
solver.setConflict(target);
|
|
149
|
+
poly.release();
|
|
120
150
|
return true;
|
|
121
151
|
} else if (isLeadingTermChanged) {
|
|
122
152
|
solver.popEquation(target);
|
|
123
153
|
solver.pushEquation(TO_SIMPLIFY, target);
|
|
124
154
|
}
|
|
125
155
|
}
|
|
156
|
+
poly.release();
|
|
126
157
|
}
|
|
127
158
|
return false;
|
|
128
159
|
}
|
|
@@ -134,18 +165,26 @@ export class PddSimplifier {
|
|
|
134
165
|
let hasSolved = false;
|
|
135
166
|
for (; update.i < update.size; update.i++) {
|
|
136
167
|
const equation = update.get();
|
|
137
|
-
const poly = equation.poly;
|
|
138
|
-
if (!poly.isVal() &&
|
|
168
|
+
const poly = equation.poly.copy();
|
|
169
|
+
if (!poly.isVal() && this.isHiVal(poly) && useList[poly.var()].length === 1) {
|
|
139
170
|
solver.pushEquation(SOLVED, equation);
|
|
140
171
|
hasSolved = true;
|
|
141
172
|
} else {
|
|
142
173
|
update.nextj();
|
|
143
174
|
}
|
|
175
|
+
poly.release();
|
|
144
176
|
}
|
|
145
177
|
update.finish();
|
|
146
178
|
return hasSolved;
|
|
147
179
|
}
|
|
148
180
|
|
|
181
|
+
private isHiVal(poly: Pdd) {
|
|
182
|
+
const hi = poly.hi();
|
|
183
|
+
const isVal = hi.isVal();
|
|
184
|
+
hi.release();
|
|
185
|
+
return isVal;
|
|
186
|
+
}
|
|
187
|
+
|
|
149
188
|
private addToUse(equation: Equation, useList: Equation[][]) {
|
|
150
189
|
for (const variable of equation.poly.freeVars()) {
|
|
151
190
|
while (useList.length <= variable) useList.push([]);
|