tla-ts 0.0.9-dev.8298a52 → 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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -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 +1 -1
- 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 +1 -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 +564 -366
- package/src/cli/options.ts +10 -5
- 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 +525 -216
- package/src/cli/typescript.ts +0 -3
- 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 +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- 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 +77 -117
- package/src/liveness.ts +106 -62
- 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 +24 -33
- package/src/parallel.ts +48 -40
- 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 +1 -16
- 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 +260 -91
- 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 +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- package/src/worker.ts +7 -8
|
@@ -1,22 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_core.h, src/math/lp/nla_core.cpp, src/math/lp/nla_common.cpp,
|
|
2
|
-
// src/math/lp/nla_explanations.cpp, src/math/lp/factorization.cpp,
|
|
3
|
-
// src/math/lp/factorization_factory_imp.cpp, src/math/lp/nla_solver.cpp), MIT license, see
|
|
4
|
-
// z3-license.txt. The nonlinear core over lar_solver: the monomials whose values disagree with the
|
|
5
|
-
// products of their factors' values are refined by lemmas, which the passes below generate, and
|
|
6
|
-
// by literals to split on, and by nlsat's search on what they leave open, see nra-solver.ts.
|
|
1
|
+
// Ported from Z3 (src/math/lp/nla_core.h, src/math/lp/nla_core.cpp, src/math/lp/nla_common.cpp, src/math/lp/nla_explanations.cpp, src/math/lp/factorization.cpp, src/math/lp/factorization_factory_imp.cpp, src/math/lp/nla_solver.cpp), MIT license, see z3-license.txt.
|
|
7
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
8
3
|
import type { ResourceLimit } from "../rlimit";
|
|
9
4
|
import { Rational } from "../rational";
|
|
10
5
|
import { IndexedUintSet } from "./containers";
|
|
11
|
-
import {
|
|
12
|
-
COLUMN_BOXED,
|
|
13
|
-
COLUMN_FIXED,
|
|
14
|
-
COLUMN_FREE,
|
|
15
|
-
COLUMN_LOWER,
|
|
16
|
-
COLUMN_UPPER,
|
|
17
|
-
LP_FEASIBLE,
|
|
18
|
-
LP_OPTIMAL,
|
|
19
|
-
} from "./core-solver";
|
|
6
|
+
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
20
7
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
21
8
|
import type { Dependency } from "./dependency";
|
|
22
9
|
import { Explanation } from "./explanation";
|
|
@@ -26,7 +13,7 @@ import { Impq } from "./numeric-pair";
|
|
|
26
13
|
import { Backoff, SqueezeSchedule } from "./nla-backoff";
|
|
27
14
|
import { Basics } from "./nla-basics";
|
|
28
15
|
import { Divisions } from "./nla-divisions";
|
|
29
|
-
import { Emonics, Monic } from "./nla-emonics";
|
|
16
|
+
import { Emonics, type Monic } from "./nla-emonics";
|
|
30
17
|
import { type Factor, type Factorization, mkFactor, mkMonFactorization } from "./nla-factorization";
|
|
31
18
|
import { Grobner } from "./nla-grobner";
|
|
32
19
|
import { Horner } from "./nla-horner";
|
|
@@ -56,8 +43,6 @@ interface NlaParams {
|
|
|
56
43
|
hornerFrequency: number;
|
|
57
44
|
hornerRowLengthLimit: number;
|
|
58
45
|
grobner: boolean;
|
|
59
|
-
grobnerRowLengthLimit: number;
|
|
60
|
-
grobnerFrequency: number;
|
|
61
46
|
grobnerEqsGrowth: number;
|
|
62
47
|
grobnerExprSizeGrowth: number;
|
|
63
48
|
grobnerExprDegreeGrowth: number;
|
|
@@ -79,29 +64,19 @@ interface NlaParams {
|
|
|
79
64
|
orderBinomialSign: boolean;
|
|
80
65
|
tangents: boolean;
|
|
81
66
|
tangentsBoxCorners: boolean;
|
|
82
|
-
expensivePatching: boolean;
|
|
83
|
-
expp: boolean;
|
|
84
|
-
monomialSandwich: boolean;
|
|
85
|
-
monomialSandwichMaxFanout: number;
|
|
86
|
-
monomialBinomialSign: boolean;
|
|
87
67
|
reducePseudoLinear: boolean;
|
|
88
68
|
delay: number;
|
|
89
|
-
propagateLinearMonomials: boolean;
|
|
90
69
|
linearizeViolatedMonomials: boolean;
|
|
91
70
|
optimizeBounds: boolean;
|
|
92
71
|
optimizeBoundsLpMaxVars: number;
|
|
93
|
-
crossNested: boolean;
|
|
94
72
|
}
|
|
95
73
|
|
|
96
|
-
// The arith.nl parameters of Z3's defaults that nla reads.
|
|
97
74
|
export const NLA_PARAMS: Readonly<NlaParams> = {
|
|
98
75
|
horner: true,
|
|
99
76
|
hornerSubsFixed: 2,
|
|
100
77
|
hornerFrequency: 4,
|
|
101
78
|
hornerRowLengthLimit: 10,
|
|
102
79
|
grobner: true,
|
|
103
|
-
grobnerRowLengthLimit: 10,
|
|
104
|
-
grobnerFrequency: 4,
|
|
105
80
|
grobnerEqsGrowth: 10,
|
|
106
81
|
grobnerExprSizeGrowth: 2,
|
|
107
82
|
grobnerExprDegreeGrowth: 2,
|
|
@@ -123,18 +98,11 @@ export const NLA_PARAMS: Readonly<NlaParams> = {
|
|
|
123
98
|
orderBinomialSign: true,
|
|
124
99
|
tangents: true,
|
|
125
100
|
tangentsBoxCorners: false,
|
|
126
|
-
expensivePatching: false,
|
|
127
|
-
expp: false,
|
|
128
|
-
monomialSandwich: false,
|
|
129
|
-
monomialSandwichMaxFanout: 0,
|
|
130
|
-
monomialBinomialSign: false,
|
|
131
101
|
reducePseudoLinear: true,
|
|
132
102
|
delay: 10,
|
|
133
|
-
propagateLinearMonomials: true,
|
|
134
103
|
linearizeViolatedMonomials: true,
|
|
135
104
|
optimizeBounds: true,
|
|
136
105
|
optimizeBoundsLpMaxVars: 120,
|
|
137
|
-
crossNested: true,
|
|
138
106
|
};
|
|
139
107
|
|
|
140
108
|
interface NlaEquality {
|
|
@@ -164,18 +132,17 @@ export class NlaCore {
|
|
|
164
132
|
isCheckFeasible = false;
|
|
165
133
|
isNlaSatisfied = false;
|
|
166
134
|
readonly throttle: NlaThrottle;
|
|
167
|
-
readonly tangents: Tangents;
|
|
168
|
-
readonly basics: Basics;
|
|
169
|
-
readonly order: Order;
|
|
170
|
-
readonly monotone: Monotone;
|
|
135
|
+
private readonly tangents: Tangents;
|
|
136
|
+
private readonly basics: Basics;
|
|
137
|
+
private readonly order: Order;
|
|
138
|
+
private readonly monotone: Monotone;
|
|
171
139
|
readonly divisions: Divisions;
|
|
172
140
|
readonly intervals: Intervals;
|
|
173
|
-
readonly monomialBounds: MonomialBounds;
|
|
174
|
-
readonly patcher: Patcher;
|
|
175
|
-
readonly horner: Horner;
|
|
141
|
+
private readonly monomialBounds: MonomialBounds;
|
|
142
|
+
private readonly patcher: Patcher;
|
|
143
|
+
private readonly horner: Horner;
|
|
176
144
|
readonly grobner: Grobner;
|
|
177
145
|
readonly nra = new NraSolver(this);
|
|
178
|
-
// m_use_nra_model: whether the values of the last nra check stand for lar_solver's.
|
|
179
146
|
isUsingNraModel = false;
|
|
180
147
|
private nlsatBackoff: Backoff;
|
|
181
148
|
private checkAssignmentFailCount = 0;
|
|
@@ -207,7 +174,7 @@ export class NlaCore {
|
|
|
207
174
|
};
|
|
208
175
|
}
|
|
209
176
|
|
|
210
|
-
get settings() {
|
|
177
|
+
private get settings() {
|
|
211
178
|
return this.lra.settings;
|
|
212
179
|
}
|
|
213
180
|
|
|
@@ -215,8 +182,6 @@ export class NlaCore {
|
|
|
215
182
|
return this.lra.settings.stats;
|
|
216
183
|
}
|
|
217
184
|
|
|
218
|
-
// Values and bounds.
|
|
219
|
-
|
|
220
185
|
val(lpVar: number) {
|
|
221
186
|
return this.lra.getValue(lpVar).x;
|
|
222
187
|
}
|
|
@@ -236,7 +201,7 @@ export class NlaCore {
|
|
|
236
201
|
return factor.isNegated ? value.neg() : value;
|
|
237
202
|
}
|
|
238
203
|
|
|
239
|
-
compareHolds(left: Rational, cmp: number, right: Rational) {
|
|
204
|
+
private compareHolds(left: Rational, cmp: number, right: Rational) {
|
|
240
205
|
const comparison = left.compare(right);
|
|
241
206
|
switch (cmp) {
|
|
242
207
|
case KIND_LE:
|
|
@@ -254,7 +219,7 @@ export class NlaCore {
|
|
|
254
219
|
}
|
|
255
220
|
}
|
|
256
221
|
|
|
257
|
-
value(term: LarTerm) {
|
|
222
|
+
private value(term: LarTerm) {
|
|
258
223
|
let result = Rational.zero;
|
|
259
224
|
for (const entry of term.coeffs) result = result.add(entry[1].mul(this.val(entry[0])));
|
|
260
225
|
return result;
|
|
@@ -301,10 +266,6 @@ export class NlaCore {
|
|
|
301
266
|
return this.lra.isFixed(lpVar);
|
|
302
267
|
}
|
|
303
268
|
|
|
304
|
-
varIsFree(lpVar: number) {
|
|
305
|
-
return this.lra.isFree(lpVar);
|
|
306
|
-
}
|
|
307
|
-
|
|
308
269
|
varHasPositiveLowerBound(lpVar: number) {
|
|
309
270
|
const lower = this.lra.getLowerBound(lpVar);
|
|
310
271
|
return (
|
|
@@ -321,7 +282,7 @@ export class NlaCore {
|
|
|
321
282
|
);
|
|
322
283
|
}
|
|
323
284
|
|
|
324
|
-
varIsBig(lpVar: number) {
|
|
285
|
+
private varIsBig(lpVar: number) {
|
|
325
286
|
return !this.varIsInt(lpVar) && this.val(lpVar).isBig();
|
|
326
287
|
}
|
|
327
288
|
|
|
@@ -341,8 +302,6 @@ export class NlaCore {
|
|
|
341
302
|
return vars.some((lpVar) => this.val(lpVar).isZero());
|
|
342
303
|
}
|
|
343
304
|
|
|
344
|
-
// Monomials and their canonization.
|
|
345
|
-
|
|
346
305
|
isMonicVar(lpVar: number) {
|
|
347
306
|
return this.emons.isMonicVar(lpVar);
|
|
348
307
|
}
|
|
@@ -351,26 +310,22 @@ export class NlaCore {
|
|
|
351
310
|
return this.emons.get(lpVar);
|
|
352
311
|
}
|
|
353
312
|
|
|
354
|
-
|
|
355
|
-
return
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
sortedRvars(factor: Factor) {
|
|
359
|
-
return factor.isMon ? this.emons.get(factor.variable).rvars : [this.mapToRoot(factor.variable)];
|
|
360
|
-
}
|
|
361
|
-
|
|
362
|
-
canonizeSignVar(lpVar: number) {
|
|
363
|
-
return isSignedVarNegated(this.varEqs.findVar(lpVar));
|
|
313
|
+
private sortedRvars(factor: Factor) {
|
|
314
|
+
return factor.isMon
|
|
315
|
+
? this.emons.get(factor.variable).rvars
|
|
316
|
+
: [getSignedVarVar(this.varEqs.findVar(factor.variable))];
|
|
364
317
|
}
|
|
365
318
|
|
|
366
|
-
canonizeSignFactor(factor: Factor) {
|
|
319
|
+
private canonizeSignFactor(factor: Factor) {
|
|
367
320
|
return (
|
|
368
321
|
factor.isNegated !==
|
|
369
|
-
(factor.isMon
|
|
322
|
+
(factor.isMon
|
|
323
|
+
? this.emons.get(factor.variable).rsign
|
|
324
|
+
: isSignedVarNegated(this.varEqs.findVar(factor.variable)))
|
|
370
325
|
);
|
|
371
326
|
}
|
|
372
327
|
|
|
373
|
-
canonizeSignFactorization(factorization: Factorization) {
|
|
328
|
+
private canonizeSignFactorization(factorization: Factorization) {
|
|
374
329
|
let sign = false;
|
|
375
330
|
for (const factor of factorization.factors) sign = sign !== this.canonizeSignFactor(factor);
|
|
376
331
|
return sign;
|
|
@@ -386,28 +341,15 @@ export class NlaCore {
|
|
|
386
341
|
return sign;
|
|
387
342
|
}
|
|
388
343
|
|
|
389
|
-
findCanonicalMonicOfVars(vars: number[]) {
|
|
390
|
-
return this.emons.findCanonical(vars)?.variable;
|
|
391
|
-
}
|
|
392
|
-
|
|
393
|
-
isCanonicalMonic(lpVar: number) {
|
|
394
|
-
return this.emons.isCanonicalMonic(lpVar);
|
|
395
|
-
}
|
|
396
|
-
|
|
397
344
|
addMonic(lpVar: number, vars: number[]) {
|
|
398
345
|
this.emons.add(lpVar, vars);
|
|
399
346
|
this.monicsWithChangedBounds.add(lpVar);
|
|
400
347
|
}
|
|
401
348
|
|
|
402
|
-
productValue(monic: Monic) {
|
|
403
|
-
return this.mulVal(monic);
|
|
404
|
-
}
|
|
405
|
-
|
|
406
|
-
// check_monic: whether the value of the monic is the product of its factors' values.
|
|
407
349
|
checkMonic(monic: Monic) {
|
|
408
350
|
const value = this.lra.getValue(monic.variable);
|
|
409
351
|
if (this.lra.isInt(monic.variable) && !value.x.isInt()) return true;
|
|
410
|
-
return this.
|
|
352
|
+
return this.mulVal(monic).equals(value.x);
|
|
411
353
|
}
|
|
412
354
|
|
|
413
355
|
hasRelevantMonomial() {
|
|
@@ -433,7 +375,6 @@ export class NlaCore {
|
|
|
433
375
|
return weight;
|
|
434
376
|
}
|
|
435
377
|
|
|
436
|
-
// divide: the factor b with bc = b * c, up to sign.
|
|
437
378
|
divide(product: Monic, divisor: Factor): Factor | undefined {
|
|
438
379
|
const divisorVars = this.sortedRvars(divisor);
|
|
439
380
|
const quotientVars = getVectorDiv(product.rvars, divisorVars);
|
|
@@ -450,7 +391,6 @@ export class NlaCore {
|
|
|
450
391
|
return quotient;
|
|
451
392
|
}
|
|
452
393
|
|
|
453
|
-
// The factorizations of a monic: into its variables first, then into two canonical factors.
|
|
454
394
|
*getFactorizations(rooted: Monic): Generator<Factorization> {
|
|
455
395
|
const vars = rooted.rvars;
|
|
456
396
|
const monic = this.emons.get(rooted.variable);
|
|
@@ -460,7 +400,7 @@ export class NlaCore {
|
|
|
460
400
|
let numFailures = 0;
|
|
461
401
|
const getFactor = (factorVars: number[]): Factor | undefined => {
|
|
462
402
|
if (factorVars.length === 1) return mkFactor(factorVars[0], false);
|
|
463
|
-
const variable = this.
|
|
403
|
+
const variable = this.emons.findCanonical(factorVars)?.variable;
|
|
464
404
|
if (variable === undefined) {
|
|
465
405
|
numFailures++;
|
|
466
406
|
return undefined;
|
|
@@ -502,14 +442,10 @@ export class NlaCore {
|
|
|
502
442
|
}
|
|
503
443
|
}
|
|
504
444
|
|
|
505
|
-
// Lemma helpers.
|
|
506
|
-
|
|
507
445
|
negateRelation(lemma: LemmaBuilder, lpVar: number, value: Rational) {
|
|
508
446
|
lemma.addIneq(mkIneq(lpVar, this.val(lpVar).compare(value) < 0 ? KIND_GE : KIND_LE, value));
|
|
509
447
|
}
|
|
510
448
|
|
|
511
|
-
// Explanations of inequalities by bounds.
|
|
512
|
-
|
|
513
449
|
private explainCoeffBound(
|
|
514
450
|
column: number,
|
|
515
451
|
coeff: Rational,
|
|
@@ -541,7 +477,6 @@ export class NlaCore {
|
|
|
541
477
|
return true;
|
|
542
478
|
}
|
|
543
479
|
|
|
544
|
-
// explain_ineq: whether the bounds imply the negation of term cmp rs, added to the lemma.
|
|
545
480
|
explainIneq(lemma: LemmaBuilder, term: LarTerm, cmp: number, rs: Rational) {
|
|
546
481
|
if (term.size === 0 && rs.isZero() && (cmp === KIND_LT || cmp === KIND_GT || cmp === KIND_NE))
|
|
547
482
|
return true;
|
|
@@ -575,7 +510,6 @@ export class NlaCore {
|
|
|
575
510
|
return true;
|
|
576
511
|
}
|
|
577
512
|
|
|
578
|
-
// is_octagon_term: whether the term is +-x +-y, and whether its signs agree.
|
|
579
513
|
private getOctagonTerm(term: LarTerm) {
|
|
580
514
|
if (term.size !== 2) return undefined;
|
|
581
515
|
let isMinusSeen = false;
|
|
@@ -600,7 +534,6 @@ export class NlaCore {
|
|
|
600
534
|
return true;
|
|
601
535
|
}
|
|
602
536
|
|
|
603
|
-
// collect_equivs: the term columns fixed to zero that equate or negate two variables.
|
|
604
537
|
private collectEquivs() {
|
|
605
538
|
const lra = this.lra;
|
|
606
539
|
for (const term of lra.terms) {
|
|
@@ -618,8 +551,6 @@ export class NlaCore {
|
|
|
618
551
|
this.emons.ensureCanonized();
|
|
619
552
|
}
|
|
620
553
|
|
|
621
|
-
// The search.
|
|
622
|
-
|
|
623
554
|
random() {
|
|
624
555
|
return this.settings.getRandomNext();
|
|
625
556
|
}
|
|
@@ -628,13 +559,12 @@ export class NlaCore {
|
|
|
628
559
|
return this.settings.isCanceled();
|
|
629
560
|
}
|
|
630
561
|
|
|
631
|
-
// check_bounded_divisions: the lemmas of the divisions of bounded terms by numerals.
|
|
632
562
|
checkBoundedDivisions() {
|
|
633
563
|
this.clear();
|
|
634
564
|
this.divisions.checkBoundedDivisions();
|
|
635
565
|
}
|
|
636
566
|
|
|
637
|
-
clear() {
|
|
567
|
+
private clear() {
|
|
638
568
|
this.lemmas = [];
|
|
639
569
|
this.literals = [];
|
|
640
570
|
this.fixedEqualities = [];
|
|
@@ -642,15 +572,6 @@ export class NlaCore {
|
|
|
642
572
|
this.isCheckFeasible = false;
|
|
643
573
|
}
|
|
644
574
|
|
|
645
|
-
private initSearch() {
|
|
646
|
-
this.clear();
|
|
647
|
-
this.collectEquivs();
|
|
648
|
-
}
|
|
649
|
-
|
|
650
|
-
insertToRefine(lpVar: number) {
|
|
651
|
-
this.toRefine.add(lpVar);
|
|
652
|
-
}
|
|
653
|
-
|
|
654
575
|
eraseFromToRefine(lpVar: number) {
|
|
655
576
|
if (this.toRefine.has(lpVar)) this.toRefine.delete(lpVar);
|
|
656
577
|
}
|
|
@@ -662,11 +583,11 @@ export class NlaCore {
|
|
|
662
583
|
const size = this.emons.numMonics;
|
|
663
584
|
for (let index = 0; index < size; index++) {
|
|
664
585
|
const monic = this.emons.monics[(index + offset) % size];
|
|
665
|
-
if (!this.checkMonic(monic)) this.
|
|
586
|
+
if (!this.checkMonic(monic)) this.toRefine.add(monic.variable);
|
|
666
587
|
}
|
|
667
588
|
}
|
|
668
589
|
|
|
669
|
-
conflictFound() {
|
|
590
|
+
private conflictFound() {
|
|
670
591
|
return this.lemmas.some(isConflictLemma);
|
|
671
592
|
}
|
|
672
593
|
|
|
@@ -674,7 +595,7 @@ export class NlaCore {
|
|
|
674
595
|
return this.lemmas.length >= 10 || this.conflictFound() || this.isCanceled();
|
|
675
596
|
}
|
|
676
597
|
|
|
677
|
-
findBfcToRefineOnMonic(monic: Monic) {
|
|
598
|
+
private findBfcToRefineOnMonic(monic: Monic) {
|
|
678
599
|
for (const factorization of this.getFactorizations(monic)) {
|
|
679
600
|
if (factorization.factors.length !== 2) continue;
|
|
680
601
|
const product = this.valFactor(factorization.factors[0]).mul(
|
|
@@ -685,7 +606,6 @@ export class NlaCore {
|
|
|
685
606
|
return undefined;
|
|
686
607
|
}
|
|
687
608
|
|
|
688
|
-
// find_bfc_to_refine: a monic to refine, with a binary factorization of it.
|
|
689
609
|
findBfcToRefine() {
|
|
690
610
|
const offset = this.random();
|
|
691
611
|
const size = this.toRefine.size;
|
|
@@ -705,7 +625,6 @@ export class NlaCore {
|
|
|
705
625
|
return undefined;
|
|
706
626
|
}
|
|
707
627
|
|
|
708
|
-
// check_weighted: runs the checks in a random order weighted by their weights, until one yields.
|
|
709
628
|
private checkWeighted(checks: WeightedCheck[]) {
|
|
710
629
|
let bound = 0;
|
|
711
630
|
for (const check of checks) bound += check[0];
|
|
@@ -725,14 +644,13 @@ export class NlaCore {
|
|
|
725
644
|
}
|
|
726
645
|
}
|
|
727
646
|
|
|
728
|
-
// add_bounds: a split on a free variable of a monic to refine.
|
|
729
647
|
private addBounds() {
|
|
730
648
|
const offset = this.random();
|
|
731
649
|
const size = this.toRefine.size;
|
|
732
650
|
for (let index = 0; index < size; index++) {
|
|
733
651
|
const monic = this.emons.get(this.toRefine.elems[(index + offset) % size]);
|
|
734
652
|
for (const lpVar of monic.vars) {
|
|
735
|
-
if (!this.
|
|
653
|
+
if (!this.lra.isFree(lpVar) || monic.isBoundPropagated) continue;
|
|
736
654
|
this.emons.setBoundPropagated(monic);
|
|
737
655
|
this.literals.push(mkIneq(lpVar, KIND_EQ, 0));
|
|
738
656
|
this.stats.nlaAddBounds++;
|
|
@@ -750,18 +668,18 @@ export class NlaCore {
|
|
|
750
668
|
const stats = this.stats;
|
|
751
669
|
stats.nlaCalls++;
|
|
752
670
|
this.lra.getRidOfInfEps();
|
|
753
|
-
if (this.lra.
|
|
671
|
+
if (!this.lra.isFeasible()) return L_UNDEF;
|
|
754
672
|
this.initToRefine();
|
|
755
673
|
this.patcher.patchMonomials();
|
|
756
674
|
this.setUseNraModel(false);
|
|
757
675
|
if (this.toRefine.size === 0) return this.onToRefineEmpty();
|
|
758
|
-
this.
|
|
676
|
+
this.clear();
|
|
677
|
+
this.collectEquivs();
|
|
759
678
|
this.isNlaSatisfied = false;
|
|
760
679
|
let result = L_UNDEF;
|
|
761
680
|
const isRunningGrobner = NLA_PARAMS.grobner;
|
|
762
681
|
const isRunningHorner = NLA_PARAMS.horner && stats.nlaCalls % NLA_PARAMS.hornerFrequency === 0;
|
|
763
682
|
const isRunningBounds = NLA_PARAMS.branching;
|
|
764
|
-
// Model-based basic lemmas are effective on small systems, and branching on larger ones.
|
|
765
683
|
const isDelayingBounds = isRunningBounds && this.emons.numMonics <= 8;
|
|
766
684
|
const hasNoEffect = () =>
|
|
767
685
|
result === L_UNDEF &&
|
|
@@ -814,7 +732,8 @@ export class NlaCore {
|
|
|
814
732
|
result = this.nra.checkAssignment();
|
|
815
733
|
if (result !== L_TRUE) this.checkAssignmentFailCount++;
|
|
816
734
|
}
|
|
817
|
-
if (hasNoEffect() &&
|
|
735
|
+
if (hasNoEffect() && NLA_PARAMS.nra && this.nlsatBackoff.shouldRun())
|
|
736
|
+
result = this.boundedNlsat();
|
|
818
737
|
if (hasNoEffect()) this.basics.basicLemma(true);
|
|
819
738
|
if (hasNoEffect() && isDelayingBounds) this.basics.basicLemma(false);
|
|
820
739
|
if (hasNoEffect() && isDelayingBounds) this.addBounds();
|
|
@@ -839,12 +758,6 @@ export class NlaCore {
|
|
|
839
758
|
return result;
|
|
840
759
|
}
|
|
841
760
|
|
|
842
|
-
private shouldRunBoundedNlsat() {
|
|
843
|
-
return NLA_PARAMS.nra && this.nlsatBackoff.shouldRun();
|
|
844
|
-
}
|
|
845
|
-
|
|
846
|
-
// bounded_nlsat: a run of nlsat capped at 100 conflicts and 100000 steps. A refutation, or a run
|
|
847
|
-
// that took less than a tenth of the steps, makes the backoff run it again sooner.
|
|
848
761
|
private boundedNlsat() {
|
|
849
762
|
const budget = 100000;
|
|
850
763
|
const result = this.nra.check(100, budget);
|
|
@@ -854,7 +767,6 @@ export class NlaCore {
|
|
|
854
767
|
return result;
|
|
855
768
|
}
|
|
856
769
|
|
|
857
|
-
// set_use_nra_model, undone on pop.
|
|
858
770
|
setUseNraModel(isUsing: boolean) {
|
|
859
771
|
if (isUsing === this.isUsingNraModel) return;
|
|
860
772
|
this.emons.trail.push(() => {
|
|
@@ -863,8 +775,6 @@ export class NlaCore {
|
|
|
863
775
|
this.isUsingNraModel = isUsing;
|
|
864
776
|
}
|
|
865
777
|
|
|
866
|
-
// Propagation.
|
|
867
|
-
|
|
868
778
|
propagate() {
|
|
869
779
|
this.clear();
|
|
870
780
|
let isPropagated = false;
|
|
@@ -884,8 +794,6 @@ export class NlaCore {
|
|
|
884
794
|
return isPropagated;
|
|
885
795
|
}
|
|
886
796
|
|
|
887
|
-
// Pseudo-linear monomials: all but one factor are integers in a range of at most 4.
|
|
888
|
-
|
|
889
797
|
private isPseudoLinear(monic: Monic) {
|
|
890
798
|
let hasUnbounded = false;
|
|
891
799
|
for (const lpVar of monic.vars) {
|
|
@@ -943,8 +851,6 @@ export class NlaCore {
|
|
|
943
851
|
);
|
|
944
852
|
}
|
|
945
853
|
|
|
946
|
-
// Scopes.
|
|
947
|
-
|
|
948
854
|
push() {
|
|
949
855
|
this.emons.push();
|
|
950
856
|
}
|
|
@@ -954,7 +860,6 @@ export class NlaCore {
|
|
|
954
860
|
}
|
|
955
861
|
}
|
|
956
862
|
|
|
957
|
-
// vector_div: the multiset difference of sorted vectors, when the divisor is a proper factor.
|
|
958
863
|
const getVectorDiv = (product: number[], divisor: number[]) => {
|
|
959
864
|
if (divisor.length >= product.length) return undefined;
|
|
960
865
|
const quotient: number[] = [];
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/lp/nla_divisions.h, src/math/lp/nla_divisions.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
// divisor, bounded divisions by numerals, and divisibility closures over a shared divisor. The
|
|
4
|
-
// check is skipped while nla uses nlsat's model.
|
|
2
|
+
// z3-license.txt.
|
|
5
3
|
import { getEuclideanDiv, Rational } from "../rational";
|
|
6
4
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
7
5
|
import { NULL_LPVAR } from "./lar-solver";
|
|
8
6
|
import { LarTerm } from "./lar-term";
|
|
9
|
-
import {
|
|
7
|
+
import type { NlaCore } from "./nla-core";
|
|
10
8
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
11
9
|
|
|
12
|
-
// A division q = x / y with r its remainder, or a divisibility fact r = mod(x, y), q = div(x, y).
|
|
13
10
|
export interface Division {
|
|
14
11
|
readonly quotient: number;
|
|
15
12
|
readonly dividend: number;
|
|
@@ -26,7 +23,6 @@ interface DivisionValues {
|
|
|
26
23
|
readonly quotientValue: Rational;
|
|
27
24
|
}
|
|
28
25
|
|
|
29
|
-
// div on integers: Euclidean division, as mpz_manager::div.
|
|
30
26
|
const getIntDiv = (dividend: Rational, divisor: Rational) =>
|
|
31
27
|
Rational.of(getEuclideanDiv(dividend.num, divisor.num));
|
|
32
28
|
|
|
@@ -45,7 +41,6 @@ const mkDifference = (first: number, second: number) =>
|
|
|
45
41
|
export class Divisions {
|
|
46
42
|
private idivisions: Division[] = [];
|
|
47
43
|
private boundedDivisions: Division[] = [];
|
|
48
|
-
// Divisibility facts, whose quotient is div(x, y) and remainder mod(x, y).
|
|
49
44
|
private divisibility: Division[] = [];
|
|
50
45
|
|
|
51
46
|
constructor(private core: NlaCore) {}
|
|
@@ -73,7 +68,6 @@ export class Divisions {
|
|
|
73
68
|
this.pushDivision(this.divisibility, division);
|
|
74
69
|
}
|
|
75
70
|
|
|
76
|
-
// y1 >= y2 > 0 & 0 <= x1 <= x2 => x1/y1 <= x2/y2
|
|
77
71
|
private monotonicity1(first: DivisionValues, second: DivisionValues) {
|
|
78
72
|
if (
|
|
79
73
|
!(
|
|
@@ -94,7 +88,6 @@ export class Divisions {
|
|
|
94
88
|
return true;
|
|
95
89
|
}
|
|
96
90
|
|
|
97
|
-
// y2 <= y1 < 0 & x1 >= x2 >= 0 => x1/y1 <= x2/y2
|
|
98
91
|
private monotonicity2(first: DivisionValues, second: DivisionValues) {
|
|
99
92
|
if (
|
|
100
93
|
!(
|
|
@@ -115,7 +108,6 @@ export class Divisions {
|
|
|
115
108
|
return true;
|
|
116
109
|
}
|
|
117
110
|
|
|
118
|
-
// y2 <= y1 < 0 & x1 <= x2 <= 0 => x1/y1 >= x2/y2
|
|
119
111
|
private monotonicity3(first: DivisionValues, second: DivisionValues) {
|
|
120
112
|
if (
|
|
121
113
|
!(
|
|
@@ -159,8 +151,6 @@ export class Divisions {
|
|
|
159
151
|
};
|
|
160
152
|
}
|
|
161
153
|
|
|
162
|
-
// The monotonicity lemmas of the integer divisions whose quotients are wrong, against the others.
|
|
163
|
-
// Z3's theory_lra registers no real divisions, so the rdivisions it would also check stay empty.
|
|
164
154
|
private checkMonotonicity(divisions: Division[]) {
|
|
165
155
|
const core = this.core;
|
|
166
156
|
for (const division of divisions) {
|
|
@@ -187,8 +177,6 @@ export class Divisions {
|
|
|
187
177
|
this.checkModCongruence();
|
|
188
178
|
}
|
|
189
179
|
|
|
190
|
-
// p <= q * div(r, q) + q - 1 => div(p, q) <= div(r, q), and p >= q * div(r, q) =>
|
|
191
|
-
// div(r, q) <= div(p, q), for a bounded p, a value q and r = eval(p).
|
|
192
180
|
checkBoundedDivisions() {
|
|
193
181
|
const core = this.core;
|
|
194
182
|
const offset = core.random();
|
|
@@ -222,7 +210,6 @@ export class Divisions {
|
|
|
222
210
|
}
|
|
223
211
|
}
|
|
224
212
|
|
|
225
|
-
// mod(factor, p) = 0 => mod(factor * k, p) = 0
|
|
226
213
|
private checkModMult() {
|
|
227
214
|
const core = this.core;
|
|
228
215
|
const offset = core.random();
|
|
@@ -249,40 +236,40 @@ export class Divisions {
|
|
|
249
236
|
}
|
|
250
237
|
}
|
|
251
238
|
|
|
252
|
-
// y != 0 & mod(a, y) = 0 & x = c * a, for an integer constant c, => mod(x, y) = 0
|
|
253
239
|
private checkLinearDivisibility() {
|
|
254
240
|
const core = this.core;
|
|
255
241
|
const size = this.divisibility.length;
|
|
256
242
|
for (let index = 0; index < size; index++) {
|
|
257
243
|
const fact = this.divisibility[index];
|
|
258
|
-
const
|
|
259
|
-
const
|
|
244
|
+
const dividend = fact.dividend;
|
|
245
|
+
const divisor = fact.divisor;
|
|
260
246
|
if (!core.isRelevant(fact.remainder)) continue;
|
|
261
247
|
if (core.val(fact.remainder).isZero()) continue;
|
|
262
|
-
const
|
|
263
|
-
const
|
|
264
|
-
if (
|
|
248
|
+
const dividendValue = core.val(dividend);
|
|
249
|
+
const divisorValue = core.val(divisor);
|
|
250
|
+
if (divisorValue.isZero() || dividendValue.isZero()) continue;
|
|
265
251
|
for (let otherIndex = 0; otherIndex < size; otherIndex++) {
|
|
266
252
|
if (index === otherIndex) continue;
|
|
267
253
|
const other = this.divisibility[otherIndex];
|
|
268
|
-
const
|
|
269
|
-
const
|
|
270
|
-
if (
|
|
254
|
+
const otherDividend = other.dividend;
|
|
255
|
+
const otherDivisor = other.divisor;
|
|
256
|
+
if (otherDivisor !== divisor && !core.val(otherDivisor).equals(divisorValue)) continue;
|
|
271
257
|
if (!core.isRelevant(other.remainder)) continue;
|
|
272
258
|
if (!core.val(other.remainder).isZero()) continue;
|
|
273
|
-
const
|
|
274
|
-
if (
|
|
275
|
-
const coeff =
|
|
259
|
+
const otherDividendValue = core.val(otherDividend);
|
|
260
|
+
if (otherDividendValue.isZero()) continue;
|
|
261
|
+
const coeff = dividendValue.div(otherDividendValue);
|
|
276
262
|
if (!coeff.isInt() || coeff.isZero()) continue;
|
|
277
|
-
if (!
|
|
263
|
+
if (!dividendValue.equals(coeff.mul(otherDividendValue))) continue;
|
|
278
264
|
const lemma = new LemmaBuilder(core);
|
|
279
|
-
lemma.addIneq(mkIneq(
|
|
280
|
-
if (
|
|
265
|
+
lemma.addIneq(mkIneq(divisor, KIND_EQ, 0));
|
|
266
|
+
if (otherDivisor !== divisor)
|
|
267
|
+
lemma.addIneq(mkIneq(mkDifference(divisor, otherDivisor), KIND_NE, 0));
|
|
281
268
|
lemma.addIneq(
|
|
282
269
|
mkIneq(
|
|
283
270
|
new LarTerm([
|
|
284
|
-
[
|
|
285
|
-
[
|
|
271
|
+
[dividend, Rational.one],
|
|
272
|
+
[otherDividend, coeff.neg()],
|
|
286
273
|
]),
|
|
287
274
|
KIND_NE,
|
|
288
275
|
0,
|
|
@@ -295,35 +282,38 @@ export class Divisions {
|
|
|
295
282
|
}
|
|
296
283
|
}
|
|
297
284
|
|
|
298
|
-
// div(x,y) - div(s,y) = delta => mod(x,y) - mod(s,y) = (x - s) - delta*y, for y != 0
|
|
299
285
|
private checkModCongruence() {
|
|
300
286
|
const core = this.core;
|
|
301
287
|
const size = this.divisibility.length;
|
|
302
288
|
for (let index = 0; index < size; index++) {
|
|
303
289
|
const fact = this.divisibility[index];
|
|
304
|
-
const
|
|
290
|
+
const divisor = fact.divisor;
|
|
305
291
|
if (!core.isRelevant(fact.remainder)) continue;
|
|
306
|
-
const
|
|
307
|
-
if (
|
|
292
|
+
const divisorValue = core.val(divisor);
|
|
293
|
+
if (divisorValue.isZero()) continue;
|
|
308
294
|
for (let otherIndex = index + 1; otherIndex < size; otherIndex++) {
|
|
309
295
|
const other = this.divisibility[otherIndex];
|
|
310
|
-
const
|
|
296
|
+
const otherDivisor = other.divisor;
|
|
311
297
|
if (!core.isRelevant(other.remainder)) continue;
|
|
312
|
-
if (
|
|
298
|
+
if (otherDivisor !== divisor && !core.val(otherDivisor).equals(divisorValue)) continue;
|
|
313
299
|
const delta = core.val(fact.quotient).sub(core.val(other.quotient));
|
|
314
300
|
const left = core.val(fact.remainder).sub(core.val(other.remainder));
|
|
315
|
-
const right = core
|
|
301
|
+
const right = core
|
|
302
|
+
.val(fact.dividend)
|
|
303
|
+
.sub(core.val(other.dividend))
|
|
304
|
+
.sub(delta.mul(divisorValue));
|
|
316
305
|
if (left.equals(right)) continue;
|
|
317
306
|
const lemma = new LemmaBuilder(core);
|
|
318
|
-
lemma.addIneq(mkIneq(
|
|
319
|
-
if (
|
|
307
|
+
lemma.addIneq(mkIneq(divisor, KIND_EQ, 0));
|
|
308
|
+
if (otherDivisor !== divisor)
|
|
309
|
+
lemma.addIneq(mkIneq(mkDifference(divisor, otherDivisor), KIND_NE, 0));
|
|
320
310
|
lemma.addIneq(mkIneq(mkDifference(fact.quotient, other.quotient), KIND_NE, delta));
|
|
321
311
|
const term = new LarTerm();
|
|
322
312
|
term.addMonomial(Rational.one, fact.remainder);
|
|
323
313
|
term.addMonomial(Rational.minusOne, other.remainder);
|
|
324
314
|
term.addMonomial(Rational.minusOne, fact.dividend);
|
|
325
315
|
term.addMonomial(Rational.one, other.dividend);
|
|
326
|
-
term.addMonomial(delta,
|
|
316
|
+
term.addMonomial(delta, divisor);
|
|
327
317
|
lemma.addIneq(mkIneq(term, KIND_EQ, 0));
|
|
328
318
|
return;
|
|
329
319
|
}
|