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,10 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/dioph_eq.cpp, src/math/lp/var_register.h), MIT license, see
|
|
2
|
-
// z3-license.txt. The Diophantine solver of Griggio's "A Practical Approach to Satisfiability
|
|
3
|
-
// Modulo Linear Integer Arithmetic": every integer term t with column j gives the equation
|
|
4
|
-
// t - j = 0 over the columns that are not fixed. The equations are normalized by the gcd of their
|
|
5
|
-
// coefficients, which finds a conflict when the gcd does not divide the constant, and solved for a
|
|
6
|
-
// column with a unit coefficient, or rewritten with a fresh column until one appears. The bounds of
|
|
7
|
-
// the term columns are then tightened modulo the gcd of their terms after the substitutions.
|
|
8
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
9
2
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
10
3
|
import { IndexedUintSet, UnorderedUintMap } from "./containers";
|
|
@@ -12,6 +5,7 @@ import { KIND_GE, KIND_LE } from "./constraints";
|
|
|
12
5
|
import { LP_CANCELLED, LP_FEASIBLE, LP_OPTIMAL } from "./core-solver";
|
|
13
6
|
import { type Dependency, mkJoin } from "./dependency";
|
|
14
7
|
import { Explanation } from "./explanation";
|
|
8
|
+
import { getRemainder } from "./hnf";
|
|
15
9
|
import type { IntSolver } from "./int-solver";
|
|
16
10
|
import type { LarSolver } from "./lar-solver";
|
|
17
11
|
import { LarTerm } from "./lar-term";
|
|
@@ -32,10 +26,8 @@ interface FreshDefinition {
|
|
|
32
26
|
}
|
|
33
27
|
|
|
34
28
|
const NO_VAR = -1;
|
|
35
|
-
// m_tighten_size_max: a longer term likely has gcd one.
|
|
36
29
|
const TIGHTEN_SIZE_MAX = 10;
|
|
37
30
|
|
|
38
|
-
// join of lia_move, for the moves the Diophantine solver makes.
|
|
39
31
|
const joinMoves = (first: DioMove, second: DioMove): DioMove => {
|
|
40
32
|
if (first === second || second === "undef") return first;
|
|
41
33
|
if (first === "undef") return second;
|
|
@@ -45,7 +37,6 @@ const joinMoves = (first: DioMove, second: DioMove): DioMove => {
|
|
|
45
37
|
const getTermMonomials = (term: LarTerm): Monomial[] =>
|
|
46
38
|
[...term.coeffs].map((entry) => ({ coeff: entry[1], column: entry[0] }));
|
|
47
39
|
|
|
48
|
-
// ext_coeffs: the monomials of the term and then the term column with coefficient -1.
|
|
49
40
|
const getExtendedMonomials = (term: LarTerm) => [
|
|
50
41
|
...getTermMonomials(term),
|
|
51
42
|
{ coeff: Rational.minusOne, column: term.column },
|
|
@@ -53,13 +44,9 @@ const getExtendedMonomials = (term: LarTerm) => [
|
|
|
53
44
|
|
|
54
45
|
const isUnit = (value: Rational) => value.equals(Rational.one) || value.equals(Rational.minusOne);
|
|
55
46
|
|
|
56
|
-
// rem and machine_div_rem of integers: truncating, so the remainder has the sign of the dividend.
|
|
57
|
-
const getRemainder = (left: Rational, right: Rational) => Rational.of(left.num % right.num);
|
|
58
|
-
|
|
59
47
|
const getTruncatedQuotient = (left: Rational, right: Rational) => Rational.of(left.num / right.num);
|
|
60
48
|
|
|
61
|
-
|
|
62
|
-
const getBitsize = (value: Rational) => {
|
|
49
|
+
const getRationalBitsize = (value: Rational) => {
|
|
63
50
|
const getIntBitsize = (part: bigint) =>
|
|
64
51
|
part === 0n ? 1 : (part < 0n ? -part : part).toString(2).length;
|
|
65
52
|
return value.isInt()
|
|
@@ -67,7 +54,6 @@ const getBitsize = (value: Rational) => {
|
|
|
67
54
|
: getIntBitsize(value.num) + getIntBitsize(value.den);
|
|
68
55
|
};
|
|
69
56
|
|
|
70
|
-
// gcd_of_coeffs: one as soon as a unit coefficient shows up when asked to look for one.
|
|
71
57
|
const getGcdOfCoeffs = (monomials: Iterable<{ coeff: Rational }>, isCheckingForOne: boolean) => {
|
|
72
58
|
if (isCheckingForOne)
|
|
73
59
|
for (const monomial of monomials) if (isUnit(monomial.coeff)) return Rational.one;
|
|
@@ -79,8 +65,6 @@ const getGcdOfCoeffs = (monomials: Iterable<{ coeff: Rational }>, isCheckingForO
|
|
|
79
65
|
return gcd;
|
|
80
66
|
};
|
|
81
67
|
|
|
82
|
-
// term_with_index: the monomials in a vector with the position of every column, and a removal
|
|
83
|
-
// that moves the last monomial into the gap.
|
|
84
68
|
class TermWithIndex {
|
|
85
69
|
readonly data: Monomial[] = [];
|
|
86
70
|
private positions: number[] = [];
|
|
@@ -127,7 +111,6 @@ class TermWithIndex {
|
|
|
127
111
|
}
|
|
128
112
|
}
|
|
129
113
|
|
|
130
|
-
// protected_queue: a queue of distinct columns that can also lose a column in the middle.
|
|
131
114
|
class ProtectedQueue {
|
|
132
115
|
readonly items: number[] = [];
|
|
133
116
|
private members = new Set<number>();
|
|
@@ -159,8 +142,6 @@ class ProtectedQueue {
|
|
|
159
142
|
}
|
|
160
143
|
}
|
|
161
144
|
|
|
162
|
-
// var_register: the local columns of the equations, and the lar_solver column of each, or none
|
|
163
|
-
// for a fresh column.
|
|
164
145
|
class VarRegister {
|
|
165
146
|
private localToExternal: number[] = [];
|
|
166
147
|
private externalToLocal = new Map<number, number>();
|
|
@@ -182,7 +163,6 @@ class VarRegister {
|
|
|
182
163
|
return this.externalToLocal.has(external);
|
|
183
164
|
}
|
|
184
165
|
|
|
185
|
-
// external_to_local, which Z3 asserts finds the column.
|
|
186
166
|
getLocal(external: number) {
|
|
187
167
|
const local = this.externalToLocal.get(external);
|
|
188
168
|
if (local === undefined)
|
|
@@ -202,8 +182,6 @@ class VarRegister {
|
|
|
202
182
|
}
|
|
203
183
|
}
|
|
204
184
|
|
|
205
|
-
// m_fresh_k2xt_terms: the definition of a substituted column k by a fresh column xt, reachable
|
|
206
|
-
// from both. The map from k to xt is an unordered_map whose order Z3 iterates.
|
|
207
185
|
class FreshDefinitions {
|
|
208
186
|
readonly keyToFresh = new UnorderedUintMap<number>();
|
|
209
187
|
private freshToKey = new Map<number, number>();
|
|
@@ -248,22 +226,16 @@ class FreshDefinitions {
|
|
|
248
226
|
}
|
|
249
227
|
|
|
250
228
|
export class DiophantineSolver {
|
|
251
|
-
// m_some_terms_are_ignored: a term was not integral or had a big number, so the GCD test and
|
|
252
|
-
// Gomory cuts run.
|
|
253
229
|
hasIgnoredTerms = false;
|
|
254
230
|
private readonly solver: LarSolver;
|
|
255
231
|
private sumOfFixed: Rational[] = [];
|
|
256
232
|
private varRegister = new VarRegister();
|
|
257
|
-
// m_e_matrix: the equations over local columns. m_l_matrix: each as a combination of the term
|
|
258
|
-
// definitions, which explains it.
|
|
259
233
|
private eMatrix = new StaticMatrix();
|
|
260
234
|
private lMatrix = new StaticMatrix();
|
|
261
235
|
private infeasExplanation = new Explanation();
|
|
262
|
-
// m_c, the constant of m_espace.
|
|
263
236
|
private constant = Rational.zero;
|
|
264
237
|
private lspace = new TermWithIndex();
|
|
265
238
|
private espace = new TermWithIndex();
|
|
266
|
-
// m_k2s: the column each equation of S is solved for, and back.
|
|
267
239
|
private keyToRow = new Map<number, number>();
|
|
268
240
|
private rowToKey = new Map<number, number>();
|
|
269
241
|
private freshDefinitions = new FreshDefinitions();
|
|
@@ -287,8 +259,7 @@ export class DiophantineSolver {
|
|
|
287
259
|
}
|
|
288
260
|
|
|
289
261
|
check() {
|
|
290
|
-
|
|
291
|
-
settings.stats.dioCalls++;
|
|
262
|
+
this.solver.settings.stats.dioCalls++;
|
|
292
263
|
const fVector: number[] = [];
|
|
293
264
|
let move: DioMove;
|
|
294
265
|
do {
|
|
@@ -304,15 +275,11 @@ export class DiophantineSolver {
|
|
|
304
275
|
for (const constraint of this.infeasExplanation) explanation.push(constraint);
|
|
305
276
|
return;
|
|
306
277
|
}
|
|
307
|
-
|
|
308
|
-
this.
|
|
309
|
-
this.conflictGcd,
|
|
278
|
+
explanation.pushDependency(
|
|
279
|
+
this.explainFixedInMetaTerm(this.lMatrix.rows[this.conflictRow], this.conflictGcd),
|
|
310
280
|
);
|
|
311
|
-
explanation.pushDependency(dep);
|
|
312
281
|
}
|
|
313
282
|
|
|
314
|
-
// Callbacks of lar_solver.
|
|
315
|
-
|
|
316
283
|
private addTermCallback(term: LarTerm) {
|
|
317
284
|
if (!this.solver.isInt(term.column)) {
|
|
318
285
|
this.hasIgnoredTerms = true;
|
|
@@ -361,8 +328,6 @@ export class DiophantineSolver {
|
|
|
361
328
|
}
|
|
362
329
|
}
|
|
363
330
|
|
|
364
|
-
// elimination_work_estimate: the words that eliminating the column of the retired term from
|
|
365
|
-
// m_l_matrix touches.
|
|
366
331
|
private getEliminationWorkEstimate() {
|
|
367
332
|
const lMatrix = this.lMatrix;
|
|
368
333
|
if (lMatrix.getColumnCount() === 0 || lMatrix.getRowCount() === 0) return 0;
|
|
@@ -370,12 +335,10 @@ export class DiophantineSolver {
|
|
|
370
335
|
if (columnSize <= 1) return 0;
|
|
371
336
|
let words = 0;
|
|
372
337
|
for (const cell of lMatrix.rows[lMatrix.getRowCount() - 1])
|
|
373
|
-
words += 1 + Math.floor(
|
|
338
|
+
words += 1 + Math.floor(getRationalBitsize(cell.coeff) / 32);
|
|
374
339
|
return (columnSize - 1) * words;
|
|
375
340
|
}
|
|
376
341
|
|
|
377
|
-
// reset_state: drops what was derived, and puts the active terms back to be added again in the
|
|
378
|
-
// order of their columns.
|
|
379
342
|
private resetState() {
|
|
380
343
|
for (const term of this.activeTerms) {
|
|
381
344
|
this.deregisterColumnsOfTerm(term);
|
|
@@ -404,7 +367,6 @@ export class DiophantineSolver {
|
|
|
404
367
|
this.solver.settings.stats.dioStateResets++;
|
|
405
368
|
}
|
|
406
369
|
|
|
407
|
-
// shrink_matrices: removes the equation of the retired term, the last one.
|
|
408
370
|
private shrinkMatrices() {
|
|
409
371
|
const lastRow = this.lMatrix.getRowCount() - 1;
|
|
410
372
|
this.eliminateLastTermColumn();
|
|
@@ -422,8 +384,6 @@ export class DiophantineSolver {
|
|
|
422
384
|
this.sumOfFixed.pop();
|
|
423
385
|
}
|
|
424
386
|
|
|
425
|
-
// eliminate_last_term_column: pivots the last column of m_l_matrix into its last row, and marks
|
|
426
|
-
// the rows that change, whose equations are recalculated later.
|
|
427
387
|
private eliminateLastTermColumn() {
|
|
428
388
|
const lMatrix = this.lMatrix;
|
|
429
389
|
const termColumn = lMatrix.getColumnCount() - 1;
|
|
@@ -443,8 +403,6 @@ export class DiophantineSolver {
|
|
|
443
403
|
}
|
|
444
404
|
}
|
|
445
405
|
|
|
446
|
-
// Filling the equations.
|
|
447
|
-
|
|
448
406
|
private init(fVector: number[]) {
|
|
449
407
|
this.infeasExplanation.clear();
|
|
450
408
|
this.lia.term.clear();
|
|
@@ -468,7 +426,6 @@ export class DiophantineSolver {
|
|
|
468
426
|
}
|
|
469
427
|
}
|
|
470
428
|
|
|
471
|
-
// fill_entry: the equation t - j = 0 with the fixed columns in the constant, explained by j.
|
|
472
429
|
private fillEntry(term: LarTerm) {
|
|
473
430
|
const solver = this.solver;
|
|
474
431
|
const row = this.eMatrix.getRowCount();
|
|
@@ -490,7 +447,6 @@ export class DiophantineSolver {
|
|
|
490
447
|
this.subsEntry(row);
|
|
491
448
|
}
|
|
492
449
|
|
|
493
|
-
// subs_entry: substitutes the solved and the freshly defined columns in the equation.
|
|
494
450
|
private subsEntry(row: number) {
|
|
495
451
|
if (row >= this.eMatrix.getRowCount()) return;
|
|
496
452
|
const queue = this.queue;
|
|
@@ -515,14 +471,12 @@ export class DiophantineSolver {
|
|
|
515
471
|
}
|
|
516
472
|
}
|
|
517
473
|
|
|
518
|
-
// add_two_entries: adds an equation times coeff to another.
|
|
519
474
|
private addTwoEntries(coeff: Rational, from: number, to: number) {
|
|
520
475
|
this.eMatrix.addRows(coeff, from, to);
|
|
521
476
|
this.lMatrix.addRows(coeff, from, to);
|
|
522
477
|
this.sumOfFixed[to] = this.sumOfFixed[to].add(coeff.mul(this.sumOfFixed[from]));
|
|
523
478
|
}
|
|
524
479
|
|
|
525
|
-
// recalculate_entry: the equation again from its explanation, scaled to integers.
|
|
526
480
|
private recalculateEntry(row: number) {
|
|
527
481
|
let fixedSum = this.openLTermToEspace(row);
|
|
528
482
|
const eRow = this.eMatrix.rows[row];
|
|
@@ -544,8 +498,6 @@ export class DiophantineSolver {
|
|
|
544
498
|
if (this.rowToKey.has(row)) this.removeFromS(row);
|
|
545
499
|
}
|
|
546
500
|
|
|
547
|
-
// open_l_term_to_espace: the combination of term definitions of the row, over lar_solver
|
|
548
|
-
// columns, with the fixed ones in the returned constant.
|
|
549
501
|
private openLTermToEspace(row: number) {
|
|
550
502
|
const solver = this.solver;
|
|
551
503
|
this.espace.clear();
|
|
@@ -560,8 +512,6 @@ export class DiophantineSolver {
|
|
|
560
512
|
return constant;
|
|
561
513
|
}
|
|
562
514
|
|
|
563
|
-
// process_m_changed_f_columns: recalculates the equations that the columns that became fixed or
|
|
564
|
-
// stopped being fixed, and the changed terms, touch.
|
|
565
515
|
private processChangedFixedColumns(fVector: number[]) {
|
|
566
516
|
for (const column of this.changedFixedColumns.elems.slice()) {
|
|
567
517
|
const terms = this.columnsToTerms.get(column);
|
|
@@ -610,7 +560,6 @@ export class DiophantineSolver {
|
|
|
610
560
|
this.changedTerms.clear();
|
|
611
561
|
}
|
|
612
562
|
|
|
613
|
-
// is_big_term_or_no_term: also marks the terms ignored for their big numbers.
|
|
614
563
|
private isBigTermOrNoTerm(column: number) {
|
|
615
564
|
const solver = this.solver;
|
|
616
565
|
if (column >= solver.getColumnCount() || !solver.hasTerm(column)) return true;
|
|
@@ -624,9 +573,6 @@ export class DiophantineSolver {
|
|
|
624
573
|
return false;
|
|
625
574
|
}
|
|
626
575
|
|
|
627
|
-
// Fresh definitions.
|
|
628
|
-
|
|
629
|
-
// collect_dependent_fresh_vars: the fresh columns whose definitions use a removed one.
|
|
630
576
|
private collectDependentFreshVars(removed: number, toRemove: number[]) {
|
|
631
577
|
const newlyFound: number[] = [];
|
|
632
578
|
for (const entry of this.freshDefinitions.keyToFresh) {
|
|
@@ -640,8 +586,6 @@ export class DiophantineSolver {
|
|
|
640
586
|
for (const fresh of newlyFound) this.collectDependentFreshVars(fresh, toRemove);
|
|
641
587
|
}
|
|
642
588
|
|
|
643
|
-
// deep_remove_fresh_var: removes the fresh column and those that depend on it, and marks the
|
|
644
|
-
// rows that use them.
|
|
645
589
|
private deepRemoveFreshVar(removed: number) {
|
|
646
590
|
if (!this.freshDefinitions.hasFresh(removed)) return;
|
|
647
591
|
const toRemove = [removed];
|
|
@@ -680,8 +624,6 @@ export class DiophantineSolver {
|
|
|
680
624
|
for (const row of rows) this.removeIrrelevantFreshDefsForRow(row);
|
|
681
625
|
}
|
|
682
626
|
|
|
683
|
-
// fresh_var_step: step 7 of the paper. With the smallest coefficient a of k in row h, the fresh
|
|
684
|
-
// column xt = k + sum (a_i div a) x_i replaces k in the equations of F.
|
|
685
627
|
private freshVarStep(row: number, key: number, ahk: Rational) {
|
|
686
628
|
const fresh = this.varRegister.addVar(NO_VAR);
|
|
687
629
|
while (fresh >= this.eMatrix.getColumnCount()) this.eMatrix.addColumn();
|
|
@@ -693,8 +635,7 @@ export class DiophantineSolver {
|
|
|
693
635
|
const quotient = getTruncatedQuotient(cell.coeff, ahk);
|
|
694
636
|
if (!quotient.isZero()) freshTerm.addMonomial(quotient, cell.column);
|
|
695
637
|
}
|
|
696
|
-
//
|
|
697
|
-
// it, so the stored term is reinserted twice in iteration order.
|
|
638
|
+
// Z3 copies the term twice (std::make_pair, then bij_map), reinserting it in iteration order.
|
|
698
639
|
const stored = new LarTerm(new LarTerm(freshTerm.coeffs).coeffs);
|
|
699
640
|
this.freshDefinitions.add(key, fresh, { term: stored, row });
|
|
700
641
|
const defs = this.rowToFreshDefs.get(row);
|
|
@@ -708,8 +649,6 @@ export class DiophantineSolver {
|
|
|
708
649
|
}
|
|
709
650
|
}
|
|
710
651
|
|
|
711
|
-
// Solving F.
|
|
712
|
-
|
|
713
652
|
private processFAndTightenTerms(fVector: number[]): DioMove {
|
|
714
653
|
const move = this.processF(fVector);
|
|
715
654
|
if (move !== "undef") return move;
|
|
@@ -735,8 +674,6 @@ export class DiophantineSolver {
|
|
|
735
674
|
this.solver.settings.stats.dioRewriteConflicts++;
|
|
736
675
|
}
|
|
737
676
|
|
|
738
|
-
// rewrite_eqs: steps 6 and 7 of the paper on the equation of F with the smallest coefficient,
|
|
739
|
-
// and of those the one whose substitution fills the fewest cells.
|
|
740
677
|
private rewriteEqs(fVector: number[]): DioMove {
|
|
741
678
|
if (fVector.length === 0) return "undef";
|
|
742
679
|
let chosenRow = NO_VAR;
|
|
@@ -792,8 +729,6 @@ export class DiophantineSolver {
|
|
|
792
729
|
return "continue";
|
|
793
730
|
}
|
|
794
731
|
|
|
795
|
-
// find_minimal_abs_coeff: the first column with the smallest coefficient, its sign, and the
|
|
796
|
-
// Markowitz number of the pivot.
|
|
797
732
|
private findMinimalAbsCoeff(row: number) {
|
|
798
733
|
let ahk = Rational.zero;
|
|
799
734
|
let column = NO_VAR;
|
|
@@ -811,8 +746,6 @@ export class DiophantineSolver {
|
|
|
811
746
|
return { ahk, column, sign, markovich };
|
|
812
747
|
}
|
|
813
748
|
|
|
814
|
-
// normalize_e_by_gcd: the gcd of the coefficients after dividing the equation by it, or
|
|
815
|
-
// undefined on the conflict of a gcd that does not divide the constant.
|
|
816
749
|
private normalizeEByGcd(row: number) {
|
|
817
750
|
const gcd = getGcdOfCoeffs(this.eMatrix.rows[row], true);
|
|
818
751
|
if (gcd.isZero() || gcd.equals(Rational.one)) return gcd;
|
|
@@ -827,7 +760,6 @@ export class DiophantineSolver {
|
|
|
827
760
|
return gcd;
|
|
828
761
|
}
|
|
829
762
|
|
|
830
|
-
// eliminate_var_in_f: substitutes the column solved by the row in the other equations of F.
|
|
831
763
|
private eliminateVarInF(row: number, key: number, sign: number) {
|
|
832
764
|
const constant = this.sumOfFixed[row];
|
|
833
765
|
const column = this.eMatrix.columns[key];
|
|
@@ -856,10 +788,6 @@ export class DiophantineSolver {
|
|
|
856
788
|
return this.keyToRow.has(column) || this.freshDefinitions.hasKey(column);
|
|
857
789
|
}
|
|
858
790
|
|
|
859
|
-
private isFresh(column: number) {
|
|
860
|
-
return this.freshDefinitions.hasFresh(column);
|
|
861
|
-
}
|
|
862
|
-
|
|
863
791
|
private getCoeffInERow(row: number, column: number) {
|
|
864
792
|
return this.eMatrix.rows[row].find((cell) => cell.column === column)?.coeff ?? Rational.zero;
|
|
865
793
|
}
|
|
@@ -868,13 +796,6 @@ export class DiophantineSolver {
|
|
|
868
796
|
return this.getCoeffInERow(row, column).isPositive() ? 1 : -1;
|
|
869
797
|
}
|
|
870
798
|
|
|
871
|
-
private getRowMonomials(matrix: StaticMatrix, row: number): Monomial[] {
|
|
872
|
-
return matrix.rows[row].map((cell) => ({ coeff: cell.coeff, column: cell.column }));
|
|
873
|
-
}
|
|
874
|
-
|
|
875
|
-
// Tightening the bounds of term columns.
|
|
876
|
-
|
|
877
|
-
// tighten_terms_with_S: the terms whose bounds changed, the most shared first.
|
|
878
799
|
private tightenTermsWithS(): DioMove {
|
|
879
800
|
const solver = this.solver;
|
|
880
801
|
const sortedTerms: number[] = [];
|
|
@@ -925,8 +846,6 @@ export class DiophantineSolver {
|
|
|
925
846
|
return this.tightenOnEspace(column);
|
|
926
847
|
}
|
|
927
848
|
|
|
928
|
-
// init_substitutions: m_espace is the term over local columns with its fixed part in m_c, and
|
|
929
|
-
// m_lspace explains it. False on a big number.
|
|
930
849
|
private initSubstitutions(term: LarTerm, queue: ProtectedQueue) {
|
|
931
850
|
const solver = this.solver;
|
|
932
851
|
const isIgnoringBigNums = solver.settings.isDioIgnoringBigNums;
|
|
@@ -970,8 +889,6 @@ export class DiophantineSolver {
|
|
|
970
889
|
return joinMoves(move, tightened);
|
|
971
890
|
}
|
|
972
891
|
|
|
973
|
-
// find_var_to_substitute_on_espace: the queued column whose substitution adds the fewest new
|
|
974
|
-
// columns, drawn at random among ties, and the queued columns no longer in m_espace dropped.
|
|
975
892
|
private findVarToSubstituteOnEspace(queue: ProtectedQueue) {
|
|
976
893
|
const espace = this.espace;
|
|
977
894
|
let best = NO_VAR;
|
|
@@ -1006,7 +923,6 @@ export class DiophantineSolver {
|
|
|
1006
923
|
return best;
|
|
1007
924
|
}
|
|
1008
925
|
|
|
1009
|
-
// subs_qfront_by_fresh: replaces k by its fresh definition, which leaves m_lspace as it is.
|
|
1010
926
|
private subsByFresh(key: number, queue: ProtectedQueue, column: number) {
|
|
1011
927
|
const term = this.freshDefinitions.getByKey(key).term;
|
|
1012
928
|
const coeff = this.espace.get(key).neg();
|
|
@@ -1019,8 +935,6 @@ export class DiophantineSolver {
|
|
|
1019
935
|
return this.tightenOnEspace(column);
|
|
1020
936
|
}
|
|
1021
937
|
|
|
1022
|
-
// subs_qfront_by_S: replaces k by the equation solved for it, and adds that equation's
|
|
1023
|
-
// explanation to m_lspace.
|
|
1024
938
|
private subsByS(key: number, queue: ProtectedQueue, column: number) {
|
|
1025
939
|
const row = this.keyToRow.get(key) ?? NO_VAR;
|
|
1026
940
|
const constant = this.sumOfFixed[row];
|
|
@@ -1043,7 +957,7 @@ export class DiophantineSolver {
|
|
|
1043
957
|
const fixed: number[] = [];
|
|
1044
958
|
for (const monomial of this.espace.data)
|
|
1045
959
|
if (
|
|
1046
|
-
!this.
|
|
960
|
+
!this.freshDefinitions.hasFresh(monomial.column) &&
|
|
1047
961
|
solver.isFixed(this.varRegister.getExternal(monomial.column))
|
|
1048
962
|
)
|
|
1049
963
|
fixed.push(monomial.column);
|
|
@@ -1054,8 +968,6 @@ export class DiophantineSolver {
|
|
|
1054
968
|
}
|
|
1055
969
|
}
|
|
1056
970
|
|
|
1057
|
-
// tighten_on_espace: with g the gcd of m_espace, the bounds of the term column move to the
|
|
1058
|
-
// nearest values congruent to m_c modulo g, and a constant m_espace is checked against them.
|
|
1059
971
|
private tightenOnEspace(column: number): DioMove {
|
|
1060
972
|
const gcd = getGcdOfCoeffs(this.espace.data, true);
|
|
1061
973
|
if (gcd.equals(Rational.one)) return "undef";
|
|
@@ -1091,7 +1003,6 @@ export class DiophantineSolver {
|
|
|
1091
1003
|
this.infeasExplanation.pushDependency(dep);
|
|
1092
1004
|
}
|
|
1093
1005
|
|
|
1094
|
-
// tighten_bounds_for_non_trivial_gcd: whether tightening the bound found a conflict.
|
|
1095
1006
|
private tightenBoundsForNonTrivialGcd(gcd: Rational, column: number, isUpper: boolean) {
|
|
1096
1007
|
const bound = this.solver.getBound(column, isUpper);
|
|
1097
1008
|
if (bound === undefined) return false;
|
|
@@ -1102,8 +1013,6 @@ export class DiophantineSolver {
|
|
|
1102
1013
|
);
|
|
1103
1014
|
}
|
|
1104
1015
|
|
|
1105
|
-
// tighten_bound_kind: t = g*t' + m_c <= rs gives t <= rs - (rs - m_c) mod g, and a lower bound
|
|
1106
|
-
// likewise. The fixed columns whose coefficients g divides do not explain the new bound.
|
|
1107
1016
|
private tightenBoundKind(
|
|
1108
1017
|
gcd: Rational,
|
|
1109
1018
|
column: number,
|
|
@@ -1128,7 +1037,6 @@ export class DiophantineSolver {
|
|
|
1128
1037
|
return true;
|
|
1129
1038
|
}
|
|
1130
1039
|
|
|
1131
|
-
// open_fixed_from_ml: the fixed columns of a combination of term definitions.
|
|
1132
1040
|
private openFixedFromMl(monomials: Iterable<Monomial>) {
|
|
1133
1041
|
const solver = this.solver;
|
|
1134
1042
|
const result = new TermWithIndex();
|
|
@@ -1143,8 +1051,6 @@ export class DiophantineSolver {
|
|
|
1143
1051
|
return this.explainFixed(this.openFixedFromMl(monomials).data, gcd);
|
|
1144
1052
|
}
|
|
1145
1053
|
|
|
1146
|
-
// explain_fixed: the bounds of the fixed columns, but those whose coefficients a nonzero gcd
|
|
1147
|
-
// divides.
|
|
1148
1054
|
private explainFixed(monomials: Iterable<Monomial>, gcd: Rational) {
|
|
1149
1055
|
let dep: Dependency = null;
|
|
1150
1056
|
for (const monomial of monomials) {
|
|
@@ -1167,7 +1073,6 @@ const popEmptyColumns = (matrix: StaticMatrix) => {
|
|
|
1167
1073
|
matrix.popColumn();
|
|
1168
1074
|
};
|
|
1169
1075
|
|
|
1170
|
-
// Swaps the cell of the pivot row to the head of the column, as the pivots of Z3 do.
|
|
1171
1076
|
const moveCellToFront = (
|
|
1172
1077
|
matrix: StaticMatrix,
|
|
1173
1078
|
column: { row: number; offset: number }[],
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/explanation.h), MIT license, see z3-license.txt. The constraints
|
|
2
|
-
// behind a conflict or a propagation: weighted pairs, or a set of constraint indices whose
|
|
3
|
-
// iteration order is the slot order of Z3's hashtable.
|
|
4
1
|
import { getIdentityHash, ObjMap } from "../hashtable";
|
|
5
2
|
import { Rational } from "../rational";
|
|
6
3
|
import { type Dependency, linearize } from "./dependency";
|
|
@@ -22,7 +19,6 @@ export class Explanation {
|
|
|
22
19
|
this.indices.set(constraint, true);
|
|
23
20
|
}
|
|
24
21
|
|
|
25
|
-
// push_explanation: the constraints behind a dependency.
|
|
26
22
|
pushDependency(dep: Dependency) {
|
|
27
23
|
for (const constraint of linearize([dep])) this.push(constraint);
|
|
28
24
|
}
|
|
@@ -31,14 +27,12 @@ export class Explanation {
|
|
|
31
27
|
return this.pairs.length === 0 && this.indices.size === 0;
|
|
32
28
|
}
|
|
33
29
|
|
|
34
|
-
// add_expl: the pairs of the other explanation, or its indices when it has no pairs.
|
|
35
30
|
addExplanation(other: Explanation) {
|
|
36
31
|
if (other.pairs.length === 0)
|
|
37
32
|
for (const constraint of other.indices.keys()) this.push(constraint);
|
|
38
33
|
else for (const pair of other.pairs) this.addPair(pair[0], pair[1]);
|
|
39
34
|
}
|
|
40
35
|
|
|
41
|
-
// The constraints, from the pairs when there are any and from the indices otherwise.
|
|
42
36
|
*[Symbol.iterator](): IterableIterator<number> {
|
|
43
37
|
if (this.pairs.length > 0) for (const pair of this.pairs) yield pair[0];
|
|
44
38
|
else yield* this.indices.keys();
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/gomory.cpp), MIT license, see z3-license.txt. Gomory cuts: from the
|
|
2
|
-
// row of a fractional basic column whose non-basic columns sit at bounds, the inequality that every
|
|
3
|
-
// integer solution meets and the current solution violates.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import { KIND_GE, KIND_LE } from "./constraints";
|
|
6
3
|
import { LP_CANCELLED } from "./core-solver";
|
|
@@ -16,7 +13,7 @@ const POLARITY_MIXED = 3;
|
|
|
16
13
|
|
|
17
14
|
const HALF = Rational.of(1n, 2n);
|
|
18
15
|
|
|
19
|
-
const getFractionalPart = (value: Rational) => value.sub(value.floor());
|
|
16
|
+
export const getFractionalPart = (value: Rational) => value.sub(value.floor());
|
|
20
17
|
|
|
21
18
|
interface Cut {
|
|
22
19
|
coeffs: [number, Rational][];
|
|
@@ -24,7 +21,6 @@ interface Cut {
|
|
|
24
21
|
dep: Dependency;
|
|
25
22
|
}
|
|
26
23
|
|
|
27
|
-
// create_cut: the cut of one row, in the term and the offset of the integer solver.
|
|
28
24
|
class CutBuilder {
|
|
29
25
|
polarity = POLARITY_UNDEF;
|
|
30
26
|
offset = Rational.one;
|
|
@@ -62,8 +58,7 @@ class CutBuilder {
|
|
|
62
58
|
if (Rational.of(newA.num).compare(this.bigNumber) > 0) this.isBigFound = true;
|
|
63
59
|
}
|
|
64
60
|
|
|
65
|
-
|
|
66
|
-
private addIntCase(column: number, fj: Rational) {
|
|
61
|
+
private intCaseInGomoryCut(column: number, fj: Rational) {
|
|
67
62
|
const solver = this.lia.solver;
|
|
68
63
|
const oneMinusFj = Rational.one.sub(fj);
|
|
69
64
|
if (this.lia.atLower(column)) {
|
|
@@ -80,8 +75,7 @@ class CutBuilder {
|
|
|
80
75
|
this.addMonomial(newA, column);
|
|
81
76
|
}
|
|
82
77
|
|
|
83
|
-
|
|
84
|
-
private addRealCase(a: Rational, column: number) {
|
|
78
|
+
private realCaseInGomoryCut(a: Rational, column: number) {
|
|
85
79
|
const solver = this.lia.solver;
|
|
86
80
|
const isLower = this.lia.atLower(column);
|
|
87
81
|
const isGrowing = a.isPositive() === isLower;
|
|
@@ -114,9 +108,10 @@ class CutBuilder {
|
|
|
114
108
|
this.lia.explanation.pushDependency(solver.getUpperWitness(column));
|
|
115
109
|
continue;
|
|
116
110
|
}
|
|
117
|
-
if (!solver.isInt(column)) this.
|
|
111
|
+
if (!solver.isInt(column)) this.realCaseInGomoryCut(cell.coeff.neg(), column);
|
|
118
112
|
else {
|
|
119
|
-
if (!cell.coeff.isInt())
|
|
113
|
+
if (!cell.coeff.isInt())
|
|
114
|
+
this.intCaseInGomoryCut(column, getFractionalPart(cell.coeff.neg()));
|
|
120
115
|
if (this.polarity !== POLARITY_MIXED) this.setPolarityForInt(cell.coeff, column);
|
|
121
116
|
}
|
|
122
117
|
if (this.isBigFound) return "undef";
|
|
@@ -127,15 +122,12 @@ class CutBuilder {
|
|
|
127
122
|
}
|
|
128
123
|
}
|
|
129
124
|
|
|
130
|
-
// get_gomory_score: the distance of the value of the column to the nearest integer.
|
|
131
125
|
const getGomoryScore = (lia: IntSolver, column: number) => {
|
|
132
126
|
const value = lia.solver.getValue(column).x;
|
|
133
127
|
const fraction = getFractionalPart(value);
|
|
134
128
|
return fraction.compare(HALF) <= 0 ? fraction : Rational.one.sub(fraction);
|
|
135
129
|
};
|
|
136
130
|
|
|
137
|
-
// is_gomory_cut_target: every other column of the row is integral with an integral coefficient,
|
|
138
|
-
// or sits at a bound without an infinitesimal.
|
|
139
131
|
const isGomoryCutTarget = (lia: IntSolver, column: number) => {
|
|
140
132
|
const solver = lia.solver;
|
|
141
133
|
for (const cell of solver.getRow(solver.core.heading[column])) {
|
|
@@ -147,9 +139,7 @@ const isGomoryCutTarget = (lia: IntSolver, column: number) => {
|
|
|
147
139
|
return true;
|
|
148
140
|
};
|
|
149
141
|
|
|
150
|
-
|
|
151
|
-
// toward the values closest to integers.
|
|
152
|
-
const selectColumns = (lia: IntSolver, cutCount: number) => {
|
|
142
|
+
const gomorySelectIntInfeasibleVars = (lia: IntSolver, cutCount: number) => {
|
|
153
143
|
const solver = lia.solver;
|
|
154
144
|
const scores = new Map<number, Rational>();
|
|
155
145
|
const sorted: number[] = [];
|
|
@@ -176,8 +166,6 @@ const selectColumns = (lia: IntSolver, cutCount: number) => {
|
|
|
176
166
|
return selected;
|
|
177
167
|
};
|
|
178
168
|
|
|
179
|
-
// add_deps: the bounds of the integer columns with integral coefficients, which the cut leaves
|
|
180
|
-
// out of its explanation.
|
|
181
169
|
const addDeps = (lia: IntSolver, dep: Dependency, row: RowCell[], basic: number) => {
|
|
182
170
|
const solver = lia.solver;
|
|
183
171
|
let result = dep;
|
|
@@ -193,8 +181,6 @@ const addDeps = (lia: IntSolver, dep: Dependency, row: RowCell[], basic: number)
|
|
|
193
181
|
return result;
|
|
194
182
|
};
|
|
195
183
|
|
|
196
|
-
// get_gomory_cuts: cuts for the selected rows. Cuts with big coefficients stay out unless the
|
|
197
|
-
// small ones alone leave the problem feasible.
|
|
198
184
|
export const getGomoryCuts = (lia: IntSolver, cutCount: number): LiaMove => {
|
|
199
185
|
const solver = lia.solver;
|
|
200
186
|
const bigCuts: Cut[] = [];
|
|
@@ -209,7 +195,7 @@ export const getGomoryCuts = (lia: IntSolver, cutCount: number): LiaMove => {
|
|
|
209
195
|
solver.getInfeasibilityExplanation(lia.explanation);
|
|
210
196
|
return false;
|
|
211
197
|
};
|
|
212
|
-
for (const column of
|
|
198
|
+
for (const column of gomorySelectIntInfeasibleVars(lia, cutCount)) {
|
|
213
199
|
const row = solver.getRow(solver.core.heading[column]);
|
|
214
200
|
const builder = new CutBuilder(lia, column, row);
|
|
215
201
|
const result = builder.cut();
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf_cutter.cpp, and get_equality_and_right_side_for_term_on_current_x
|
|
2
|
-
// in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt. Cuts from proofs: the integer
|
|
3
|
-
// terms tight at the current solution form A x = b; with A in Hermite normal form H, a row of
|
|
4
|
-
// H^-1 b that is fractional gives a cut that every integer solution meets.
|
|
5
1
|
import { Rational } from "../rational";
|
|
6
2
|
import type { Dependency } from "./dependency";
|
|
7
3
|
import { GeneralMatrix, getDeterminantOfRectangularMatrix, getHermiteNormalForm } from "./hnf";
|
|
@@ -15,8 +11,6 @@ interface TightTerm {
|
|
|
15
11
|
dep: Dependency;
|
|
16
12
|
}
|
|
17
13
|
|
|
18
|
-
// get_equality_and_right_side_for_term_on_current_x: the non-strict bound of an integer term that
|
|
19
|
-
// its current value meets, without infinitesimals.
|
|
20
14
|
const getTightTerm = (lia: IntSolver, term: LarTerm): TightTerm | undefined => {
|
|
21
15
|
const solver = lia.solver;
|
|
22
16
|
const column = term.column;
|
|
@@ -38,7 +32,6 @@ const getTightTerm = (lia: IntSolver, term: LarTerm): TightTerm | undefined => {
|
|
|
38
32
|
return undefined;
|
|
39
33
|
};
|
|
40
34
|
|
|
41
|
-
// find_cut_row_index: a fractional entry, drawn uniformly by reservoir sampling.
|
|
42
35
|
const findCutRowIndex = (lia: IntSolver, values: Rational[]) => {
|
|
43
36
|
let result = -1;
|
|
44
37
|
let count = 0;
|
|
@@ -52,7 +45,6 @@ const findCutRowIndex = (lia: IntSolver, values: Rational[]) => {
|
|
|
52
45
|
return result;
|
|
53
46
|
};
|
|
54
47
|
|
|
55
|
-
// make_hnf_cut: the cut, in the term and the explanation of the integer solver.
|
|
56
48
|
export const makeHnfCut = (lia: IntSolver): LiaMove => {
|
|
57
49
|
const solver = lia.solver;
|
|
58
50
|
const settings = solver.settings;
|
|
@@ -87,31 +79,32 @@ export const makeHnfCut = (lia: IntSolver): LiaMove => {
|
|
|
87
79
|
});
|
|
88
80
|
const basisRows: number[] = [];
|
|
89
81
|
const bigNumber = absMax.mul(absMax).mul(absMax);
|
|
90
|
-
const
|
|
91
|
-
if (
|
|
82
|
+
const determinant = getDeterminantOfRectangularMatrix(matrix, basisRows, bigNumber);
|
|
83
|
+
if (determinant.compare(bigNumber) >= 0 || settings.isCanceled()) return { kind: "undef" };
|
|
92
84
|
const isFullRank = basisRows.length === tightTerms.length;
|
|
93
85
|
matrix.shrinkToRank(basisRows);
|
|
94
86
|
const deps = isFullRank
|
|
95
87
|
? tightTerms.map((tight) => tight.dep)
|
|
96
88
|
: basisRows.map((row) => tightTerms[row].dep);
|
|
97
|
-
const
|
|
98
|
-
if (
|
|
99
|
-
const
|
|
89
|
+
const hermite = getHermiteNormalForm(matrix, determinant, settings.isCanceled);
|
|
90
|
+
if (hermite === undefined) return { kind: "undef" };
|
|
91
|
+
const rightSides = isFullRank
|
|
100
92
|
? tightTerms.map((tight) => tight.rightSide)
|
|
101
93
|
: basisRows.map((row) => tightTerms[row].rightSide);
|
|
102
|
-
for (let
|
|
103
|
-
for (let
|
|
104
|
-
|
|
94
|
+
for (let row = 0; row < hermite.length; row++) {
|
|
95
|
+
for (let column = 0; column < row; column++)
|
|
96
|
+
rightSides[row] = rightSides[row].sub(hermite[row][column].mul(rightSides[column]));
|
|
97
|
+
rightSides[row] = rightSides[row].div(hermite[row][row]);
|
|
105
98
|
}
|
|
106
|
-
const cutRow = findCutRowIndex(lia,
|
|
99
|
+
const cutRow = findCutRowIndex(lia, rightSides);
|
|
107
100
|
if (cutRow === -1) return { kind: "undef" };
|
|
108
|
-
// get_ei_H_minus_1: the row cutRow of the inverse of H.
|
|
109
101
|
const inverseRow = Array.from({ length: matrix.getColumnCount() }, () => Rational.zero);
|
|
110
|
-
inverseRow[cutRow] = Rational.one.div(
|
|
111
|
-
for (let
|
|
102
|
+
inverseRow[cutRow] = Rational.one.div(hermite[cutRow][cutRow]);
|
|
103
|
+
for (let column = cutRow - 1; column >= 0; column--) {
|
|
112
104
|
let sum = Rational.zero;
|
|
113
|
-
for (let
|
|
114
|
-
|
|
105
|
+
for (let row = column + 1; row <= cutRow; row++)
|
|
106
|
+
sum = sum.add(hermite[row][column].mul(inverseRow[row]));
|
|
107
|
+
inverseRow[column] = sum.neg().div(hermite[column][column]);
|
|
115
108
|
}
|
|
116
109
|
for (let column = 0; column < matrix.getColumnCount(); column++) {
|
|
117
110
|
let coeff = Rational.zero;
|
|
@@ -121,5 +114,5 @@ export const makeHnfCut = (lia: IntSolver): LiaMove => {
|
|
|
121
114
|
}
|
|
122
115
|
lia.explanation.clear();
|
|
123
116
|
for (const dep of deps) lia.explanation.pushDependency(dep);
|
|
124
|
-
return { kind: "cut", offset:
|
|
117
|
+
return { kind: "cut", offset: rightSides[cutRow].floor(), isUpper: true };
|
|
125
118
|
};
|