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,8 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT
|
|
2
|
-
// license, see z3-license.txt. The containers whose iteration order the lp solver depends on.
|
|
1
|
+
// Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT license, see z3-license.txt.
|
|
3
2
|
import { shrink } from "../array";
|
|
4
3
|
|
|
5
|
-
// indexed_uint_set: insertion order, and a removal moves the last element into the gap.
|
|
6
4
|
export class IndexedUintSet {
|
|
7
5
|
elems: number[] = [];
|
|
8
6
|
private positions: number[] = [];
|
|
@@ -39,7 +37,6 @@ export class IndexedUintSet {
|
|
|
39
37
|
}
|
|
40
38
|
}
|
|
41
39
|
|
|
42
|
-
// heap<lpvar_lt>: the infeasible columns, smallest first.
|
|
43
40
|
export class VarHeap {
|
|
44
41
|
private values: number[] = [];
|
|
45
42
|
private positions: number[] = [];
|
|
@@ -78,11 +75,6 @@ export class VarHeap {
|
|
|
78
75
|
this.moveDown(this.positions[last]);
|
|
79
76
|
}
|
|
80
77
|
|
|
81
|
-
clear() {
|
|
82
|
-
for (const value of this.values) this.positions[value] = -1;
|
|
83
|
-
this.values = [];
|
|
84
|
-
}
|
|
85
|
-
|
|
86
78
|
private swap(first: number, second: number) {
|
|
87
79
|
const values = this.values;
|
|
88
80
|
const saved = values[first];
|
|
@@ -127,7 +119,6 @@ interface StackedScope {
|
|
|
127
119
|
logSize: number;
|
|
128
120
|
}
|
|
129
121
|
|
|
130
|
-
// stacked_vector: a vector whose size and values a pop restores to the matching push.
|
|
131
122
|
export class StackedVector<T> {
|
|
132
123
|
values: T[] = [];
|
|
133
124
|
private log: StackedLogEntry<T>[] = [];
|
|
@@ -172,8 +163,7 @@ interface HashNode<V> extends HashLink<V> {
|
|
|
172
163
|
readonly value: V;
|
|
173
164
|
}
|
|
174
165
|
|
|
175
|
-
|
|
176
|
-
const getBucket = (hash: number, count: number) =>
|
|
166
|
+
const constrainHash = (hash: number, count: number) =>
|
|
177
167
|
(count & (count - 1)) === 0 ? hash & (count - 1) : hash < count ? hash : hash % count;
|
|
178
168
|
|
|
179
169
|
const isHashPowerOfTwo = (count: number) => count > 2 && (count & (count - 1)) === 0;
|
|
@@ -190,18 +180,12 @@ const getNextPrime = (value: number) => {
|
|
|
190
180
|
return candidate;
|
|
191
181
|
};
|
|
192
182
|
|
|
193
|
-
// std::unordered_map
|
|
194
|
-
// threads every node, each bucket points at the node before its first one, a new node goes to the
|
|
195
|
-
// front of its bucket, and the table grows to the next prime. The iteration order is the list.
|
|
183
|
+
// libc++'s std::unordered_map, whose iteration order Z3's macOS release build exposes: a Map would iterate differently.
|
|
196
184
|
export class UnorderedUintMap<V> {
|
|
197
185
|
private readonly anchor: HashLink<V> = { key: -1, next: null };
|
|
198
186
|
private buckets: (HashLink<V> | null)[] = [];
|
|
199
187
|
private nodes = new Map<number, HashNode<V>>();
|
|
200
188
|
|
|
201
|
-
get size() {
|
|
202
|
-
return this.nodes.size;
|
|
203
|
-
}
|
|
204
|
-
|
|
205
189
|
has(key: number) {
|
|
206
190
|
return this.nodes.has(key);
|
|
207
191
|
}
|
|
@@ -214,14 +198,13 @@ export class UnorderedUintMap<V> {
|
|
|
214
198
|
for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
|
|
215
199
|
}
|
|
216
200
|
|
|
217
|
-
// __emplace_unique_key_args: the key is new.
|
|
218
201
|
insert(key: number, value: V) {
|
|
219
202
|
const node: HashNode<V> = { key, value, next: null };
|
|
220
203
|
const count = this.buckets.length;
|
|
221
204
|
if (this.nodes.size + 1 > count || count === 0)
|
|
222
205
|
this.rehash(Math.max(2 * count + (isHashPowerOfTwo(count) ? 0 : 1), this.nodes.size + 1));
|
|
223
206
|
this.nodes.set(key, node);
|
|
224
|
-
const bucket =
|
|
207
|
+
const bucket = constrainHash(key, this.buckets.length);
|
|
225
208
|
const previous = this.buckets[bucket];
|
|
226
209
|
if (previous !== null) {
|
|
227
210
|
node.next = previous.next;
|
|
@@ -231,29 +214,28 @@ export class UnorderedUintMap<V> {
|
|
|
231
214
|
node.next = this.anchor.next;
|
|
232
215
|
this.anchor.next = node;
|
|
233
216
|
this.buckets[bucket] = this.anchor;
|
|
234
|
-
if (node.next !== null) this.buckets[
|
|
217
|
+
if (node.next !== null) this.buckets[constrainHash(node.next.key, this.buckets.length)] = node;
|
|
235
218
|
}
|
|
236
219
|
|
|
237
|
-
// remove: unlinks the node and repairs the buckets of it and of its successor.
|
|
238
220
|
delete(key: number) {
|
|
239
221
|
const node = this.nodes.get(key);
|
|
240
222
|
if (node === undefined) return;
|
|
241
223
|
this.nodes.delete(key);
|
|
242
224
|
const count = this.buckets.length;
|
|
243
|
-
const bucket =
|
|
225
|
+
const bucket = constrainHash(key, count);
|
|
244
226
|
let previous = this.buckets[bucket] ?? this.anchor;
|
|
245
227
|
while (previous.next !== node) previous = previous.next ?? this.anchor;
|
|
246
|
-
const isPreviousOutside =
|
|
247
|
-
|
|
228
|
+
const isPreviousOutside =
|
|
229
|
+
previous === this.anchor || constrainHash(previous.key, count) !== bucket;
|
|
230
|
+
if (isPreviousOutside && (node.next === null || constrainHash(node.next.key, count) !== bucket))
|
|
248
231
|
this.buckets[bucket] = null;
|
|
249
232
|
if (node.next !== null) {
|
|
250
|
-
const nextBucket =
|
|
233
|
+
const nextBucket = constrainHash(node.next.key, count);
|
|
251
234
|
if (nextBucket !== bucket) this.buckets[nextBucket] = previous;
|
|
252
235
|
}
|
|
253
236
|
previous.next = node.next;
|
|
254
237
|
}
|
|
255
238
|
|
|
256
|
-
// clear keeps the bucket count.
|
|
257
239
|
clear() {
|
|
258
240
|
this.anchor.next = null;
|
|
259
241
|
this.buckets.fill(null);
|
|
@@ -272,11 +254,11 @@ export class UnorderedUintMap<V> {
|
|
|
272
254
|
let previous: HashLink<V> = this.anchor;
|
|
273
255
|
let current = previous.next;
|
|
274
256
|
if (current === null) return;
|
|
275
|
-
let previousBucket =
|
|
257
|
+
let previousBucket = constrainHash(current.key, count);
|
|
276
258
|
this.buckets[previousBucket] = previous;
|
|
277
259
|
previous = current;
|
|
278
260
|
for (current = current.next; current !== null; current = previous.next) {
|
|
279
|
-
const bucket =
|
|
261
|
+
const bucket = constrainHash(current.key, count);
|
|
280
262
|
if (bucket === previousBucket) {
|
|
281
263
|
previous = current;
|
|
282
264
|
continue;
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
|
|
2
2
|
// src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
|
-
// that lar_solver runs with the tableau_rows strategy: the smallest infeasible basic column
|
|
5
|
-
// leaves, and the entering column is the one in its row that frees the fewest bounded basics.
|
|
3
|
+
// license, see z3-license.txt.
|
|
6
4
|
import { Rational } from "../rational";
|
|
7
5
|
import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
|
|
8
6
|
import type { LpSettings } from "./lp-settings";
|
|
9
7
|
import { Impq } from "./numeric-pair";
|
|
10
|
-
import { RowCell, StaticMatrix } from "./static-matrix";
|
|
8
|
+
import { type RowCell, StaticMatrix } from "./static-matrix";
|
|
11
9
|
|
|
12
10
|
export const COLUMN_FREE = 0;
|
|
13
11
|
export const COLUMN_LOWER = 1;
|
|
@@ -15,7 +13,6 @@ export const COLUMN_UPPER = 2;
|
|
|
15
13
|
export const COLUMN_BOXED = 3;
|
|
16
14
|
export const COLUMN_FIXED = 4;
|
|
17
15
|
|
|
18
|
-
// column_type: which bounds a column has.
|
|
19
16
|
export type ColumnType =
|
|
20
17
|
| typeof COLUMN_FREE
|
|
21
18
|
| typeof COLUMN_LOWER
|
|
@@ -47,7 +44,6 @@ export class CoreSolver {
|
|
|
47
44
|
infRowIndex = -1;
|
|
48
45
|
infeasibleSumSign = 0;
|
|
49
46
|
infeasibleCombination: [Rational, number][] = [];
|
|
50
|
-
// m_d: the reduced costs while maximize_term runs the tableau_costs strategy, kept on pivots.
|
|
51
47
|
reducedCosts: Rational[] | undefined;
|
|
52
48
|
private isBlandMode = false;
|
|
53
49
|
private leftBasis = new IndexedUintSet();
|
|
@@ -55,11 +51,6 @@ export class CoreSolver {
|
|
|
55
51
|
|
|
56
52
|
constructor(readonly settings: LpSettings) {}
|
|
57
53
|
|
|
58
|
-
getColumnCount() {
|
|
59
|
-
return this.matrix.getColumnCount();
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
// add_new_var_to_core_fields_for_mpq: a column at zero, basic in a new row or nonbasic.
|
|
63
54
|
addColumn(isBasic: boolean) {
|
|
64
55
|
const column = this.matrix.getColumnCount();
|
|
65
56
|
this.matrix.addColumn();
|
|
@@ -76,33 +67,30 @@ export class CoreSolver {
|
|
|
76
67
|
this.nbasis.push(column);
|
|
77
68
|
}
|
|
78
69
|
|
|
79
|
-
// remove_last_column_from_basis_tableau: the last column out of the basis or the nonbasic
|
|
80
|
-
// columns, once the tableau no longer holds it.
|
|
81
70
|
removeLastColumn(column: number) {
|
|
82
71
|
this.x.length = this.matrix.getColumnCount();
|
|
83
72
|
const position = this.heading[column];
|
|
84
73
|
if (position >= 0) {
|
|
85
74
|
const lastPosition = this.basis.length - 1;
|
|
86
75
|
if (position !== lastPosition) {
|
|
87
|
-
const
|
|
88
|
-
this.basis[position] =
|
|
89
|
-
this.heading[
|
|
76
|
+
const movedColumn = this.basis[lastPosition];
|
|
77
|
+
this.basis[position] = movedColumn;
|
|
78
|
+
this.heading[movedColumn] = position;
|
|
90
79
|
}
|
|
91
80
|
this.basis.pop();
|
|
92
81
|
} else {
|
|
93
82
|
const index = -1 - position;
|
|
94
83
|
const lastPosition = this.nbasis.length - 1;
|
|
95
84
|
if (index !== lastPosition) {
|
|
96
|
-
const
|
|
97
|
-
this.nbasis[index] =
|
|
98
|
-
this.heading[
|
|
85
|
+
const movedColumn = this.nbasis[lastPosition];
|
|
86
|
+
this.nbasis[index] = movedColumn;
|
|
87
|
+
this.heading[movedColumn] = -index - 1;
|
|
99
88
|
}
|
|
100
89
|
this.nbasis.pop();
|
|
101
90
|
}
|
|
102
91
|
this.heading.pop();
|
|
103
92
|
}
|
|
104
93
|
|
|
105
|
-
// The action, with pivots not recording the rows they touch.
|
|
106
94
|
withoutTouchedRows<T>(action: () => T) {
|
|
107
95
|
const savedTouchedRows = this.touchedRows;
|
|
108
96
|
this.touchedRows = null;
|
|
@@ -171,7 +159,6 @@ export class CoreSolver {
|
|
|
171
159
|
this.trackColumnFeasibility(column);
|
|
172
160
|
}
|
|
173
161
|
|
|
174
|
-
// make_column_feasible: moves the value of a column into its bounds, and returns the move.
|
|
175
162
|
makeColumnFeasible(column: number) {
|
|
176
163
|
const value = this.x[column];
|
|
177
164
|
const lower = this.lowerBounds[column];
|
|
@@ -231,7 +218,6 @@ export class CoreSolver {
|
|
|
231
218
|
return true;
|
|
232
219
|
}
|
|
233
220
|
|
|
234
|
-
// pivot_column_tableau: makes the column a unit column with its one in the pivot row.
|
|
235
221
|
pivotColumnTableau(column: number, pivotRow: number) {
|
|
236
222
|
if (!this.divideRowByPivot(pivotRow, column)) return false;
|
|
237
223
|
this.settings.stats.pivots++;
|
|
@@ -256,7 +242,6 @@ export class CoreSolver {
|
|
|
256
242
|
return true;
|
|
257
243
|
}
|
|
258
244
|
|
|
259
|
-
// pivot_to_reduced_costs_tableau: eliminates the reduced cost of the column that enters.
|
|
260
245
|
private pivotToReducedCosts(reducedCosts: Rational[], pivotRow: number, column: number) {
|
|
261
246
|
const alpha = reducedCosts[column];
|
|
262
247
|
if (alpha.isZero()) return;
|
|
@@ -282,8 +267,6 @@ export class CoreSolver {
|
|
|
282
267
|
this.matrix.transposeRows(first, second);
|
|
283
268
|
}
|
|
284
269
|
|
|
285
|
-
// The simplex.
|
|
286
|
-
|
|
287
270
|
private needsToGrow(basic: number) {
|
|
288
271
|
const type = this.columnTypes.get(basic);
|
|
289
272
|
return (
|
|
@@ -292,7 +275,7 @@ export class CoreSolver {
|
|
|
292
275
|
);
|
|
293
276
|
}
|
|
294
277
|
|
|
295
|
-
infSignOfColumn(basic: number) {
|
|
278
|
+
private infSignOfColumn(basic: number) {
|
|
296
279
|
switch (this.columnTypes.get(basic)) {
|
|
297
280
|
case COLUMN_FREE:
|
|
298
281
|
return 0;
|
|
@@ -356,7 +339,6 @@ export class CoreSolver {
|
|
|
356
339
|
return result;
|
|
357
340
|
}
|
|
358
341
|
|
|
359
|
-
// find_beneficial_entering_tableau_rows: the cell of the entering column, or undefined.
|
|
360
342
|
private findBeneficialEntering(rowIndex: number) {
|
|
361
343
|
const row = this.matrix.rows[rowIndex];
|
|
362
344
|
const basic = this.basis[rowIndex];
|
|
@@ -450,7 +432,6 @@ export class CoreSolver {
|
|
|
450
432
|
if (this.isFeasible()) this.status = LP_OPTIMAL;
|
|
451
433
|
}
|
|
452
434
|
|
|
453
|
-
// lp_primal_core_solver::solve, looking only for a feasible solution.
|
|
454
435
|
private solveTableau() {
|
|
455
436
|
if (this.isFeasible()) {
|
|
456
437
|
this.status = LP_FEASIBLE;
|
|
@@ -473,7 +454,6 @@ export class CoreSolver {
|
|
|
473
454
|
);
|
|
474
455
|
}
|
|
475
456
|
|
|
476
|
-
// lar_core_solver::solve.
|
|
477
457
|
solve() {
|
|
478
458
|
if (this.isFeasible()) {
|
|
479
459
|
this.status = LP_OPTIMAL;
|
|
@@ -497,8 +477,7 @@ export class CoreSolver {
|
|
|
497
477
|
|
|
498
478
|
popScope(count: number) {
|
|
499
479
|
this.columnTypes.popScope(count);
|
|
500
|
-
|
|
501
|
-
this.x.length = columnCount;
|
|
480
|
+
this.x.length = this.matrix.getColumnCount();
|
|
502
481
|
this.infeasibleCombination = [];
|
|
503
482
|
}
|
|
504
483
|
}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// expression in place: the front holds the slots of the subsums still to split.
|
|
5
|
-
//
|
|
6
|
-
// The occurrence map is a Map in insertion order, where Z3 has an unordered_map. So when several
|
|
7
|
-
// variables divide every summand, the extracted common factor may list them in another order.
|
|
1
|
+
// Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
|
|
2
|
+
// Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
|
|
3
|
+
// so an extracted common factor may list its variables in another order.
|
|
8
4
|
import { Rational } from "../rational";
|
|
9
5
|
import {
|
|
10
6
|
type Nex,
|
|
@@ -17,7 +13,6 @@ import {
|
|
|
17
13
|
} from "./nex";
|
|
18
14
|
import type { NexCreator } from "./nex-creator";
|
|
19
15
|
|
|
20
|
-
// A place that holds an expression, where Z3 has a nex**.
|
|
21
16
|
interface NexSlot {
|
|
22
17
|
get(): Nex;
|
|
23
18
|
set(value: Nex): void;
|
|
@@ -45,8 +40,6 @@ const isDivisibleByVar = (expr: Nex, variable: number) =>
|
|
|
45
40
|
(expr.kind === "mul" && containsVar(expr, variable)) ||
|
|
46
41
|
(expr.kind === "var" && expr.variable === variable);
|
|
47
42
|
|
|
48
|
-
// has_common_factor: whether a variable of the first summand divides the rest. A sum that
|
|
49
|
-
// simplified to one term counts as a sum of that term.
|
|
50
43
|
const hasCommonFactor = (expr: Nex) => {
|
|
51
44
|
const children = expr.kind === "sum" ? expr.children : [expr];
|
|
52
45
|
for (const variable of getVarsOfExpr(children[0]))
|
|
@@ -59,14 +52,13 @@ export class CrossNested {
|
|
|
59
52
|
private isDone = false;
|
|
60
53
|
private isLimitExceeded = false;
|
|
61
54
|
private reported = 0;
|
|
62
|
-
private isRandomBit = false;
|
|
63
55
|
|
|
64
56
|
constructor(
|
|
65
57
|
private readonly callOnResult: (expr: Nex) => boolean,
|
|
66
58
|
private readonly varIsFixed: (variable: number) => boolean,
|
|
67
59
|
private readonly limit: Limit,
|
|
68
60
|
private randomSeed: number,
|
|
69
|
-
readonly nexCreator: NexCreator,
|
|
61
|
+
private readonly nexCreator: NexCreator,
|
|
70
62
|
) {}
|
|
71
63
|
|
|
72
64
|
run(expr: Nex) {
|
|
@@ -152,18 +144,16 @@ export class CrossNested {
|
|
|
152
144
|
for (const entry of occurences) if (entry[1].occs <= 1) occurences.delete(entry[0]);
|
|
153
145
|
}
|
|
154
146
|
|
|
155
|
-
// The variables to factor out, by occurrences, then by power, then by index in the direction
|
|
156
|
-
// of a random bit.
|
|
157
147
|
private getVarsFromOccurencesMap() {
|
|
158
148
|
const occurences = this.nexCreator.occurencesMap;
|
|
159
|
-
|
|
149
|
+
const isRandomBit = this.nextRandom() % 2 === 1;
|
|
160
150
|
return [...occurences.keys()].sort((first, second) => {
|
|
161
151
|
const firstOcc = occurences.get(first);
|
|
162
152
|
const secondOcc = occurences.get(second);
|
|
163
153
|
if (firstOcc === undefined || secondOcc === undefined) return 0;
|
|
164
154
|
if (firstOcc.occs !== secondOcc.occs) return secondOcc.occs - firstOcc.occs;
|
|
165
155
|
if (firstOcc.power !== secondOcc.power) return secondOcc.power - firstOcc.power;
|
|
166
|
-
return
|
|
156
|
+
return isRandomBit ? first - second : second - first;
|
|
167
157
|
});
|
|
168
158
|
}
|
|
169
159
|
|
|
@@ -174,10 +164,8 @@ export class CrossNested {
|
|
|
174
164
|
return;
|
|
175
165
|
}
|
|
176
166
|
const expr = slot.get();
|
|
177
|
-
// A front element is a sum, unlike in Z3, which would misread anything else as one.
|
|
178
167
|
if (expr.kind === "sum") {
|
|
179
168
|
this.calcOccurences(expr);
|
|
180
|
-
// Z3 passes a copy of the front here.
|
|
181
169
|
if (this.proceedWithCommonFactor(slot, expr, [...front])) return;
|
|
182
170
|
const vars = this.getVarsFromOccurencesMap();
|
|
183
171
|
if (vars.length > 0) return this.exploreExprOnFrontElemVars(slot, front, vars);
|
|
@@ -199,8 +187,6 @@ export class CrossNested {
|
|
|
199
187
|
this.exploreExprOnFrontElem(next, front);
|
|
200
188
|
}
|
|
201
189
|
|
|
202
|
-
// split_with_var: e = j*a + b, where a sums the summands divisible by j, divided by it, and b
|
|
203
|
-
// sums the rest. It is enough to split on the variables where a has no common factor.
|
|
204
190
|
private splitWithVar(slot: NexSlot, variable: number, front: NexSlot[]) {
|
|
205
191
|
const expr = slot.get();
|
|
206
192
|
if (expr.kind !== "sum") return false;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
|
|
2
2
|
// src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
|
-
// carries the dependency that justifies it. Only the operations nla_intervals, horner,
|
|
5
|
-
// pdd_interval, and monomial_bounds call are here; mpq is exact, so there is no rounding.
|
|
3
|
+
// z3-license.txt.
|
|
6
4
|
import { Rational } from "../rational";
|
|
7
5
|
import { type Dependency, linearize, mkJoin } from "./dependency";
|
|
8
6
|
|
|
@@ -17,7 +15,6 @@ export interface DepInterval {
|
|
|
17
15
|
upperDep: Dependency;
|
|
18
16
|
}
|
|
19
17
|
|
|
20
|
-
// with_deps_t: whether an operation also computes the dependencies of the result.
|
|
21
18
|
export type DepsMode = "with-deps" | "without-deps";
|
|
22
19
|
|
|
23
20
|
interface ExtNumeral {
|
|
@@ -25,7 +22,6 @@ interface ExtNumeral {
|
|
|
25
22
|
readonly value: Rational;
|
|
26
23
|
}
|
|
27
24
|
|
|
28
|
-
// interval_deps_combine_rule: bitmasks of the argument bounds that justify each result bound.
|
|
29
25
|
interface CombineRule {
|
|
30
26
|
readonly lower: number;
|
|
31
27
|
readonly upper: number;
|
|
@@ -99,8 +95,6 @@ const extLt = (first: ExtNumeral, second: ExtNumeral) => {
|
|
|
99
95
|
return second.kind === "plus-inf";
|
|
100
96
|
};
|
|
101
97
|
|
|
102
|
-
// The bounds of a result go in only after every bound of the arguments is read, since the result
|
|
103
|
-
// may be one of the arguments.
|
|
104
98
|
const setBounds = (
|
|
105
99
|
result: DepInterval,
|
|
106
100
|
lower: ExtNumeral,
|
|
@@ -130,7 +124,6 @@ const isN0 = (interval: DepInterval) => upperIsZero(interval) && !interval.isUpp
|
|
|
130
124
|
const isN1 = (interval: DepInterval) =>
|
|
131
125
|
upperIsNeg(interval) || (upperIsZero(interval) && interval.isUpperOpen);
|
|
132
126
|
const isM = (interval: DepInterval) => lowerIsNeg(interval) && upperIsPos(interval);
|
|
133
|
-
// interval_manager::is_zero, which unlike dep_intervals::is_zero ignores openness.
|
|
134
127
|
const areBoundsZero = (interval: DepInterval) => lowerIsZero(interval) && upperIsZero(interval);
|
|
135
128
|
|
|
136
129
|
const imSet = (target: DepInterval, source: DepInterval) => {
|
|
@@ -152,7 +145,6 @@ const imAdd = (first: DepInterval, second: DepInterval, result: DepInterval) =>
|
|
|
152
145
|
first.isUpperOpen || second.isUpperOpen,
|
|
153
146
|
);
|
|
154
147
|
|
|
155
|
-
// div_mul with inv_k false.
|
|
156
148
|
const imMulScalar = (scalar: Rational, interval: DepInterval, result: DepInterval) => {
|
|
157
149
|
if (scalar.isZero()) return setBounds(result, MINUS_INF, true, PLUS_INF, true);
|
|
158
150
|
const factor = mkNumeral(scalar);
|
|
@@ -236,7 +228,7 @@ const imMul = (first: DepInterval, second: DepInterval, result: DepInterval) =>
|
|
|
236
228
|
);
|
|
237
229
|
};
|
|
238
230
|
|
|
239
|
-
//
|
|
231
|
+
// Z3 tests the stored value of c and d for zero even when the bound is infinite.
|
|
240
232
|
const imDiv = (first: DepInterval, second: DepInterval, result: DepInterval) => {
|
|
241
233
|
if (areBoundsZero(first))
|
|
242
234
|
return setBounds(result, mkNumeral(Rational.zero), false, mkNumeral(Rational.zero), false);
|
|
@@ -451,7 +443,6 @@ const getPowerRule = (interval: DepInterval, exponent: number): CombineRule => {
|
|
|
451
443
|
return { lower: 0, upper: DEP_IN_LOWER1 | DEP_IN_UPPER1 };
|
|
452
444
|
};
|
|
453
445
|
|
|
454
|
-
// im_config::mk_dependency: the joined dependencies of the bounds in the mask.
|
|
455
446
|
const mkDependency = (first: DepInterval, second: DepInterval | null, mask: number) => {
|
|
456
447
|
const withLower1 = mask & DEP_IN_LOWER1 ? first.lowerDep : null;
|
|
457
448
|
const withLower2 =
|
|
@@ -460,8 +451,7 @@ const mkDependency = (first: DepInterval, second: DepInterval | null, mask: numb
|
|
|
460
451
|
return second !== null && mask & DEP_IN_UPPER2 ? mkJoin(withUpper1, second.upperDep) : withUpper1;
|
|
461
452
|
};
|
|
462
453
|
|
|
463
|
-
|
|
464
|
-
const combineDeps = (
|
|
454
|
+
const addDeps = (
|
|
465
455
|
first: DepInterval,
|
|
466
456
|
second: DepInterval | null,
|
|
467
457
|
rule: CombineRule,
|
|
@@ -489,7 +479,7 @@ export const power = (
|
|
|
489
479
|
if (exponent === 1 && interval === result) return;
|
|
490
480
|
const rule = getPowerRule(interval, exponent);
|
|
491
481
|
imPower(interval, exponent, result);
|
|
492
|
-
if (mode === "with-deps")
|
|
482
|
+
if (mode === "with-deps") addDeps(interval, null, rule, result);
|
|
493
483
|
};
|
|
494
484
|
|
|
495
485
|
export const mulScalar = (
|
|
@@ -514,7 +504,7 @@ export const mul = (
|
|
|
514
504
|
) => {
|
|
515
505
|
const rule = getMulRule(first, second);
|
|
516
506
|
imMul(first, second, result);
|
|
517
|
-
if (mode === "with-deps")
|
|
507
|
+
if (mode === "with-deps") addDeps(first, second, rule, result);
|
|
518
508
|
};
|
|
519
509
|
|
|
520
510
|
export const div = (
|
|
@@ -525,7 +515,7 @@ export const div = (
|
|
|
525
515
|
) => {
|
|
526
516
|
const rule = getDivRule(first, second);
|
|
527
517
|
imDiv(first, second, result);
|
|
528
|
-
if (mode === "with-deps")
|
|
518
|
+
if (mode === "with-deps") addDeps(first, second, rule, result);
|
|
529
519
|
};
|
|
530
520
|
|
|
531
521
|
export const add = (
|
|
@@ -535,10 +525,9 @@ export const add = (
|
|
|
535
525
|
mode: DepsMode,
|
|
536
526
|
) => {
|
|
537
527
|
imAdd(first, second, result);
|
|
538
|
-
if (mode === "with-deps")
|
|
528
|
+
if (mode === "with-deps") addDeps(first, second, getAddRule(), result);
|
|
539
529
|
};
|
|
540
530
|
|
|
541
|
-
// add(rational, interval): shifts the finite bounds and keeps the dependencies.
|
|
542
531
|
export const addScalar = (scalar: Rational, interval: DepInterval) => {
|
|
543
532
|
if (!interval.isLowerInf) interval.lower = interval.lower.add(scalar);
|
|
544
533
|
if (!interval.isUpperInf) interval.upper = interval.upper.add(scalar);
|
|
@@ -558,7 +547,6 @@ const copyUpperBound = (source: DepInterval, target: DepInterval, mode: DepsMode
|
|
|
558
547
|
if (mode === "with-deps") target.upperDep = source.upperDep;
|
|
559
548
|
};
|
|
560
549
|
|
|
561
|
-
// On equal bounds the bound of first wins if it is open, else the bound of second.
|
|
562
550
|
export const intersect = (
|
|
563
551
|
first: DepInterval,
|
|
564
552
|
second: DepInterval,
|
|
@@ -583,7 +571,6 @@ export const intersect = (
|
|
|
583
571
|
}
|
|
584
572
|
};
|
|
585
573
|
|
|
586
|
-
// set_value and set_interval_for_scalar: the closed point interval, keeping the dependencies.
|
|
587
574
|
export const setValue = (interval: DepInterval, value: Rational) =>
|
|
588
575
|
setBounds(interval, mkNumeral(value), false, mkNumeral(value), false);
|
|
589
576
|
|
|
@@ -611,8 +598,6 @@ const separatedFromZeroOnUpper = (interval: DepInterval) =>
|
|
|
611
598
|
export const separatedFromZero = (interval: DepInterval) =>
|
|
612
599
|
separatedFromZeroOnUpper(interval) || separatedFromZeroOnLower(interval);
|
|
613
600
|
|
|
614
|
-
// When the interval excludes zero, reports the joined dependency of dep and the separating bound,
|
|
615
|
-
// lower first.
|
|
616
601
|
export const checkIntervalForConflictOnZero = (
|
|
617
602
|
interval: DepInterval,
|
|
618
603
|
dep: Dependency,
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt.
|
|
2
|
-
// a DAG whose leaves are constraint indices. Without proofs, lar_solver's evidence_manager is the
|
|
3
|
-
// plain u_dependency_manager.
|
|
1
|
+
// Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt.
|
|
4
2
|
|
|
5
3
|
export interface DependencyLeaf {
|
|
6
4
|
readonly isLeaf: true;
|
|
@@ -25,7 +23,6 @@ export const mkJoin = (first: Dependency, second: Dependency): Dependency => {
|
|
|
25
23
|
return { isLeaf: false, first, second, isMarked: false };
|
|
26
24
|
};
|
|
27
25
|
|
|
28
|
-
// linearize: the leaves in breadth-first order, each once, from the given roots.
|
|
29
26
|
export const linearize = (roots: Dependency[]) => {
|
|
30
27
|
const todo: (DependencyLeaf | DependencyJoin)[] = [];
|
|
31
28
|
for (const root of roots) {
|