tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- 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 +599 -754
- 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 +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -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 +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -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 +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- 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 +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- 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 +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -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 +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -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 +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- 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 +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- 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 +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -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/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
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/lp/hnf.h, src/math/lp/general_matrix.h,
|
|
2
2
|
// src/math/lp/permutation_matrix.h, and the extended gcd of src/util/mpz.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
|
-
// determinant of its rows, as the HNF cutter needs it.
|
|
3
|
+
// z3-license.txt.
|
|
5
4
|
import { Rational } from "../rational";
|
|
6
5
|
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
export const getRemainder = (first: Rational, second: Rational) =>
|
|
7
|
+
Rational.of(first.num % second.num);
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
const getExtendedGcd = (first: Rational, second: Rational) => {
|
|
9
|
+
const getMpzExtendedGcd = (first: Rational, second: Rational) => {
|
|
12
10
|
let left = first.num < 0n ? -first.num : first.num;
|
|
13
11
|
let right = second.num < 0n ? -second.num : second.num;
|
|
14
12
|
let a = 1n;
|
|
@@ -33,12 +31,10 @@ const getExtendedGcd = (first: Rational, second: Rational) => {
|
|
|
33
31
|
};
|
|
34
32
|
};
|
|
35
33
|
|
|
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
34
|
const getExtendedGcdMinimalUv = (a: Rational, b: Rational) => {
|
|
39
35
|
if (a.isZero()) return { d: b, u: Rational.zero, v: Rational.one };
|
|
40
36
|
if (b.isZero()) return { d: a, u: Rational.one, v: Rational.zero };
|
|
41
|
-
const result =
|
|
37
|
+
const result = getMpzExtendedGcd(a, b);
|
|
42
38
|
let d = result.gcd;
|
|
43
39
|
let u = result.u;
|
|
44
40
|
let v = result.v;
|
|
@@ -63,7 +59,6 @@ const getExtendedGcdMinimalUv = (a: Rational, b: Rational) => {
|
|
|
63
59
|
return { d, u, v };
|
|
64
60
|
};
|
|
65
61
|
|
|
66
|
-
// permutation_matrix: a permutation and its inverse.
|
|
67
62
|
class Permutation {
|
|
68
63
|
constructor(
|
|
69
64
|
readonly forward: number[],
|
|
@@ -71,7 +66,7 @@ class Permutation {
|
|
|
71
66
|
) {}
|
|
72
67
|
|
|
73
68
|
static identity(length: number) {
|
|
74
|
-
const getIndex = (
|
|
69
|
+
const getIndex = (_value: unknown, index: number) => index;
|
|
75
70
|
return new Permutation(Array.from({ length }, getIndex), Array.from({ length }, getIndex));
|
|
76
71
|
}
|
|
77
72
|
|
|
@@ -99,7 +94,6 @@ class Permutation {
|
|
|
99
94
|
}
|
|
100
95
|
}
|
|
101
96
|
|
|
102
|
-
// general_matrix: dense rows behind a row and a column permutation.
|
|
103
97
|
export class GeneralMatrix {
|
|
104
98
|
private rowPermutation: Permutation;
|
|
105
99
|
private columnPermutation: Permutation;
|
|
@@ -149,15 +143,13 @@ export class GeneralMatrix {
|
|
|
149
143
|
this.columnPermutation.transposeFromLeft(first, second);
|
|
150
144
|
}
|
|
151
145
|
|
|
152
|
-
// shrink_to_rank: only the given data rows, leaving the permutations as they are.
|
|
153
146
|
shrinkToRank(basisRows: number[]) {
|
|
154
147
|
if (basisRows.length === this.getRowCount()) return;
|
|
155
148
|
this.data = basisRows.map((row) => this.data[row]);
|
|
156
149
|
}
|
|
157
150
|
}
|
|
158
151
|
|
|
159
|
-
|
|
160
|
-
const preparePivot = (matrix: GeneralMatrix, r: number) => {
|
|
152
|
+
const preparePivotForLowerTriangle = (matrix: GeneralMatrix, r: number) => {
|
|
161
153
|
for (let row = r; row < matrix.getRowCount(); row++)
|
|
162
154
|
for (let column = r; column < matrix.getColumnCount(); column++) {
|
|
163
155
|
if (matrix.get(row, column).isZero()) continue;
|
|
@@ -168,8 +160,6 @@ const preparePivot = (matrix: GeneralMatrix, r: number) => {
|
|
|
168
160
|
return false;
|
|
169
161
|
};
|
|
170
162
|
|
|
171
|
-
// pivot_column_non_fractional: a fraction-free elimination step under (r, r); false when an entry
|
|
172
|
-
// reaches the big number.
|
|
173
163
|
const pivotColumnNonFractional = (matrix: GeneralMatrix, r: number, bigNumber: Rational) => {
|
|
174
164
|
const pivot = matrix.get(r, r);
|
|
175
165
|
const denominator = r > 0 ? matrix.get(r - 1, r - 1) : undefined;
|
|
@@ -185,9 +175,6 @@ const pivotColumnNonFractional = (matrix: GeneralMatrix, r: number, bigNumber: R
|
|
|
185
175
|
return true;
|
|
186
176
|
};
|
|
187
177
|
|
|
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
178
|
export const getDeterminantOfRectangularMatrix = (
|
|
192
179
|
matrix: GeneralMatrix,
|
|
193
180
|
basisRows: number[],
|
|
@@ -196,7 +183,7 @@ export const getDeterminantOfRectangularMatrix = (
|
|
|
196
183
|
const triangle = matrix.copy();
|
|
197
184
|
let rank = 0;
|
|
198
185
|
for (; rank < triangle.getRowCount(); rank++) {
|
|
199
|
-
if (!
|
|
186
|
+
if (!preparePivotForLowerTriangle(triangle, rank)) break;
|
|
200
187
|
if (!pivotColumnNonFractional(triangle, rank, bigNumber)) return bigNumber;
|
|
201
188
|
}
|
|
202
189
|
if (rank === 0) return Rational.one;
|
|
@@ -210,13 +197,11 @@ export const getDeterminantOfRectangularMatrix = (
|
|
|
210
197
|
}
|
|
211
198
|
for (; column < triangle.getColumnCount(); column++) {
|
|
212
199
|
const value = triangle.get(last, column);
|
|
213
|
-
if (!value.isZero()) gcd =
|
|
200
|
+
if (!value.isZero()) gcd = getMpzExtendedGcd(gcd, value).gcd;
|
|
214
201
|
}
|
|
215
202
|
return gcd;
|
|
216
203
|
};
|
|
217
204
|
|
|
218
|
-
// hnf: W, the Hermite normal form of the rows of the matrix, computed modulo d. Undefined when
|
|
219
|
-
// canceled.
|
|
220
205
|
export const getHermiteNormalForm = (
|
|
221
206
|
matrix: GeneralMatrix,
|
|
222
207
|
d: Rational,
|
|
@@ -230,12 +215,12 @@ export const getHermiteNormalForm = (
|
|
|
230
215
|
let r = d;
|
|
231
216
|
let halfR = r.div(Rational.of(2n)).floor();
|
|
232
217
|
const getModBalanced = (value: Rational) => {
|
|
233
|
-
const rem =
|
|
218
|
+
const rem = getRemainder(value, r);
|
|
234
219
|
if (rem.compare(halfR) > 0) return rem.sub(r);
|
|
235
220
|
return rem.compare(halfR.neg()) < 0 ? rem.add(r) : rem;
|
|
236
221
|
};
|
|
237
222
|
const getMod = (value: Rational) => {
|
|
238
|
-
const rem =
|
|
223
|
+
const rem = getRemainder(value, r);
|
|
239
224
|
return rem.isNegative() ? rem.add(r) : rem;
|
|
240
225
|
};
|
|
241
226
|
for (let i = 0; i < rowCount; i++) {
|
|
@@ -1,9 +1,4 @@
|
|
|
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.
|
|
1
|
+
// Ported from Z3 (src/math/lp/int_cube.cpp, and tighten_term_bounds_by_delta and round_to_integer_solution in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
|
|
7
2
|
import { Rational } from "../rational";
|
|
8
3
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
9
4
|
import { LP_FEASIBLE, LP_OPTIMAL } from "./core-solver";
|
|
@@ -14,9 +9,7 @@ import { Impq } from "./numeric-pair";
|
|
|
14
9
|
|
|
15
10
|
const HALF = Rational.of(1n, 2n);
|
|
16
11
|
|
|
17
|
-
|
|
18
|
-
// otherwise half the sum of the integer coefficients.
|
|
19
|
-
const getCubeDelta = (solver: LarSolver, term: LarTerm) => {
|
|
12
|
+
const getCubeDeltaForTerm = (solver: LarSolver, term: LarTerm) => {
|
|
20
13
|
const entries = [...term.coeffs];
|
|
21
14
|
if (entries.length === 2) {
|
|
22
15
|
let isPlusSeen = false;
|
|
@@ -39,9 +32,7 @@ const getCubeDelta = (solver: LarSolver, term: LarTerm) => {
|
|
|
39
32
|
const addVarBound = (solver: LarSolver, column: number, kind: ConstraintKind, rhs: Rational) =>
|
|
40
33
|
solver.activate(solver.mkVarBound(column, kind, rhs));
|
|
41
34
|
|
|
42
|
-
|
|
43
|
-
// by delta.
|
|
44
|
-
const tightenTermBounds = (solver: LarSolver, column: number, delta: Impq) => {
|
|
35
|
+
const tightenTermBoundsByDelta = (solver: LarSolver, column: number, delta: Impq) => {
|
|
45
36
|
const core = solver.core;
|
|
46
37
|
const hasUpper = core.hasUpperBound(column);
|
|
47
38
|
const hasLower = core.hasLowerBound(column);
|
|
@@ -64,34 +55,32 @@ const tightenTermBounds = (solver: LarSolver, column: number, delta: Impq) => {
|
|
|
64
55
|
return true;
|
|
65
56
|
};
|
|
66
57
|
|
|
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
58
|
const roundToIntegerSolution = (solver: LarSolver) => {
|
|
70
|
-
const
|
|
59
|
+
const values = solver.core.x;
|
|
71
60
|
const rounded = new Set<number>();
|
|
72
61
|
for (let column = 0; column < solver.getColumnCount(); column++) {
|
|
73
62
|
if (!solver.isInt(column) || solver.hasTerm(column)) continue;
|
|
74
|
-
const value =
|
|
63
|
+
const value = values[column];
|
|
75
64
|
if (value.isInt()) continue;
|
|
76
65
|
const floor = new Impq(value.floor());
|
|
77
|
-
|
|
66
|
+
values[column] =
|
|
67
|
+
floor.sub(value).compare(new Impq(HALF.neg())) < 0 ? new Impq(value.ceil()) : floor;
|
|
78
68
|
rounded.add(column);
|
|
79
69
|
}
|
|
80
70
|
if (rounded.size === 0) return;
|
|
81
71
|
for (const term of solver.terms)
|
|
82
|
-
if ([...term.coeffs].some((entry) => rounded.has(entry[0])))
|
|
72
|
+
if ([...term.coeffs].some((entry) => rounded.has(entry[0])))
|
|
73
|
+
values[term.column] = term.apply(values);
|
|
83
74
|
};
|
|
84
75
|
|
|
85
|
-
// r_basis_has_inf_int.
|
|
86
76
|
const hasBasicInfInt = (solver: LarSolver) =>
|
|
87
77
|
solver.core.basis.some((column) => solver.isInt(column) && !solver.getValue(column).isInt());
|
|
88
78
|
|
|
89
|
-
// int_cube::operator(): whether the cube test found an integer solution.
|
|
90
79
|
export const findCube = (solver: LarSolver) => {
|
|
91
80
|
solver.push();
|
|
92
81
|
for (const term of solver.terms) {
|
|
93
|
-
const delta =
|
|
94
|
-
if (delta.isZero() ||
|
|
82
|
+
const delta = getCubeDeltaForTerm(solver, term);
|
|
83
|
+
if (delta.isZero() || tightenTermBoundsByDelta(solver, term.column, delta)) continue;
|
|
95
84
|
solver.pop(1);
|
|
96
85
|
solver.status = LP_OPTIMAL;
|
|
97
86
|
return false;
|
|
@@ -108,12 +97,10 @@ export const findCube = (solver: LarSolver) => {
|
|
|
108
97
|
return true;
|
|
109
98
|
};
|
|
110
99
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
const addEdgeRows = (solver: LarSolver, column: number, edge: number) => {
|
|
114
|
-
const delta = getCubeDelta(solver, solver.getTerm(column));
|
|
100
|
+
const addEdgeRowsForTerm = (solver: LarSolver, column: number, edge: number) => {
|
|
101
|
+
const delta = getCubeDeltaForTerm(solver, solver.getTerm(column));
|
|
115
102
|
if (delta.isZero()) return true;
|
|
116
|
-
if (!delta.y.isZero()) return
|
|
103
|
+
if (!delta.y.isZero()) return tightenTermBoundsByDelta(solver, column, delta);
|
|
117
104
|
const core = solver.core;
|
|
118
105
|
if (core.hasUpperBound(column)) {
|
|
119
106
|
const upper = solver.getUpperBound(column);
|
|
@@ -140,7 +127,6 @@ const addEdgeRows = (solver: LarSolver, column: number, edge: number) => {
|
|
|
140
127
|
return true;
|
|
141
128
|
};
|
|
142
129
|
|
|
143
|
-
// sat_after_rounding.
|
|
144
130
|
const roundCenter = (solver: LarSolver) => {
|
|
145
131
|
roundToIntegerSolution(solver);
|
|
146
132
|
solver.status = LP_FEASIBLE;
|
|
@@ -148,21 +134,17 @@ const roundCenter = (solver: LarSolver) => {
|
|
|
148
134
|
return true;
|
|
149
135
|
};
|
|
150
136
|
|
|
151
|
-
// A rounded column, its floor, and whether it sits at its floor plus one.
|
|
152
137
|
interface FlipCandidate {
|
|
153
138
|
column: number;
|
|
154
139
|
floor: Rational;
|
|
155
140
|
isAtHigh: boolean;
|
|
156
141
|
}
|
|
157
142
|
|
|
158
|
-
// A term column with a bound, and its value while the repair flips columns.
|
|
159
143
|
interface BoundedRow {
|
|
160
144
|
column: number;
|
|
161
145
|
value: Impq;
|
|
162
146
|
}
|
|
163
147
|
|
|
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
148
|
const repairRoundedCandidate = (solver: LarSolver, flips: FlipCandidate[]) => {
|
|
167
149
|
const core = solver.core;
|
|
168
150
|
const rows: BoundedRow[] = [];
|
|
@@ -230,7 +212,6 @@ const repairRoundedCandidate = (solver: LarSolver, flips: FlipCandidate[]) => {
|
|
|
230
212
|
return true;
|
|
231
213
|
};
|
|
232
214
|
|
|
233
|
-
// round_and_repair: rounds the center of the cube and repairs it, or restores the center.
|
|
234
215
|
const roundAndRepair = (solver: LarSolver) => {
|
|
235
216
|
const core = solver.core;
|
|
236
217
|
const backup = core.x.slice();
|
|
@@ -251,8 +232,6 @@ const roundAndRepair = (solver: LarSolver) => {
|
|
|
251
232
|
return false;
|
|
252
233
|
};
|
|
253
234
|
|
|
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
235
|
export const findLargestCube = (solver: LarSolver) => {
|
|
257
236
|
solver.settings.stats.lcubeCalls++;
|
|
258
237
|
solver.push();
|
|
@@ -262,7 +241,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
262
241
|
addVarBound(solver, edge, KIND_GE, Rational.zero);
|
|
263
242
|
const isAdded = solver.terms
|
|
264
243
|
.map((term) => term.column)
|
|
265
|
-
.every((column) =>
|
|
244
|
+
.every((column) => addEdgeRowsForTerm(solver, column, edge));
|
|
266
245
|
solver.onAddTerm = onAddTerm;
|
|
267
246
|
if (!isAdded) {
|
|
268
247
|
solver.pop(1);
|
|
@@ -1,13 +1,10 @@
|
|
|
1
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.
|
|
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.
|
|
2
|
+
// src/math/lp/int_branch.cpp), MIT license, see z3-license.txt.
|
|
6
3
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
7
4
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
8
5
|
import { DiophantineSolver } from "./dioph-eq";
|
|
9
6
|
import { Explanation } from "./explanation";
|
|
10
|
-
import { getGomoryCuts } from "./gomory";
|
|
7
|
+
import { getFractionalPart, getGomoryCuts } from "./gomory";
|
|
11
8
|
import { makeHnfCut } from "./hnf-cutter";
|
|
12
9
|
import { findCube, findLargestCube } from "./int-cube";
|
|
13
10
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -23,10 +20,7 @@ export type LiaMove =
|
|
|
23
20
|
| { kind: "cut"; offset: Rational; isUpper: boolean }
|
|
24
21
|
| { kind: "branch"; isUpper: boolean; offset: Rational };
|
|
25
22
|
|
|
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) => {
|
|
23
|
+
const getExtendedGcdTriple = (first: bigint, second: bigint) => {
|
|
30
24
|
let previous = [first, 1n, 0n];
|
|
31
25
|
let current = [second, 0n, 1n];
|
|
32
26
|
while (current[0] !== 0n) {
|
|
@@ -42,11 +36,10 @@ const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
|
42
36
|
return previous[0] < 0n ? previous.map((value) => -value) : previous;
|
|
43
37
|
};
|
|
44
38
|
|
|
45
|
-
// get_patching_deltas: the moves of a column with coefficient alpha that make x integral.
|
|
46
39
|
const getPatchingDeltas = (x: Rational, alpha: Rational) => {
|
|
47
40
|
if (alpha.den % x.den !== 0n) return undefined;
|
|
48
41
|
const scale = alpha.den / x.den;
|
|
49
|
-
const coeff =
|
|
42
|
+
const coeff = getExtendedGcdTriple(alpha.num, x.den)[1];
|
|
50
43
|
const product = coeff * scale * x.num;
|
|
51
44
|
const remainder = ((product % alpha.den) + alpha.den) % alpha.den;
|
|
52
45
|
const plus = Rational.of(remainder);
|
|
@@ -60,18 +53,14 @@ interface Parity {
|
|
|
60
53
|
}
|
|
61
54
|
|
|
62
55
|
export class IntSolver {
|
|
63
|
-
private numberOfCalls = 0;
|
|
64
|
-
// m_parities and m_inserted_vars of the GCD test, for one test.
|
|
65
56
|
private parities = new Map<number, Parity[]>();
|
|
66
57
|
private parityColumns: number[] = [];
|
|
67
58
|
private lcubePeriod: number;
|
|
68
59
|
readonly explanation = new Explanation();
|
|
69
|
-
// m_t: the term of a branch or a cut, kept across calls as Z3 keeps its table.
|
|
70
60
|
readonly term = new LarTerm();
|
|
71
61
|
|
|
72
62
|
private dio: DiophantineSolver;
|
|
73
63
|
private initialDioCallsPeriod: number;
|
|
74
|
-
// m_dio_undef_in_a_row: the Diophantine solver's calls in a row that found nothing.
|
|
75
64
|
private dioUndefInARow = 0;
|
|
76
65
|
|
|
77
66
|
constructor(readonly solver: LarSolver) {
|
|
@@ -123,7 +112,6 @@ export class IntSolver {
|
|
|
123
112
|
if (!solver.hasInfInt()) return { kind: "sat" };
|
|
124
113
|
this.term.clear();
|
|
125
114
|
this.explanation.clear();
|
|
126
|
-
// lp.dio_run_gcd is off, so the GCD test runs only when the Diophantine solver ignores terms.
|
|
127
115
|
const move: LiaMove = this.dio.hasIgnoredTerms ? this.gcdTest() : { kind: "undef" };
|
|
128
116
|
return solver.core.withoutTouchedRows(() => this.checkAfterGcd(move));
|
|
129
117
|
}
|
|
@@ -131,7 +119,6 @@ export class IntSolver {
|
|
|
131
119
|
private checkAfterGcd(gcdMove: LiaMove): LiaMove {
|
|
132
120
|
const settings = this.solver.settings;
|
|
133
121
|
if (settings.isCanceled()) return { kind: "undef" };
|
|
134
|
-
this.numberOfCalls++;
|
|
135
122
|
const move = gcdMove.kind === "undef" ? this.getMoveAfterGcd() : gcdMove;
|
|
136
123
|
return settings.isCanceled() ? { kind: "undef" } : move;
|
|
137
124
|
}
|
|
@@ -159,8 +146,6 @@ export class IntSolver {
|
|
|
159
146
|
return this.branch();
|
|
160
147
|
}
|
|
161
148
|
|
|
162
|
-
// find_lcube: the period doubles while the largest cube finds nothing, and resets when it finds a
|
|
163
|
-
// solution.
|
|
164
149
|
private findLcube() {
|
|
165
150
|
const isSat = findLargestCube(this.solver);
|
|
166
151
|
if (isSat) this.lcubePeriod = this.solver.settings.intFindCubePeriod;
|
|
@@ -168,8 +153,6 @@ export class IntSolver {
|
|
|
168
153
|
return isSat;
|
|
169
154
|
}
|
|
170
155
|
|
|
171
|
-
// should_solve_dioph_eq: a draw with the current period, which relaxes toward the initial one
|
|
172
|
-
// when it misses.
|
|
173
156
|
private shouldSolveDiophantineEquations() {
|
|
174
157
|
const settings = this.solver.settings;
|
|
175
158
|
const isHit = this.hitPeriod(settings.dioCallsPeriod);
|
|
@@ -183,9 +166,6 @@ export class IntSolver {
|
|
|
183
166
|
return isHit;
|
|
184
167
|
}
|
|
185
168
|
|
|
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
169
|
private solveDiophantineEquations(): LiaMove {
|
|
190
170
|
const settings = this.solver.settings;
|
|
191
171
|
if (this.dio.check() === "conflict") {
|
|
@@ -202,8 +182,6 @@ export class IntSolver {
|
|
|
202
182
|
return { kind: "undef" };
|
|
203
183
|
}
|
|
204
184
|
|
|
205
|
-
// GCD test.
|
|
206
|
-
|
|
207
185
|
private gcdTest(): LiaMove {
|
|
208
186
|
const solver = this.solver;
|
|
209
187
|
solver.settings.stats.gcdCalls++;
|
|
@@ -212,8 +190,6 @@ export class IntSolver {
|
|
|
212
190
|
return { kind: "conflict" };
|
|
213
191
|
}
|
|
214
192
|
|
|
215
|
-
// gcd_test: the rows of fractional basic columns, then the other rows of the columns whose
|
|
216
|
-
// parity a row fixed.
|
|
217
193
|
private isGcdTestFeasible() {
|
|
218
194
|
const solver = this.solver;
|
|
219
195
|
this.parities.clear();
|
|
@@ -294,8 +270,6 @@ export class IntSolver {
|
|
|
294
270
|
return this.accumulateParity(row, leastCoeffColumn, lcm, consts, leastCoeff);
|
|
295
271
|
}
|
|
296
272
|
|
|
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
273
|
private accumulateParity(
|
|
300
274
|
row: RowCell[],
|
|
301
275
|
leastColumn: number,
|
|
@@ -379,8 +353,6 @@ export class IntSolver {
|
|
|
379
353
|
if (this.solver.isFixed(cell.column)) this.addBoundWitnesses(cell.column);
|
|
380
354
|
}
|
|
381
355
|
|
|
382
|
-
// Patching.
|
|
383
|
-
|
|
384
356
|
private patchBasicColumns() {
|
|
385
357
|
const solver = this.solver;
|
|
386
358
|
solver.settings.stats.patches++;
|
|
@@ -433,8 +405,6 @@ export class IntSolver {
|
|
|
433
405
|
return true;
|
|
434
406
|
}
|
|
435
407
|
|
|
436
|
-
// Branching.
|
|
437
|
-
|
|
438
408
|
private branch(): LiaMove {
|
|
439
409
|
const solver = this.solver;
|
|
440
410
|
solver.moveNonBasicColumnsToBounds();
|