tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +28 -28
- package/dist/deciders.js +43 -43
- 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 +116 -36
- 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 +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- 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 +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- 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 +5 -10
- package/src/prover/deciders.ts +0 -4
- 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 +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- 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 +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- 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 +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- 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 +1 -14
- 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 +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- 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 +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- 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 +13 -36
- 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 +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- 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 +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- 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 +66 -101
- 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 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- 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 +4 -61
- 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 +3 -34
- 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 +0 -5
- 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 +6 -98
- 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 +12 -98
- 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 +35 -130
- 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 +14 -56
- 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 +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- 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 -48
- 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 +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- 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 +2 -37
- 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 +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- 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 +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- 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 +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- 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 +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- 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 +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- 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 +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -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 +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -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 +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -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 +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
|
@@ -1,12 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/dd/dd_pdd.h, src/math/dd/dd_pdd.cpp, src/math/dd/pdd_eval.h), MIT
|
|
2
|
-
//
|
|
3
|
-
// solver works on: a node is x*hi + lo for the variable x at its level, lo has no x, and the leaves
|
|
4
|
-
// are values. Only the free semantics is ported, the one nla and dd::solver use: not mod2, mod2N or
|
|
5
|
-
// zero_one_vars, nor what only those or polysat use (the boolean operations, substitution of
|
|
6
|
-
// values, resolve, quot_rem, and division without the inverse). Nodes are never freed, so there is
|
|
7
|
-
// no garbage collection: node indices match Z3's until its first collection, and the node limit
|
|
8
|
-
// counts every node made. The op cache keys on both operands, where Z3's eq_entry compares the
|
|
9
|
-
// first operand of one entry with the second of the other.
|
|
1
|
+
// Ported from Z3 (src/math/dd/dd_pdd.h, src/math/dd/dd_pdd.cpp, src/math/dd/pdd_eval.h), MIT license, see z3-license.txt.
|
|
2
|
+
// Deviation from Z3: nodes are never freed, so node indices match Z3 only until its first collection.
|
|
10
3
|
import { PddMemoryOutError } from "../../../../errors";
|
|
11
4
|
import { getGcd, Rational } from "../rational";
|
|
12
5
|
import { shrink } from "../array";
|
|
@@ -18,7 +11,6 @@ const SUB_OP = 3;
|
|
|
18
11
|
const MINUS_OP = 4;
|
|
19
12
|
const MUL_OP = 5;
|
|
20
13
|
const REDUCE_OP = 6;
|
|
21
|
-
// Nodes below this index stand for the operations in the op cache, besides 0 and 1.
|
|
22
14
|
const NO_OP = 10;
|
|
23
15
|
const INITIAL_FREE_NODES = 1024;
|
|
24
16
|
|
|
@@ -72,7 +64,7 @@ export class PddManager {
|
|
|
72
64
|
private numAllocated = 0;
|
|
73
65
|
private maxNumNodes = 1 << 24;
|
|
74
66
|
private isApplying = false;
|
|
75
|
-
var2pdd: number[] = [];
|
|
67
|
+
private var2pdd: number[] = [];
|
|
76
68
|
var2level: number[] = [];
|
|
77
69
|
level2var: number[] = [];
|
|
78
70
|
|
|
@@ -121,19 +113,14 @@ export class PddManager {
|
|
|
121
113
|
return this.levels.length;
|
|
122
114
|
}
|
|
123
115
|
|
|
124
|
-
numVars() {
|
|
125
|
-
return this.var2pdd.length;
|
|
126
|
-
}
|
|
127
|
-
|
|
128
116
|
isVal(node: number) {
|
|
129
117
|
return this.his[node] === 0;
|
|
130
118
|
}
|
|
131
119
|
|
|
132
|
-
level(node: number) {
|
|
120
|
+
private level(node: number) {
|
|
133
121
|
return this.levels[node];
|
|
134
122
|
}
|
|
135
123
|
|
|
136
|
-
// A value node is at level 0, so its var is the lowest variable, as in Z3.
|
|
137
124
|
var(node: number) {
|
|
138
125
|
return this.level2var[this.levels[node]];
|
|
139
126
|
}
|
|
@@ -150,12 +137,6 @@ export class PddManager {
|
|
|
150
137
|
return this.values[this.los[node]];
|
|
151
138
|
}
|
|
152
139
|
|
|
153
|
-
offset(node: number) {
|
|
154
|
-
let current = node;
|
|
155
|
-
while (!this.isVal(current)) current = this.lo(current);
|
|
156
|
-
return this.val(current);
|
|
157
|
-
}
|
|
158
|
-
|
|
159
140
|
mkVar(variable: number) {
|
|
160
141
|
while (this.var2level.length <= variable) {
|
|
161
142
|
const next = this.var2level.length;
|
|
@@ -174,7 +155,7 @@ export class PddManager {
|
|
|
174
155
|
return new Pdd(this, ZERO_PDD);
|
|
175
156
|
}
|
|
176
157
|
|
|
177
|
-
one() {
|
|
158
|
+
private one() {
|
|
178
159
|
return new Pdd(this, ONE_PDD);
|
|
179
160
|
}
|
|
180
161
|
|
|
@@ -205,13 +186,10 @@ export class PddManager {
|
|
|
205
186
|
if (exponent === 0) return this.one();
|
|
206
187
|
if (exponent === 1 || poly.isZero() || poly.isOne()) return poly;
|
|
207
188
|
if (poly.isVal()) return this.mkVal(poly.val().pow(exponent));
|
|
208
|
-
// j even: pow(p,2*j') = pow(p*p,j'); j odd: pow(p,2*j'+1) = p*pow(p*p,j')
|
|
209
189
|
const half = this.pow(this.mul(poly, poly), Math.floor(exponent / 2));
|
|
210
190
|
return exponent % 2 === 1 ? this.mul(half, poly) : half;
|
|
211
191
|
}
|
|
212
192
|
|
|
213
|
-
// apply: operations grow the node limit where Z3 catches mem_out, collects garbage, retries and
|
|
214
|
-
// then doubles the limit. Without garbage to collect, only the doubling matters.
|
|
215
193
|
private apply(first: number, second: number, op: number) {
|
|
216
194
|
return this.whileApplying(() => this.applyRec(first, second, op));
|
|
217
195
|
}
|
|
@@ -283,26 +261,20 @@ export class PddManager {
|
|
|
283
261
|
}
|
|
284
262
|
case SUB_OP: {
|
|
285
263
|
if (this.isVal(first) || (!this.isVal(second) && firstLevel < secondLevel)) {
|
|
286
|
-
// p - (ax + b) = -ax + (p - b)
|
|
287
264
|
const lo = this.applyRec(first, this.lo(second), op);
|
|
288
265
|
return this.makeNode(secondLevel, lo, this.minusRec(this.hi(second)));
|
|
289
266
|
}
|
|
290
267
|
if (this.isVal(second) || firstLevel > secondLevel) {
|
|
291
|
-
// (ax + b) - k = ax + (b - k)
|
|
292
268
|
return this.makeNode(firstLevel, this.applyRec(firstLo, second, op), firstHi);
|
|
293
269
|
}
|
|
294
|
-
// (ax + b) - (cx + d) = (a - c)x + (b - d)
|
|
295
270
|
const lo = this.applyRec(firstLo, this.lo(second), op);
|
|
296
271
|
return this.makeNode(firstLevel, lo, this.applyRec(firstHi, this.hi(second), op));
|
|
297
272
|
}
|
|
298
273
|
case MUL_OP: {
|
|
299
274
|
if (this.isVal(second) || firstLevel !== secondLevel) {
|
|
300
|
-
// (x*hi(p)+lo(p))*b = x*hi(p)*b + lo(p)*b
|
|
301
275
|
const lo = this.applyRec(firstLo, second, op);
|
|
302
276
|
return this.makeNode(firstLevel, lo, this.applyRec(firstHi, second, op));
|
|
303
277
|
}
|
|
304
|
-
// (xa + b)(xc + d) = x(x*ac + ad + bc) + bd, where ad + bc may be x*e + f, so that the
|
|
305
|
-
// hi child is x*(ac + e) + f.
|
|
306
278
|
const ac = this.applyRec(firstHi, this.hi(second), op);
|
|
307
279
|
const ad = this.applyRec(firstHi, this.lo(second), op);
|
|
308
280
|
const bc = this.applyRec(firstLo, this.hi(second), op);
|
|
@@ -342,7 +314,6 @@ export class PddManager {
|
|
|
342
314
|
return result;
|
|
343
315
|
}
|
|
344
316
|
|
|
345
|
-
// reduce_on_match: the monomials of a that lm(b) divides become (b - lt(b))/lm(b).
|
|
346
317
|
private reduceOnMatch(first: number, second: number) {
|
|
347
318
|
let current = first;
|
|
348
319
|
while (this.lmOccurs(second, current)) {
|
|
@@ -352,7 +323,6 @@ export class PddManager {
|
|
|
352
323
|
return current;
|
|
353
324
|
}
|
|
354
325
|
|
|
355
|
-
// lm_occurs: whether the leading monomial of p divides a monomial of q.
|
|
356
326
|
private lmOccurs(first: number, second: number): boolean {
|
|
357
327
|
let divisor = this.firstLeading(first);
|
|
358
328
|
let target = second;
|
|
@@ -371,7 +341,6 @@ export class PddManager {
|
|
|
371
341
|
}
|
|
372
342
|
}
|
|
373
343
|
|
|
374
|
-
// lt_quotient: minus the r such that lt(p)*r is a monomial of q, given lm_occurs(p, q).
|
|
375
344
|
private ltQuotient(first: number, second: number): number {
|
|
376
345
|
let divisor = this.firstLeading(first);
|
|
377
346
|
let target = second;
|
|
@@ -394,8 +363,6 @@ export class PddManager {
|
|
|
394
363
|
return this.applyRec(this.var2pdd[this.var(second)], quotient, MUL_OP);
|
|
395
364
|
}
|
|
396
365
|
|
|
397
|
-
// try_spoly: a*q*qc - b*p*pc, where p = lcm(lm(a),lm(b))/lm(a), q = lcm(lm(a),lm(b))/lm(b) and pc
|
|
398
|
-
// and qc are the leading coefficients of a and b, when the leading monomials share a variable.
|
|
399
366
|
trySpoly(first: Pdd, second: Pdd) {
|
|
400
367
|
const factors = this.commonFactors(first, second);
|
|
401
368
|
if (factors === null) return null;
|
|
@@ -454,7 +421,6 @@ export class PddManager {
|
|
|
454
421
|
}
|
|
455
422
|
}
|
|
456
423
|
|
|
457
|
-
// lm_lt: compares the leading monomials, then the monomials in degree-lex order.
|
|
458
424
|
lmLt(first: Pdd, second: Pdd) {
|
|
459
425
|
let firstNode = this.firstLeading(first.root);
|
|
460
426
|
let secondNode = this.firstLeading(second.root);
|
|
@@ -497,8 +463,6 @@ export class PddManager {
|
|
|
497
463
|
}
|
|
498
464
|
}
|
|
499
465
|
|
|
500
|
-
// first_leading: the first node with a term of the leading monomial, the monomial of highest
|
|
501
|
-
// degree and then highest variables.
|
|
502
466
|
private firstLeading(node: number) {
|
|
503
467
|
let current = node;
|
|
504
468
|
while (
|
|
@@ -525,7 +489,6 @@ export class PddManager {
|
|
|
525
489
|
return degree;
|
|
526
490
|
}
|
|
527
491
|
|
|
528
|
-
// factor: p = lc*v^degree + rest, where the degree of v in rest is below degree.
|
|
529
492
|
factor(poly: Pdd, variable: number, degree: number): PddFactor {
|
|
530
493
|
const variableLevel = this.var2level[variable];
|
|
531
494
|
if (degree === 0 || this.level(poly.root) < variableLevel) {
|
|
@@ -567,7 +530,6 @@ export class PddManager {
|
|
|
567
530
|
return { lc, rest };
|
|
568
531
|
}
|
|
569
532
|
|
|
570
|
-
// is_binary: v1, x*v1 + v2 or x*v1 + y*v2 + v3, for values v1, v2 and v3.
|
|
571
533
|
isBinary(node: number) {
|
|
572
534
|
const lo = this.lo(node);
|
|
573
535
|
return (
|
|
@@ -577,8 +539,6 @@ export class PddManager {
|
|
|
577
539
|
);
|
|
578
540
|
}
|
|
579
541
|
|
|
580
|
-
// get_powers: the variables with a power above 1. The var of a value node is the lowest
|
|
581
|
-
// variable, so Z3 counts a value under that variable as one more power of it.
|
|
582
542
|
getPowers(poly: Pdd) {
|
|
583
543
|
const powers: PddPower[] = [];
|
|
584
544
|
const marked = new Set<number>();
|
|
@@ -589,6 +549,7 @@ export class PddManager {
|
|
|
589
549
|
const variable = this.var(node);
|
|
590
550
|
let current = node;
|
|
591
551
|
let degree = 1;
|
|
552
|
+
// Like Z3, a value under the lowest variable counts as one more power of it.
|
|
592
553
|
while (!this.isVal(current) && this.var(this.hi(current)) === variable) {
|
|
593
554
|
degree++;
|
|
594
555
|
todo.push(this.lo(current));
|
|
@@ -600,7 +561,6 @@ export class PddManager {
|
|
|
600
561
|
return powers;
|
|
601
562
|
}
|
|
602
563
|
|
|
603
|
-
// var_is_leaf: whether every node of v has values as children.
|
|
604
564
|
varIsLeaf(poly: Pdd, variable: number) {
|
|
605
565
|
const marked = new Set<number>();
|
|
606
566
|
const todo = [poly.root];
|
|
@@ -661,8 +621,6 @@ export class PddManager {
|
|
|
661
621
|
return hi === ZERO_PDD ? lo : this.insertNode(level, lo, hi);
|
|
662
622
|
}
|
|
663
623
|
|
|
664
|
-
// insert_node: Z3 adds half as many free nodes again when they run out, and is out of memory
|
|
665
|
-
// when the nodes already number more than the limit.
|
|
666
624
|
private insertNode(level: number, lo: number, hi: number) {
|
|
667
625
|
const key = `${level},${lo},${hi}`;
|
|
668
626
|
const existing = this.nodeTable.get(key);
|
|
@@ -683,7 +641,7 @@ export class PddManager {
|
|
|
683
641
|
|
|
684
642
|
export class Pdd {
|
|
685
643
|
constructor(
|
|
686
|
-
readonly manager: PddManager,
|
|
644
|
+
private readonly manager: PddManager,
|
|
687
645
|
readonly root: number,
|
|
688
646
|
) {}
|
|
689
647
|
|
|
@@ -703,10 +661,6 @@ export class Pdd {
|
|
|
703
661
|
return this.manager.val(this.root);
|
|
704
662
|
}
|
|
705
663
|
|
|
706
|
-
offset() {
|
|
707
|
-
return this.manager.offset(this.root);
|
|
708
|
-
}
|
|
709
|
-
|
|
710
664
|
isVal() {
|
|
711
665
|
return this.manager.isVal(this.root);
|
|
712
666
|
}
|
|
@@ -723,16 +677,10 @@ export class Pdd {
|
|
|
723
677
|
return this.manager.degree(this.root) === 1;
|
|
724
678
|
}
|
|
725
679
|
|
|
726
|
-
isVar() {
|
|
727
|
-
return !this.isVal() && this.lo().isZero() && this.hi().isOne();
|
|
728
|
-
}
|
|
729
|
-
|
|
730
|
-
// a*x for a value a.
|
|
731
680
|
isUnary() {
|
|
732
681
|
return !this.isVal() && this.lo().isZero() && this.hi().isVal();
|
|
733
682
|
}
|
|
734
683
|
|
|
735
|
-
// x + b for a value b.
|
|
736
684
|
isOffset() {
|
|
737
685
|
return !this.isVal() && this.lo().isVal() && this.hi().isOne();
|
|
738
686
|
}
|
|
@@ -765,11 +713,6 @@ export class Pdd {
|
|
|
765
713
|
: this.manager.mul(this, other);
|
|
766
714
|
}
|
|
767
715
|
|
|
768
|
-
// div: in the free semantics, multiplication by the inverse, which shares the op cache.
|
|
769
|
-
div(divisor: Rational) {
|
|
770
|
-
return this.mul(Rational.one.div(divisor));
|
|
771
|
-
}
|
|
772
|
-
|
|
773
716
|
pow(exponent: number) {
|
|
774
717
|
return this.manager.pow(this, exponent);
|
|
775
718
|
}
|
|
@@ -806,7 +749,6 @@ export class Pdd {
|
|
|
806
749
|
return this.manager.getPowers(this);
|
|
807
750
|
}
|
|
808
751
|
|
|
809
|
-
// var_factors: the variables that divide every monomial, with their product divided out.
|
|
810
752
|
varFactors(): PddVarFactors {
|
|
811
753
|
if (this.isVal()) return { vars: [], poly: this };
|
|
812
754
|
const manager = this.manager;
|
|
@@ -821,7 +763,6 @@ export class Pdd {
|
|
|
821
763
|
const loVars = loFactors.vars;
|
|
822
764
|
if (loVars.length === 0) return { vars: [], poly: this };
|
|
823
765
|
const loAndHi: number[] = [];
|
|
824
|
-
// Moves the variables in both lists to loAndHi and keeps the rest in place, by level.
|
|
825
766
|
const merge = (hiVars: number[]) => {
|
|
826
767
|
let loKept = 0;
|
|
827
768
|
let hiKept = 0;
|
|
@@ -868,7 +809,6 @@ export class Pdd {
|
|
|
868
809
|
};
|
|
869
810
|
}
|
|
870
811
|
|
|
871
|
-
// subst_pdd: replaces the variable by the polynomial, without the op cache.
|
|
872
812
|
substPdd(variable: number, replacement: Pdd): Pdd {
|
|
873
813
|
const manager = this.manager;
|
|
874
814
|
if (this.isVal() || manager.var2level[this.var()] < manager.var2level[variable]) return this;
|
|
@@ -879,7 +819,6 @@ export class Pdd {
|
|
|
879
819
|
return manager.mkVar(this.var()).mul(hi).add(lo);
|
|
880
820
|
}
|
|
881
821
|
|
|
882
|
-
// The monomials, hi before lo, each with its variables from the highest level down.
|
|
883
822
|
*[Symbol.iterator](): Generator<PddMonomial> {
|
|
884
823
|
const manager = this.manager;
|
|
885
824
|
const nodes: IteratorNode[] = [];
|
|
@@ -917,7 +856,6 @@ export class Pdd {
|
|
|
917
856
|
}
|
|
918
857
|
}
|
|
919
858
|
|
|
920
|
-
// The coefficients, each marked as the constant term or not. Zero yields one constant 0.
|
|
921
859
|
*coefficients(): Generator<PddCoefficient> {
|
|
922
860
|
const manager = this.manager;
|
|
923
861
|
const nodes: number[] = [];
|
|
@@ -962,7 +900,6 @@ export class Pdd {
|
|
|
962
900
|
}
|
|
963
901
|
}
|
|
964
902
|
|
|
965
|
-
// pdd_eval: the value of the polynomial under the values of its variables.
|
|
966
903
|
export const evaluatePdd = (poly: Pdd, getValue: (variable: number) => Rational): Rational =>
|
|
967
904
|
poly.isVal()
|
|
968
905
|
? poly.val()
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/lp/random_updater_def.h, and shift_var and
|
|
2
|
-
// get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt. Moves non-basic columns to random values inside the interval that keeps every
|
|
4
|
-
// row feasible, so that columns with equal values, which theory combination would assume equal,
|
|
5
|
-
// become different.
|
|
2
|
+
// get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see z3-license.txt.
|
|
6
3
|
import { getLcm, Rational } from "../rational";
|
|
7
4
|
import { IndexedUintSet } from "./containers";
|
|
8
5
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -16,8 +13,6 @@ interface FreedomInterval {
|
|
|
16
13
|
multiple: Rational;
|
|
17
14
|
}
|
|
18
15
|
|
|
19
|
-
// get_freedom_interval_for_column: the values of a non-basic column that keep the basic columns
|
|
20
|
-
// that depend on it within their bounds.
|
|
21
16
|
const getFreedomInterval = (solver: LarSolver, column: number): FreedomInterval | undefined => {
|
|
22
17
|
const core = solver.core;
|
|
23
18
|
if (core.isBase(column) || solver.isFixed(column)) return undefined;
|
|
@@ -68,7 +63,6 @@ const getFreedomInterval = (solver: LarSolver, column: number): FreedomInterval
|
|
|
68
63
|
return { lower: shiftedLower, upper: shiftedUpper, multiple: Rational.of(multiple) };
|
|
69
64
|
};
|
|
70
65
|
|
|
71
|
-
// int_solver::shift_var.
|
|
72
66
|
const shiftVar = (solver: LarSolver, column: number) => {
|
|
73
67
|
if (solver.isFixed(column) || solver.isBase(column) || solver.settings.isCanceled()) return false;
|
|
74
68
|
const interval = getFreedomInterval(solver, column);
|
|
@@ -114,7 +108,6 @@ const shiftVar = (solver: LarSolver, column: number) => {
|
|
|
114
108
|
return true;
|
|
115
109
|
};
|
|
116
110
|
|
|
117
|
-
// random_updater::update over the given columns.
|
|
118
111
|
export const randomUpdate = (solver: LarSolver, columns: number[]) => {
|
|
119
112
|
const varSet = new IndexedUintSet();
|
|
120
113
|
for (const column of columns) varSet.add(column);
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/static_matrix.h, src/math/lp/static_matrix_def.h), MIT license, see
|
|
2
|
-
// z3-license.txt. The sparse tableau: every row cell knows the offset of its column cell and back,
|
|
3
|
-
// and cells are removed by moving the last cell of the strip into their place, so the order of
|
|
4
|
-
// the cells is Z3's.
|
|
1
|
+
// Ported from Z3 (src/math/lp/static_matrix.h, src/math/lp/static_matrix_def.h), MIT license, see z3-license.txt.
|
|
5
2
|
import { Rational } from "../rational";
|
|
6
3
|
import type { LarTerm } from "./lar-term";
|
|
7
4
|
|
|
@@ -14,6 +11,11 @@ export interface RowCell {
|
|
|
14
11
|
coeff: Rational;
|
|
15
12
|
}
|
|
16
13
|
|
|
14
|
+
interface CoeffCell {
|
|
15
|
+
column: number;
|
|
16
|
+
coeff: Rational;
|
|
17
|
+
}
|
|
18
|
+
|
|
17
19
|
interface ColumnCell {
|
|
18
20
|
row: number;
|
|
19
21
|
offset: number;
|
|
@@ -60,8 +62,7 @@ export class StaticMatrix {
|
|
|
60
62
|
this.rowOffsets = [];
|
|
61
63
|
}
|
|
62
64
|
|
|
63
|
-
|
|
64
|
-
set(row: number, column: number, coeff: Rational) {
|
|
65
|
+
private set(row: number, column: number, coeff: Rational) {
|
|
65
66
|
if (coeff.isZero()) return;
|
|
66
67
|
this.addNewElement(row, column, coeff);
|
|
67
68
|
}
|
|
@@ -96,8 +97,6 @@ export class StaticMatrix {
|
|
|
96
97
|
this.rowOffsets[rowCells[index].column] = index;
|
|
97
98
|
}
|
|
98
99
|
|
|
99
|
-
// pivot_row_to_row_given_cell: eliminates the pivot column from the row of the cell by adding a
|
|
100
|
-
// multiple of the pivot row.
|
|
101
100
|
pivotRowToRowGivenCell(pivotRow: number, cell: ColumnCell, pivotColumn: number) {
|
|
102
101
|
const target = cell.row;
|
|
103
102
|
const targetCells = this.rows[target];
|
|
@@ -135,13 +134,10 @@ export class StaticMatrix {
|
|
|
135
134
|
for (const cell of this.rows[row]) cell.coeff = cell.coeff.div(alpha);
|
|
136
135
|
}
|
|
137
136
|
|
|
138
|
-
// add_rows: adds row from multiplied by alpha to row to.
|
|
139
137
|
addRows(alpha: Rational, from: number, to: number) {
|
|
140
138
|
this.addCellsToRow(to, this.rows[from], alpha, -1);
|
|
141
139
|
}
|
|
142
140
|
|
|
143
|
-
// pivot_row_to_row_given_cell_with_sign: eliminates the pivot column from the row of the cell by
|
|
144
|
-
// adding the pivot row times the sign.
|
|
145
141
|
pivotRowToRowGivenCellWithSign(
|
|
146
142
|
pivotRow: number,
|
|
147
143
|
cell: ColumnCell,
|
|
@@ -151,19 +147,17 @@ export class StaticMatrix {
|
|
|
151
147
|
this.pivotCellsToRow(this.rows[pivotRow], cell, pivotColumn, sign);
|
|
152
148
|
}
|
|
153
149
|
|
|
154
|
-
// pivot_term_to_row_given_cell: the same with the cells of a term in place of the pivot row.
|
|
155
150
|
pivotTermToRowGivenCell(term: LarTerm, cell: ColumnCell, pivotColumn: number, sign: number) {
|
|
156
151
|
this.pivotCellsToRow(getTermCells(term), cell, pivotColumn, sign);
|
|
157
152
|
}
|
|
158
153
|
|
|
159
|
-
// add_term_to_row: adds the term multiplied by alpha to the row.
|
|
160
154
|
addTermToRow(alpha: Rational, term: LarTerm, row: number) {
|
|
161
155
|
for (const entry of term.coeffs) this.addColumnsUpTo(entry[0]);
|
|
162
156
|
this.addCellsToRow(row, getTermCells(term), alpha, -1);
|
|
163
157
|
}
|
|
164
158
|
|
|
165
159
|
private pivotCellsToRow(
|
|
166
|
-
cells: readonly
|
|
160
|
+
cells: readonly CoeffCell[],
|
|
167
161
|
cell: ColumnCell,
|
|
168
162
|
pivotColumn: number,
|
|
169
163
|
sign: number,
|
|
@@ -175,11 +169,9 @@ export class StaticMatrix {
|
|
|
175
169
|
this.addCellsToRow(target, cells, alpha, pivotColumn);
|
|
176
170
|
}
|
|
177
171
|
|
|
178
|
-
// The cells times alpha added to the row, skipping a column, and the cells that cancel removed
|
|
179
|
-
// from the end.
|
|
180
172
|
private addCellsToRow(
|
|
181
173
|
row: number,
|
|
182
|
-
cells: readonly
|
|
174
|
+
cells: readonly CoeffCell[],
|
|
183
175
|
alpha: Rational,
|
|
184
176
|
skippedColumn: number,
|
|
185
177
|
) {
|
|
@@ -206,8 +198,6 @@ export class StaticMatrix {
|
|
|
206
198
|
for (const cell of this.rows[second]) this.columns[cell.column][cell.offset].row = second;
|
|
207
199
|
}
|
|
208
200
|
|
|
209
|
-
// fill_last_row_with_pivoting: the row of a new basic column for a term, with the basic columns
|
|
210
|
-
// of the term substituted by their rows.
|
|
211
201
|
fillLastRowWithPivoting(term: LarTerm, basic: number, basisHeading: number[]) {
|
|
212
202
|
const work: Rational[] = [];
|
|
213
203
|
const index: number[] = [];
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/trail.h, src/util/union_find.h), MIT license, see z3-license.txt.
|
|
2
|
-
// scoped undo trail, and the union-find over it whose merges a pop undoes, which nla's variable
|
|
3
|
-
// equivalences and monomial congruence classes use.
|
|
1
|
+
// Ported from Z3 (src/util/trail.h, src/util/union_find.h), MIT license, see z3-license.txt.
|
|
4
2
|
import { shrink } from "../array";
|
|
5
3
|
|
|
6
4
|
export class TrailStack {
|
|
@@ -23,9 +21,7 @@ export class TrailStack {
|
|
|
23
21
|
}
|
|
24
22
|
}
|
|
25
23
|
|
|
26
|
-
// The handlers of union_find's context: r2 becomes the root of r1's class.
|
|
27
24
|
export interface UnionFindHandler {
|
|
28
|
-
mergeEh?: (r2: number, r1: number, v2: number, v1: number) => void;
|
|
29
25
|
afterMergeEh?: (r2: number, r1: number, v2: number, v1: number) => void;
|
|
30
26
|
unmergeEh?: (r2: number, r1: number) => void;
|
|
31
27
|
}
|
|
@@ -75,7 +71,6 @@ export class UnionFind {
|
|
|
75
71
|
const r2 = isSwapped ? root1 : root2;
|
|
76
72
|
const v1 = isSwapped ? inputV2 : inputV1;
|
|
77
73
|
const v2 = isSwapped ? inputV1 : inputV2;
|
|
78
|
-
this.handler.mergeEh?.(r2, r1, v2, v1);
|
|
79
74
|
this.finds[r1] = r2;
|
|
80
75
|
this.sizes[r2] += this.sizes[r1];
|
|
81
76
|
this.swapNexts(r1, r2);
|