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,16 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/levelwise.cpp, src/nlsat/nlsat_common.cpp,
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
// Deviation: Z3 breaks two ties by polynomial id: between root functions of equal value and degree,
|
|
7
|
-
// and in the order of the arguments of a top-level resultant. Z3 recycles the ids of freed
|
|
8
|
-
// polynomials (id_gen in polynomial.cpp), so its ids depend on its reference counting. Here ids
|
|
9
|
-
// follow creation order. Either choice bounds a valid cell, but the bounding polynomial can be a
|
|
10
|
-
// different one with the same root, such as x0 for -x0. Differential tests count these as ties.
|
|
1
|
+
// Ported from Z3 (src/nlsat/levelwise.cpp, src/nlsat/nlsat_common.cpp), MIT license, see
|
|
2
|
+
// z3-license.txt.
|
|
3
|
+
// Deviation from Z3: ties between polynomials break by creation-order id, where Z3 recycles ids of
|
|
4
|
+
// freed polynomials (id_gen in polynomial.cpp), so a cell bound can be another polynomial with the same root.
|
|
11
5
|
import { NlsatUnsupportedError } from "../../../../errors";
|
|
12
6
|
import { Rational } from "../rational";
|
|
13
|
-
import type
|
|
7
|
+
import { type AlgebraicManager, type Anum, mergeSortIndices } from "./algebraic";
|
|
14
8
|
import {
|
|
15
9
|
NULL_VAR,
|
|
16
10
|
type Polynomial,
|
|
@@ -18,8 +12,6 @@ import {
|
|
|
18
12
|
type PolynomialManager,
|
|
19
13
|
} from "./polynomial";
|
|
20
14
|
|
|
21
|
-
// A section is the index-th root of lower. A sector lies between the lowerIndex-th root of lower
|
|
22
|
-
// and the upperIndex-th root of upper, and a null bound is infinite.
|
|
23
15
|
interface CellInterval {
|
|
24
16
|
isSection: boolean;
|
|
25
17
|
lower: Polynomial | null;
|
|
@@ -28,19 +20,6 @@ interface CellInterval {
|
|
|
28
20
|
upperIndex: number;
|
|
29
21
|
}
|
|
30
22
|
|
|
31
|
-
// lws_spt_threshold, lws_witness_subs_lc and lws_witness_subs_disc.
|
|
32
|
-
interface LevelwiseParams {
|
|
33
|
-
spanningTreeThreshold: number;
|
|
34
|
-
isWitnessSubsLc: boolean;
|
|
35
|
-
isWitnessSubsDisc: boolean;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
const DEFAULT_LEVELWISE_PARAMS: LevelwiseParams = {
|
|
39
|
-
spanningTreeThreshold: 4,
|
|
40
|
-
isWitnessSubsLc: true,
|
|
41
|
-
isWitnessSubsDisc: true,
|
|
42
|
-
};
|
|
43
|
-
|
|
44
23
|
interface RootFunction {
|
|
45
24
|
value: Anum;
|
|
46
25
|
polynomial: Polynomial;
|
|
@@ -51,32 +30,9 @@ interface RootFunction {
|
|
|
51
30
|
type ProjectionMode = "section" | "sector" | "spanningTree";
|
|
52
31
|
|
|
53
32
|
const UNSET = -1;
|
|
54
|
-
// m_side_mask: bit 0 for a root at or below the sample, bit 1 above, 3 for both.
|
|
55
33
|
const BOTH_SIDES = 3;
|
|
34
|
+
const SPANNING_TREE_THRESHOLD = 4;
|
|
56
35
|
|
|
57
|
-
// stable_index_merge_sort: bottom-up, so each pair is compared once even though comparing refines
|
|
58
|
-
// the numbers.
|
|
59
|
-
const sortIndicesStably = (count: number, isLess: (first: number, second: number) => boolean) => {
|
|
60
|
-
let source = Array.from({ length: count }, (_, index) => index);
|
|
61
|
-
for (let width = 1; width < count; width *= 2) {
|
|
62
|
-
const target: number[] = [];
|
|
63
|
-
for (let low = 0; low < count; low += 2 * width) {
|
|
64
|
-
const middle = Math.min(low + width, count);
|
|
65
|
-
const high = Math.min(low + 2 * width, count);
|
|
66
|
-
let left = low;
|
|
67
|
-
let right = middle;
|
|
68
|
-
while (left < middle && right < high)
|
|
69
|
-
target.push(isLess(source[right], source[left]) ? source[right++] : source[left++]);
|
|
70
|
-
while (left < middle) target.push(source[left++]);
|
|
71
|
-
while (right < high) target.push(source[right++]);
|
|
72
|
-
}
|
|
73
|
-
source = target;
|
|
74
|
-
}
|
|
75
|
-
return source;
|
|
76
|
-
};
|
|
77
|
-
|
|
78
|
-
// todo_set with canonicalization: the distinct primitive, sign-normalized polynomials still to
|
|
79
|
-
// project, in insertion order. A polynomial already in the cache goes in as it is.
|
|
80
36
|
export class TodoSet {
|
|
81
37
|
polynomials: Polynomial[] = [];
|
|
82
38
|
private inSet = new Set<number>();
|
|
@@ -95,10 +51,6 @@ export class TodoSet {
|
|
|
95
51
|
this.inSet.clear();
|
|
96
52
|
}
|
|
97
53
|
|
|
98
|
-
contains(polynomial: Polynomial) {
|
|
99
|
-
return this.inSet.has(polynomial.id);
|
|
100
|
-
}
|
|
101
|
-
|
|
102
54
|
insert(polynomial: Polynomial) {
|
|
103
55
|
if (this.inSet.has(polynomial.id)) return polynomial;
|
|
104
56
|
if (this.cache.contains(polynomial)) {
|
|
@@ -119,15 +71,9 @@ export class TodoSet {
|
|
|
119
71
|
}
|
|
120
72
|
|
|
121
73
|
getMaxVar() {
|
|
122
|
-
|
|
123
|
-
for (const polynomial of this.polynomials) {
|
|
124
|
-
const variable = this.pm.maxVar(polynomial);
|
|
125
|
-
if (result === NULL_VAR || variable > result) result = variable;
|
|
126
|
-
}
|
|
127
|
-
return result;
|
|
74
|
+
return this.pm.getMaxVarOfPolys(this.polynomials);
|
|
128
75
|
}
|
|
129
76
|
|
|
130
|
-
// extract_max_polys: moves the polynomials of the maximal variable to out, after clearing it.
|
|
131
77
|
extractMaxPolys(out: Polynomial[]) {
|
|
132
78
|
out.length = 0;
|
|
133
79
|
const variable = this.getMaxVar();
|
|
@@ -135,7 +81,6 @@ export class TodoSet {
|
|
|
135
81
|
return variable;
|
|
136
82
|
}
|
|
137
83
|
|
|
138
|
-
// extract_polys_at_level: moves the polynomials whose maximal variable is x to out.
|
|
139
84
|
extractPolysAtLevel(variable: number, out: Polynomial[]) {
|
|
140
85
|
const kept: Polynomial[] = [];
|
|
141
86
|
for (const polynomial of this.polynomials) {
|
|
@@ -158,7 +103,6 @@ class Levelwise {
|
|
|
158
103
|
private witnesses: (Polynomial | null)[] = [];
|
|
159
104
|
private hasRoots: boolean[] = [];
|
|
160
105
|
private rootFunctions: RootFunction[] = [];
|
|
161
|
-
// m_rel.m_pairs: pairs of levelPolys indices, smaller first, iterated in order.
|
|
162
106
|
private pairs = new Map<string, [number, number]>();
|
|
163
107
|
private sideMask: number[] = [];
|
|
164
108
|
private isLcOmitted: boolean[] = [];
|
|
@@ -172,7 +116,6 @@ class Levelwise {
|
|
|
172
116
|
private sample: readonly (Anum | undefined)[],
|
|
173
117
|
private maxVar: number,
|
|
174
118
|
private isLinear: boolean,
|
|
175
|
-
private params: LevelwiseParams,
|
|
176
119
|
) {
|
|
177
120
|
this.todo = new TodoSet(pm, cache);
|
|
178
121
|
this.intervals = Array.from({ length: maxVar }, () => ({
|
|
@@ -198,7 +141,6 @@ class Levelwise {
|
|
|
198
141
|
if (!this.pm.isConst(factor)) this.todo.insert(factor);
|
|
199
142
|
}
|
|
200
143
|
|
|
201
|
-
// The first element of the subresultant chain that is not zero, or null when it is constant.
|
|
202
144
|
private getFirstPsc(first: Polynomial, second: Polynomial, variable: number) {
|
|
203
145
|
for (const element of this.cache.pscChain(first, second, variable)) {
|
|
204
146
|
if (this.pm.isZero(element)) continue;
|
|
@@ -212,8 +154,6 @@ class Levelwise {
|
|
|
212
154
|
return this.getFirstPsc(polynomial, this.pm.derivative(polynomial, variable), variable);
|
|
213
155
|
}
|
|
214
156
|
|
|
215
|
-
// handle_nullified_poly: p vanishes at the sample. Its coefficients, then its partial
|
|
216
|
-
// derivatives level by level, in non-decreasing variable order, until one does not vanish.
|
|
217
157
|
private handleNullifiedPoly(polynomial: Polynomial) {
|
|
218
158
|
const degree = this.pm.degree(polynomial, this.level);
|
|
219
159
|
for (let power = 0; power <= degree; power++)
|
|
@@ -240,8 +180,6 @@ class Levelwise {
|
|
|
240
180
|
}
|
|
241
181
|
}
|
|
242
182
|
|
|
243
|
-
// choose_nonzero_coeff: a coefficient of p in x that is nonzero at the sample: a constant if
|
|
244
|
-
// there is one, else the least by total degree, size and maximal variable. Null when p vanishes.
|
|
245
183
|
private chooseNonzeroCoeff(polynomial: Polynomial, variable: number) {
|
|
246
184
|
const degree = this.pm.degree(polynomial, variable);
|
|
247
185
|
for (let power = 0; power <= degree; power++) {
|
|
@@ -271,22 +209,17 @@ class Levelwise {
|
|
|
271
209
|
variable: number,
|
|
272
210
|
witness: Polynomial | null,
|
|
273
211
|
isLcAdded: boolean,
|
|
274
|
-
isDiscAdded: boolean,
|
|
275
212
|
) {
|
|
276
213
|
let isWitnessAdded = witness !== null && !this.pm.isConst(witness);
|
|
277
214
|
if (isLcAdded) {
|
|
278
|
-
const
|
|
279
|
-
this.requestFactorized(
|
|
280
|
-
if (isWitnessAdded && this.
|
|
281
|
-
isWitnessAdded = false;
|
|
215
|
+
const leadingCoeff = this.pm.lc(polynomial, variable);
|
|
216
|
+
this.requestFactorized(leadingCoeff);
|
|
217
|
+
if (isWitnessAdded && this.getSign(leadingCoeff) !== 0) isWitnessAdded = false;
|
|
282
218
|
}
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
if (isWitnessAdded && this.params.isWitnessSubsDisc && this.getSign(disc) !== 0)
|
|
288
|
-
isWitnessAdded = false;
|
|
289
|
-
}
|
|
219
|
+
const discriminant = this.getPscDiscriminant(polynomial, variable);
|
|
220
|
+
if (discriminant !== null) {
|
|
221
|
+
this.requestFactorized(discriminant);
|
|
222
|
+
if (isWitnessAdded && this.getSign(discriminant) !== 0) isWitnessAdded = false;
|
|
290
223
|
}
|
|
291
224
|
if (isWitnessAdded) this.requestFactorized(witness);
|
|
292
225
|
}
|
|
@@ -316,13 +249,10 @@ class Levelwise {
|
|
|
316
249
|
});
|
|
317
250
|
}
|
|
318
251
|
|
|
319
|
-
private getBoundIndex(
|
|
320
|
-
return
|
|
252
|
+
private getBoundIndex(rootFunctionIndex: number) {
|
|
253
|
+
return rootFunctionIndex === UNSET ? UNSET : this.rootFunctions[rootFunctionIndex].psIndex;
|
|
321
254
|
}
|
|
322
255
|
|
|
323
|
-
// compute_omit_lc_both_sides: by projective delineability, the leading coefficient of a
|
|
324
|
-
// polynomial with roots on both sides that does not bound the cell may be left out. With
|
|
325
|
-
// isLeafRequired, only for the leaves of the resultant graph.
|
|
326
256
|
private computeOmitLcBothSides(isLeafRequired: boolean) {
|
|
327
257
|
this.isLcOmitted = this.levelPolys.map(() => false);
|
|
328
258
|
if (this.rootFunctions.length === 0 || this.pairs.size === 0 || this.sideMask.length === 0)
|
|
@@ -357,8 +287,6 @@ class Levelwise {
|
|
|
357
287
|
this.addPair(this.lowerRf, index);
|
|
358
288
|
}
|
|
359
289
|
|
|
360
|
-
// build_both_side_spanning_tree: by the reaching orders lemma, in order of the lower root, each
|
|
361
|
-
// polynomial with roots on both sides is joined to the remaining one whose upper root is least.
|
|
362
290
|
private buildBothSideSpanningTree() {
|
|
363
291
|
const lowerRfs = this.levelPolys.map(() => UNSET);
|
|
364
292
|
const upperRfs = this.levelPolys.map(() => UNSET);
|
|
@@ -367,7 +295,11 @@ class Levelwise {
|
|
|
367
295
|
for (let index = this.upperRf; index < this.rootFunctions.length; index++)
|
|
368
296
|
upperRfs[this.rootFunctions[index].psIndex] = index;
|
|
369
297
|
const both = this.levelPolys
|
|
370
|
-
.map((
|
|
298
|
+
.map((_polynomial, psIndex) => ({
|
|
299
|
+
psIndex,
|
|
300
|
+
lowerRf: lowerRfs[psIndex],
|
|
301
|
+
upperRf: upperRfs[psIndex],
|
|
302
|
+
}))
|
|
371
303
|
.filter((info) => this.sideMask[info.psIndex] === BOTH_SIDES)
|
|
372
304
|
.sort((first, second) => first.lowerRf - second.lowerRf);
|
|
373
305
|
for (let first = 0; first < both.length - 1; first++) {
|
|
@@ -380,13 +312,12 @@ class Levelwise {
|
|
|
380
312
|
|
|
381
313
|
private fillRelationSpanningTree() {
|
|
382
314
|
this.buildBothSideSpanningTree();
|
|
383
|
-
const isBoth = (
|
|
384
|
-
|
|
315
|
+
const isBoth = (rootFunctionIndex: number) =>
|
|
316
|
+
this.sideMask[this.rootFunctions[rootFunctionIndex].psIndex] === BOTH_SIDES;
|
|
385
317
|
for (let index = 0; index < this.lowerRf; index++)
|
|
386
318
|
if (!isBoth(index)) this.addPair(index, this.lowerRf);
|
|
387
319
|
for (let index = this.upperRf + 1; index < this.rootFunctions.length; index++)
|
|
388
320
|
if (!isBoth(index)) this.addPair(this.upperRf, index);
|
|
389
|
-
// connect_tree_extremes_to_bounds
|
|
390
321
|
let maxLowerBoth = UNSET;
|
|
391
322
|
for (let index = 0; index < this.lowerRf; index++) if (isBoth(index)) maxLowerBoth = index;
|
|
392
323
|
let minUpperBoth = UNSET;
|
|
@@ -400,8 +331,6 @@ class Levelwise {
|
|
|
400
331
|
this.addPair(this.lowerRf, this.upperRf);
|
|
401
332
|
}
|
|
402
333
|
|
|
403
|
-
// isolate_roots_around_sample: the roots of p closest to v, at or below it in lower and above
|
|
404
|
-
// it in upper, only the one at v for a section. Whether p has roots.
|
|
405
334
|
private isolateRootsAroundSample(
|
|
406
335
|
psIndex: number,
|
|
407
336
|
value: Anum,
|
|
@@ -410,7 +339,7 @@ class Levelwise {
|
|
|
410
339
|
) {
|
|
411
340
|
const polynomial = this.levelPolys[psIndex];
|
|
412
341
|
const values = this.getValuesWithout(this.level);
|
|
413
|
-
const
|
|
342
|
+
const mkRootFunction = (root: Anum, index: number) => ({
|
|
414
343
|
value: this.am.copy(root),
|
|
415
344
|
polynomial,
|
|
416
345
|
index,
|
|
@@ -419,7 +348,9 @@ class Levelwise {
|
|
|
419
348
|
if (value.value instanceof Rational) {
|
|
420
349
|
const closest = this.am.isolateRootsClosest(this.pm, polynomial, values, value.value);
|
|
421
350
|
closest.roots.forEach((root, index) => {
|
|
422
|
-
(this.am.compare(root, value) <= 0 ? lower : upper).push(
|
|
351
|
+
(this.am.compare(root, value) <= 0 ? lower : upper).push(
|
|
352
|
+
mkRootFunction(root, closest.indices[index]),
|
|
353
|
+
);
|
|
423
354
|
});
|
|
424
355
|
return closest.roots.length > 0;
|
|
425
356
|
}
|
|
@@ -440,15 +371,13 @@ class Levelwise {
|
|
|
440
371
|
}
|
|
441
372
|
}
|
|
442
373
|
if (lowerIndex !== UNSET) {
|
|
443
|
-
lower.push(
|
|
374
|
+
lower.push(mkRootFunction(roots[lowerIndex], lowerIndex + 1));
|
|
444
375
|
if (isSection) return roots.length > 0;
|
|
445
376
|
}
|
|
446
|
-
if (upperIndex !== UNSET) upper.push(
|
|
377
|
+
if (upperIndex !== UNSET) upper.push(mkRootFunction(roots[upperIndex], upperIndex + 1));
|
|
447
378
|
return roots.length > 0;
|
|
448
379
|
}
|
|
449
380
|
|
|
450
|
-
// root_function_lt: by value, ties by degree, descending for the lower partition, whose last
|
|
451
|
-
// element bounds the cell, then by polynomial id.
|
|
452
381
|
private isRootFunctionLess(first: RootFunction, second: RootFunction, isDegreeDesc: boolean) {
|
|
453
382
|
if (first.polynomial === second.polynomial) return first.index < second.index;
|
|
454
383
|
const sign = this.am.compare(first.value, second.value);
|
|
@@ -461,7 +390,7 @@ class Levelwise {
|
|
|
461
390
|
}
|
|
462
391
|
|
|
463
392
|
private sortRootFunctions(rootFunctions: RootFunction[], isDegreeDesc: boolean) {
|
|
464
|
-
return
|
|
393
|
+
return mergeSortIndices(rootFunctions.length, (first, second) =>
|
|
465
394
|
this.isRootFunctionLess(rootFunctions[first], rootFunctions[second], isDegreeDesc),
|
|
466
395
|
).map((index) => rootFunctions[index]);
|
|
467
396
|
}
|
|
@@ -512,8 +441,6 @@ class Levelwise {
|
|
|
512
441
|
return polynomial;
|
|
513
442
|
}
|
|
514
443
|
|
|
515
|
-
// add_linear_approximations: bounds of degree 2 or more are replaced by linear polynomials
|
|
516
|
-
// whose roots lie between them and the sample, so the cell only shrinks.
|
|
517
444
|
private addLinearApproximations(value: Anum) {
|
|
518
445
|
const interval = this.intervals[this.level];
|
|
519
446
|
const mkRootFunction = (polynomial: Polynomial, root: Anum) => ({
|
|
@@ -524,7 +451,6 @@ class Levelwise {
|
|
|
524
451
|
});
|
|
525
452
|
if (interval.isSection) {
|
|
526
453
|
if (!this.am.isRational(value))
|
|
527
|
-
// Z3's NOT_IMPLEMENTED_YET exits the process here.
|
|
528
454
|
throw new NlsatUnsupportedError("a linear cell around an irrational section");
|
|
529
455
|
if (this.pm.totalDegree(interval.lower!) > 1) {
|
|
530
456
|
const polynomial = this.addLinearPolyFromRoot(value, true);
|
|
@@ -546,7 +472,6 @@ class Levelwise {
|
|
|
546
472
|
}
|
|
547
473
|
}
|
|
548
474
|
|
|
549
|
-
// build_interval: the root functions around the sample, sorted, and the interval they bound.
|
|
550
475
|
private buildInterval() {
|
|
551
476
|
this.rootFunctions = [];
|
|
552
477
|
this.pairs.clear();
|
|
@@ -562,7 +487,7 @@ class Levelwise {
|
|
|
562
487
|
const value = this.sample[this.level]!;
|
|
563
488
|
const lower: RootFunction[] = [];
|
|
564
489
|
const upper: RootFunction[] = [];
|
|
565
|
-
this.hasRoots = this.levelPolys.map((
|
|
490
|
+
this.hasRoots = this.levelPolys.map((_polynomial, psIndex) =>
|
|
566
491
|
this.isolateRootsAroundSample(psIndex, value, lower, upper),
|
|
567
492
|
);
|
|
568
493
|
if (lower.length === 0 && upper.length === 0) return false;
|
|
@@ -583,8 +508,6 @@ class Levelwise {
|
|
|
583
508
|
);
|
|
584
509
|
}
|
|
585
510
|
|
|
586
|
-
// add_adjacent_root_resultants: at the top level, the resultants of the polynomials of adjacent
|
|
587
|
-
// roots.
|
|
588
511
|
private addAdjacentRootResultants() {
|
|
589
512
|
const rootValues: { root: Anum; polynomial: Polynomial }[] = [];
|
|
590
513
|
const values = this.getValuesWithout(this.maxVar);
|
|
@@ -594,7 +517,7 @@ class Levelwise {
|
|
|
594
517
|
return roots.length > 0;
|
|
595
518
|
});
|
|
596
519
|
if (rootValues.length < 2) return;
|
|
597
|
-
const order =
|
|
520
|
+
const order = mergeSortIndices(
|
|
598
521
|
rootValues.length,
|
|
599
522
|
(first, second) => this.am.compare(rootValues[first].root, rootValues[second].root) < 0,
|
|
600
523
|
);
|
|
@@ -611,14 +534,12 @@ class Levelwise {
|
|
|
611
534
|
}
|
|
612
535
|
}
|
|
613
536
|
|
|
614
|
-
// Polynomials with roots keep their order by resultants with the section's polynomial. Those
|
|
615
|
-
// without need their leading coefficient and discriminant to stay without.
|
|
616
537
|
private addSectionProjections() {
|
|
617
538
|
const sectionPolynomial = this.intervals[this.level].lower;
|
|
618
539
|
const withRoots = new Set(this.rootFunctions.map((rootFunction) => rootFunction.psIndex));
|
|
619
540
|
this.levelPolys.forEach((polynomial, index) => {
|
|
620
541
|
const isFull = polynomial === sectionPolynomial || !withRoots.has(index);
|
|
621
|
-
this.addProjectionForPoly(polynomial, this.level, this.witnesses[index], isFull
|
|
542
|
+
this.addProjectionForPoly(polynomial, this.level, this.witnesses[index], isFull);
|
|
622
543
|
});
|
|
623
544
|
}
|
|
624
545
|
|
|
@@ -626,27 +547,24 @@ class Levelwise {
|
|
|
626
547
|
this.levelPolys.forEach((polynomial, index) => {
|
|
627
548
|
const isLcAdded = !(this.isLcOmitted[index] ?? false);
|
|
628
549
|
let witness = this.witnesses[index];
|
|
629
|
-
// coeffNonNull: a leading coefficient nonzero at the sample is its own witness.
|
|
630
550
|
if (
|
|
631
551
|
isLcAdded &&
|
|
632
552
|
witness !== null &&
|
|
633
553
|
!this.pm.isConst(witness) &&
|
|
634
|
-
this.params.isWitnessSubsLc &&
|
|
635
554
|
this.getSign(this.pm.lc(polynomial, this.level)) !== 0
|
|
636
555
|
)
|
|
637
556
|
witness = null;
|
|
638
|
-
this.addProjectionForPoly(polynomial, this.level, witness, isLcAdded
|
|
557
|
+
this.addProjectionForPoly(polynomial, this.level, witness, isLcAdded);
|
|
639
558
|
});
|
|
640
559
|
}
|
|
641
560
|
|
|
642
561
|
private shouldUseSpanningTree() {
|
|
643
|
-
if (this.params.spanningTreeThreshold < 2) return false;
|
|
644
562
|
if (this.rootFunctions.length < 4 || this.sideMask.length === 0) return false;
|
|
645
563
|
if (this.lowerRf === UNSET || this.upperRf === UNSET) return false;
|
|
646
564
|
if (this.getBoundIndex(this.lowerRf) === this.getBoundIndex(this.upperRf)) return false;
|
|
647
565
|
let bothCount = 0;
|
|
648
566
|
for (let index = 0; index < this.levelPolys.length; index++)
|
|
649
|
-
if (this.sideMask[index] === BOTH_SIDES && ++bothCount >=
|
|
567
|
+
if (this.sideMask[index] === BOTH_SIDES && ++bothCount >= SPANNING_TREE_THRESHOLD)
|
|
650
568
|
return true;
|
|
651
569
|
return false;
|
|
652
570
|
}
|
|
@@ -666,8 +584,6 @@ class Levelwise {
|
|
|
666
584
|
this.addRelationResultants();
|
|
667
585
|
}
|
|
668
586
|
|
|
669
|
-
// collect_non_null_witnesses: a witness per polynomial, until handling the vanishing ones adds
|
|
670
|
-
// no more polynomials at this level.
|
|
671
587
|
private collectNonNullWitnesses() {
|
|
672
588
|
this.witnesses = [];
|
|
673
589
|
for (let index = 0; index < this.levelPolys.length; index++) {
|
|
@@ -686,28 +602,29 @@ class Levelwise {
|
|
|
686
602
|
this.sideMask = [];
|
|
687
603
|
this.collectNonNullWitnesses();
|
|
688
604
|
const hasInterval = this.buildInterval();
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
605
|
+
this.processLevelWithMode(
|
|
606
|
+
this.intervals[this.level].isSection
|
|
607
|
+
? "section"
|
|
608
|
+
: this.shouldUseSpanningTree()
|
|
609
|
+
? "spanningTree"
|
|
610
|
+
: "sector",
|
|
611
|
+
hasInterval,
|
|
612
|
+
);
|
|
695
613
|
}
|
|
696
614
|
|
|
697
|
-
// The top level is projected out without an interval. By projective delineability, a
|
|
698
|
-
// polynomial without roots whose leading coefficient is nonzero needs only its discriminant.
|
|
699
615
|
private processTopLevel() {
|
|
700
616
|
this.collectNonNullWitnesses();
|
|
701
617
|
this.addAdjacentRootResultants();
|
|
702
618
|
this.levelPolys.forEach((polynomial, index) => {
|
|
703
|
-
const
|
|
704
|
-
const isLcAdded =
|
|
619
|
+
const leadingCoeff = this.pm.lc(polynomial, this.maxVar);
|
|
620
|
+
const isLcAdded =
|
|
621
|
+
this.hasRoots[index] || this.pm.isZero(leadingCoeff) || this.getSign(leadingCoeff) === 0;
|
|
705
622
|
if (!isLcAdded) this.witnesses[index] = null;
|
|
706
|
-
this.addProjectionForPoly(polynomial, this.maxVar, this.witnesses[index], isLcAdded
|
|
623
|
+
this.addProjectionForPoly(polynomial, this.maxVar, this.witnesses[index], isLcAdded);
|
|
707
624
|
});
|
|
708
625
|
}
|
|
709
626
|
|
|
710
|
-
|
|
627
|
+
computeSingleCell(polynomials: readonly Polynomial[]) {
|
|
711
628
|
if (this.maxVar === 0) return this.intervals;
|
|
712
629
|
for (const polynomial of polynomials) this.requestFactorized(polynomial);
|
|
713
630
|
if (this.todo.isEmpty) return this.intervals;
|
|
@@ -723,8 +640,6 @@ class Levelwise {
|
|
|
723
640
|
}
|
|
724
641
|
}
|
|
725
642
|
|
|
726
|
-
// levelwise::single_cell: the cell intervals of the variables below maxVar around the sample.
|
|
727
|
-
// isLinear forces linear bounds, for check_assignment's explanations.
|
|
728
643
|
export const getSingleCell = (
|
|
729
644
|
pm: PolynomialManager,
|
|
730
645
|
am: AlgebraicManager,
|
|
@@ -733,5 +648,4 @@ export const getSingleCell = (
|
|
|
733
648
|
maxVar: number,
|
|
734
649
|
sample: readonly (Anum | undefined)[],
|
|
735
650
|
isLinear: boolean,
|
|
736
|
-
|
|
737
|
-
) => new Levelwise(pm, am, cache, sample, maxVar, isLinear, params).singleCell(polynomials);
|
|
651
|
+
) => new Levelwise(pm, am, cache, sample, maxVar, isLinear).computeSingleCell(polynomials);
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/mpbq.{h,cpp}), MIT license, see z3-license.txt.
|
|
2
|
-
// num/2^k, normalized so that k is 0 or num is odd. Like Z3, mul, div2 and power skip normalizing
|
|
3
|
-
// when a normalized input cannot need it, so an unnormalized input stays unnormalized. That
|
|
4
|
-
// matters because magnitudes and is_int read k.
|
|
1
|
+
// Ported from Z3 (src/util/mpbq.{h,cpp}), MIT license, see z3-license.txt.
|
|
5
2
|
import { Rational } from "../rational";
|
|
6
3
|
|
|
7
4
|
const getPowerOfTwoMultiple = (value: bigint) => {
|
|
@@ -15,7 +12,6 @@ const getPowerOfTwoMultiple = (value: bigint) => {
|
|
|
15
12
|
return count;
|
|
16
13
|
};
|
|
17
14
|
|
|
18
|
-
// mpz log2: the position of the most significant bit of |value|.
|
|
19
15
|
export const getLog2 = (value: bigint) => (value < 0n ? -value : value).toString(2).length - 1;
|
|
20
16
|
|
|
21
17
|
export class Mpbq {
|
|
@@ -33,8 +29,6 @@ export class Mpbq {
|
|
|
33
29
|
return new Mpbq(num >> BigInt(shift), k - shift);
|
|
34
30
|
}
|
|
35
31
|
|
|
36
|
-
// to_mpbq: q when its denominator is a power of two, else the binary rational with q's numerator
|
|
37
|
-
// over 2^(log2(den) + 1), which is not equal to q.
|
|
38
32
|
static fromRational(value: Rational) {
|
|
39
33
|
if (value.den === 1n) return { value: Mpbq.of(value.num), isExact: true };
|
|
40
34
|
const log2 = getLog2(value.den);
|
|
@@ -77,14 +71,13 @@ export class Mpbq {
|
|
|
77
71
|
return Mpbq.of(aligned[0] - aligned[1], aligned[2]);
|
|
78
72
|
}
|
|
79
73
|
|
|
80
|
-
// mul
|
|
74
|
+
// Like Z3, mul, div2 and power leave some results unnormalized, and magnitudes and isInt read k.
|
|
81
75
|
mul(other: Mpbq) {
|
|
82
76
|
const product = new Mpbq(this.num * other.num, this.k + other.k);
|
|
83
77
|
return this.k === 0 || other.k === 0 ? Mpbq.of(product.num, product.k) : product;
|
|
84
78
|
}
|
|
85
79
|
|
|
86
|
-
// mul(a, b, b)
|
|
87
|
-
// integer.
|
|
80
|
+
// Z3's mul(a, b, b) reads b's k after writing the product's k, so only an integer a normalizes.
|
|
88
81
|
mulIntoOther(other: Mpbq) {
|
|
89
82
|
const product = new Mpbq(this.num * other.num, this.k + other.k);
|
|
90
83
|
return this.k === 0 ? Mpbq.of(product.num, product.k) : product;
|
|
@@ -115,7 +108,6 @@ export class Mpbq {
|
|
|
115
108
|
return this.toRational().compare(other);
|
|
116
109
|
}
|
|
117
110
|
|
|
118
|
-
// lt_1div2k: this < 1/2^k.
|
|
119
111
|
isLessThanOneDiv2k(k: number) {
|
|
120
112
|
if (this.num <= 0n) return true;
|
|
121
113
|
if (this.k <= k) return false;
|
|
@@ -139,8 +131,6 @@ export class Mpbq {
|
|
|
139
131
|
}
|
|
140
132
|
}
|
|
141
133
|
|
|
142
|
-
// refine_upper: l < q < u, where q is not a binary rational. Bisects until the midpoint is above q,
|
|
143
|
-
// which becomes the new u.
|
|
144
134
|
export const refineUpper = (value: Rational, lower: Mpbq, upper: Mpbq) => {
|
|
145
135
|
let currentLower = lower;
|
|
146
136
|
while (true) {
|
|
@@ -150,7 +140,6 @@ export const refineUpper = (value: Rational, lower: Mpbq, upper: Mpbq) => {
|
|
|
150
140
|
}
|
|
151
141
|
};
|
|
152
142
|
|
|
153
|
-
// refine_lower: as refine_upper, until the midpoint is below q, which becomes the new l.
|
|
154
143
|
export const refineLower = (value: Rational, lower: Mpbq, upper: Mpbq) => {
|
|
155
144
|
let currentUpper = upper;
|
|
156
145
|
while (true) {
|