tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. Builds, orders, and simplifies nex expressions. The order compares variables by
|
|
3
|
-
// weight, then by index, and simplification sorts products and sums by it and merges like terms.
|
|
4
|
-
// Z3 keeps every expression it allocates so that it can free them; here the collector does.
|
|
1
|
+
// Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { Rational } from "../rational";
|
|
6
3
|
import {
|
|
7
4
|
type Nex,
|
|
@@ -17,7 +14,6 @@ import {
|
|
|
17
14
|
isZeroScalar,
|
|
18
15
|
} from "./nex";
|
|
19
16
|
|
|
20
|
-
// occ: how many summands a variable divides, and its smallest power among them.
|
|
21
17
|
interface Occ {
|
|
22
18
|
occs: number;
|
|
23
19
|
power: number;
|
|
@@ -33,7 +29,6 @@ export class NexCreator {
|
|
|
33
29
|
readonly powers = new Map<number, number>();
|
|
34
30
|
private activeVarsWeights: number[] = [];
|
|
35
31
|
|
|
36
|
-
// Assumes every variable is below k. Growing keeps the weights already set.
|
|
37
32
|
setNumberOfVars(count: number) {
|
|
38
33
|
const previousCount = this.activeVarsWeights.length;
|
|
39
34
|
this.activeVarsWeights.length = count;
|
|
@@ -56,7 +51,6 @@ export class NexCreator {
|
|
|
56
51
|
return { kind: "sum", children: [...children] };
|
|
57
52
|
}
|
|
58
53
|
|
|
59
|
-
// mk_mul(e, es...): a rational multiplies the coefficient, an expression is a factor.
|
|
60
54
|
mkMul(...factors: (Nex | Rational)[]): NexMul {
|
|
61
55
|
const children: NexPow[] = [];
|
|
62
56
|
let coeff = Rational.one;
|
|
@@ -71,7 +65,6 @@ export class NexCreator {
|
|
|
71
65
|
return { kind: "mul", coeff, children: [...children] };
|
|
72
66
|
}
|
|
73
67
|
|
|
74
|
-
// mul_factory::mk_reduced.
|
|
75
68
|
private mkReducedMul(coeff: Rational, children: NexPow[]) {
|
|
76
69
|
if (children.length === 0) return this.mkScalar(coeff);
|
|
77
70
|
if (coeff.equals(Rational.one) && children.length === 1 && children[0].power === 1)
|
|
@@ -79,14 +72,12 @@ export class NexCreator {
|
|
|
79
72
|
return this.mkMulWithPowers(coeff, children);
|
|
80
73
|
}
|
|
81
74
|
|
|
82
|
-
gtVar(first: number, second: number) {
|
|
75
|
+
private gtVar(first: number, second: number) {
|
|
83
76
|
const firstWeight = this.activeVarsWeights[first];
|
|
84
77
|
const secondWeight = this.activeVarsWeights[second];
|
|
85
78
|
return firstWeight !== secondWeight ? firstWeight > secondWeight : first > second;
|
|
86
79
|
}
|
|
87
80
|
|
|
88
|
-
// Scalars are the smallest, and the coefficient of a product does not count. Z3's
|
|
89
|
-
// gt_for_sort_join_sum is the same order.
|
|
90
81
|
gt(first: Nex, second: Nex): boolean {
|
|
91
82
|
if (first === second) return false;
|
|
92
83
|
if (first.kind === "var") return this.gtOnVarNex(first, second);
|
|
@@ -149,7 +140,6 @@ export class NexCreator {
|
|
|
149
140
|
return first.children.length > size;
|
|
150
141
|
}
|
|
151
142
|
|
|
152
|
-
// A std::map ordered by gt, greatest first: the index of the key, inserting it when absent.
|
|
153
143
|
private findOrInsert<Value>(entries: MapEntry<Value>[], key: Nex, value: Value) {
|
|
154
144
|
let low = 0;
|
|
155
145
|
let high = entries.length;
|
|
@@ -170,8 +160,6 @@ export class NexCreator {
|
|
|
170
160
|
return expr;
|
|
171
161
|
}
|
|
172
162
|
|
|
173
|
-
// eat_scalar_pow: the coefficient times the factor raised to power when the factor is a
|
|
174
|
-
// constant, else null.
|
|
175
163
|
private eatScalarPow(coeff: Rational, child: NexPow, power: number) {
|
|
176
164
|
if (child.expr.kind === "mul" && child.expr.children.length === 0)
|
|
177
165
|
return child.expr.coeff.equals(Rational.one)
|
|
@@ -183,9 +171,7 @@ export class NexCreator {
|
|
|
183
171
|
: coeff.mul(child.expr.value.pow(child.power * power));
|
|
184
172
|
}
|
|
185
173
|
|
|
186
|
-
|
|
187
|
-
// flattens the product factors, and merges equal factors into powers.
|
|
188
|
-
simplifyMul(mul: NexMul): Nex {
|
|
174
|
+
private simplifyMul(mul: NexMul): Nex {
|
|
189
175
|
const children: NexPow[] = [];
|
|
190
176
|
const toPromote: NexPow[] = [];
|
|
191
177
|
for (const child of mul.children) {
|
|
@@ -214,7 +200,6 @@ export class NexCreator {
|
|
|
214
200
|
return mul;
|
|
215
201
|
}
|
|
216
202
|
|
|
217
|
-
// The map already orders the factors by gt, so Z3's sort that follows changes nothing.
|
|
218
203
|
private mulToPowers(children: NexPow[]): NexPow[] {
|
|
219
204
|
const entries: MapEntry<number>[] = [];
|
|
220
205
|
for (const child of children) {
|
|
@@ -248,9 +233,6 @@ export class NexCreator {
|
|
|
248
233
|
this.sortJoinSum(sum);
|
|
249
234
|
}
|
|
250
235
|
|
|
251
|
-
// sort_join_sum: merges the summands that differ only in their coefficient, a + 3bc + 2bc into
|
|
252
|
-
// a + 5bc, sorts them by gt, and puts the sum of the scalars last. Like Z3, a merged product
|
|
253
|
-
// takes the new coefficient in place.
|
|
254
236
|
private sortJoinSum(sum: NexSum) {
|
|
255
237
|
const entries: MapEntry<Rational>[] = [];
|
|
256
238
|
let commonScalar = Rational.zero;
|
|
@@ -267,6 +249,7 @@ export class NexCreator {
|
|
|
267
249
|
for (const entry of entries) {
|
|
268
250
|
if (entry.value.isZero()) continue;
|
|
269
251
|
if (entry.key.kind === "mul") {
|
|
252
|
+
// Like Z3, a merged product takes the new coefficient in place.
|
|
270
253
|
entry.key.coeff = entry.value;
|
|
271
254
|
sum.children.push(this.simplify(entry.key));
|
|
272
255
|
} else if (entry.value.equals(Rational.one)) sum.children.push(entry.key);
|
|
@@ -286,7 +269,6 @@ export class NexCreator {
|
|
|
286
269
|
return this.mkSum(expr.children.map((child) => this.clone(child)));
|
|
287
270
|
}
|
|
288
271
|
|
|
289
|
-
// mk_div(a, j): a, a product or the variable itself, divided by the variable once.
|
|
290
272
|
mkDivByVar(expr: Nex, variable: number): Nex {
|
|
291
273
|
if (expr.kind !== "mul") return this.mkScalar(Rational.one);
|
|
292
274
|
const children: NexPow[] = [];
|
|
@@ -305,7 +287,6 @@ export class NexCreator {
|
|
|
305
287
|
return this.mkReducedMul(expr.coeff, children);
|
|
306
288
|
}
|
|
307
289
|
|
|
308
|
-
// mk_div_by_mul: each summand, a product or a variable, divided by the product of powers.
|
|
309
290
|
mkDiv(expr: Nex, divisor: NexMul): Nex {
|
|
310
291
|
if (expr.kind === "sum")
|
|
311
292
|
return this.mkSum(expr.children.map((child) => this.mkDiv(child, divisor)));
|
|
@@ -327,15 +308,12 @@ export class NexCreator {
|
|
|
327
308
|
children.push({ expr: this.mkVar(variable), power: child.power - divisorPower });
|
|
328
309
|
this.powers.delete(variable);
|
|
329
310
|
} else if (child.power === divisorPower) this.powers.delete(variable);
|
|
330
|
-
// The factor is eaten by the divisor, whose variable keeps the rest of its power.
|
|
331
311
|
else this.powers.set(variable, divisorPower - child.power);
|
|
332
312
|
}
|
|
333
313
|
return this.mkReducedMul(expr.coeff.div(divisor.coeff), children);
|
|
334
314
|
}
|
|
335
315
|
|
|
336
|
-
|
|
337
|
-
// the coefficient of the product; here the summands keep it.
|
|
338
|
-
canonize(expr: Nex): Nex {
|
|
316
|
+
private canonize(expr: Nex): Nex {
|
|
339
317
|
if (isElementary(expr)) return this.clone(expr);
|
|
340
318
|
const simplified = this.simplify(this.clone(expr));
|
|
341
319
|
if (simplified.kind === "sum") {
|
|
@@ -363,7 +341,6 @@ export class NexCreator {
|
|
|
363
341
|
return this.canonize(this.mkSum(summands));
|
|
364
342
|
}
|
|
365
343
|
|
|
366
|
-
// equal: whether the canonical forms agree when each variable weighs its index.
|
|
367
344
|
static equal(first: Nex, second: Nex) {
|
|
368
345
|
const creator = new NexCreator();
|
|
369
346
|
const count = Math.max(
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt.
|
|
2
|
-
// that horner splits into cross-nested forms: scalars, variables, products of powers with a
|
|
3
|
-
// coefficient, and sums. Products and sums are mutable, since nex_creator simplifies them in place
|
|
4
|
-
// and cross_nested rewrites their children.
|
|
1
|
+
// Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt.
|
|
5
2
|
import { Rational } from "../rational";
|
|
6
3
|
|
|
7
4
|
interface NexScalar {
|
|
@@ -56,7 +53,6 @@ export const isLinear = (expr: Nex): boolean => {
|
|
|
56
53
|
return true;
|
|
57
54
|
};
|
|
58
55
|
|
|
59
|
-
// is_a_linear_term: a linear combination of at least two variables.
|
|
60
56
|
export const isALinearTerm = (sum: NexSum) => {
|
|
61
57
|
let numberOfNonScalars = 0;
|
|
62
58
|
for (const child of sum.children) {
|
|
@@ -68,7 +64,6 @@ export const isALinearTerm = (sum: NexSum) => {
|
|
|
68
64
|
return numberOfNonScalars > 1;
|
|
69
65
|
};
|
|
70
66
|
|
|
71
|
-
// get_powers_from_mul: refills powers with the power of each variable child.
|
|
72
67
|
export const getPowersFromMul = (mul: NexMul, powers: Map<number, number>) => {
|
|
73
68
|
powers.clear();
|
|
74
69
|
for (const child of mul.children)
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_backoff.h), MIT license, see z3-license.txt.
|
|
2
|
-
// its expensive engines.
|
|
1
|
+
// Ported from Z3 (src/math/lp/nla_backoff.h), MIT license, see z3-license.txt.
|
|
3
2
|
|
|
4
|
-
// backoff: how many calls to skip before the next run of an expensive engine.
|
|
5
3
|
export class Backoff {
|
|
6
4
|
private delay = 0;
|
|
7
5
|
|
|
@@ -19,7 +17,6 @@ export class Backoff {
|
|
|
19
17
|
}
|
|
20
18
|
}
|
|
21
19
|
|
|
22
|
-
// squeeze_schedule: when to run the bounds optimization of the monomials.
|
|
23
20
|
export class SqueezeSchedule {
|
|
24
21
|
private failStreak = 0;
|
|
25
22
|
private squeezesSinceSatCheck = 0;
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_basics_lemmas.h, src/math/lp/nla_basics_lemmas.cpp), MIT
|
|
2
|
-
//
|
|
3
|
-
// (-ab = (-a)b), zeros (xy = 0 iff x = 0 or y = 0), neutral factors (|xa| = |x| and x != 0 imply
|
|
4
|
-
// |a| = 1) and proportions (|xy| >= |y| when x != 0). Only the model-based lemmas are ported: with
|
|
5
|
-
// derived = true, basic_lemma returns after the sign lemma, so Z3 never reaches its derived
|
|
6
|
-
// zero and neutral lemmas.
|
|
1
|
+
// Ported from Z3 (src/math/lp/nla_basics_lemmas.h, src/math/lp/nla_basics_lemmas.cpp), MIT license,
|
|
2
|
+
// see z3-license.txt.
|
|
7
3
|
import { Rational } from "../rational";
|
|
8
4
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
9
5
|
import { LarTerm } from "./lar-term";
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
6
|
+
import type { NlaCore } from "./nla-core";
|
|
7
|
+
import type { Factorization } from "./nla-factorization";
|
|
12
8
|
import { getRatSign, LemmaBuilder, mkIneq, signToRat } from "./nla-types";
|
|
13
9
|
import type { Monic } from "./nla-emonics";
|
|
14
10
|
|
|
@@ -33,8 +29,6 @@ export class Basics {
|
|
|
33
29
|
);
|
|
34
30
|
}
|
|
35
31
|
|
|
36
|
-
// Signs.
|
|
37
|
-
|
|
38
32
|
private basicSignLemmaOnTwoMonics(first: Monic, second: Monic) {
|
|
39
33
|
const sign = signToRat(first.rsign !== second.rsign);
|
|
40
34
|
if (this.core.varVal(first).equals(this.core.varVal(second).mul(sign))) return false;
|
|
@@ -61,8 +55,6 @@ export class Basics {
|
|
|
61
55
|
for (const lpVar of fixedZeros) this.addFixedZeroLemma(monic, lpVar);
|
|
62
56
|
}
|
|
63
57
|
|
|
64
|
-
// try_get_non_strict_sign_from_bounds and get_non_strict_sign: the sign times the sign of the
|
|
65
|
-
// variable, from its value or else its bounds, or 0.
|
|
66
58
|
private getNonStrictSign(lpVar: number, sign: number) {
|
|
67
59
|
const core = this.core;
|
|
68
60
|
const value = core.val(lpVar);
|
|
@@ -135,10 +127,6 @@ export class Basics {
|
|
|
135
127
|
lemma.explainMonic(second);
|
|
136
128
|
}
|
|
137
129
|
|
|
138
|
-
// Zeros.
|
|
139
|
-
|
|
140
|
-
// find_best_zero: a variable of value 0, preferably with 0 inside its bounds, and the variables
|
|
141
|
-
// fixed to 0.
|
|
142
130
|
private findBestZero(monic: Monic, fixedZeros: number[]) {
|
|
143
131
|
const core = this.core;
|
|
144
132
|
let zeroVar = -1;
|
|
@@ -185,8 +173,6 @@ export class Basics {
|
|
|
185
173
|
lemma.addIneq(mkIneq(lpVar, KIND_LT, 0));
|
|
186
174
|
}
|
|
187
175
|
|
|
188
|
-
// Model-based lemmas on the factorizations of a monic.
|
|
189
|
-
|
|
190
176
|
private basicLemmaForMonModelBased(rooted: Monic) {
|
|
191
177
|
const core = this.core;
|
|
192
178
|
const isZero = core.varVal(rooted).isZero();
|
|
@@ -203,7 +189,6 @@ export class Basics {
|
|
|
203
189
|
}
|
|
204
190
|
}
|
|
205
191
|
|
|
206
|
-
// x != 0 or y = 0 => |xy| >= |y|
|
|
207
192
|
private proportionLemmaModelBased(rooted: Monic, factorization: Factorization) {
|
|
208
193
|
const core = this.core;
|
|
209
194
|
if (core.hasRealFactorization(factorization)) return;
|
|
@@ -215,7 +200,6 @@ export class Basics {
|
|
|
215
200
|
if (factorIndex !== -1) this.generatePl(rooted, factorization, factorIndex);
|
|
216
201
|
}
|
|
217
202
|
|
|
218
|
-
// sign_m*m < 0 or \/_{i != k} f_i = 0 or sign_m*m >= sign_k*f_k
|
|
219
203
|
private generatePlOnMon(monic: Monic, factorIndex: number) {
|
|
220
204
|
const core = this.core;
|
|
221
205
|
const lemma = new LemmaBuilder(core);
|
|
@@ -281,7 +265,6 @@ export class Basics {
|
|
|
281
265
|
);
|
|
282
266
|
}
|
|
283
267
|
|
|
284
|
-
// xy = 0 -> x = 0 or y = 0
|
|
285
268
|
private basicLemmaForMonZeroModelBased(rooted: Monic, factorization: Factorization) {
|
|
286
269
|
const lemma = new LemmaBuilder(this.core);
|
|
287
270
|
lemma.addIneq(mkIneq(rooted.variable, KIND_NE, 0));
|
|
@@ -294,8 +277,6 @@ export class Basics {
|
|
|
294
277
|
lemma.explainFactorization(factorization);
|
|
295
278
|
}
|
|
296
279
|
|
|
297
|
-
// /\_{j != i} f_j = val(f_j) => m = sign * f_i, or /\_j f_j = val(f_j) => m = sign, over the
|
|
298
|
-
// variables of a monic.
|
|
299
280
|
private basicLemmaForMonNeutralFromFactorsToMonicModelBasedFm(monic: Monic) {
|
|
300
281
|
const core = this.core;
|
|
301
282
|
const neutral = this.getNeutralNotOne(
|
|
@@ -326,18 +307,13 @@ export class Basics {
|
|
|
326
307
|
);
|
|
327
308
|
}
|
|
328
309
|
|
|
329
|
-
//
|
|
330
|
-
// equal to the monic in absolute value, which no factor's variable is, so it never makes a
|
|
331
|
-
// lemma (nla_basics_lemmas.cpp, the loop over f).
|
|
310
|
+
// Deviation from Z3: the monic-to-factor neutral lemma is left out because it never fires (nla_basics_lemmas.cpp).
|
|
332
311
|
private basicLemmaForMonNeutralModelBased(rooted: Monic, factorization: Factorization) {
|
|
333
312
|
if (factorization.mon !== null)
|
|
334
313
|
this.basicLemmaForMonNeutralFromFactorsToMonicModelBasedFm(factorization.mon);
|
|
335
314
|
else this.basicLemmaForMonNeutralFromFactorsToMonicModelBased(rooted, factorization);
|
|
336
315
|
}
|
|
337
316
|
|
|
338
|
-
// can_create_lemma_for_mon_neutral_from_factors_to_monic_model_based: the one factor whose
|
|
339
|
-
// value is not +-1, or -1 when there is none, and the product of the other values, when the
|
|
340
|
-
// monic's value disagrees with them.
|
|
341
317
|
private getNeutralNotOne(monic: Monic, factors: FactorValue[]) {
|
|
342
318
|
let sign = Rational.one;
|
|
343
319
|
let notOne = -1;
|
|
@@ -383,7 +359,6 @@ export class Basics {
|
|
|
383
359
|
lemma.explainFactorization(factorization);
|
|
384
360
|
}
|
|
385
361
|
|
|
386
|
-
// x = 0 or y = 0 -> xy = 0
|
|
387
362
|
private basicLemmaForMonNonZeroModelBased(factorization: Factorization) {
|
|
388
363
|
const monic = factorization.mon;
|
|
389
364
|
if (monic === null) return;
|