tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- 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 -16
- 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 +626 -56
- 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 +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- 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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +179 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- 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 +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +21 -26
- 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 +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- 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 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- 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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +1210 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt. The interpreter of Z3's
|
|
2
|
-
// matching abstract machine: it runs a code tree against a term, backtracking through the choices
|
|
3
|
-
// of BIND, CONTINUE and CHOOSE, and reports each match.
|
|
4
1
|
import type { Context } from "./context";
|
|
5
2
|
import type { Enode } from "./enode";
|
|
6
3
|
import {
|
|
@@ -30,8 +27,6 @@ import { shrink } from "./array";
|
|
|
30
27
|
|
|
31
28
|
export type OnMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) => void;
|
|
32
29
|
|
|
33
|
-
// backtrack_point: the instruction to resume, the generation to restore, the term a BIND is at,
|
|
34
|
-
// and the terms a CONTINUE goes through.
|
|
35
30
|
interface BacktrackPoint {
|
|
36
31
|
instr: Instruction;
|
|
37
32
|
oldMaxGeneration: number;
|
|
@@ -41,16 +36,13 @@ interface BacktrackPoint {
|
|
|
41
36
|
end: number;
|
|
42
37
|
}
|
|
43
38
|
|
|
44
|
-
// GET_CGR1 to GET_CGR6 filter their arguments by the parent labels, GET_CGRN does not.
|
|
45
39
|
const MAX_FILTERED_GET_CGR_ARGS = 6;
|
|
46
40
|
|
|
47
41
|
export class Interpreter {
|
|
48
42
|
private registers: (Enode | null)[] = [];
|
|
49
|
-
// m_bindings: the terms a YIELD reports, which the match callback does not keep.
|
|
50
43
|
private bindings: Enode[] = [];
|
|
51
44
|
private backtrackStack: BacktrackPoint[] = [];
|
|
52
45
|
private top = 0;
|
|
53
|
-
// m_max_generation: the largest generation of a term the match went through.
|
|
54
46
|
private maxGeneration = 0;
|
|
55
47
|
|
|
56
48
|
constructor(
|
|
@@ -74,7 +66,6 @@ export class Interpreter {
|
|
|
74
66
|
return point;
|
|
75
67
|
}
|
|
76
68
|
|
|
77
|
-
// get_first_f_app and get_next_f_app: the next congruence root with the label in the class.
|
|
78
69
|
private getNextFApp(label: number, numArgs: number, first: Enode, start: Enode | null) {
|
|
79
70
|
let curr = start === null ? first : start.next;
|
|
80
71
|
if (start !== null && curr === first) return null;
|
|
@@ -88,7 +79,6 @@ export class Interpreter {
|
|
|
88
79
|
return null;
|
|
89
80
|
}
|
|
90
81
|
|
|
91
|
-
// exec_is_cgr: whether the class has a term with the label and the arguments of the registers.
|
|
92
82
|
private isCgr(instr: Instruction) {
|
|
93
83
|
const registers = this.registers;
|
|
94
84
|
const args: Enode[] = [];
|
|
@@ -124,8 +114,6 @@ export class Interpreter {
|
|
|
124
114
|
);
|
|
125
115
|
}
|
|
126
116
|
|
|
127
|
-
// mk_depth1_vector: the relevant decl-parents of the class of node where it is argument argIndex.
|
|
128
|
-
// init_continue drops a vector of limit terms or more, so this stops at limit and returns null.
|
|
129
117
|
private getDepth1Vector(node: Enode, decl: number, argIndex: number, limit: number) {
|
|
130
118
|
const root = node.root;
|
|
131
119
|
const result: Enode[] = [];
|
|
@@ -137,7 +125,6 @@ export class Interpreter {
|
|
|
137
125
|
return result;
|
|
138
126
|
}
|
|
139
127
|
|
|
140
|
-
// mk_depth2_vector, which stops at limit like getDepth1Vector.
|
|
141
128
|
private getDepth2Vector(joint: Joint, decl: number, argIndex: number, limit: number) {
|
|
142
129
|
const node = this.registers[joint.reg];
|
|
143
130
|
if (node === null || node === undefined) return null;
|
|
@@ -156,7 +143,6 @@ export class Interpreter {
|
|
|
156
143
|
return result;
|
|
157
144
|
}
|
|
158
145
|
|
|
159
|
-
// SET_VAR's filter: whether the class of each input register has a parent with the label.
|
|
160
146
|
private hasParentLabels(instr: Instruction) {
|
|
161
147
|
for (const reg of instr.regs) {
|
|
162
148
|
const root = (this.registers[reg] as Enode).root;
|
|
@@ -171,7 +157,6 @@ export class Interpreter {
|
|
|
171
157
|
return null;
|
|
172
158
|
}
|
|
173
159
|
|
|
174
|
-
// init_continue: the smallest candidate vector among the joints, or all terms with the label.
|
|
175
160
|
private initContinue(instr: Instruction) {
|
|
176
161
|
const context = this.context;
|
|
177
162
|
const label = instr.label;
|
|
@@ -224,8 +209,6 @@ export class Interpreter {
|
|
|
224
209
|
for (let index = 0; index < numArgs; index++) this.registers[oreg + index] = node.getArg(index);
|
|
225
210
|
}
|
|
226
211
|
|
|
227
|
-
// The backtracking step of execute_core: the instruction to resume at, or null when the top choice
|
|
228
|
-
// is exhausted and was popped.
|
|
229
212
|
private resume(point: BacktrackPoint): Instruction | null {
|
|
230
213
|
const instr = point.instr;
|
|
231
214
|
if (instr.op === OP_CHOOSE) {
|
|
@@ -260,8 +243,6 @@ export class Interpreter {
|
|
|
260
243
|
return null;
|
|
261
244
|
}
|
|
262
245
|
|
|
263
|
-
// execute_core: runs the tree against a term, one instruction at a time, and backtracks when an
|
|
264
|
-
// instruction fails. It returns false when the search is canceled.
|
|
265
246
|
executeCore(tree: CodeTree, node: Enode) {
|
|
266
247
|
const context = this.context;
|
|
267
248
|
const registers = this.registers;
|
|
@@ -385,8 +366,6 @@ export class Interpreter {
|
|
|
385
366
|
}
|
|
386
367
|
}
|
|
387
368
|
|
|
388
|
-
// execute: runs the tree against its candidates. A tree that filters its candidates runs each
|
|
389
|
-
// term once.
|
|
390
369
|
execute(tree: CodeTree) {
|
|
391
370
|
const context = this.context;
|
|
392
371
|
const seen = tree.isFilteringCandidates ? new Set<Enode>() : null;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { AstManager } from "./ast";
|
|
2
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
5
|
+
|
|
6
|
+
// dependent_expr_state_tactic pushes a scope of the state but not of the simplifier, so the
|
|
7
|
+
// rewriter never registers the kinds it shares and leaves every formula as it is.
|
|
8
|
+
export const runMaxBvSharing = (manager: AstManager) => (goal: Goal) => {
|
|
9
|
+
runSimplifier(goal, false, (state) => {
|
|
10
|
+
const rewriter = new MaxBvSharing(manager);
|
|
11
|
+
return {
|
|
12
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
13
|
+
release: () => rewriter.release(),
|
|
14
|
+
};
|
|
15
|
+
});
|
|
16
|
+
return [goal];
|
|
17
|
+
};
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
const getSortedSet = (set: Set<number>) => [...set].sort((left, right) => left - right);
|
|
2
|
+
|
|
3
|
+
export class MaxCliques {
|
|
4
|
+
private next: number[][] = [];
|
|
5
|
+
private tc: number[][] = [];
|
|
6
|
+
private seen1 = new Set<number>();
|
|
7
|
+
private seen2 = new Set<number>();
|
|
8
|
+
|
|
9
|
+
constructor(private negate: (vertex: number) => number) {}
|
|
10
|
+
|
|
11
|
+
private getNext(vertex: number) {
|
|
12
|
+
return this.next[vertex] ?? [];
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
private getTc(vertex: number) {
|
|
16
|
+
this.tc[vertex] ??= [];
|
|
17
|
+
return this.tc[vertex];
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
private getReachable(start: number, goal: Set<number>, reachable: Set<number>) {
|
|
21
|
+
this.seen1.clear();
|
|
22
|
+
const todo = [start];
|
|
23
|
+
for (let index = 0; index < todo.length; index++) {
|
|
24
|
+
const vertex = todo[index];
|
|
25
|
+
if (this.seen1.has(vertex)) continue;
|
|
26
|
+
this.seen1.add(vertex);
|
|
27
|
+
if (this.seen2.has(vertex)) {
|
|
28
|
+
for (const next of this.getTc(vertex)) if (goal.has(next)) reachable.add(next);
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const negated = this.negate(vertex);
|
|
32
|
+
if (goal.has(negated)) reachable.add(negated);
|
|
33
|
+
todo.push(...this.getNext(negated));
|
|
34
|
+
}
|
|
35
|
+
for (let index = todo.length; index-- > 0;) {
|
|
36
|
+
const vertex = todo[index];
|
|
37
|
+
if (this.seen2.has(vertex)) continue;
|
|
38
|
+
this.seen2.add(vertex);
|
|
39
|
+
const negated = this.negate(vertex);
|
|
40
|
+
const tc = this.getTc(vertex);
|
|
41
|
+
if (goal.has(negated)) tc.push(negated);
|
|
42
|
+
else for (const next of this.getNext(negated)) tc.push(...this.getTc(next));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
addEdge(source: number, target: number) {
|
|
47
|
+
(this.next[source] ??= []).push(target);
|
|
48
|
+
(this.next[target] ??= []).push(source);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
cliques2(vertices: readonly number[]) {
|
|
52
|
+
const goal = new Set(vertices);
|
|
53
|
+
const conns = new Map<number, Set<number>>();
|
|
54
|
+
for (const vertex of vertices) {
|
|
55
|
+
const reach = new Set<number>();
|
|
56
|
+
this.getReachable(vertex, goal, reach);
|
|
57
|
+
conns.set(vertex, reach);
|
|
58
|
+
}
|
|
59
|
+
return this.cliques(vertices, conns);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
cliques(vertices: readonly number[], conns: Map<number, Set<number>>) {
|
|
63
|
+
const getConns = (vertex: number) => {
|
|
64
|
+
const set = conns.get(vertex);
|
|
65
|
+
if (set !== undefined) return set;
|
|
66
|
+
const created = new Set<number>();
|
|
67
|
+
conns.set(vertex, created);
|
|
68
|
+
return created;
|
|
69
|
+
};
|
|
70
|
+
const isLess = (first: number, second: number) => {
|
|
71
|
+
const firstSize = getConns(first).size;
|
|
72
|
+
const secondSize = getConns(second).size;
|
|
73
|
+
return firstSize < secondSize || (firstSize === secondSize && first < second);
|
|
74
|
+
};
|
|
75
|
+
const todo = new Set(vertices);
|
|
76
|
+
const heap = new Set(vertices);
|
|
77
|
+
const result: number[][] = [];
|
|
78
|
+
while (todo.size > 0) {
|
|
79
|
+
let vertex = -1;
|
|
80
|
+
for (const candidate of heap)
|
|
81
|
+
if (vertex === -1 || isLess(candidate, vertex)) vertex = candidate;
|
|
82
|
+
const atMostOne = new Set<number>();
|
|
83
|
+
const next = getSortedSet(getConns(vertex))
|
|
84
|
+
.filter((neighbor) => todo.has(neighbor))
|
|
85
|
+
.sort((first, second) => (isLess(first, second) ? -1 : isLess(second, first) ? 1 : 0));
|
|
86
|
+
for (const neighbor of next) {
|
|
87
|
+
const isAll =
|
|
88
|
+
heap.has(neighbor) &&
|
|
89
|
+
getSortedSet(atMostOne).every((member) => getConns(neighbor).has(member));
|
|
90
|
+
if (isAll) atMostOne.add(neighbor);
|
|
91
|
+
}
|
|
92
|
+
atMostOne.add(vertex);
|
|
93
|
+
const members = getSortedSet(atMostOne);
|
|
94
|
+
for (const member of members) {
|
|
95
|
+
todo.delete(member);
|
|
96
|
+
for (const neighbor of getSortedSet(getConns(member))) getConns(neighbor).delete(member);
|
|
97
|
+
}
|
|
98
|
+
for (const member of members) heap.delete(member);
|
|
99
|
+
if (members.length <= 1) continue;
|
|
100
|
+
if (members.length === 2 && members[0] === this.negate(members[1])) continue;
|
|
101
|
+
result.push(members);
|
|
102
|
+
}
|
|
103
|
+
return result;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
@@ -0,0 +1,310 @@
|
|
|
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
|
+
const numAssertions = this.solver.getNumAssertions();
|
|
278
|
+
this.model = model;
|
|
279
|
+
this.context.modelUpdated(model);
|
|
280
|
+
for (const soft of this.soft) soft.value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
281
|
+
if (numAssertions === this.solver.getNumAssertions()) this.upper = upper;
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
private removeSoft(core: readonly number[]) {
|
|
285
|
+
const kept = this.asms.items.filter((expr) => !core.includes(expr));
|
|
286
|
+
for (const expr of kept) this.trail.push(expr);
|
|
287
|
+
this.asms.reset();
|
|
288
|
+
for (const expr of kept) this.asms.push(expr);
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
private initLocal() {
|
|
292
|
+
for (const soft of this.soft) this.addSoft(soft.expr, soft.weight);
|
|
293
|
+
this.isFeasibleOptimumFound = false;
|
|
294
|
+
this.csmodel = null;
|
|
295
|
+
this.correctionSetSize = 0;
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
commitAssignment() {
|
|
299
|
+
if (!this.isFeasibleOptimumFound) return;
|
|
300
|
+
for (const expr of this.defs.items) this.add(expr);
|
|
301
|
+
for (const expr of this.asms.items) this.add(expr);
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
release() {
|
|
305
|
+
this.asms.reset();
|
|
306
|
+
this.defs.reset();
|
|
307
|
+
this.mus.reset();
|
|
308
|
+
super.release();
|
|
309
|
+
}
|
|
310
|
+
}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// maximize_bv_sharing_rw: an associative application of more than two arguments becomes a tree of
|
|
3
|
-
// binary applications that reuses the pairs it made before.
|
|
4
|
-
import { OP_ADD, OP_OR, type AstManager } from "./ast";
|
|
1
|
+
import { OP_ADD, OP_BADD, OP_BAND, OP_BMUL, OP_BOR, OP_OR } from "./ast";
|
|
5
2
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
6
3
|
import { shrink } from "./array";
|
|
7
4
|
|
|
@@ -11,32 +8,24 @@ interface SharingEntry {
|
|
|
11
8
|
second: number;
|
|
12
9
|
}
|
|
13
10
|
|
|
14
|
-
// MAX_NUM_ARGS_FOR_OPT: pairs are reused only for fewer arguments.
|
|
15
11
|
const MAX_NUM_ARGS_FOR_OPT = 128;
|
|
16
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
|
+
|
|
17
16
|
export class MaxBvSharing extends RewriterTpl {
|
|
18
|
-
// Z3 registers the kinds of bvadd, bvmul, bvor and bvand when the first scope is pushed, and
|
|
19
|
-
// compares the kind without the family. bvmul has the kind of or and of +, so those are shared.
|
|
20
17
|
private isInit = false;
|
|
21
|
-
// m_entries and m_cache: the pairs made, which hold their arguments. The cache maps a declaration
|
|
22
|
-
// and the lower of two arguments to the higher ones, so a pair matches in either order.
|
|
23
18
|
private entries: SharingEntry[] = [];
|
|
24
19
|
private pairCache = new Map<number, Map<number, Set<number>>>();
|
|
25
20
|
private pairScopes: number[] = [];
|
|
26
21
|
|
|
27
|
-
constructor(manager: AstManager) {
|
|
28
|
-
super(manager);
|
|
29
|
-
}
|
|
30
|
-
|
|
31
22
|
reduceApp(decl: number, args: number[], sort: number) {
|
|
32
23
|
const manager = this.manager;
|
|
33
24
|
const op = manager.funcDecls[decl].op;
|
|
34
|
-
if (!this.isInit || (op
|
|
25
|
+
if (!this.isInit || !SHARED_OPS.has(op) || args.length <= 2) return -1;
|
|
35
26
|
return manager.withTemporaries(() => {
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
// each reuse, but no pair is made meanwhile, so before the reused pair only the pairs with
|
|
39
|
-
// the argument it became can match.
|
|
27
|
+
const numeral = manager.isBvNumeral(args[0]) ? args[0] : -1;
|
|
28
|
+
const pending = numeral === -1 ? [...args] : args.slice(1);
|
|
40
29
|
for (let merged = 0; pending.length > 1 && pending.length < MAX_NUM_ARGS_FOR_OPT;) {
|
|
41
30
|
let pairFirst = -1;
|
|
42
31
|
let pairSecond = -1;
|
|
@@ -68,11 +57,10 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
68
57
|
}
|
|
69
58
|
pending.splice(0, pending.length, ...next);
|
|
70
59
|
}
|
|
71
|
-
return pending[0];
|
|
60
|
+
return numeral === -1 ? pending[0] : manager.mkApp(decl, [numeral, pending[0]], sort);
|
|
72
61
|
});
|
|
73
62
|
}
|
|
74
63
|
|
|
75
|
-
// entry orders its arguments by id, and pop_scope releases them in that order.
|
|
76
64
|
private insert(decl: number, first: number, second: number) {
|
|
77
65
|
const isOrdered = this.manager.ids[first] <= this.manager.ids[second];
|
|
78
66
|
this.entries.push({
|
|
@@ -101,7 +89,6 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
101
89
|
this.pairScopes.push(this.entries.length);
|
|
102
90
|
}
|
|
103
91
|
|
|
104
|
-
// pop_scope: releases the pairs made since the matching push, the last first.
|
|
105
92
|
popScope() {
|
|
106
93
|
const size = this.pairScopes.pop() as number;
|
|
107
94
|
for (let index = this.entries.length - 1; index >= size; index--) {
|