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,14 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf.h, src/math/lp/general_matrix.h,
|
|
2
|
-
// src/math/lp/permutation_matrix.h, and the extended gcd of src/util/mpz.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt. The Hermite normal form of an integer matrix, computed modulo a multiple of the
|
|
4
|
-
// determinant of its rows, as the HNF cutter needs it.
|
|
5
1
|
import { Rational } from "../rational";
|
|
6
2
|
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
export const getRemainder = (first: Rational, second: Rational) =>
|
|
4
|
+
Rational.of(first.num % second.num);
|
|
9
5
|
|
|
10
|
-
|
|
11
|
-
const getExtendedGcd = (first: Rational, second: Rational) => {
|
|
6
|
+
const getMpzExtendedGcd = (first: Rational, second: Rational) => {
|
|
12
7
|
let left = first.num < 0n ? -first.num : first.num;
|
|
13
8
|
let right = second.num < 0n ? -second.num : second.num;
|
|
14
9
|
let a = 1n;
|
|
@@ -33,12 +28,10 @@ const getExtendedGcd = (first: Rational, second: Rational) => {
|
|
|
33
28
|
};
|
|
34
29
|
};
|
|
35
30
|
|
|
36
|
-
// extended_gcd_minimal_uv: the gcd d of a and b with a * u + b * v = d, where v is the smallest
|
|
37
|
-
// coefficient of its residue class with the sign of -b.
|
|
38
31
|
const getExtendedGcdMinimalUv = (a: Rational, b: Rational) => {
|
|
39
32
|
if (a.isZero()) return { d: b, u: Rational.zero, v: Rational.one };
|
|
40
33
|
if (b.isZero()) return { d: a, u: Rational.one, v: Rational.zero };
|
|
41
|
-
const result =
|
|
34
|
+
const result = getMpzExtendedGcd(a, b);
|
|
42
35
|
let d = result.gcd;
|
|
43
36
|
let u = result.u;
|
|
44
37
|
let v = result.v;
|
|
@@ -63,7 +56,6 @@ const getExtendedGcdMinimalUv = (a: Rational, b: Rational) => {
|
|
|
63
56
|
return { d, u, v };
|
|
64
57
|
};
|
|
65
58
|
|
|
66
|
-
// permutation_matrix: a permutation and its inverse.
|
|
67
59
|
class Permutation {
|
|
68
60
|
constructor(
|
|
69
61
|
readonly forward: number[],
|
|
@@ -71,7 +63,7 @@ class Permutation {
|
|
|
71
63
|
) {}
|
|
72
64
|
|
|
73
65
|
static identity(length: number) {
|
|
74
|
-
const getIndex = (
|
|
66
|
+
const getIndex = (_value: unknown, index: number) => index;
|
|
75
67
|
return new Permutation(Array.from({ length }, getIndex), Array.from({ length }, getIndex));
|
|
76
68
|
}
|
|
77
69
|
|
|
@@ -99,7 +91,6 @@ class Permutation {
|
|
|
99
91
|
}
|
|
100
92
|
}
|
|
101
93
|
|
|
102
|
-
// general_matrix: dense rows behind a row and a column permutation.
|
|
103
94
|
export class GeneralMatrix {
|
|
104
95
|
private rowPermutation: Permutation;
|
|
105
96
|
private columnPermutation: Permutation;
|
|
@@ -149,15 +140,13 @@ export class GeneralMatrix {
|
|
|
149
140
|
this.columnPermutation.transposeFromLeft(first, second);
|
|
150
141
|
}
|
|
151
142
|
|
|
152
|
-
// shrink_to_rank: only the given data rows, leaving the permutations as they are.
|
|
153
143
|
shrinkToRank(basisRows: number[]) {
|
|
154
144
|
if (basisRows.length === this.getRowCount()) return;
|
|
155
145
|
this.data = basisRows.map((row) => this.data[row]);
|
|
156
146
|
}
|
|
157
147
|
}
|
|
158
148
|
|
|
159
|
-
|
|
160
|
-
const preparePivot = (matrix: GeneralMatrix, r: number) => {
|
|
149
|
+
const preparePivotForLowerTriangle = (matrix: GeneralMatrix, r: number) => {
|
|
161
150
|
for (let row = r; row < matrix.getRowCount(); row++)
|
|
162
151
|
for (let column = r; column < matrix.getColumnCount(); column++) {
|
|
163
152
|
if (matrix.get(row, column).isZero()) continue;
|
|
@@ -168,8 +157,6 @@ const preparePivot = (matrix: GeneralMatrix, r: number) => {
|
|
|
168
157
|
return false;
|
|
169
158
|
};
|
|
170
159
|
|
|
171
|
-
// pivot_column_non_fractional: a fraction-free elimination step under (r, r); false when an entry
|
|
172
|
-
// reaches the big number.
|
|
173
160
|
const pivotColumnNonFractional = (matrix: GeneralMatrix, r: number, bigNumber: Rational) => {
|
|
174
161
|
const pivot = matrix.get(r, r);
|
|
175
162
|
const denominator = r > 0 ? matrix.get(r - 1, r - 1) : undefined;
|
|
@@ -185,9 +172,6 @@ const pivotColumnNonFractional = (matrix: GeneralMatrix, r: number, bigNumber: R
|
|
|
185
172
|
return true;
|
|
186
173
|
};
|
|
187
174
|
|
|
188
|
-
// determinant_of_rectangular_matrix: the gcd of the last row of the triangulated matrix, a
|
|
189
|
-
// multiple of the gcd of its maximal minors, and the data rows of a basis; the big number when an
|
|
190
|
-
// entry grows too large.
|
|
191
175
|
export const getDeterminantOfRectangularMatrix = (
|
|
192
176
|
matrix: GeneralMatrix,
|
|
193
177
|
basisRows: number[],
|
|
@@ -196,7 +180,7 @@ export const getDeterminantOfRectangularMatrix = (
|
|
|
196
180
|
const triangle = matrix.copy();
|
|
197
181
|
let rank = 0;
|
|
198
182
|
for (; rank < triangle.getRowCount(); rank++) {
|
|
199
|
-
if (!
|
|
183
|
+
if (!preparePivotForLowerTriangle(triangle, rank)) break;
|
|
200
184
|
if (!pivotColumnNonFractional(triangle, rank, bigNumber)) return bigNumber;
|
|
201
185
|
}
|
|
202
186
|
if (rank === 0) return Rational.one;
|
|
@@ -210,13 +194,11 @@ export const getDeterminantOfRectangularMatrix = (
|
|
|
210
194
|
}
|
|
211
195
|
for (; column < triangle.getColumnCount(); column++) {
|
|
212
196
|
const value = triangle.get(last, column);
|
|
213
|
-
if (!value.isZero()) gcd =
|
|
197
|
+
if (!value.isZero()) gcd = getMpzExtendedGcd(gcd, value).gcd;
|
|
214
198
|
}
|
|
215
199
|
return gcd;
|
|
216
200
|
};
|
|
217
201
|
|
|
218
|
-
// hnf: W, the Hermite normal form of the rows of the matrix, computed modulo d. Undefined when
|
|
219
|
-
// canceled.
|
|
220
202
|
export const getHermiteNormalForm = (
|
|
221
203
|
matrix: GeneralMatrix,
|
|
222
204
|
d: Rational,
|
|
@@ -230,12 +212,12 @@ export const getHermiteNormalForm = (
|
|
|
230
212
|
let r = d;
|
|
231
213
|
let halfR = r.div(Rational.of(2n)).floor();
|
|
232
214
|
const getModBalanced = (value: Rational) => {
|
|
233
|
-
const rem =
|
|
215
|
+
const rem = getRemainder(value, r);
|
|
234
216
|
if (rem.compare(halfR) > 0) return rem.sub(r);
|
|
235
217
|
return rem.compare(halfR.neg()) < 0 ? rem.add(r) : rem;
|
|
236
218
|
};
|
|
237
219
|
const getMod = (value: Rational) => {
|
|
238
|
-
const rem =
|
|
220
|
+
const rem = getRemainder(value, r);
|
|
239
221
|
return rem.isNegative() ? rem.add(r) : rem;
|
|
240
222
|
};
|
|
241
223
|
for (let i = 0; i < rowCount; i++) {
|
|
@@ -1,12 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_cube.cpp, and tighten_term_bounds_by_delta and
|
|
2
|
-
// round_to_integer_solution in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt. The
|
|
3
|
-
// cube test: when the bounds of every term shrunk by half the sum of its integer coefficients still
|
|
4
|
-
// admit a solution, rounding that solution gives an integer one. The largest cube test maximizes
|
|
5
|
-
// the edge of that cube instead, and when the edge is below 1 it rounds the center and flips
|
|
6
|
-
// rounded columns to repair the bounds the rounding broke.
|
|
7
1
|
import { Rational } from "../rational";
|
|
8
2
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
9
|
-
import { LP_FEASIBLE, LP_OPTIMAL } from "./core-solver";
|
|
3
|
+
import { LP_FEASIBLE, LP_OPTIMAL, LP_UNBOUNDED } from "./core-solver";
|
|
10
4
|
import { type LarSolver, NULL_LPVAR } from "./lar-solver";
|
|
11
5
|
import type { LarTerm } from "./lar-term";
|
|
12
6
|
import { maximizeTerm } from "./maximize-term";
|
|
@@ -14,9 +8,7 @@ import { Impq } from "./numeric-pair";
|
|
|
14
8
|
|
|
15
9
|
const HALF = Rational.of(1n, 2n);
|
|
16
10
|
|
|
17
|
-
|
|
18
|
-
// otherwise half the sum of the integer coefficients.
|
|
19
|
-
const getCubeDelta = (solver: LarSolver, term: LarTerm) => {
|
|
11
|
+
const getCubeDeltaForTerm = (solver: LarSolver, term: LarTerm) => {
|
|
20
12
|
const entries = [...term.coeffs];
|
|
21
13
|
if (entries.length === 2) {
|
|
22
14
|
let isPlusSeen = false;
|
|
@@ -39,9 +31,7 @@ const getCubeDelta = (solver: LarSolver, term: LarTerm) => {
|
|
|
39
31
|
const addVarBound = (solver: LarSolver, column: number, kind: ConstraintKind, rhs: Rational) =>
|
|
40
32
|
solver.activate(solver.mkVarBound(column, kind, rhs));
|
|
41
33
|
|
|
42
|
-
|
|
43
|
-
// by delta.
|
|
44
|
-
const tightenTermBounds = (solver: LarSolver, column: number, delta: Impq) => {
|
|
34
|
+
const tightenTermBoundsByDelta = (solver: LarSolver, column: number, delta: Impq) => {
|
|
45
35
|
const core = solver.core;
|
|
46
36
|
const hasUpper = core.hasUpperBound(column);
|
|
47
37
|
const hasLower = core.hasLowerBound(column);
|
|
@@ -64,34 +54,32 @@ const tightenTermBounds = (solver: LarSolver, column: number, delta: Impq) => {
|
|
|
64
54
|
return true;
|
|
65
55
|
};
|
|
66
56
|
|
|
67
|
-
// round_to_integer_solution: integer columns without terms round to the nearest integer, and the
|
|
68
|
-
// terms that use them take their new values.
|
|
69
57
|
const roundToIntegerSolution = (solver: LarSolver) => {
|
|
70
|
-
const
|
|
58
|
+
const values = solver.core.x;
|
|
71
59
|
const rounded = new Set<number>();
|
|
72
60
|
for (let column = 0; column < solver.getColumnCount(); column++) {
|
|
73
61
|
if (!solver.isInt(column) || solver.hasTerm(column)) continue;
|
|
74
|
-
const value =
|
|
62
|
+
const value = values[column];
|
|
75
63
|
if (value.isInt()) continue;
|
|
76
64
|
const floor = new Impq(value.floor());
|
|
77
|
-
|
|
65
|
+
values[column] =
|
|
66
|
+
floor.sub(value).compare(new Impq(HALF.neg())) < 0 ? new Impq(value.ceil()) : floor;
|
|
78
67
|
rounded.add(column);
|
|
79
68
|
}
|
|
80
69
|
if (rounded.size === 0) return;
|
|
81
70
|
for (const term of solver.terms)
|
|
82
|
-
if ([...term.coeffs].some((entry) => rounded.has(entry[0])))
|
|
71
|
+
if ([...term.coeffs].some((entry) => rounded.has(entry[0])))
|
|
72
|
+
values[term.column] = term.apply(values);
|
|
83
73
|
};
|
|
84
74
|
|
|
85
|
-
// r_basis_has_inf_int.
|
|
86
75
|
const hasBasicInfInt = (solver: LarSolver) =>
|
|
87
76
|
solver.core.basis.some((column) => solver.isInt(column) && !solver.getValue(column).isInt());
|
|
88
77
|
|
|
89
|
-
// int_cube::operator(): whether the cube test found an integer solution.
|
|
90
78
|
export const findCube = (solver: LarSolver) => {
|
|
91
79
|
solver.push();
|
|
92
80
|
for (const term of solver.terms) {
|
|
93
|
-
const delta =
|
|
94
|
-
if (delta.isZero() ||
|
|
81
|
+
const delta = getCubeDeltaForTerm(solver, term);
|
|
82
|
+
if (delta.isZero() || tightenTermBoundsByDelta(solver, term.column, delta)) continue;
|
|
95
83
|
solver.pop(1);
|
|
96
84
|
solver.status = LP_OPTIMAL;
|
|
97
85
|
return false;
|
|
@@ -108,12 +96,10 @@ export const findCube = (solver: LarSolver) => {
|
|
|
108
96
|
return true;
|
|
109
97
|
};
|
|
110
98
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
const addEdgeRows = (solver: LarSolver, column: number, edge: number) => {
|
|
114
|
-
const delta = getCubeDelta(solver, solver.getTerm(column));
|
|
99
|
+
const addEdgeRowsForTerm = (solver: LarSolver, column: number, edge: number) => {
|
|
100
|
+
const delta = getCubeDeltaForTerm(solver, solver.getTerm(column));
|
|
115
101
|
if (delta.isZero()) return true;
|
|
116
|
-
if (!delta.y.isZero()) return
|
|
102
|
+
if (!delta.y.isZero()) return tightenTermBoundsByDelta(solver, column, delta);
|
|
117
103
|
const core = solver.core;
|
|
118
104
|
if (core.hasUpperBound(column)) {
|
|
119
105
|
const upper = solver.getUpperBound(column);
|
|
@@ -140,7 +126,6 @@ const addEdgeRows = (solver: LarSolver, column: number, edge: number) => {
|
|
|
140
126
|
return true;
|
|
141
127
|
};
|
|
142
128
|
|
|
143
|
-
// sat_after_rounding.
|
|
144
129
|
const roundCenter = (solver: LarSolver) => {
|
|
145
130
|
roundToIntegerSolution(solver);
|
|
146
131
|
solver.status = LP_FEASIBLE;
|
|
@@ -148,21 +133,17 @@ const roundCenter = (solver: LarSolver) => {
|
|
|
148
133
|
return true;
|
|
149
134
|
};
|
|
150
135
|
|
|
151
|
-
// A rounded column, its floor, and whether it sits at its floor plus one.
|
|
152
136
|
interface FlipCandidate {
|
|
153
137
|
column: number;
|
|
154
138
|
floor: Rational;
|
|
155
139
|
isAtHigh: boolean;
|
|
156
140
|
}
|
|
157
141
|
|
|
158
|
-
// A term column with a bound, and its value while the repair flips columns.
|
|
159
142
|
interface BoundedRow {
|
|
160
143
|
column: number;
|
|
161
144
|
value: Impq;
|
|
162
145
|
}
|
|
163
146
|
|
|
164
|
-
// repair_rounded_candidate: while the bounded terms are violated, flips the rounded column that
|
|
165
|
-
// decreases the total violation most, within a budget, and keeps the values when none is left.
|
|
166
147
|
const repairRoundedCandidate = (solver: LarSolver, flips: FlipCandidate[]) => {
|
|
167
148
|
const core = solver.core;
|
|
168
149
|
const rows: BoundedRow[] = [];
|
|
@@ -230,7 +211,6 @@ const repairRoundedCandidate = (solver: LarSolver, flips: FlipCandidate[]) => {
|
|
|
230
211
|
return true;
|
|
231
212
|
};
|
|
232
213
|
|
|
233
|
-
// round_and_repair: rounds the center of the cube and repairs it, or restores the center.
|
|
234
214
|
const roundAndRepair = (solver: LarSolver) => {
|
|
235
215
|
const core = solver.core;
|
|
236
216
|
const backup = core.x.slice();
|
|
@@ -251,8 +231,6 @@ const roundAndRepair = (solver: LarSolver) => {
|
|
|
251
231
|
return false;
|
|
252
232
|
};
|
|
253
233
|
|
|
254
|
-
// find_largest_cube: whether an integer solution comes from the largest cube that fits in the
|
|
255
|
-
// bounds of the terms, with its edge as a new column that the optimizing simplex maximizes.
|
|
256
234
|
export const findLargestCube = (solver: LarSolver) => {
|
|
257
235
|
solver.settings.stats.lcubeCalls++;
|
|
258
236
|
solver.push();
|
|
@@ -262,7 +240,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
262
240
|
addVarBound(solver, edge, KIND_GE, Rational.zero);
|
|
263
241
|
const isAdded = solver.terms
|
|
264
242
|
.map((term) => term.column)
|
|
265
|
-
.every((column) =>
|
|
243
|
+
.every((column) => addEdgeRowsForTerm(solver, column, edge));
|
|
266
244
|
solver.onAddTerm = onAddTerm;
|
|
267
245
|
if (!isAdded) {
|
|
268
246
|
solver.pop(1);
|
|
@@ -280,7 +258,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
280
258
|
solver.pop(1);
|
|
281
259
|
return false;
|
|
282
260
|
}
|
|
283
|
-
if (maximum ===
|
|
261
|
+
if (maximum.status === LP_UNBOUNDED) {
|
|
284
262
|
addVarBound(solver, edge, KIND_GE, Rational.one);
|
|
285
263
|
const boundedStatus = solver.findFeasibleSolution();
|
|
286
264
|
solver.pop(1);
|
|
@@ -289,7 +267,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
289
267
|
: false;
|
|
290
268
|
}
|
|
291
269
|
solver.pop(1);
|
|
292
|
-
return maximum.compare(new Impq(Rational.one)) >= 0
|
|
270
|
+
return maximum.value.compare(new Impq(Rational.one)) >= 0
|
|
293
271
|
? roundCenter(solver)
|
|
294
272
|
: roundAndRepair(solver);
|
|
295
273
|
};
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_solver.cpp, src/math/lp/int_gcd_test.cpp,
|
|
2
|
-
// src/math/lp/int_branch.cpp), MIT license, see z3-license.txt. The integer check of the final
|
|
3
|
-
// check: the GCD test on rows, patching fractional basic columns through integer non-basic ones,
|
|
4
|
-
// the cube and largest cube tests, HNF cuts, the Diophantine solver, Gomory cuts, and a branch on a
|
|
5
|
-
// fractional basic column.
|
|
6
1
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
7
2
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
8
3
|
import { DiophantineSolver } from "./dioph-eq";
|
|
9
4
|
import { Explanation } from "./explanation";
|
|
10
|
-
import { getGomoryCuts } from "./gomory";
|
|
5
|
+
import { getFractionalPart, getGomoryCuts } from "./gomory";
|
|
11
6
|
import { makeHnfCut } from "./hnf-cutter";
|
|
12
7
|
import { findCube, findLargestCube } from "./int-cube";
|
|
13
8
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -23,10 +18,7 @@ export type LiaMove =
|
|
|
23
18
|
| { kind: "cut"; offset: Rational; isUpper: boolean }
|
|
24
19
|
| { kind: "branch"; isUpper: boolean; offset: Rational };
|
|
25
20
|
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
// gcd(a, b, u, v): the gcd of a and b, with a * u + b * v equal to it.
|
|
29
|
-
const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
21
|
+
const getExtendedGcdTriple = (first: bigint, second: bigint) => {
|
|
30
22
|
let previous = [first, 1n, 0n];
|
|
31
23
|
let current = [second, 0n, 1n];
|
|
32
24
|
while (current[0] !== 0n) {
|
|
@@ -42,11 +34,10 @@ const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
|
42
34
|
return previous[0] < 0n ? previous.map((value) => -value) : previous;
|
|
43
35
|
};
|
|
44
36
|
|
|
45
|
-
// get_patching_deltas: the moves of a column with coefficient alpha that make x integral.
|
|
46
37
|
const getPatchingDeltas = (x: Rational, alpha: Rational) => {
|
|
47
38
|
if (alpha.den % x.den !== 0n) return undefined;
|
|
48
39
|
const scale = alpha.den / x.den;
|
|
49
|
-
const coeff =
|
|
40
|
+
const coeff = getExtendedGcdTriple(alpha.num, x.den)[1];
|
|
50
41
|
const product = coeff * scale * x.num;
|
|
51
42
|
const remainder = ((product % alpha.den) + alpha.den) % alpha.den;
|
|
52
43
|
const plus = Rational.of(remainder);
|
|
@@ -60,18 +51,14 @@ interface Parity {
|
|
|
60
51
|
}
|
|
61
52
|
|
|
62
53
|
export class IntSolver {
|
|
63
|
-
private numberOfCalls = 0;
|
|
64
|
-
// m_parities and m_inserted_vars of the GCD test, for one test.
|
|
65
54
|
private parities = new Map<number, Parity[]>();
|
|
66
55
|
private parityColumns: number[] = [];
|
|
67
56
|
private lcubePeriod: number;
|
|
68
57
|
readonly explanation = new Explanation();
|
|
69
|
-
// m_t: the term of a branch or a cut, kept across calls as Z3 keeps its table.
|
|
70
58
|
readonly term = new LarTerm();
|
|
71
59
|
|
|
72
60
|
private dio: DiophantineSolver;
|
|
73
61
|
private initialDioCallsPeriod: number;
|
|
74
|
-
// m_dio_undef_in_a_row: the Diophantine solver's calls in a row that found nothing.
|
|
75
62
|
private dioUndefInARow = 0;
|
|
76
63
|
|
|
77
64
|
constructor(readonly solver: LarSolver) {
|
|
@@ -123,7 +110,6 @@ export class IntSolver {
|
|
|
123
110
|
if (!solver.hasInfInt()) return { kind: "sat" };
|
|
124
111
|
this.term.clear();
|
|
125
112
|
this.explanation.clear();
|
|
126
|
-
// lp.dio_run_gcd is off, so the GCD test runs only when the Diophantine solver ignores terms.
|
|
127
113
|
const move: LiaMove = this.dio.hasIgnoredTerms ? this.gcdTest() : { kind: "undef" };
|
|
128
114
|
return solver.core.withoutTouchedRows(() => this.checkAfterGcd(move));
|
|
129
115
|
}
|
|
@@ -131,7 +117,6 @@ export class IntSolver {
|
|
|
131
117
|
private checkAfterGcd(gcdMove: LiaMove): LiaMove {
|
|
132
118
|
const settings = this.solver.settings;
|
|
133
119
|
if (settings.isCanceled()) return { kind: "undef" };
|
|
134
|
-
this.numberOfCalls++;
|
|
135
120
|
const move = gcdMove.kind === "undef" ? this.getMoveAfterGcd() : gcdMove;
|
|
136
121
|
return settings.isCanceled() ? { kind: "undef" } : move;
|
|
137
122
|
}
|
|
@@ -159,8 +144,6 @@ export class IntSolver {
|
|
|
159
144
|
return this.branch();
|
|
160
145
|
}
|
|
161
146
|
|
|
162
|
-
// find_lcube: the period doubles while the largest cube finds nothing, and resets when it finds a
|
|
163
|
-
// solution.
|
|
164
147
|
private findLcube() {
|
|
165
148
|
const isSat = findLargestCube(this.solver);
|
|
166
149
|
if (isSat) this.lcubePeriod = this.solver.settings.intFindCubePeriod;
|
|
@@ -168,8 +151,6 @@ export class IntSolver {
|
|
|
168
151
|
return isSat;
|
|
169
152
|
}
|
|
170
153
|
|
|
171
|
-
// should_solve_dioph_eq: a draw with the current period, which relaxes toward the initial one
|
|
172
|
-
// when it misses.
|
|
173
154
|
private shouldSolveDiophantineEquations() {
|
|
174
155
|
const settings = this.solver.settings;
|
|
175
156
|
const isHit = this.hitPeriod(settings.dioCallsPeriod);
|
|
@@ -183,9 +164,6 @@ export class IntSolver {
|
|
|
183
164
|
return isHit;
|
|
184
165
|
}
|
|
185
166
|
|
|
186
|
-
// solve_dioph_eq: a conflict resets the period and stops Gomory cuts, and nothing found doubles
|
|
187
|
-
// the period and starts Gomory cuts after enough failures in a row. Z3 also sets the GCD test's
|
|
188
|
-
// flag, which it does not read while the Diophantine solver is on.
|
|
189
167
|
private solveDiophantineEquations(): LiaMove {
|
|
190
168
|
const settings = this.solver.settings;
|
|
191
169
|
if (this.dio.check() === "conflict") {
|
|
@@ -202,8 +180,6 @@ export class IntSolver {
|
|
|
202
180
|
return { kind: "undef" };
|
|
203
181
|
}
|
|
204
182
|
|
|
205
|
-
// GCD test.
|
|
206
|
-
|
|
207
183
|
private gcdTest(): LiaMove {
|
|
208
184
|
const solver = this.solver;
|
|
209
185
|
solver.settings.stats.gcdCalls++;
|
|
@@ -212,8 +188,6 @@ export class IntSolver {
|
|
|
212
188
|
return { kind: "conflict" };
|
|
213
189
|
}
|
|
214
190
|
|
|
215
|
-
// gcd_test: the rows of fractional basic columns, then the other rows of the columns whose
|
|
216
|
-
// parity a row fixed.
|
|
217
191
|
private isGcdTestFeasible() {
|
|
218
192
|
const solver = this.solver;
|
|
219
193
|
this.parities.clear();
|
|
@@ -294,8 +268,6 @@ export class IntSolver {
|
|
|
294
268
|
return this.accumulateParity(row, leastCoeffColumn, lcm, consts, leastCoeff);
|
|
295
269
|
}
|
|
296
270
|
|
|
297
|
-
// accumulate_parity: the row fixes the residue of its unique least column modulo the gcd of the
|
|
298
|
-
// others, and two rows that fix different residues for the same modulus conflict.
|
|
299
271
|
private accumulateParity(
|
|
300
272
|
row: RowCell[],
|
|
301
273
|
leastColumn: number,
|
|
@@ -379,8 +351,6 @@ export class IntSolver {
|
|
|
379
351
|
if (this.solver.isFixed(cell.column)) this.addBoundWitnesses(cell.column);
|
|
380
352
|
}
|
|
381
353
|
|
|
382
|
-
// Patching.
|
|
383
|
-
|
|
384
354
|
private patchBasicColumns() {
|
|
385
355
|
const solver = this.solver;
|
|
386
356
|
solver.settings.stats.patches++;
|
|
@@ -433,8 +403,6 @@ export class IntSolver {
|
|
|
433
403
|
return true;
|
|
434
404
|
}
|
|
435
405
|
|
|
436
|
-
// Branching.
|
|
437
|
-
|
|
438
406
|
private branch(): LiaMove {
|
|
439
407
|
const solver = this.solver;
|
|
440
408
|
solver.moveNonBasicColumnsToBounds();
|