tla-ts 0.0.9 → 0.0.10-dev.b4a856304
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 +72 -10
- package/dist/index.d.ts +72 -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 +128 -103
- package/dist/transfer.js +128 -103
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +576 -300
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -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 +630 -297
- 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 +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +17 -26
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +121 -49
- 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 +29 -13
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- 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 +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +119 -169
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +1 -8
- 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 +494 -154
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +166 -48
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +267 -77
- package/src/symmetry.ts +31 -8
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -61
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +33 -38
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +563 -211
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -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 +826 -276
- package/src/worker.ts +7 -8
|
@@ -1,23 +1,8 @@
|
|
|
1
1
|
// Ported from Z3 (src/math/lp/nra_solver.cpp, src/math/lp/nla_coi.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
// constraint, nlsat's linear cell around them becomes a lemma.
|
|
7
|
-
// Deviations from Z3:
|
|
8
|
-
// - nlsat input it does not implement (NlsatUnsupportedError) answers unknown. That is a linear
|
|
9
|
-
// cell around an irrational section, where Z3 exits the process (levelwise.cpp,
|
|
10
|
-
// add_linear_approximations).
|
|
11
|
-
// - nlsat's check(rvalues) never answers satisfied, because its solver starts with the clause
|
|
12
|
-
// [true], whose literal is unassigned outside search. So the satisfied branch of
|
|
13
|
-
// check_assignment, which switches nla to nlsat's model, is left out.
|
|
14
|
-
// - A lemma literal of check_assignment is always linear, because the cell bounds are, so
|
|
15
|
-
// add_mul_def, which defines a fresh monomial column, is left out. A nonlinear literal would
|
|
16
|
-
// answer unknown.
|
|
17
|
-
// - nlsat counts against the budget of a check only its own steps, not those of the polynomial and
|
|
18
|
-
// algebraic number managers, so a long search stops at a different point than Z3's. Like Z3's,
|
|
19
|
-
// it then throws, which ends the whole check as unknown.
|
|
20
|
-
// - Transcendental functions are not supported, so none are registered with nlsat.
|
|
2
|
+
// z3-license.txt.
|
|
3
|
+
// Deviations from Z3: unsupported nlsat input answers unknown where Z3 exits (levelwise.cpp,
|
|
4
|
+
// add_linear_approximations), check_assignment has no satisfied branch and no add_mul_def, the
|
|
5
|
+
// budget counts only nlsat's own steps, and transcendental functions are not supported.
|
|
21
6
|
import { NlsatUnsupportedError, SmtInvariantError } from "../../../../errors";
|
|
22
7
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
23
8
|
import { Rational, getLcm } from "../rational";
|
|
@@ -37,7 +22,7 @@ import {
|
|
|
37
22
|
import { Explanation } from "./explanation";
|
|
38
23
|
import type { LarSolver } from "./lar-solver";
|
|
39
24
|
import { LarTerm } from "./lar-term";
|
|
40
|
-
import {
|
|
25
|
+
import type { NlaCore } from "./nla-core";
|
|
41
26
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
42
27
|
|
|
43
28
|
interface Occurrences {
|
|
@@ -46,14 +31,11 @@ interface Occurrences {
|
|
|
46
31
|
terms: number[];
|
|
47
32
|
}
|
|
48
33
|
|
|
49
|
-
// lar_base_constraint::coeffs: the term of a term column, else the column itself.
|
|
50
34
|
const getConstraintCoeffs = (lra: LarSolver, constraint: LarConstraint): [number, Rational][] =>
|
|
51
35
|
lra.hasTerm(constraint.column)
|
|
52
36
|
? [...lra.getTerm(constraint.column).coeffs]
|
|
53
37
|
: [[constraint.column, Rational.one]];
|
|
54
38
|
|
|
55
|
-
// coi::init: the constraints reachable from the monomials to refine through shared variables,
|
|
56
|
-
// monomials and terms, in the order the search reaches them.
|
|
57
39
|
const getConeOfInfluence = (core: NlaCore) => {
|
|
58
40
|
const lra = core.lra;
|
|
59
41
|
const occurrences: Occurrences[] = [];
|
|
@@ -96,25 +78,19 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
96
78
|
return { vars, constraints, monics };
|
|
97
79
|
};
|
|
98
80
|
|
|
99
|
-
// has_large_dyadic_denominator: a denominator 2^k with k >= 24.
|
|
100
81
|
const hasLargeDyadicDenominator = (value: Rational) => {
|
|
101
82
|
const den = value.den;
|
|
102
83
|
return den >= 1n << 24n && (den & (den - 1n)) === 0n;
|
|
103
84
|
};
|
|
104
85
|
|
|
105
|
-
// is_dyadic_artifact: a constraint of an nla lemma's atom with a constant whose denominator is a
|
|
106
|
-
// large power of two, the value of a column at an LP vertex. nlsat leaves it out, since clearing
|
|
107
|
-
// such denominators blows up its resultants.
|
|
108
86
|
const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
|
|
109
87
|
constraint.isAuxiliary &&
|
|
110
88
|
(hasLargeDyadicDenominator(constraint.rhs.x) ||
|
|
111
89
|
getConstraintCoeffs(lra, constraint).some((entry) => hasLargeDyadicDenominator(entry[1])));
|
|
112
90
|
|
|
113
91
|
export class NraSolver {
|
|
114
|
-
// m_nlsat and m_values: the solver of the last check, and the values of its model.
|
|
115
92
|
private solver = new NlsatSolver();
|
|
116
93
|
private values: Anum[] = [];
|
|
117
|
-
// m_lp2nl: the nlsat variable of each column the solver has.
|
|
118
94
|
private lp2nl = new Map<number, number>();
|
|
119
95
|
|
|
120
96
|
constructor(private core: NlaCore) {}
|
|
@@ -123,14 +99,10 @@ export class NraSolver {
|
|
|
123
99
|
return this.solver.am;
|
|
124
100
|
}
|
|
125
101
|
|
|
126
|
-
// The steps of the last check.
|
|
127
102
|
get steps() {
|
|
128
103
|
return this.solver.steps;
|
|
129
104
|
}
|
|
130
105
|
|
|
131
|
-
// mk_definition: each included column as a polynomial in the included columns that are neither
|
|
132
|
-
// monomials nor terms, scaled by an integer denominator to keep the coefficients integral.
|
|
133
|
-
// Excluded columns have no definition.
|
|
134
106
|
private mkDefinitions(isIncluded: (lpVar: number) => boolean) {
|
|
135
107
|
const core = this.core;
|
|
136
108
|
const lra = core.lra;
|
|
@@ -180,8 +152,6 @@ export class NraSolver {
|
|
|
180
152
|
return { definitions, denominators };
|
|
181
153
|
}
|
|
182
154
|
|
|
183
|
-
// add_constraint: the constraint sum(coeff * v) kind rhs as den * (sum(coeff / den[v] * def[v]) -
|
|
184
|
-
// rhs) kind 0, where den clears every denominator, in a unit clause that assumes the constraint.
|
|
185
155
|
private addConstraint(
|
|
186
156
|
constraintIndex: number,
|
|
187
157
|
definitions: readonly (Polynomial | null)[],
|
|
@@ -217,10 +187,6 @@ export class NraSolver {
|
|
|
217
187
|
return literal;
|
|
218
188
|
}
|
|
219
189
|
|
|
220
|
-
// check: nlsat's search on the constraints in the cone of influence, with every included column
|
|
221
|
-
// replaced by its polynomial, giving up after maxConflicts conflicts or budget steps. A model
|
|
222
|
-
// becomes nla's, when it satisfies every constraint and monomial, and a refutation becomes the
|
|
223
|
-
// lemma that the constraints of its core are inconsistent.
|
|
224
190
|
check(maxConflicts: number, budget: number) {
|
|
225
191
|
const core = this.core;
|
|
226
192
|
const lra = core.lra;
|
|
@@ -250,7 +216,6 @@ export class NraSolver {
|
|
|
250
216
|
this.solver.restoreOrder();
|
|
251
217
|
core.setUseNraModel(true);
|
|
252
218
|
lra.initModel();
|
|
253
|
-
// A violated constraint or monomial that nlsat saw would be a bug.
|
|
254
219
|
for (const [constraintIndex, constraint] of lra.constraints.constraints.entries()) {
|
|
255
220
|
if (!constraint.isActive || this.isConstraintSatisfied(constraint)) continue;
|
|
256
221
|
if (cone.constraints.has(constraintIndex) && !skipped.has(constraintIndex))
|
|
@@ -273,8 +238,6 @@ export class NraSolver {
|
|
|
273
238
|
return result;
|
|
274
239
|
}
|
|
275
240
|
|
|
276
|
-
// value: the model's value of a column. A monomial or term gets the value of its definition, a
|
|
277
|
-
// column outside the cone of influence its value in lar_solver.
|
|
278
241
|
value(lpVar: number) {
|
|
279
242
|
const core = this.core;
|
|
280
243
|
const lra = core.lra;
|
|
@@ -308,7 +271,6 @@ export class NraSolver {
|
|
|
308
271
|
return this.values[lpVar];
|
|
309
272
|
}
|
|
310
273
|
|
|
311
|
-
// check_monic
|
|
312
274
|
private isMonicSatisfied(lpVar: number, vars: readonly number[]) {
|
|
313
275
|
const am = this.solver.am;
|
|
314
276
|
const product = vars.reduce(
|
|
@@ -318,7 +280,6 @@ export class NraSolver {
|
|
|
318
280
|
return am.compare(this.value(lpVar), product) === 0;
|
|
319
281
|
}
|
|
320
282
|
|
|
321
|
-
// check_constraint: the value of the left side against the right side, without δ.
|
|
322
283
|
private isConstraintSatisfied(constraint: LarConstraint) {
|
|
323
284
|
const am = this.solver.am;
|
|
324
285
|
const sum = getConstraintCoeffs(this.core.lra, constraint).reduce(
|
|
@@ -338,8 +299,6 @@ export class NraSolver {
|
|
|
338
299
|
: sign === 0;
|
|
339
300
|
}
|
|
340
301
|
|
|
341
|
-
// setup_assignment_solver and nlsat's check(rvalues, clause): the lemma clause, with the
|
|
342
|
-
// constraint each literal came from, or null when nlsat finds no violated constraint.
|
|
343
302
|
private getClause() {
|
|
344
303
|
const core = this.core;
|
|
345
304
|
const lra = core.lra;
|
|
@@ -363,7 +322,6 @@ export class NraSolver {
|
|
|
363
322
|
return { clause: result.clause, literalConstraints };
|
|
364
323
|
}
|
|
365
324
|
|
|
366
|
-
// check_assignment
|
|
367
325
|
checkAssignment() {
|
|
368
326
|
const clause = (() => {
|
|
369
327
|
try {
|
|
@@ -377,9 +335,6 @@ export class NraSolver {
|
|
|
377
335
|
return this.addLemma(clause.clause, clause.literalConstraints);
|
|
378
336
|
}
|
|
379
337
|
|
|
380
|
-
// add_lemma: a literal whose negation is a constraint's literal becomes that constraint in the
|
|
381
|
-
// explanation, and any other literal an inequality over the columns. Unknown, without the lemma,
|
|
382
|
-
// when such an inequality already holds.
|
|
383
338
|
private addLemma(clause: number[], literalConstraints: ReadonlyMap<number, number>) {
|
|
384
339
|
const core = this.core;
|
|
385
340
|
const solver = this.solver;
|
|
@@ -395,7 +350,6 @@ export class NraSolver {
|
|
|
395
350
|
}
|
|
396
351
|
const atom = solver.getAtom(literal);
|
|
397
352
|
if (atom === null) throw new SmtInvariantError(`nlsat literal ${literal} has no atom`);
|
|
398
|
-
// A root atom or a product of factors is unknown, and so is a nonlinear polynomial.
|
|
399
353
|
if (
|
|
400
354
|
!isIneqAtom(atom) ||
|
|
401
355
|
atom.polynomials.length !== 1 ||
|
|
@@ -404,7 +358,6 @@ export class NraSolver {
|
|
|
404
358
|
core.lemmas.pop();
|
|
405
359
|
return L_UNDEF;
|
|
406
360
|
}
|
|
407
|
-
// process_polynomial_check_assignment, for a linear polynomial.
|
|
408
361
|
const polynomial = atom.polynomials[0];
|
|
409
362
|
const term = new LarTerm();
|
|
410
363
|
let bound = Rational.zero;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/numeric_pair.h), MIT license, see z3-license.txt.
|
|
2
|
-
// of a column, where δ is a positive infinitesimal that encodes strict bounds.
|
|
1
|
+
// Ported from Z3 (src/math/lp/numeric_pair.h), MIT license, see z3-license.txt.
|
|
3
2
|
import { Rational } from "../rational";
|
|
4
3
|
|
|
5
4
|
export class Impq {
|
|
@@ -30,7 +29,6 @@ export class Impq {
|
|
|
30
29
|
return new Impq(this.x.neg(), this.y.neg());
|
|
31
30
|
}
|
|
32
31
|
|
|
33
|
-
// Lexicographic, as δ is smaller than any positive rational.
|
|
34
32
|
compare(other: Impq) {
|
|
35
33
|
const byX = this.x.compare(other.x);
|
|
36
34
|
return byX !== 0 ? byX : this.y.compare(other.y);
|
|
@@ -48,7 +46,6 @@ export class Impq {
|
|
|
48
46
|
return this.y.isZero() && this.x.isInt();
|
|
49
47
|
}
|
|
50
48
|
|
|
51
|
-
// floor and ceil of numeric_pair: x + δy rounded, for a positive δ smaller than any gap.
|
|
52
49
|
floor() {
|
|
53
50
|
if (!this.x.isInt()) return this.x.floor();
|
|
54
51
|
return this.y.isNegative() ? this.x.sub(Rational.one) : this.x;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/dd/pdd_interval.h), MIT license, see z3-license.txt.
|
|
2
|
-
// pdd under the intervals of its variables, as x*hi + lo by interval arithmetic. The distributed
|
|
3
|
-
// variant, which nla does not call, is not ported.
|
|
1
|
+
// Ported from Z3 (src/math/dd/pdd_interval.h), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
3
|
add,
|
|
6
4
|
type DepInterval,
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_simplifier.h, src/math/grobner/pdd_simplifier.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. The passes that dd::solver::simplify runs before saturation: solve
|
|
3
|
-
// linear equations for their top variable, retire equations whose top variable occurs nowhere
|
|
4
|
-
// else, subtract equations that share a lo part, and eliminate variables that occur as leaves.
|
|
5
|
-
// The extended linear pass works only modulo 2 and the dual elimination is disabled in Z3, so
|
|
6
|
-
// neither is ported. No pass makes a value outside an operation, so none can run out of nodes.
|
|
1
|
+
// Ported from Z3 (src/math/grobner/pdd_simplifier.h, src/math/grobner/pdd_simplifier.cpp), MIT license, see z3-license.txt.
|
|
7
2
|
import { mkJoin } from "./dependency";
|
|
8
|
-
import { Equation, PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
3
|
+
import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
9
4
|
import { shrink } from "../array";
|
|
10
5
|
|
|
11
6
|
export class PddSimplifier {
|
|
@@ -30,8 +25,6 @@ export class PddSimplifier {
|
|
|
30
25
|
return this.simplifyLinear(linear);
|
|
31
26
|
}
|
|
32
27
|
|
|
33
|
-
// simplify_linear_step: solves each linear equation for its top variable, which it eliminates
|
|
34
|
-
// from the others, and moves it to the solved equations.
|
|
35
28
|
private simplifyLinear(linear: Equation[]) {
|
|
36
29
|
const solver = this.solver;
|
|
37
30
|
const useList = this.getUseList();
|
|
@@ -45,7 +38,6 @@ export class PddSimplifier {
|
|
|
45
38
|
const variable = source.poly.var();
|
|
46
39
|
const uses = useList[variable];
|
|
47
40
|
let isAllReduced = true;
|
|
48
|
-
// Equations added to the uses of the variable during the walk are not walked.
|
|
49
41
|
for (let index = 0, length = uses.length; index < length; index++) {
|
|
50
42
|
const target = uses[index];
|
|
51
43
|
if (source === target || solver.isTrivial(target)) continue;
|
|
@@ -80,7 +72,6 @@ export class PddSimplifier {
|
|
|
80
72
|
return kept > 0 || hasConflict;
|
|
81
73
|
}
|
|
82
74
|
|
|
83
|
-
// simplify_cc_step: replaces p*x + q and r*y + q by p*x + q and p*x - r*y, when p or r is a value.
|
|
84
75
|
private simplifyCcStep() {
|
|
85
76
|
const solver = this.solver;
|
|
86
77
|
const los = new Map<number, Equation>();
|
|
@@ -107,7 +98,6 @@ export class PddSimplifier {
|
|
|
107
98
|
return isReduced;
|
|
108
99
|
}
|
|
109
100
|
|
|
110
|
-
// simplify_leaf_step: removes a*x + b from the equations where x occurs as a leaf, for a value a.
|
|
111
101
|
private simplifyLeafStep() {
|
|
112
102
|
const solver = this.solver;
|
|
113
103
|
const useList = this.getUseList();
|
|
@@ -137,8 +127,6 @@ export class PddSimplifier {
|
|
|
137
127
|
return false;
|
|
138
128
|
}
|
|
139
129
|
|
|
140
|
-
// simplify_elim_pure_step: an equation linear in its top variable, which occurs nowhere else, is
|
|
141
|
-
// solved.
|
|
142
130
|
private simplifyElimPureStep() {
|
|
143
131
|
const solver = this.solver;
|
|
144
132
|
const useList = this.getUseList();
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_solver.h, src/math/grobner/pdd_solver.cpp), MIT license,
|
|
2
|
-
//
|
|
3
|
-
// pdds. Each step picks the simplest equation whose leading variable is highest, simplifies it by
|
|
4
|
-
// the processed equations and them by it, and adds its S-polynomials with them to be simplified.
|
|
5
|
-
// Equations move between the solved, processed and to-simplify sets, each in an array where an
|
|
6
|
-
// equation knows its index. Z3's solver::simplify runs the simplifier, which here is PddSimplifier
|
|
7
|
-
// in pdd-simplifier, run by its caller.
|
|
1
|
+
// Ported from Z3 (src/math/grobner/pdd_solver.h, src/math/grobner/pdd_solver.cpp), MIT license, see
|
|
2
|
+
// z3-license.txt.
|
|
8
3
|
import { PddMemoryOutError } from "../../../../errors";
|
|
9
|
-
import { Dependency, mkJoin } from "./dependency";
|
|
10
|
-
import { Pdd, PddManager } from "./pdd";
|
|
4
|
+
import { type Dependency, mkJoin } from "./dependency";
|
|
5
|
+
import type { Pdd, PddManager } from "./pdd";
|
|
11
6
|
import { shrink } from "../array";
|
|
12
7
|
|
|
13
8
|
export const SOLVED = 0;
|
|
@@ -48,9 +43,6 @@ interface Subst {
|
|
|
48
43
|
|
|
49
44
|
class PddSolverStats {
|
|
50
45
|
simplified = 0;
|
|
51
|
-
maxExprSize = 0;
|
|
52
|
-
maxExprDegree = 0;
|
|
53
|
-
superposed = 0;
|
|
54
46
|
computeSteps = 0;
|
|
55
47
|
}
|
|
56
48
|
|
|
@@ -64,8 +56,6 @@ export class Equation {
|
|
|
64
56
|
) {}
|
|
65
57
|
}
|
|
66
58
|
|
|
67
|
-
// scoped_update: walks a set with i and keeps the equations that nextj moves to j. finish keeps
|
|
68
|
-
// those not walked and drops the rest, as Z3's destructor does.
|
|
69
59
|
export class SetUpdate {
|
|
70
60
|
i = 0;
|
|
71
61
|
private j = 0;
|
|
@@ -141,10 +131,8 @@ export class PddSolver {
|
|
|
141
131
|
if (this.var2level.length > 0) {
|
|
142
132
|
this.levelp1 = Math.max(this.var2level[poly.var()] + 1, this.levelp1);
|
|
143
133
|
}
|
|
144
|
-
this.updateStats(equation);
|
|
145
134
|
}
|
|
146
135
|
|
|
147
|
-
// simplify: applies the substitutions to p, and returns it with its dependency.
|
|
148
136
|
simplify(poly: Pdd, dep: Dependency) {
|
|
149
137
|
let result = poly;
|
|
150
138
|
let resultDep = dep;
|
|
@@ -175,7 +163,6 @@ export class PddSolver {
|
|
|
175
163
|
const isLeadingTermChanged = substituted.differentLeadingTerm(target.poly);
|
|
176
164
|
target.poly = substituted;
|
|
177
165
|
target.dep = mkJoin(target.dep, dep);
|
|
178
|
-
this.updateStats(target);
|
|
179
166
|
return isLeadingTermChanged;
|
|
180
167
|
};
|
|
181
168
|
if (!this.isDone()) this.simplifySetUsing(this.processed, simplifier);
|
|
@@ -201,7 +188,6 @@ export class PddSolver {
|
|
|
201
188
|
this.stats.computeSteps++;
|
|
202
189
|
const equation = this.pickNext();
|
|
203
190
|
if (equation === null) return false;
|
|
204
|
-
// scoped_process: the equation goes back to processed unless the step settles it.
|
|
205
191
|
let pending: Equation | null = equation;
|
|
206
192
|
try {
|
|
207
193
|
this.simplifyUsingAll(equation, this.processed);
|
|
@@ -261,11 +247,9 @@ export class PddSolver {
|
|
|
261
247
|
this.isTooComplexFound = true;
|
|
262
248
|
return;
|
|
263
249
|
}
|
|
264
|
-
this.stats.superposed++;
|
|
265
250
|
this.add(poly, mkJoin(first.dep, second.dep));
|
|
266
251
|
}
|
|
267
252
|
|
|
268
|
-
// simplify_using(eq, eqs): reduces eq by the set until no reduction applies.
|
|
269
253
|
private simplifyUsingAll(equation: Equation, set: Equation[]) {
|
|
270
254
|
let isSimplified = false;
|
|
271
255
|
do {
|
|
@@ -284,8 +268,6 @@ export class PddSolver {
|
|
|
284
268
|
this.simplifySetUsing(set, (target) => this.trySimplifyUsing(target, source));
|
|
285
269
|
}
|
|
286
270
|
|
|
287
|
-
// simplify_using(set, simplifier): the simplifier returns null when it leaves the target, and
|
|
288
|
-
// otherwise whether the leading term changed.
|
|
289
271
|
private simplifySetUsing(set: Equation[], simplifier: (target: Equation) => boolean | null) {
|
|
290
272
|
const update = new SetUpdate(set);
|
|
291
273
|
for (; update.i < update.size; update.i++) {
|
|
@@ -306,8 +288,6 @@ export class PddSolver {
|
|
|
306
288
|
update.finish();
|
|
307
289
|
}
|
|
308
290
|
|
|
309
|
-
// try_simplify_using: null when the target stays, and otherwise whether its leading term changed
|
|
310
|
-
// while it was processed.
|
|
311
291
|
private trySimplifyUsing(target: Equation, source: Equation) {
|
|
312
292
|
if (source === target) return null;
|
|
313
293
|
this.stats.simplified++;
|
|
@@ -321,12 +301,9 @@ export class PddSolver {
|
|
|
321
301
|
target.state === PROCESSED && reduced.differentLeadingTerm(target.poly);
|
|
322
302
|
target.poly = reduced;
|
|
323
303
|
target.dep = mkJoin(target.dep, source.dep);
|
|
324
|
-
this.updateStats(target);
|
|
325
304
|
return isLeadingTermChanged;
|
|
326
305
|
}
|
|
327
306
|
|
|
328
|
-
// simplify_using(dst, src): reduces dst by src whatever the result, and returns whether its
|
|
329
|
-
// leading term changed while it was processed.
|
|
330
307
|
simplifyUsing(target: Equation, source: Equation) {
|
|
331
308
|
if (source === target) return false;
|
|
332
309
|
this.stats.simplified++;
|
|
@@ -336,7 +313,6 @@ export class PddSolver {
|
|
|
336
313
|
if (reduced.equals(target.poly)) return isLeadingTermChanged;
|
|
337
314
|
target.poly = reduced;
|
|
338
315
|
target.dep = mkJoin(target.dep, source.dep);
|
|
339
|
-
this.updateStats(target);
|
|
340
316
|
return isLeadingTermChanged;
|
|
341
317
|
}
|
|
342
318
|
|
|
@@ -400,9 +376,4 @@ export class PddSolver {
|
|
|
400
376
|
equation.idx = set.length;
|
|
401
377
|
set.push(equation);
|
|
402
378
|
}
|
|
403
|
-
|
|
404
|
-
private updateStats(equation: Equation) {
|
|
405
|
-
this.stats.maxExprSize = Math.max(this.stats.maxExprSize, equation.poly.treeSize());
|
|
406
|
-
this.stats.maxExprDegree = Math.max(this.stats.maxExprDegree, equation.poly.degree());
|
|
407
|
-
}
|
|
408
379
|
}
|