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
|
@@ -0,0 +1,309 @@
|
|
|
1
|
+
// Only the maxres strategy with Z3's default parameters is ported.
|
|
2
|
+
import { OP_AND, OP_EQ, OP_IMPLIES, OP_OR, SORT_BOOL } from "./ast";
|
|
3
|
+
import { mkNot } from "./ast-util";
|
|
4
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
5
|
+
import { type MaxsatContext, MaxsmtSolverBase, type Soft } from "./maxsmt-base";
|
|
6
|
+
import { Mus } from "./mus";
|
|
7
|
+
import type { ProtoModel } from "./proto-model";
|
|
8
|
+
import { Rational } from "./rational";
|
|
9
|
+
import { RefVector } from "./ref-vector";
|
|
10
|
+
|
|
11
|
+
export class Maxcore extends MaxsmtSolverBase {
|
|
12
|
+
private asms: RefVector;
|
|
13
|
+
private defs: RefVector;
|
|
14
|
+
private asm2weight = new Map<number, Rational>();
|
|
15
|
+
private mus: Mus;
|
|
16
|
+
private csmodel: ProtoModel | null = null;
|
|
17
|
+
private correctionSetSize = 0;
|
|
18
|
+
private isFeasibleOptimumFound = false;
|
|
19
|
+
|
|
20
|
+
constructor(context: MaxsatContext, index: number, soft: Soft[]) {
|
|
21
|
+
super(context, soft, index);
|
|
22
|
+
this.asms = new RefVector(context.manager);
|
|
23
|
+
this.defs = new RefVector(context.manager);
|
|
24
|
+
this.mus = new Mus(context.manager, context.getSolver());
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
private isLiteral(expr: number) {
|
|
28
|
+
const manager = this.manager;
|
|
29
|
+
const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
|
|
30
|
+
return manager.isUninterpretedConst(atom);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
private pin(expr: number) {
|
|
34
|
+
this.trail.push(expr);
|
|
35
|
+
return expr;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
private mkApp(op: number, args: number[]) {
|
|
39
|
+
return this.pin(this.manager.mkApp(op, args, SORT_BOOL));
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
private add(expr: number) {
|
|
43
|
+
if (!this.manager.isTrue(expr)) this.solver.assertExpr(expr);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
private addSoft(expr: number, weight: Rational) {
|
|
47
|
+
const existing = this.asm2weight.get(expr);
|
|
48
|
+
if (existing !== undefined) {
|
|
49
|
+
this.asm2weight.set(expr, existing.add(weight));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (this.isLiteral(expr)) {
|
|
53
|
+
this.newAssumption(expr, weight);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const assumption = this.mkFreshBool("soft");
|
|
57
|
+
const fml = this.mkApp(OP_EQ, [assumption, expr]);
|
|
58
|
+
this.defs.push(fml);
|
|
59
|
+
this.add(fml);
|
|
60
|
+
this.newAssumption(assumption, weight);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
private newAssumption(expr: number, weight: Rational) {
|
|
64
|
+
this.asm2weight.set(expr, weight);
|
|
65
|
+
this.asms.push(expr);
|
|
66
|
+
this.trail.push(expr);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
private isFalseIn(model: ProtoModel, expr: number) {
|
|
70
|
+
const value = model.eval(expr, true);
|
|
71
|
+
const isFalse = value === this.manager.falseExpr;
|
|
72
|
+
this.manager.decRef(value);
|
|
73
|
+
return isFalse;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
run() {
|
|
77
|
+
this.defs.reset();
|
|
78
|
+
if (!this.init()) return L_UNDEF;
|
|
79
|
+
this.initLocal();
|
|
80
|
+
while (this.lower.compare(this.upper) < 0) {
|
|
81
|
+
const status = this.checkSatHillClimb(this.asms.items);
|
|
82
|
+
if (!this.manager.limit.inc()) return L_UNDEF;
|
|
83
|
+
if (status === L_TRUE) {
|
|
84
|
+
this.foundOptimum();
|
|
85
|
+
return L_TRUE;
|
|
86
|
+
}
|
|
87
|
+
if (status === L_UNDEF) return L_UNDEF;
|
|
88
|
+
const processed = this.processUnsat();
|
|
89
|
+
if (processed === L_FALSE) this.lower = this.upper;
|
|
90
|
+
if (processed === L_UNDEF) return L_UNDEF;
|
|
91
|
+
}
|
|
92
|
+
this.foundOptimum();
|
|
93
|
+
return L_TRUE;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
private checkSatHillClimb(assumptions: readonly number[]) {
|
|
97
|
+
if (!this.context.params.isHillClimbing) return this.checkSat(assumptions);
|
|
98
|
+
const asms = this.sortAssumptions(assumptions);
|
|
99
|
+
let status = L_TRUE;
|
|
100
|
+
let lastIndex = 0;
|
|
101
|
+
let index = 0;
|
|
102
|
+
while (index < asms.length && status === L_TRUE) {
|
|
103
|
+
while (asms.length > 20 * (index - lastIndex) && index < asms.length)
|
|
104
|
+
index = this.nextIndex(asms, index);
|
|
105
|
+
lastIndex = index;
|
|
106
|
+
status = this.checkSat(asms.slice(0, index));
|
|
107
|
+
}
|
|
108
|
+
return status;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private checkSat(assumptions: readonly number[]) {
|
|
112
|
+
const status = this.solver.checkSat(assumptions);
|
|
113
|
+
if (status !== L_TRUE) return status;
|
|
114
|
+
const model = this.solver.getModel();
|
|
115
|
+
if (model !== null) this.updateAssignment(model);
|
|
116
|
+
return status;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
private foundOptimum() {
|
|
120
|
+
const model = this.model;
|
|
121
|
+
this.lower = Rational.zero;
|
|
122
|
+
for (const soft of this.soft) {
|
|
123
|
+
soft.value = model !== null && this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
124
|
+
if (soft.value !== L_TRUE) this.lower = this.lower.add(soft.weight);
|
|
125
|
+
}
|
|
126
|
+
this.upper = this.lower;
|
|
127
|
+
this.isFeasibleOptimumFound = true;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
private getWeight(expr: number) {
|
|
131
|
+
return this.asm2weight.get(expr) ?? Rational.zero;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
private sortAssumptions(assumptions: readonly number[]) {
|
|
135
|
+
const ids = this.manager.ids;
|
|
136
|
+
return [...assumptions].sort(
|
|
137
|
+
(first, second) =>
|
|
138
|
+
this.getWeight(second).compare(this.getWeight(first)) || ids[second] - ids[first],
|
|
139
|
+
);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
private nextIndex(asms: readonly number[], start: number) {
|
|
143
|
+
if (start >= asms.length) return start;
|
|
144
|
+
const weight = this.getWeight(asms[start]);
|
|
145
|
+
let index = start + 1;
|
|
146
|
+
while (index < asms.length && weight.equals(this.getWeight(asms[index]))) index++;
|
|
147
|
+
return index;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
private processUnsat() {
|
|
151
|
+
const cores: { core: number[]; weight: Rational }[] = [];
|
|
152
|
+
let status = L_FALSE;
|
|
153
|
+
while (status === L_FALSE) {
|
|
154
|
+
const core = new RefVector(this.manager);
|
|
155
|
+
for (const expr of this.solver.getUnsatCore()) core.push(expr);
|
|
156
|
+
this.updateMusModel();
|
|
157
|
+
status = this.minimizeCore(core);
|
|
158
|
+
const items = [...core.items];
|
|
159
|
+
for (const expr of items) this.trail.push(expr);
|
|
160
|
+
core.reset();
|
|
161
|
+
if (status !== L_TRUE) break;
|
|
162
|
+
if (items.length === 0) {
|
|
163
|
+
this.lower = this.upper;
|
|
164
|
+
return L_TRUE;
|
|
165
|
+
}
|
|
166
|
+
const weight = this.getCoreWeight(items);
|
|
167
|
+
cores.push({ core: items, weight });
|
|
168
|
+
this.removeSoft(items);
|
|
169
|
+
this.splitCore(items, weight);
|
|
170
|
+
if (items.length >= this.context.params.maxCoreSize) break;
|
|
171
|
+
status = this.checkSatHillClimb(this.asms.items);
|
|
172
|
+
}
|
|
173
|
+
if (status !== L_TRUE) return status;
|
|
174
|
+
if (cores.length === 0) return L_FALSE;
|
|
175
|
+
for (const entry of cores) this.processCore(entry.core, entry.weight);
|
|
176
|
+
return L_TRUE;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
// The SAT core extracts a model while it computes a core; mus keeps no model for opt.
|
|
180
|
+
private updateMusModel() {
|
|
181
|
+
if (!this.context.isSatEnabled) return;
|
|
182
|
+
const model = this.solver.getModel();
|
|
183
|
+
if (model !== null && this.upper.isPositive()) this.updateAssignment(model);
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
private minimizeCore(core: RefVector) {
|
|
187
|
+
if (core.size === 0 || this.context.isSatEnabled) return L_TRUE;
|
|
188
|
+
this.mus.reset();
|
|
189
|
+
for (const expr of core.items) this.mus.addSoft(expr);
|
|
190
|
+
const minimized = new RefVector(this.manager);
|
|
191
|
+
const status = this.mus.getMus(minimized);
|
|
192
|
+
if (status === L_TRUE) {
|
|
193
|
+
core.reset();
|
|
194
|
+
for (const expr of minimized.items) core.push(expr);
|
|
195
|
+
}
|
|
196
|
+
minimized.reset();
|
|
197
|
+
return status;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
private getCoreWeight(core: readonly number[]) {
|
|
201
|
+
if (core.length === 0) return Rational.zero;
|
|
202
|
+
return core
|
|
203
|
+
.map((expr) => this.getWeight(expr))
|
|
204
|
+
.reduce((minimum, weight) => (weight.compare(minimum) < 0 ? weight : minimum));
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
private splitCore(core: readonly number[], weight: Rational) {
|
|
208
|
+
for (const expr of core) {
|
|
209
|
+
const other = this.getWeight(expr);
|
|
210
|
+
if (other.compare(weight) > 0) this.newAssumption(expr, other.sub(weight));
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
private updateModel(def: number, value: number) {
|
|
215
|
+
const decl = this.manager.decls[def];
|
|
216
|
+
for (const model of [this.csmodel, this.model]) {
|
|
217
|
+
if (model === null) continue;
|
|
218
|
+
const evaluated = model.eval(value, true);
|
|
219
|
+
model.registerConst(decl, evaluated);
|
|
220
|
+
this.manager.decRef(evaluated);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
private processCore(core: readonly number[], weight: Rational) {
|
|
225
|
+
this.maxResolve(core, weight);
|
|
226
|
+
const fml = this.pin(mkNot(this.manager, this.pin(this.manager.mkAnd([...core]))));
|
|
227
|
+
this.add(fml);
|
|
228
|
+
if (core.length <= 2) this.defs.push(fml);
|
|
229
|
+
this.lower = this.lower.add(weight);
|
|
230
|
+
if (this.csmodel !== null && this.correctionSetSize > 0) this.correctionSetSize--;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
private maxResolve(core: readonly number[], weight: Rational) {
|
|
234
|
+
let disjunct = -1;
|
|
235
|
+
for (let index = 1; index < core.length; index++) {
|
|
236
|
+
const previous = core[index - 1];
|
|
237
|
+
const current = core[index];
|
|
238
|
+
if (index === 1) disjunct = previous;
|
|
239
|
+
else if (index === 2) disjunct = this.mkApp(OP_AND, [previous, disjunct]);
|
|
240
|
+
else {
|
|
241
|
+
const fresh = this.mkFreshBool("d");
|
|
242
|
+
for (const implied of [disjunct, previous]) {
|
|
243
|
+
const fml = this.mkApp(OP_IMPLIES, [fresh, implied]);
|
|
244
|
+
this.add(fml);
|
|
245
|
+
this.defs.push(fml);
|
|
246
|
+
}
|
|
247
|
+
this.updateModel(fresh, this.mkApp(OP_AND, [disjunct, previous]));
|
|
248
|
+
disjunct = fresh;
|
|
249
|
+
}
|
|
250
|
+
const assumption = this.mkFreshBool("a");
|
|
251
|
+
const clause = this.mkApp(OP_OR, [current, disjunct]);
|
|
252
|
+
const fml = this.mkApp(OP_IMPLIES, [assumption, clause]);
|
|
253
|
+
this.updateModel(assumption, clause);
|
|
254
|
+
this.newAssumption(assumption, weight);
|
|
255
|
+
this.add(fml);
|
|
256
|
+
this.defs.push(fml);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
private getCost(model: ProtoModel) {
|
|
261
|
+
let cost = Rational.zero;
|
|
262
|
+
for (const soft of this.soft)
|
|
263
|
+
if (!this.isTrueIn(model, soft.expr)) cost = cost.add(soft.weight);
|
|
264
|
+
return cost;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
private updateAssignment(model: ProtoModel) {
|
|
268
|
+
let correctionSetSize = 0;
|
|
269
|
+
for (const expr of this.asms.items) if (this.isFalseIn(model, expr)) correctionSetSize++;
|
|
270
|
+
if (this.csmodel === null || correctionSetSize < this.correctionSetSize) {
|
|
271
|
+
this.csmodel = model;
|
|
272
|
+
this.correctionSetSize = correctionSetSize;
|
|
273
|
+
}
|
|
274
|
+
const upper = this.getCost(model);
|
|
275
|
+
if (upper.compare(this.upper) > 0) return;
|
|
276
|
+
if (!this.context.verifyModel(this.index, model, upper)) return;
|
|
277
|
+
this.model = model;
|
|
278
|
+
this.context.modelUpdated(model);
|
|
279
|
+
for (const soft of this.soft) soft.value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
280
|
+
this.upper = upper;
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
private removeSoft(core: readonly number[]) {
|
|
284
|
+
const kept = this.asms.items.filter((expr) => !core.includes(expr));
|
|
285
|
+
for (const expr of kept) this.trail.push(expr);
|
|
286
|
+
this.asms.reset();
|
|
287
|
+
for (const expr of kept) this.asms.push(expr);
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
private initLocal() {
|
|
291
|
+
for (const soft of this.soft) this.addSoft(soft.expr, soft.weight);
|
|
292
|
+
this.isFeasibleOptimumFound = false;
|
|
293
|
+
this.csmodel = null;
|
|
294
|
+
this.correctionSetSize = 0;
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
commitAssignment() {
|
|
298
|
+
if (!this.isFeasibleOptimumFound) return;
|
|
299
|
+
for (const expr of this.defs.items) this.add(expr);
|
|
300
|
+
for (const expr of this.asms.items) this.add(expr);
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
release() {
|
|
304
|
+
this.asms.reset();
|
|
305
|
+
this.defs.reset();
|
|
306
|
+
this.mus.reset();
|
|
307
|
+
super.release();
|
|
308
|
+
}
|
|
309
|
+
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { OP_ADD, OP_OR } from "./ast";
|
|
1
|
+
import { OP_ADD, OP_BADD, OP_BAND, OP_BMUL, OP_BOR, OP_OR } from "./ast";
|
|
3
2
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
4
3
|
import { shrink } from "./array";
|
|
5
4
|
|
|
@@ -11,8 +10,10 @@ interface SharingEntry {
|
|
|
11
10
|
|
|
12
11
|
const MAX_NUM_ARGS_FOR_OPT = 128;
|
|
13
12
|
|
|
13
|
+
// Z3 compares kinds without the family, and bvmul's kind is also that of or and +.
|
|
14
|
+
const SHARED_OPS = new Set([OP_BADD, OP_BMUL, OP_BOR, OP_BAND, OP_OR, OP_ADD]);
|
|
15
|
+
|
|
14
16
|
export class MaxBvSharing extends RewriterTpl {
|
|
15
|
-
// Z3 compares the kind without the family, and bvmul has the kind of or and of +, so those are shared.
|
|
16
17
|
private isInit = false;
|
|
17
18
|
private entries: SharingEntry[] = [];
|
|
18
19
|
private pairCache = new Map<number, Map<number, Set<number>>>();
|
|
@@ -21,9 +22,10 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
21
22
|
reduceApp(decl: number, args: number[], sort: number) {
|
|
22
23
|
const manager = this.manager;
|
|
23
24
|
const op = manager.funcDecls[decl].op;
|
|
24
|
-
if (!this.isInit || (op
|
|
25
|
+
if (!this.isInit || !SHARED_OPS.has(op) || args.length <= 2) return -1;
|
|
25
26
|
return manager.withTemporaries(() => {
|
|
26
|
-
const
|
|
27
|
+
const numeral = manager.isBvNumeral(args[0]) ? args[0] : -1;
|
|
28
|
+
const pending = numeral === -1 ? [...args] : args.slice(1);
|
|
27
29
|
for (let merged = 0; pending.length > 1 && pending.length < MAX_NUM_ARGS_FOR_OPT;) {
|
|
28
30
|
let pairFirst = -1;
|
|
29
31
|
let pairSecond = -1;
|
|
@@ -55,7 +57,7 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
55
57
|
}
|
|
56
58
|
pending.splice(0, pending.length, ...next);
|
|
57
59
|
}
|
|
58
|
-
return pending[0];
|
|
60
|
+
return numeral === -1 ? pending[0] : manager.mkApp(decl, [numeral, pending[0]], sort);
|
|
59
61
|
});
|
|
60
62
|
}
|
|
61
63
|
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { OP_NOT, SORT_BOOL } from "./ast";
|
|
2
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
3
|
+
import { type MaxsatContext, MaxsmtSolverBase, type Soft } from "./maxsmt-base";
|
|
4
|
+
import type { ProtoModel } from "./proto-model";
|
|
5
|
+
import { Rational } from "./rational";
|
|
6
|
+
|
|
7
|
+
export const isMaxlex = (soft: readonly Soft[]) => {
|
|
8
|
+
const weights = soft.map((entry) => entry.weight).sort((first, second) => second.compare(first));
|
|
9
|
+
let sum = weights.reduce((total, weight) => total.add(weight), Rational.zero);
|
|
10
|
+
for (const weight of weights) {
|
|
11
|
+
if (sum.compare(weight.add(weight)) > 0) return false;
|
|
12
|
+
sum = sum.sub(weight);
|
|
13
|
+
}
|
|
14
|
+
return true;
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
export class Maxlex extends MaxsmtSolverBase {
|
|
18
|
+
constructor(context: MaxsatContext, index: number, soft: Soft[]) {
|
|
19
|
+
super(context, soft, index);
|
|
20
|
+
const ids = context.manager.ids;
|
|
21
|
+
soft.sort(
|
|
22
|
+
(first, second) => second.weight.compare(first.weight) || ids[second.expr] - ids[first.expr],
|
|
23
|
+
);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
private assertValue(soft: Soft) {
|
|
27
|
+
if (soft.value === L_TRUE) this.solver.assertExpr(soft.expr);
|
|
28
|
+
else if (soft.value === L_FALSE) {
|
|
29
|
+
const negated = this.manager.mkApp(OP_NOT, [soft.expr], SORT_BOOL);
|
|
30
|
+
this.trail.push(negated);
|
|
31
|
+
this.solver.assertExpr(negated);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
private updateFromSolver() {
|
|
36
|
+
const model = this.solver.getModel();
|
|
37
|
+
if (model === null) return false;
|
|
38
|
+
this.model = model;
|
|
39
|
+
this.context.modelUpdated(model);
|
|
40
|
+
this.updateAssignment(model);
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
private updateAssignment(model: ProtoModel) {
|
|
45
|
+
let isFirstUndef = true;
|
|
46
|
+
let isSecondUndef = false;
|
|
47
|
+
for (const soft of this.soft) {
|
|
48
|
+
if (isFirstUndef && soft.value !== L_UNDEF) continue;
|
|
49
|
+
if (isFirstUndef) {
|
|
50
|
+
soft.value = L_TRUE;
|
|
51
|
+
this.assertValue(soft);
|
|
52
|
+
isFirstUndef = false;
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
if (soft.value === L_FALSE) continue;
|
|
56
|
+
const value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
57
|
+
if (value === L_UNDEF) isSecondUndef = true;
|
|
58
|
+
soft.value = value;
|
|
59
|
+
if (!isSecondUndef) this.assertValue(soft);
|
|
60
|
+
}
|
|
61
|
+
this.updateBounds();
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
private updateBounds() {
|
|
65
|
+
this.lower = Rational.zero;
|
|
66
|
+
this.upper = Rational.zero;
|
|
67
|
+
for (const soft of this.soft) {
|
|
68
|
+
if (soft.value === L_TRUE) continue;
|
|
69
|
+
this.upper = this.upper.add(soft.weight);
|
|
70
|
+
if (soft.value === L_FALSE) this.lower = this.lower.add(soft.weight);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
private initLex() {
|
|
75
|
+
for (const soft of this.soft) soft.value = L_UNDEF;
|
|
76
|
+
const model = this.solver.getModel();
|
|
77
|
+
if (model === null) return;
|
|
78
|
+
for (const soft of this.soft) {
|
|
79
|
+
if (!this.isTrueIn(model, soft.expr)) {
|
|
80
|
+
this.updateBounds();
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
soft.value = L_TRUE;
|
|
84
|
+
this.assertValue(soft);
|
|
85
|
+
}
|
|
86
|
+
this.updateFromSolver();
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
run() {
|
|
90
|
+
this.initLex();
|
|
91
|
+
for (let index = 0; index < this.soft.length; index++) {
|
|
92
|
+
const soft = this.soft[index];
|
|
93
|
+
if (soft.value !== L_UNDEF) continue;
|
|
94
|
+
const status = this.solver.checkSat([soft.expr]);
|
|
95
|
+
if (status === L_UNDEF) return L_UNDEF;
|
|
96
|
+
if (status === L_TRUE) {
|
|
97
|
+
if (!this.updateFromSolver()) return L_UNDEF;
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
soft.value = L_FALSE;
|
|
101
|
+
this.assertValue(soft);
|
|
102
|
+
for (let later = index + 1; later < this.soft.length; later++) {
|
|
103
|
+
if (this.soft[later].value !== L_TRUE) break;
|
|
104
|
+
this.assertValue(this.soft[later]);
|
|
105
|
+
}
|
|
106
|
+
this.updateBounds();
|
|
107
|
+
}
|
|
108
|
+
return L_TRUE;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
commitAssignment() {
|
|
112
|
+
if (this.soft.some((soft) => soft.value === L_UNDEF)) return;
|
|
113
|
+
for (const soft of this.soft) this.assertValue(soft);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { type AstManager, SORT_BOOL } from "./ast";
|
|
2
|
+
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
3
|
+
import { Preprocess } from "./opt-preprocess";
|
|
4
|
+
import type { ProtoModel } from "./proto-model";
|
|
5
|
+
import { Rational } from "./rational";
|
|
6
|
+
import { RefVector } from "./ref-vector";
|
|
7
|
+
|
|
8
|
+
export interface MaxsatSolver {
|
|
9
|
+
assertExpr(expr: number): void;
|
|
10
|
+
checkSat(assumptions: readonly number[]): number;
|
|
11
|
+
getModel(): ProtoModel | null;
|
|
12
|
+
getUnsatCore(): readonly number[];
|
|
13
|
+
findMutexes(vars: readonly number[]): { status: number; mutexes: number[][] };
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface MaxsatParams {
|
|
17
|
+
maxsatEngine: string;
|
|
18
|
+
isMaxlexEnabled: boolean;
|
|
19
|
+
isHillClimbing: boolean;
|
|
20
|
+
maxCoreSize: number;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export interface MaxsatContext {
|
|
24
|
+
readonly manager: AstManager;
|
|
25
|
+
readonly params: MaxsatParams;
|
|
26
|
+
readonly isSatEnabled: boolean;
|
|
27
|
+
getSolver(): MaxsatSolver;
|
|
28
|
+
getBaseModel(): ProtoModel | null;
|
|
29
|
+
hide(decl: number): void;
|
|
30
|
+
adjust(index: number, value: Rational): Rational;
|
|
31
|
+
addOffset(index: number, value: Rational): void;
|
|
32
|
+
verifyModel(index: number, model: ProtoModel, value: Rational): boolean;
|
|
33
|
+
modelUpdated(model: ProtoModel): void;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface Soft {
|
|
37
|
+
expr: number;
|
|
38
|
+
weight: Rational;
|
|
39
|
+
value: number;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
export abstract class MaxsmtSolverBase {
|
|
43
|
+
protected readonly manager: AstManager;
|
|
44
|
+
lower = Rational.zero;
|
|
45
|
+
upper = Rational.zero;
|
|
46
|
+
model: ProtoModel | null;
|
|
47
|
+
protected trail: RefVector;
|
|
48
|
+
|
|
49
|
+
constructor(
|
|
50
|
+
protected readonly context: MaxsatContext,
|
|
51
|
+
protected soft: Soft[],
|
|
52
|
+
protected readonly index: number,
|
|
53
|
+
) {
|
|
54
|
+
this.manager = context.manager;
|
|
55
|
+
this.model = context.getBaseModel();
|
|
56
|
+
this.trail = new RefVector(context.manager);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
abstract run(): number;
|
|
60
|
+
|
|
61
|
+
abstract commitAssignment(): void;
|
|
62
|
+
|
|
63
|
+
protected get solver() {
|
|
64
|
+
return this.context.getSolver();
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
protected isTrueIn(model: ProtoModel, expr: number) {
|
|
68
|
+
const value = model.eval(expr, true);
|
|
69
|
+
const isTrue = value === this.manager.trueExpr;
|
|
70
|
+
this.manager.decRef(value);
|
|
71
|
+
return isTrue;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
protected init() {
|
|
75
|
+
this.lower = Rational.zero;
|
|
76
|
+
this.upper = Rational.zero;
|
|
77
|
+
for (const soft of this.soft) {
|
|
78
|
+
soft.value = this.manager.isTrue(soft.expr) ? L_TRUE : L_UNDEF;
|
|
79
|
+
if (soft.value !== L_TRUE) this.upper = this.upper.add(soft.weight);
|
|
80
|
+
}
|
|
81
|
+
const preprocess = new Preprocess(this.manager, this.solver);
|
|
82
|
+
const preprocessed = preprocess.run(this.soft);
|
|
83
|
+
if (preprocessed !== undefined) {
|
|
84
|
+
this.soft.splice(0, this.soft.length, ...preprocessed.soft);
|
|
85
|
+
for (const soft of this.soft) this.trail.push(soft.expr);
|
|
86
|
+
}
|
|
87
|
+
preprocess.release();
|
|
88
|
+
if (preprocessed === undefined) return false;
|
|
89
|
+
this.context.addOffset(this.index, preprocessed.lower);
|
|
90
|
+
this.upper = this.upper.sub(preprocessed.lower);
|
|
91
|
+
return true;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
protected mkFreshBool(name: string) {
|
|
95
|
+
const manager = this.manager;
|
|
96
|
+
const fresh = manager.mkFreshConst(name, SORT_BOOL);
|
|
97
|
+
this.trail.push(fresh);
|
|
98
|
+
this.context.hide(manager.decls[fresh]);
|
|
99
|
+
return fresh;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
release() {
|
|
103
|
+
this.trail.reset();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
|
|
2
|
+
import { L_FALSE, L_UNDEF } from "./lbool";
|
|
3
|
+
import { Maxcore } from "./maxcore";
|
|
4
|
+
import { isMaxlex, Maxlex } from "./maxlex";
|
|
5
|
+
import type { MaxsatContext, MaxsmtSolverBase, Soft } from "./maxsmt-base";
|
|
6
|
+
import type { ProtoModel } from "./proto-model";
|
|
7
|
+
import { Rational } from "./rational";
|
|
8
|
+
import { RefVector } from "./ref-vector";
|
|
9
|
+
|
|
10
|
+
export class Maxsmt {
|
|
11
|
+
private soft: Soft[] = [];
|
|
12
|
+
private softIndex = new Map<number, number>();
|
|
13
|
+
private terms: RefVector;
|
|
14
|
+
private msolver: MaxsmtSolverBase | null = null;
|
|
15
|
+
private lower = Rational.zero;
|
|
16
|
+
private upper = Rational.zero;
|
|
17
|
+
model: ProtoModel | null = null;
|
|
18
|
+
|
|
19
|
+
constructor(
|
|
20
|
+
private readonly context: MaxsatContext,
|
|
21
|
+
private readonly index: number,
|
|
22
|
+
) {
|
|
23
|
+
this.terms = new RefVector(context.manager);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
run(isCommitted: boolean) {
|
|
27
|
+
const context = this.context;
|
|
28
|
+
const engine = context.params.maxsatEngine;
|
|
29
|
+
this.msolver?.release();
|
|
30
|
+
this.msolver = null;
|
|
31
|
+
if (!isCommitted && context.params.isMaxlexEnabled && isMaxlex(this.soft))
|
|
32
|
+
this.msolver = new Maxlex(context, this.index, this.soft);
|
|
33
|
+
else if (this.soft.length === 0 || engine === "maxres")
|
|
34
|
+
this.msolver = new Maxcore(context, this.index, this.soft);
|
|
35
|
+
else throw new SmtUnsupportedError(`the MaxSAT engine ${engine}`);
|
|
36
|
+
const status = (() => {
|
|
37
|
+
try {
|
|
38
|
+
return this.msolver.run();
|
|
39
|
+
} catch (error) {
|
|
40
|
+
if (!(error instanceof SmtCanceledError)) throw error;
|
|
41
|
+
return L_UNDEF;
|
|
42
|
+
}
|
|
43
|
+
})();
|
|
44
|
+
if (status !== L_FALSE) this.model = this.msolver.model;
|
|
45
|
+
return status;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
add(expr: number, weight: Rational) {
|
|
49
|
+
const existing = this.softIndex.get(expr);
|
|
50
|
+
if (existing !== undefined) this.soft[existing].weight = this.soft[existing].weight.add(weight);
|
|
51
|
+
else {
|
|
52
|
+
this.terms.push(expr);
|
|
53
|
+
this.softIndex.set(expr, this.soft.length);
|
|
54
|
+
this.soft.push({ expr, weight, value: L_UNDEF });
|
|
55
|
+
}
|
|
56
|
+
this.upper = this.upper.add(weight);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
getLower() {
|
|
60
|
+
const lower = this.msolver?.lower;
|
|
61
|
+
return this.context.adjust(
|
|
62
|
+
this.index,
|
|
63
|
+
lower !== undefined && lower.compare(this.lower) > 0 ? lower : this.lower,
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
getUpper() {
|
|
68
|
+
const upper = this.msolver?.upper;
|
|
69
|
+
return this.context.adjust(
|
|
70
|
+
this.index,
|
|
71
|
+
upper !== undefined && upper.compare(this.upper) < 0 ? upper : this.upper,
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
updateLower(value: Rational) {
|
|
76
|
+
this.lower = value;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
updateUpper(value: Rational) {
|
|
80
|
+
this.upper = value;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
commitAssignment() {
|
|
84
|
+
this.msolver?.commitAssignment();
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
release() {
|
|
88
|
+
this.msolver?.release();
|
|
89
|
+
this.msolver = null;
|
|
90
|
+
this.terms.reset();
|
|
91
|
+
}
|
|
92
|
+
}
|