tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- 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 +338 -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 +110 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- 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 +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -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 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -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 +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -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 +814 -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 +8 -23
- 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 +261 -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 +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +43 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -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 +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT
|
|
2
|
-
// license, see z3-license.txt. The containers whose iteration order the lp solver depends on.
|
|
3
1
|
import { shrink } from "../array";
|
|
4
2
|
|
|
5
|
-
// indexed_uint_set: insertion order, and a removal moves the last element into the gap.
|
|
6
3
|
export class IndexedUintSet {
|
|
7
4
|
elems: number[] = [];
|
|
8
5
|
private positions: number[] = [];
|
|
@@ -39,7 +36,6 @@ export class IndexedUintSet {
|
|
|
39
36
|
}
|
|
40
37
|
}
|
|
41
38
|
|
|
42
|
-
// heap<lpvar_lt>: the infeasible columns, smallest first.
|
|
43
39
|
export class VarHeap {
|
|
44
40
|
private values: number[] = [];
|
|
45
41
|
private positions: number[] = [];
|
|
@@ -78,11 +74,6 @@ export class VarHeap {
|
|
|
78
74
|
this.moveDown(this.positions[last]);
|
|
79
75
|
}
|
|
80
76
|
|
|
81
|
-
clear() {
|
|
82
|
-
for (const value of this.values) this.positions[value] = -1;
|
|
83
|
-
this.values = [];
|
|
84
|
-
}
|
|
85
|
-
|
|
86
77
|
private swap(first: number, second: number) {
|
|
87
78
|
const values = this.values;
|
|
88
79
|
const saved = values[first];
|
|
@@ -127,7 +118,6 @@ interface StackedScope {
|
|
|
127
118
|
logSize: number;
|
|
128
119
|
}
|
|
129
120
|
|
|
130
|
-
// stacked_vector: a vector whose size and values a pop restores to the matching push.
|
|
131
121
|
export class StackedVector<T> {
|
|
132
122
|
values: T[] = [];
|
|
133
123
|
private log: StackedLogEntry<T>[] = [];
|
|
@@ -172,8 +162,7 @@ interface HashNode<V> extends HashLink<V> {
|
|
|
172
162
|
readonly value: V;
|
|
173
163
|
}
|
|
174
164
|
|
|
175
|
-
|
|
176
|
-
const getBucket = (hash: number, count: number) =>
|
|
165
|
+
const constrainHash = (hash: number, count: number) =>
|
|
177
166
|
(count & (count - 1)) === 0 ? hash & (count - 1) : hash < count ? hash : hash % count;
|
|
178
167
|
|
|
179
168
|
const isHashPowerOfTwo = (count: number) => count > 2 && (count & (count - 1)) === 0;
|
|
@@ -190,18 +179,12 @@ const getNextPrime = (value: number) => {
|
|
|
190
179
|
return candidate;
|
|
191
180
|
};
|
|
192
181
|
|
|
193
|
-
// std::unordered_map
|
|
194
|
-
// threads every node, each bucket points at the node before its first one, a new node goes to the
|
|
195
|
-
// front of its bucket, and the table grows to the next prime. The iteration order is the list.
|
|
182
|
+
// libc++'s std::unordered_map, whose iteration order Z3's macOS release build exposes: a Map would iterate differently.
|
|
196
183
|
export class UnorderedUintMap<V> {
|
|
197
184
|
private readonly anchor: HashLink<V> = { key: -1, next: null };
|
|
198
185
|
private buckets: (HashLink<V> | null)[] = [];
|
|
199
186
|
private nodes = new Map<number, HashNode<V>>();
|
|
200
187
|
|
|
201
|
-
get size() {
|
|
202
|
-
return this.nodes.size;
|
|
203
|
-
}
|
|
204
|
-
|
|
205
188
|
has(key: number) {
|
|
206
189
|
return this.nodes.has(key);
|
|
207
190
|
}
|
|
@@ -214,14 +197,13 @@ export class UnorderedUintMap<V> {
|
|
|
214
197
|
for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
|
|
215
198
|
}
|
|
216
199
|
|
|
217
|
-
// __emplace_unique_key_args: the key is new.
|
|
218
200
|
insert(key: number, value: V) {
|
|
219
201
|
const node: HashNode<V> = { key, value, next: null };
|
|
220
202
|
const count = this.buckets.length;
|
|
221
203
|
if (this.nodes.size + 1 > count || count === 0)
|
|
222
204
|
this.rehash(Math.max(2 * count + (isHashPowerOfTwo(count) ? 0 : 1), this.nodes.size + 1));
|
|
223
205
|
this.nodes.set(key, node);
|
|
224
|
-
const bucket =
|
|
206
|
+
const bucket = constrainHash(key, this.buckets.length);
|
|
225
207
|
const previous = this.buckets[bucket];
|
|
226
208
|
if (previous !== null) {
|
|
227
209
|
node.next = previous.next;
|
|
@@ -231,29 +213,28 @@ export class UnorderedUintMap<V> {
|
|
|
231
213
|
node.next = this.anchor.next;
|
|
232
214
|
this.anchor.next = node;
|
|
233
215
|
this.buckets[bucket] = this.anchor;
|
|
234
|
-
if (node.next !== null) this.buckets[
|
|
216
|
+
if (node.next !== null) this.buckets[constrainHash(node.next.key, this.buckets.length)] = node;
|
|
235
217
|
}
|
|
236
218
|
|
|
237
|
-
// remove: unlinks the node and repairs the buckets of it and of its successor.
|
|
238
219
|
delete(key: number) {
|
|
239
220
|
const node = this.nodes.get(key);
|
|
240
221
|
if (node === undefined) return;
|
|
241
222
|
this.nodes.delete(key);
|
|
242
223
|
const count = this.buckets.length;
|
|
243
|
-
const bucket =
|
|
224
|
+
const bucket = constrainHash(key, count);
|
|
244
225
|
let previous = this.buckets[bucket] ?? this.anchor;
|
|
245
226
|
while (previous.next !== node) previous = previous.next ?? this.anchor;
|
|
246
|
-
const isPreviousOutside =
|
|
247
|
-
|
|
227
|
+
const isPreviousOutside =
|
|
228
|
+
previous === this.anchor || constrainHash(previous.key, count) !== bucket;
|
|
229
|
+
if (isPreviousOutside && (node.next === null || constrainHash(node.next.key, count) !== bucket))
|
|
248
230
|
this.buckets[bucket] = null;
|
|
249
231
|
if (node.next !== null) {
|
|
250
|
-
const nextBucket =
|
|
232
|
+
const nextBucket = constrainHash(node.next.key, count);
|
|
251
233
|
if (nextBucket !== bucket) this.buckets[nextBucket] = previous;
|
|
252
234
|
}
|
|
253
235
|
previous.next = node.next;
|
|
254
236
|
}
|
|
255
237
|
|
|
256
|
-
// clear keeps the bucket count.
|
|
257
238
|
clear() {
|
|
258
239
|
this.anchor.next = null;
|
|
259
240
|
this.buckets.fill(null);
|
|
@@ -272,11 +253,11 @@ export class UnorderedUintMap<V> {
|
|
|
272
253
|
let previous: HashLink<V> = this.anchor;
|
|
273
254
|
let current = previous.next;
|
|
274
255
|
if (current === null) return;
|
|
275
|
-
let previousBucket =
|
|
256
|
+
let previousBucket = constrainHash(current.key, count);
|
|
276
257
|
this.buckets[previousBucket] = previous;
|
|
277
258
|
previous = current;
|
|
278
259
|
for (current = current.next; current !== null; current = previous.next) {
|
|
279
|
-
const bucket =
|
|
260
|
+
const bucket = constrainHash(current.key, count);
|
|
280
261
|
if (bucket === previousBucket) {
|
|
281
262
|
previous = current;
|
|
282
263
|
continue;
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
|
|
2
|
-
// src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
|
|
3
|
-
// license, see z3-license.txt. The tableau, the column values and bounds, and the primal simplex
|
|
4
|
-
// that lar_solver runs with the tableau_rows strategy: the smallest infeasible basic column
|
|
5
|
-
// leaves, and the entering column is the one in its row that frees the fewest bounded basics.
|
|
6
1
|
import { Rational } from "../rational";
|
|
7
2
|
import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
|
|
8
3
|
import type { LpSettings } from "./lp-settings";
|
|
9
4
|
import { Impq } from "./numeric-pair";
|
|
10
|
-
import { RowCell, StaticMatrix } from "./static-matrix";
|
|
5
|
+
import { type RowCell, StaticMatrix } from "./static-matrix";
|
|
11
6
|
|
|
12
7
|
export const COLUMN_FREE = 0;
|
|
13
8
|
export const COLUMN_LOWER = 1;
|
|
@@ -15,7 +10,6 @@ export const COLUMN_UPPER = 2;
|
|
|
15
10
|
export const COLUMN_BOXED = 3;
|
|
16
11
|
export const COLUMN_FIXED = 4;
|
|
17
12
|
|
|
18
|
-
// column_type: which bounds a column has.
|
|
19
13
|
export type ColumnType =
|
|
20
14
|
| typeof COLUMN_FREE
|
|
21
15
|
| typeof COLUMN_LOWER
|
|
@@ -47,8 +41,8 @@ export class CoreSolver {
|
|
|
47
41
|
infRowIndex = -1;
|
|
48
42
|
infeasibleSumSign = 0;
|
|
49
43
|
infeasibleCombination: [Rational, number][] = [];
|
|
50
|
-
// m_d: the reduced costs while maximize_term runs the tableau_costs strategy, kept on pivots.
|
|
51
44
|
reducedCosts: Rational[] | undefined;
|
|
45
|
+
private backup: Impq[] = [];
|
|
52
46
|
private isBlandMode = false;
|
|
53
47
|
private leftBasis = new IndexedUintSet();
|
|
54
48
|
private leftBasisRepeated = 0;
|
|
@@ -59,7 +53,19 @@ export class CoreSolver {
|
|
|
59
53
|
return this.matrix.getColumnCount();
|
|
60
54
|
}
|
|
61
55
|
|
|
62
|
-
|
|
56
|
+
backupX() {
|
|
57
|
+
this.backup = this.x.slice();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
restoreX() {
|
|
61
|
+
const count = Math.min(this.backup.length, this.getColumnCount());
|
|
62
|
+
for (let column = 0; column < count; column++) this.x[column] = this.backup[column];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
getBackupSize() {
|
|
66
|
+
return this.backup.length;
|
|
67
|
+
}
|
|
68
|
+
|
|
63
69
|
addColumn(isBasic: boolean) {
|
|
64
70
|
const column = this.matrix.getColumnCount();
|
|
65
71
|
this.matrix.addColumn();
|
|
@@ -76,33 +82,30 @@ export class CoreSolver {
|
|
|
76
82
|
this.nbasis.push(column);
|
|
77
83
|
}
|
|
78
84
|
|
|
79
|
-
// remove_last_column_from_basis_tableau: the last column out of the basis or the nonbasic
|
|
80
|
-
// columns, once the tableau no longer holds it.
|
|
81
85
|
removeLastColumn(column: number) {
|
|
82
86
|
this.x.length = this.matrix.getColumnCount();
|
|
83
87
|
const position = this.heading[column];
|
|
84
88
|
if (position >= 0) {
|
|
85
89
|
const lastPosition = this.basis.length - 1;
|
|
86
90
|
if (position !== lastPosition) {
|
|
87
|
-
const
|
|
88
|
-
this.basis[position] =
|
|
89
|
-
this.heading[
|
|
91
|
+
const movedColumn = this.basis[lastPosition];
|
|
92
|
+
this.basis[position] = movedColumn;
|
|
93
|
+
this.heading[movedColumn] = position;
|
|
90
94
|
}
|
|
91
95
|
this.basis.pop();
|
|
92
96
|
} else {
|
|
93
97
|
const index = -1 - position;
|
|
94
98
|
const lastPosition = this.nbasis.length - 1;
|
|
95
99
|
if (index !== lastPosition) {
|
|
96
|
-
const
|
|
97
|
-
this.nbasis[index] =
|
|
98
|
-
this.heading[
|
|
100
|
+
const movedColumn = this.nbasis[lastPosition];
|
|
101
|
+
this.nbasis[index] = movedColumn;
|
|
102
|
+
this.heading[movedColumn] = -index - 1;
|
|
99
103
|
}
|
|
100
104
|
this.nbasis.pop();
|
|
101
105
|
}
|
|
102
106
|
this.heading.pop();
|
|
103
107
|
}
|
|
104
108
|
|
|
105
|
-
// The action, with pivots not recording the rows they touch.
|
|
106
109
|
withoutTouchedRows<T>(action: () => T) {
|
|
107
110
|
const savedTouchedRows = this.touchedRows;
|
|
108
111
|
this.touchedRows = null;
|
|
@@ -171,7 +174,6 @@ export class CoreSolver {
|
|
|
171
174
|
this.trackColumnFeasibility(column);
|
|
172
175
|
}
|
|
173
176
|
|
|
174
|
-
// make_column_feasible: moves the value of a column into its bounds, and returns the move.
|
|
175
177
|
makeColumnFeasible(column: number) {
|
|
176
178
|
const value = this.x[column];
|
|
177
179
|
const lower = this.lowerBounds[column];
|
|
@@ -231,7 +233,6 @@ export class CoreSolver {
|
|
|
231
233
|
return true;
|
|
232
234
|
}
|
|
233
235
|
|
|
234
|
-
// pivot_column_tableau: makes the column a unit column with its one in the pivot row.
|
|
235
236
|
pivotColumnTableau(column: number, pivotRow: number) {
|
|
236
237
|
if (!this.divideRowByPivot(pivotRow, column)) return false;
|
|
237
238
|
this.settings.stats.pivots++;
|
|
@@ -256,7 +257,6 @@ export class CoreSolver {
|
|
|
256
257
|
return true;
|
|
257
258
|
}
|
|
258
259
|
|
|
259
|
-
// pivot_to_reduced_costs_tableau: eliminates the reduced cost of the column that enters.
|
|
260
260
|
private pivotToReducedCosts(reducedCosts: Rational[], pivotRow: number, column: number) {
|
|
261
261
|
const alpha = reducedCosts[column];
|
|
262
262
|
if (alpha.isZero()) return;
|
|
@@ -282,8 +282,6 @@ export class CoreSolver {
|
|
|
282
282
|
this.matrix.transposeRows(first, second);
|
|
283
283
|
}
|
|
284
284
|
|
|
285
|
-
// The simplex.
|
|
286
|
-
|
|
287
285
|
private needsToGrow(basic: number) {
|
|
288
286
|
const type = this.columnTypes.get(basic);
|
|
289
287
|
return (
|
|
@@ -292,7 +290,7 @@ export class CoreSolver {
|
|
|
292
290
|
);
|
|
293
291
|
}
|
|
294
292
|
|
|
295
|
-
infSignOfColumn(basic: number) {
|
|
293
|
+
private infSignOfColumn(basic: number) {
|
|
296
294
|
switch (this.columnTypes.get(basic)) {
|
|
297
295
|
case COLUMN_FREE:
|
|
298
296
|
return 0;
|
|
@@ -356,7 +354,6 @@ export class CoreSolver {
|
|
|
356
354
|
return result;
|
|
357
355
|
}
|
|
358
356
|
|
|
359
|
-
// find_beneficial_entering_tableau_rows: the cell of the entering column, or undefined.
|
|
360
357
|
private findBeneficialEntering(rowIndex: number) {
|
|
361
358
|
const row = this.matrix.rows[rowIndex];
|
|
362
359
|
const basic = this.basis[rowIndex];
|
|
@@ -450,7 +447,6 @@ export class CoreSolver {
|
|
|
450
447
|
if (this.isFeasible()) this.status = LP_OPTIMAL;
|
|
451
448
|
}
|
|
452
449
|
|
|
453
|
-
// lp_primal_core_solver::solve, looking only for a feasible solution.
|
|
454
450
|
private solveTableau() {
|
|
455
451
|
if (this.isFeasible()) {
|
|
456
452
|
this.status = LP_FEASIBLE;
|
|
@@ -473,7 +469,6 @@ export class CoreSolver {
|
|
|
473
469
|
);
|
|
474
470
|
}
|
|
475
471
|
|
|
476
|
-
// lar_core_solver::solve.
|
|
477
472
|
solve() {
|
|
478
473
|
if (this.isFeasible()) {
|
|
479
474
|
this.status = LP_OPTIMAL;
|
|
@@ -497,8 +492,7 @@ export class CoreSolver {
|
|
|
497
492
|
|
|
498
493
|
popScope(count: number) {
|
|
499
494
|
this.columnTypes.popScope(count);
|
|
500
|
-
|
|
501
|
-
this.x.length = columnCount;
|
|
495
|
+
this.x.length = this.matrix.getColumnCount();
|
|
502
496
|
this.infeasibleCombination = [];
|
|
503
497
|
}
|
|
504
498
|
}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
// until the callback returns true or 100 forms are reported. A form is built by rewriting the
|
|
4
|
-
// expression in place: the front holds the slots of the subsums still to split.
|
|
5
|
-
//
|
|
6
|
-
// The occurrence map is a Map in insertion order, where Z3 has an unordered_map. So when several
|
|
7
|
-
// variables divide every summand, the extracted common factor may list them in another order.
|
|
1
|
+
// Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
|
|
2
|
+
// so an extracted common factor may list its variables in another order.
|
|
8
3
|
import { Rational } from "../rational";
|
|
9
4
|
import {
|
|
10
5
|
type Nex,
|
|
@@ -17,7 +12,6 @@ import {
|
|
|
17
12
|
} from "./nex";
|
|
18
13
|
import type { NexCreator } from "./nex-creator";
|
|
19
14
|
|
|
20
|
-
// A place that holds an expression, where Z3 has a nex**.
|
|
21
15
|
interface NexSlot {
|
|
22
16
|
get(): Nex;
|
|
23
17
|
set(value: Nex): void;
|
|
@@ -45,8 +39,6 @@ const isDivisibleByVar = (expr: Nex, variable: number) =>
|
|
|
45
39
|
(expr.kind === "mul" && containsVar(expr, variable)) ||
|
|
46
40
|
(expr.kind === "var" && expr.variable === variable);
|
|
47
41
|
|
|
48
|
-
// has_common_factor: whether a variable of the first summand divides the rest. A sum that
|
|
49
|
-
// simplified to one term counts as a sum of that term.
|
|
50
42
|
const hasCommonFactor = (expr: Nex) => {
|
|
51
43
|
const children = expr.kind === "sum" ? expr.children : [expr];
|
|
52
44
|
for (const variable of getVarsOfExpr(children[0]))
|
|
@@ -59,14 +51,13 @@ export class CrossNested {
|
|
|
59
51
|
private isDone = false;
|
|
60
52
|
private isLimitExceeded = false;
|
|
61
53
|
private reported = 0;
|
|
62
|
-
private isRandomBit = false;
|
|
63
54
|
|
|
64
55
|
constructor(
|
|
65
56
|
private readonly callOnResult: (expr: Nex) => boolean,
|
|
66
57
|
private readonly varIsFixed: (variable: number) => boolean,
|
|
67
58
|
private readonly limit: Limit,
|
|
68
59
|
private randomSeed: number,
|
|
69
|
-
readonly nexCreator: NexCreator,
|
|
60
|
+
private readonly nexCreator: NexCreator,
|
|
70
61
|
) {}
|
|
71
62
|
|
|
72
63
|
run(expr: Nex) {
|
|
@@ -152,18 +143,16 @@ export class CrossNested {
|
|
|
152
143
|
for (const entry of occurences) if (entry[1].occs <= 1) occurences.delete(entry[0]);
|
|
153
144
|
}
|
|
154
145
|
|
|
155
|
-
// The variables to factor out, by occurrences, then by power, then by index in the direction
|
|
156
|
-
// of a random bit.
|
|
157
146
|
private getVarsFromOccurencesMap() {
|
|
158
147
|
const occurences = this.nexCreator.occurencesMap;
|
|
159
|
-
|
|
148
|
+
const isRandomBit = this.nextRandom() % 2 === 1;
|
|
160
149
|
return [...occurences.keys()].sort((first, second) => {
|
|
161
150
|
const firstOcc = occurences.get(first);
|
|
162
151
|
const secondOcc = occurences.get(second);
|
|
163
152
|
if (firstOcc === undefined || secondOcc === undefined) return 0;
|
|
164
153
|
if (firstOcc.occs !== secondOcc.occs) return secondOcc.occs - firstOcc.occs;
|
|
165
154
|
if (firstOcc.power !== secondOcc.power) return secondOcc.power - firstOcc.power;
|
|
166
|
-
return
|
|
155
|
+
return isRandomBit ? first - second : second - first;
|
|
167
156
|
});
|
|
168
157
|
}
|
|
169
158
|
|
|
@@ -174,10 +163,8 @@ export class CrossNested {
|
|
|
174
163
|
return;
|
|
175
164
|
}
|
|
176
165
|
const expr = slot.get();
|
|
177
|
-
// A front element is a sum, unlike in Z3, which would misread anything else as one.
|
|
178
166
|
if (expr.kind === "sum") {
|
|
179
167
|
this.calcOccurences(expr);
|
|
180
|
-
// Z3 passes a copy of the front here.
|
|
181
168
|
if (this.proceedWithCommonFactor(slot, expr, [...front])) return;
|
|
182
169
|
const vars = this.getVarsFromOccurencesMap();
|
|
183
170
|
if (vars.length > 0) return this.exploreExprOnFrontElemVars(slot, front, vars);
|
|
@@ -199,8 +186,6 @@ export class CrossNested {
|
|
|
199
186
|
this.exploreExprOnFrontElem(next, front);
|
|
200
187
|
}
|
|
201
188
|
|
|
202
|
-
// split_with_var: e = j*a + b, where a sums the summands divisible by j, divided by it, and b
|
|
203
|
-
// sums the rest. It is enough to split on the variables where a has no common factor.
|
|
204
189
|
private splitWithVar(slot: NexSlot, variable: number, front: NexSlot[]) {
|
|
205
190
|
const expr = slot.get();
|
|
206
191
|
if (expr.kind !== "sum") return false;
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
|
|
2
|
-
// src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt. Exact rational intervals with open, closed, or infinite bounds, where each bound
|
|
4
|
-
// carries the dependency that justifies it. Only the operations nla_intervals, horner,
|
|
5
|
-
// pdd_interval, and monomial_bounds call are here; mpq is exact, so there is no rounding.
|
|
6
1
|
import { Rational } from "../rational";
|
|
7
2
|
import { type Dependency, linearize, mkJoin } from "./dependency";
|
|
8
3
|
|
|
@@ -17,7 +12,6 @@ export interface DepInterval {
|
|
|
17
12
|
upperDep: Dependency;
|
|
18
13
|
}
|
|
19
14
|
|
|
20
|
-
// with_deps_t: whether an operation also computes the dependencies of the result.
|
|
21
15
|
export type DepsMode = "with-deps" | "without-deps";
|
|
22
16
|
|
|
23
17
|
interface ExtNumeral {
|
|
@@ -25,7 +19,6 @@ interface ExtNumeral {
|
|
|
25
19
|
readonly value: Rational;
|
|
26
20
|
}
|
|
27
21
|
|
|
28
|
-
// interval_deps_combine_rule: bitmasks of the argument bounds that justify each result bound.
|
|
29
22
|
interface CombineRule {
|
|
30
23
|
readonly lower: number;
|
|
31
24
|
readonly upper: number;
|
|
@@ -99,8 +92,6 @@ const extLt = (first: ExtNumeral, second: ExtNumeral) => {
|
|
|
99
92
|
return second.kind === "plus-inf";
|
|
100
93
|
};
|
|
101
94
|
|
|
102
|
-
// The bounds of a result go in only after every bound of the arguments is read, since the result
|
|
103
|
-
// may be one of the arguments.
|
|
104
95
|
const setBounds = (
|
|
105
96
|
result: DepInterval,
|
|
106
97
|
lower: ExtNumeral,
|
|
@@ -130,7 +121,6 @@ const isN0 = (interval: DepInterval) => upperIsZero(interval) && !interval.isUpp
|
|
|
130
121
|
const isN1 = (interval: DepInterval) =>
|
|
131
122
|
upperIsNeg(interval) || (upperIsZero(interval) && interval.isUpperOpen);
|
|
132
123
|
const isM = (interval: DepInterval) => lowerIsNeg(interval) && upperIsPos(interval);
|
|
133
|
-
// interval_manager::is_zero, which unlike dep_intervals::is_zero ignores openness.
|
|
134
124
|
const areBoundsZero = (interval: DepInterval) => lowerIsZero(interval) && upperIsZero(interval);
|
|
135
125
|
|
|
136
126
|
const imSet = (target: DepInterval, source: DepInterval) => {
|
|
@@ -152,7 +142,6 @@ const imAdd = (first: DepInterval, second: DepInterval, result: DepInterval) =>
|
|
|
152
142
|
first.isUpperOpen || second.isUpperOpen,
|
|
153
143
|
);
|
|
154
144
|
|
|
155
|
-
// div_mul with inv_k false.
|
|
156
145
|
const imMulScalar = (scalar: Rational, interval: DepInterval, result: DepInterval) => {
|
|
157
146
|
if (scalar.isZero()) return setBounds(result, MINUS_INF, true, PLUS_INF, true);
|
|
158
147
|
const factor = mkNumeral(scalar);
|
|
@@ -236,7 +225,7 @@ const imMul = (first: DepInterval, second: DepInterval, result: DepInterval) =>
|
|
|
236
225
|
);
|
|
237
226
|
};
|
|
238
227
|
|
|
239
|
-
//
|
|
228
|
+
// Z3 tests the stored value of c and d for zero even when the bound is infinite.
|
|
240
229
|
const imDiv = (first: DepInterval, second: DepInterval, result: DepInterval) => {
|
|
241
230
|
if (areBoundsZero(first))
|
|
242
231
|
return setBounds(result, mkNumeral(Rational.zero), false, mkNumeral(Rational.zero), false);
|
|
@@ -451,7 +440,6 @@ const getPowerRule = (interval: DepInterval, exponent: number): CombineRule => {
|
|
|
451
440
|
return { lower: 0, upper: DEP_IN_LOWER1 | DEP_IN_UPPER1 };
|
|
452
441
|
};
|
|
453
442
|
|
|
454
|
-
// im_config::mk_dependency: the joined dependencies of the bounds in the mask.
|
|
455
443
|
const mkDependency = (first: DepInterval, second: DepInterval | null, mask: number) => {
|
|
456
444
|
const withLower1 = mask & DEP_IN_LOWER1 ? first.lowerDep : null;
|
|
457
445
|
const withLower2 =
|
|
@@ -460,8 +448,7 @@ const mkDependency = (first: DepInterval, second: DepInterval | null, mask: numb
|
|
|
460
448
|
return second !== null && mask & DEP_IN_UPPER2 ? mkJoin(withUpper1, second.upperDep) : withUpper1;
|
|
461
449
|
};
|
|
462
450
|
|
|
463
|
-
|
|
464
|
-
const combineDeps = (
|
|
451
|
+
const addDeps = (
|
|
465
452
|
first: DepInterval,
|
|
466
453
|
second: DepInterval | null,
|
|
467
454
|
rule: CombineRule,
|
|
@@ -489,7 +476,7 @@ export const power = (
|
|
|
489
476
|
if (exponent === 1 && interval === result) return;
|
|
490
477
|
const rule = getPowerRule(interval, exponent);
|
|
491
478
|
imPower(interval, exponent, result);
|
|
492
|
-
if (mode === "with-deps")
|
|
479
|
+
if (mode === "with-deps") addDeps(interval, null, rule, result);
|
|
493
480
|
};
|
|
494
481
|
|
|
495
482
|
export const mulScalar = (
|
|
@@ -514,7 +501,7 @@ export const mul = (
|
|
|
514
501
|
) => {
|
|
515
502
|
const rule = getMulRule(first, second);
|
|
516
503
|
imMul(first, second, result);
|
|
517
|
-
if (mode === "with-deps")
|
|
504
|
+
if (mode === "with-deps") addDeps(first, second, rule, result);
|
|
518
505
|
};
|
|
519
506
|
|
|
520
507
|
export const div = (
|
|
@@ -525,7 +512,7 @@ export const div = (
|
|
|
525
512
|
) => {
|
|
526
513
|
const rule = getDivRule(first, second);
|
|
527
514
|
imDiv(first, second, result);
|
|
528
|
-
if (mode === "with-deps")
|
|
515
|
+
if (mode === "with-deps") addDeps(first, second, rule, result);
|
|
529
516
|
};
|
|
530
517
|
|
|
531
518
|
export const add = (
|
|
@@ -535,10 +522,9 @@ export const add = (
|
|
|
535
522
|
mode: DepsMode,
|
|
536
523
|
) => {
|
|
537
524
|
imAdd(first, second, result);
|
|
538
|
-
if (mode === "with-deps")
|
|
525
|
+
if (mode === "with-deps") addDeps(first, second, getAddRule(), result);
|
|
539
526
|
};
|
|
540
527
|
|
|
541
|
-
// add(rational, interval): shifts the finite bounds and keeps the dependencies.
|
|
542
528
|
export const addScalar = (scalar: Rational, interval: DepInterval) => {
|
|
543
529
|
if (!interval.isLowerInf) interval.lower = interval.lower.add(scalar);
|
|
544
530
|
if (!interval.isUpperInf) interval.upper = interval.upper.add(scalar);
|
|
@@ -558,7 +544,6 @@ const copyUpperBound = (source: DepInterval, target: DepInterval, mode: DepsMode
|
|
|
558
544
|
if (mode === "with-deps") target.upperDep = source.upperDep;
|
|
559
545
|
};
|
|
560
546
|
|
|
561
|
-
// On equal bounds the bound of first wins if it is open, else the bound of second.
|
|
562
547
|
export const intersect = (
|
|
563
548
|
first: DepInterval,
|
|
564
549
|
second: DepInterval,
|
|
@@ -583,7 +568,6 @@ export const intersect = (
|
|
|
583
568
|
}
|
|
584
569
|
};
|
|
585
570
|
|
|
586
|
-
// set_value and set_interval_for_scalar: the closed point interval, keeping the dependencies.
|
|
587
571
|
export const setValue = (interval: DepInterval, value: Rational) =>
|
|
588
572
|
setBounds(interval, mkNumeral(value), false, mkNumeral(value), false);
|
|
589
573
|
|
|
@@ -611,8 +595,6 @@ const separatedFromZeroOnUpper = (interval: DepInterval) =>
|
|
|
611
595
|
export const separatedFromZero = (interval: DepInterval) =>
|
|
612
596
|
separatedFromZeroOnUpper(interval) || separatedFromZeroOnLower(interval);
|
|
613
597
|
|
|
614
|
-
// When the interval excludes zero, reports the joined dependency of dep and the separating bound,
|
|
615
|
-
// lower first.
|
|
616
598
|
export const checkIntervalForConflictOnZero = (
|
|
617
599
|
interval: DepInterval,
|
|
618
600
|
dep: Dependency,
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt. The witnesses of bounds:
|
|
2
|
-
// a DAG whose leaves are constraint indices. Without proofs, lar_solver's evidence_manager is the
|
|
3
|
-
// plain u_dependency_manager.
|
|
4
|
-
|
|
5
1
|
export interface DependencyLeaf {
|
|
6
2
|
readonly isLeaf: true;
|
|
7
3
|
readonly value: number;
|
|
@@ -25,7 +21,6 @@ export const mkJoin = (first: Dependency, second: Dependency): Dependency => {
|
|
|
25
21
|
return { isLeaf: false, first, second, isMarked: false };
|
|
26
22
|
};
|
|
27
23
|
|
|
28
|
-
// linearize: the leaves in breadth-first order, each once, from the given roots.
|
|
29
24
|
export const linearize = (roots: Dependency[]) => {
|
|
30
25
|
const todo: (DependencyLeaf | DependencyJoin)[] = [];
|
|
31
26
|
for (const root of roots) {
|