tla-ts 0.0.9 → 0.0.10
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,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// qe-lite: Fourier-Motzkin elimination of the integer variables of a quantifier that only occur in
|
|
3
|
-
// clauses with one linear inequality.
|
|
1
|
+
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
3
|
KIND_QUANTIFIER,
|
|
6
4
|
KIND_VAR,
|
|
@@ -17,14 +15,11 @@ import {
|
|
|
17
15
|
import { getGcd } from "./rational";
|
|
18
16
|
import { RefVector } from "./ref-vector";
|
|
19
17
|
|
|
20
|
-
// fm's parameters.
|
|
21
18
|
const FM_LIMIT = 5000000;
|
|
22
19
|
const FM_CUTOFF1 = 8;
|
|
23
20
|
const FM_CUTOFF2 = 256;
|
|
24
21
|
const FM_EXTRA = 0;
|
|
25
22
|
|
|
26
|
-
// A clause of Boolean literals and one linear inequality, a1*x1 + ... + an*xn <= c, or < c when
|
|
27
|
-
// strict. A literal is the index of a Boolean constant, negative when negated.
|
|
28
23
|
interface Constraint {
|
|
29
24
|
lits: number[];
|
|
30
25
|
xs: number[];
|
|
@@ -34,8 +29,6 @@ interface Constraint {
|
|
|
34
29
|
isDead: boolean;
|
|
35
30
|
}
|
|
36
31
|
|
|
37
|
-
// fm: Fourier-Motzkin elimination of the integer variables that only occur in clauses with one
|
|
38
|
-
// linear inequality.
|
|
39
32
|
export class Fm {
|
|
40
33
|
private constraints: Constraint[] = [];
|
|
41
34
|
private bvar2expr: RefVector;
|
|
@@ -52,7 +45,6 @@ export class Fm {
|
|
|
52
45
|
private newFmls: RefVector;
|
|
53
46
|
private counter = 0;
|
|
54
47
|
private isInconsistent = false;
|
|
55
|
-
// m_sub_todo: the constraints to check for backward subsumption.
|
|
56
48
|
private subTodo: Constraint[] = [];
|
|
57
49
|
numVars = 0;
|
|
58
50
|
|
|
@@ -62,7 +54,6 @@ export class Fm {
|
|
|
62
54
|
this.newFmls = new RefVector(manager);
|
|
63
55
|
}
|
|
64
56
|
|
|
65
|
-
// ~fm.
|
|
66
57
|
release() {
|
|
67
58
|
this.resetConstraints();
|
|
68
59
|
this.newFmls.reset();
|
|
@@ -100,14 +91,13 @@ export class Fm {
|
|
|
100
91
|
this.newFmls.push(this.manager.falseExpr);
|
|
101
92
|
}
|
|
102
93
|
|
|
103
|
-
// Z3 keeps m_expr2bvar from the previous run, whose indices then point into the new, shorter
|
|
104
|
-
// m_bvar2expr. This port clears it.
|
|
105
94
|
private init(fmls: number[]) {
|
|
106
95
|
this.subTodo = [];
|
|
107
96
|
this.resetConstraints();
|
|
108
97
|
this.bvar2expr.reset();
|
|
109
98
|
this.bvar2sign = [0];
|
|
110
99
|
this.bvar2expr.push(-1);
|
|
100
|
+
// Z3 keeps m_expr2bvar from the previous run, whose indices then point into the new m_bvar2expr.
|
|
111
101
|
this.expr2bvar.clear();
|
|
112
102
|
this.expr2var.clear();
|
|
113
103
|
this.isInt = [];
|
|
@@ -135,7 +125,6 @@ export class Fm {
|
|
|
135
125
|
);
|
|
136
126
|
}
|
|
137
127
|
|
|
138
|
-
// is_linear_mon_core: the variable of x or c*x.
|
|
139
128
|
private getMonomialVar(expr: number) {
|
|
140
129
|
const manager = this.manager;
|
|
141
130
|
if (manager.getOp(expr) === OP_MUL && manager.getNumArgs(expr) === 2) {
|
|
@@ -173,7 +162,6 @@ export class Fm {
|
|
|
173
162
|
return manager.isInt(lhs) && manager.isNumeral(rhs) && this.isLinearPol(lhs);
|
|
174
163
|
}
|
|
175
164
|
|
|
176
|
-
// is_occ: a clause of literals with one linear inequality.
|
|
177
165
|
private isOcc(expr: number) {
|
|
178
166
|
const manager = this.manager;
|
|
179
167
|
if (manager.getOp(expr) !== OP_OR) return this.isLinearIneq(expr);
|
|
@@ -187,7 +175,6 @@ export class Fm {
|
|
|
187
175
|
return isFound;
|
|
188
176
|
}
|
|
189
177
|
|
|
190
|
-
// init_forbidden_set: the integer variables that occur outside the clauses are not eliminated.
|
|
191
178
|
private initForbiddenSet(fmls: number[]) {
|
|
192
179
|
const manager = this.manager;
|
|
193
180
|
this.forbiddenSet.clear();
|
|
@@ -289,7 +276,6 @@ export class Fm {
|
|
|
289
276
|
this.registerConstraint({ lits, xs, as, c, isStrict, isDead: false });
|
|
290
277
|
}
|
|
291
278
|
|
|
292
|
-
// normalize_coeffs: divides by the gcd of the coefficients and the constant.
|
|
293
279
|
private normalizeCoeffs(constraint: Constraint) {
|
|
294
280
|
if (constraint.xs.length === 0) return;
|
|
295
281
|
let divisor = constraint.c < 0n ? -constraint.c : constraint.c;
|
|
@@ -344,7 +330,6 @@ export class Fm {
|
|
|
344
330
|
this.constraints = [];
|
|
345
331
|
}
|
|
346
332
|
|
|
347
|
-
// to_expr: the constraint as a formula, with a raw reference like Z3's.
|
|
348
333
|
private toExpr(constraint: Constraint) {
|
|
349
334
|
const manager = this.manager;
|
|
350
335
|
let ineq = -1;
|
|
@@ -375,8 +360,6 @@ export class Fm {
|
|
|
375
360
|
return lits.length === 1 ? lits[0] : manager.mkApp(OP_OR, lits, SORT_BOOL);
|
|
376
361
|
}
|
|
377
362
|
|
|
378
|
-
// subsumes: c1's literals are among c2's, the polynomials are the same, and c1's bound is at most
|
|
379
|
-
// c2's.
|
|
380
363
|
private isSubsuming(first: Constraint, second: Constraint) {
|
|
381
364
|
if (first === second) return false;
|
|
382
365
|
if (first.lits.length > second.lits.length || first.xs.length !== second.xs.length)
|
|
@@ -436,8 +419,6 @@ export class Fm {
|
|
|
436
419
|
if (!constraint.isDead) this.backwardSubsumption(constraint);
|
|
437
420
|
}
|
|
438
421
|
|
|
439
|
-
// sort_candidates: the variables without a lower or upper bound first, then by the number of
|
|
440
|
-
// constraints they would create.
|
|
441
422
|
private sortCandidates() {
|
|
442
423
|
const costs: [number, number][] = [];
|
|
443
424
|
this.forbidden.forEach((isForbidden, variable) => {
|
|
@@ -455,7 +436,6 @@ export class Fm {
|
|
|
455
436
|
return costs.map((cost) => cost[0]);
|
|
456
437
|
}
|
|
457
438
|
|
|
458
|
-
// analyze: whether every variable is an integer, and whether x's coefficients are all 1 or -1.
|
|
459
439
|
private analyze(constraints: Constraint[], variable: number) {
|
|
460
440
|
let isUnit = true;
|
|
461
441
|
for (const constraint of constraints)
|
|
@@ -481,8 +461,6 @@ export class Fm {
|
|
|
481
461
|
for (const constraint of this.uppers[variable]) constraint.isDead = true;
|
|
482
462
|
}
|
|
483
463
|
|
|
484
|
-
// resolve: the combination of a lower and an upper bound of x without x, or undefined when it
|
|
485
|
-
// holds.
|
|
486
464
|
private resolve(lower: Constraint, upper: Constraint, variable: number) {
|
|
487
465
|
this.counter += lower.xs.length + upper.xs.length + lower.lits.length + upper.lits.length;
|
|
488
466
|
const a = -lower.as[lower.xs.indexOf(variable)];
|
|
@@ -561,7 +539,6 @@ export class Fm {
|
|
|
561
539
|
}
|
|
562
540
|
}
|
|
563
541
|
|
|
564
|
-
// copy_remaining: the live constraints of the upper bounds, then of the lower bounds.
|
|
565
542
|
private copyRemaining() {
|
|
566
543
|
for (const lists of [this.uppers, this.lowers])
|
|
567
544
|
for (const constraints of lists)
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. The qe-lite tactic of Z3's ufnia strategy: each quantifier, innermost first, loses
|
|
3
|
-
// the variables that its body defines by an equality, Fourier-Motzkin elimination removes integer
|
|
4
|
-
// variables that only occur in bounds, and a quantifier over a small integer range becomes a finite
|
|
5
|
-
// disjunction. Like Z3, the port counts references, so that expressions are created and deleted in
|
|
6
|
-
// Z3's order. Arrays, bit-vectors and datatypes are not ported, as tlapm's encoding does not produce
|
|
7
|
-
// them.
|
|
1
|
+
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see z3-license.txt.
|
|
8
2
|
import {
|
|
9
3
|
KIND_QUANTIFIER,
|
|
10
4
|
KIND_VAR,
|
|
@@ -33,10 +27,8 @@ import { assign, assignOwned, release } from "./expr-ref";
|
|
|
33
27
|
import { EqDer } from "./qe-lite-der";
|
|
34
28
|
import { Fm } from "./qe-lite-fm";
|
|
35
29
|
|
|
36
|
-
// qe_lite's EXPAND_BOUND_LIMIT: the largest integer range that is expanded.
|
|
37
30
|
const EXPAND_BOUND_LIMIT = 10000;
|
|
38
31
|
|
|
39
|
-
// rewriter_tpl with elim_cfg: rewrites the quantifiers bottom-up.
|
|
40
32
|
class ElimStar extends RewriterTpl {
|
|
41
33
|
constructor(
|
|
42
34
|
manager: AstManager,
|
|
@@ -50,7 +42,6 @@ class ElimStar extends RewriterTpl {
|
|
|
50
42
|
}
|
|
51
43
|
}
|
|
52
44
|
|
|
53
|
-
// qe_lite::impl.
|
|
54
45
|
class QeLite {
|
|
55
46
|
private der: EqDer;
|
|
56
47
|
private fm: Fm;
|
|
@@ -66,12 +57,10 @@ class QeLite {
|
|
|
66
57
|
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
67
58
|
}
|
|
68
59
|
|
|
69
|
-
// operator()(expr_ref&): the result comes with a reference, which the caller releases.
|
|
70
60
|
apply(formula: number) {
|
|
71
61
|
return this.elimStar.rewrite(formula);
|
|
72
62
|
}
|
|
73
63
|
|
|
74
|
-
// ~impl.
|
|
75
64
|
release() {
|
|
76
65
|
this.rewriter.release();
|
|
77
66
|
this.elimStar.release();
|
|
@@ -79,7 +68,6 @@ class QeLite {
|
|
|
79
68
|
this.der.release();
|
|
80
69
|
}
|
|
81
70
|
|
|
82
|
-
// bool_rewriter's mk_and and mk_or, with a reference to the result.
|
|
83
71
|
private mkAnd(args: number[]) {
|
|
84
72
|
return this.manager.withTemporaries(() => this.rewriter.mkAnd(args));
|
|
85
73
|
}
|
|
@@ -88,7 +76,6 @@ class QeLite {
|
|
|
88
76
|
return this.manager.withTemporaries(() => this.rewriter.mkOr(args));
|
|
89
77
|
}
|
|
90
78
|
|
|
91
|
-
// elim_cfg::reduce_quantifier.
|
|
92
79
|
private reduceQuantifier(expr: number, body: number, patterns: number[]) {
|
|
93
80
|
const manager = this.manager;
|
|
94
81
|
const data = manager.getQuantifier(expr);
|
|
@@ -110,8 +97,6 @@ class QeLite {
|
|
|
110
97
|
return result;
|
|
111
98
|
}
|
|
112
99
|
|
|
113
|
-
// operator()(index_set, index_of_bound, expr_ref&): each disjunct is a conjunction to reduce. The
|
|
114
|
-
// formula comes with a reference, and so does the result.
|
|
115
100
|
private reduceFormula(numVars: number, formula: number) {
|
|
116
101
|
const manager = this.manager;
|
|
117
102
|
const disjs = new RefVector(manager);
|
|
@@ -134,8 +119,6 @@ class QeLite {
|
|
|
134
119
|
return result;
|
|
135
120
|
}
|
|
136
121
|
|
|
137
|
-
// operator()(index_set, index_of_bound, expr_ref_vector&): a single non-ground conjunct is reduced
|
|
138
|
-
// as a disjunction, and otherwise eq_der and fm run.
|
|
139
122
|
private reduceConjs(numVars: number, fmls: RefVector) {
|
|
140
123
|
const manager = this.manager;
|
|
141
124
|
flattenAndVector(manager, fmls);
|
|
@@ -151,12 +134,10 @@ class QeLite {
|
|
|
151
134
|
this.fm.numVars = numVars;
|
|
152
135
|
this.der.apply(fmls);
|
|
153
136
|
this.fm.apply(fmls);
|
|
154
|
-
// ar_der checks the limit for each formula
|
|
137
|
+
// Z3's ar_der checks the limit for each formula, though tlapm's formulas have no arrays for it to solve.
|
|
155
138
|
for (let index = 0; index < fmls.size; index++) manager.limit.checkpoint();
|
|
156
139
|
}
|
|
157
140
|
|
|
158
|
-
// collect_negative_equalities: whether every occurrence of the variable is in a negative equality
|
|
159
|
-
// with a term without it, or outside any equality.
|
|
160
141
|
private collectNegativeEqualities(
|
|
161
142
|
expr: number,
|
|
162
143
|
index: number,
|
|
@@ -198,9 +179,6 @@ class QeLite {
|
|
|
198
179
|
return !isOccurring(manager, index, expr);
|
|
199
180
|
}
|
|
200
181
|
|
|
201
|
-
// eliminate_diseq_vars: an integer variable that occurs only in negative equalities can avoid
|
|
202
|
-
// every value they name, so those equalities are false. The body comes with a reference, and so
|
|
203
|
-
// does the result.
|
|
204
182
|
private eliminateDiseqVars(sorts: number[], body: number) {
|
|
205
183
|
const manager = this.manager;
|
|
206
184
|
const replace = new ExprSafeReplace(manager);
|
|
@@ -227,7 +205,6 @@ class QeLite {
|
|
|
227
205
|
return result;
|
|
228
206
|
}
|
|
229
207
|
|
|
230
|
-
// extract_var_bound: an inclusive integer bound of the variable that a conjunct states.
|
|
231
208
|
private getBound(expr: number, index: number) {
|
|
232
209
|
const manager = this.manager;
|
|
233
210
|
const isNegated = manager.isNot(expr);
|
|
@@ -255,8 +232,6 @@ class QeLite {
|
|
|
255
232
|
return { isLower: isVarOnLeft, value: isVarOnLeft ? value + 1n : value - 1n };
|
|
256
233
|
}
|
|
257
234
|
|
|
258
|
-
// try_expand_bounded_quantifier: the disjunction of the body over every value of the integer
|
|
259
|
-
// variables when their ranges are small, with a reference, or -1.
|
|
260
235
|
private tryExpandBoundedQuantifier(sorts: number[], body: number) {
|
|
261
236
|
const manager = this.manager;
|
|
262
237
|
const numDecls = sorts.length;
|
|
@@ -264,8 +239,7 @@ class QeLite {
|
|
|
264
239
|
const used = collectUsedVars(manager, body, numDecls);
|
|
265
240
|
const remaining = used.flatMap((isUsed, index) => (isUsed ? [index] : []));
|
|
266
241
|
if (remaining.length === 0) return -1;
|
|
267
|
-
// Z3 checks the declaration at position i for the variable with de Bruijn index i,
|
|
268
|
-
// another variable's sort. This port checks the variable's own sort.
|
|
242
|
+
// Z3 checks the declaration at position i for the variable with de Bruijn index i, where this checks the variable's own sort.
|
|
269
243
|
if (remaining.some((index) => sorts[numDecls - 1 - index] !== SORT_INT)) return -1;
|
|
270
244
|
const conjs = new RefVector(manager);
|
|
271
245
|
conjs.push(body);
|
|
@@ -332,7 +306,6 @@ class QeLite {
|
|
|
332
306
|
disjuncts.push(instBody);
|
|
333
307
|
manager.decRef(instBody);
|
|
334
308
|
instConjs.reset();
|
|
335
|
-
// The rightmost variable moves first.
|
|
336
309
|
let position = remaining.length - 1;
|
|
337
310
|
for (; position >= 0; position--) {
|
|
338
311
|
values[position]++;
|
|
@@ -352,8 +325,6 @@ class QeLite {
|
|
|
352
325
|
}
|
|
353
326
|
}
|
|
354
327
|
|
|
355
|
-
// qe_lite_simplifier::reduce in a dependent_expr_state_tactic, on each formula with a quantifier.
|
|
356
|
-
// The tactic's m_dep holds the formula it read last, until the tactic is done.
|
|
357
328
|
export const applyQeLite = (manager: AstManager, goal: Goal) => {
|
|
358
329
|
const qe = new QeLite(manager);
|
|
359
330
|
let dep = -1;
|
|
@@ -369,7 +340,6 @@ export const applyQeLite = (manager: AstManager, goal: Goal) => {
|
|
|
369
340
|
formula = assignOwned(manager, formula, qe.apply(formula));
|
|
370
341
|
if (formula !== form) goal.update(index, formula);
|
|
371
342
|
}
|
|
372
|
-
// The iterator of the simplifier's indices counts a step after each formula.
|
|
373
343
|
manager.limit.checkpoint();
|
|
374
344
|
}
|
|
375
345
|
release(manager, formula);
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/qi_queue.cpp, src/smt/smt_checker.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. Instances found by E-matching wait here. Z3's default cost is
|
|
3
|
-
// (+ weight generation): cheap instances are created at once, expensive ones only in the final
|
|
4
|
-
// check, and the checker skips instances that the current assignment already satisfies.
|
|
1
|
+
// Ported from Z3 (src/smt/qi_queue.cpp, src/smt/smt_checker.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { KIND_APP, KIND_VAR, OP_AND, OP_EQ, OP_FALSE, OP_ITE, OP_NOT, OP_OR, OP_TRUE } from "./ast";
|
|
6
3
|
import type { Context } from "./context";
|
|
7
4
|
import type { Enode } from "./enode";
|
|
@@ -20,24 +17,19 @@ interface Entry {
|
|
|
20
17
|
isInstantiated: boolean;
|
|
21
18
|
}
|
|
22
19
|
|
|
23
|
-
// A copy of the array with room for the index, at least twice as long.
|
|
24
20
|
const grow = (array: Int32Array, index: number) => {
|
|
25
21
|
const grown = new Int32Array(Math.max(2 * array.length, index + 1));
|
|
26
22
|
grown.set(array);
|
|
27
23
|
return grown;
|
|
28
24
|
};
|
|
29
25
|
|
|
30
|
-
// smt::checker: evaluates a quantifier body under bindings with the E-graph and the assignment.
|
|
31
26
|
class Checker {
|
|
32
27
|
private bindings: Enode[] = [];
|
|
33
|
-
// The caches of a run, by expression, which hold an entry for the run whose stamp it has. So a run
|
|
34
|
-
// starts with them empty without clearing them.
|
|
35
28
|
private stamp = 0;
|
|
36
29
|
private checkStamps = new Int32Array(1024);
|
|
37
30
|
private checkResults = new Int32Array(1024);
|
|
38
31
|
private enodeStamps = new Int32Array(1024);
|
|
39
32
|
private enodeResults: (Enode | null | undefined)[] = [];
|
|
40
|
-
// The ptr_buffer of each level of get_enode_eq_to_core, which Z3 keeps on the stack.
|
|
41
33
|
private argBuffers: Enode[][] = [];
|
|
42
34
|
private argDepth = 0;
|
|
43
35
|
|
|
@@ -161,7 +153,6 @@ class Checker {
|
|
|
161
153
|
return this.isAssigned(node.owner, isTrue);
|
|
162
154
|
}
|
|
163
155
|
|
|
164
|
-
// get_enode_eq_to: the relevant term of the E-graph that the expression equals by congruence.
|
|
165
156
|
private getEnodeEqTo(expr: number): Enode | null {
|
|
166
157
|
const context = this.context;
|
|
167
158
|
const manager = context.manager;
|
|
@@ -205,17 +196,12 @@ export class QiQueue {
|
|
|
205
196
|
private instantiatedTrail: number[] = [];
|
|
206
197
|
private scopes: number[] = [];
|
|
207
198
|
private checker: Checker;
|
|
208
|
-
// cached_var_subst: each instance by its quantifier and bindings, which the queue holds with them
|
|
209
|
-
// until the next search. instanceRefs lists the quantifier, the bindings and the instance of each.
|
|
210
|
-
// instanceStarts holds where each instance starts there, and instanceNext the earlier instance of
|
|
211
|
-
// the same hash, or -1. instances maps a hash of the key to its last instance.
|
|
212
199
|
private subst: VarSubst;
|
|
213
200
|
private instances = new Map<number, number>();
|
|
214
201
|
private instanceRefs: number[] = [];
|
|
215
202
|
private instanceStarts: number[] = [];
|
|
216
203
|
private instanceNext: number[] = [];
|
|
217
204
|
private bindingOwners: number[] = [];
|
|
218
|
-
// m_instances: the lemmas, which the queue holds until their scope is popped.
|
|
219
205
|
private lemmas: RefVector;
|
|
220
206
|
numInstances = 0;
|
|
221
207
|
|
|
@@ -295,7 +281,6 @@ export class QiQueue {
|
|
|
295
281
|
const manager = context.manager;
|
|
296
282
|
const data = manager.getQuantifier(entry.quantifier);
|
|
297
283
|
if (this.checker.isSat(data.body, entry.bindings)) return;
|
|
298
|
-
// The bindings' expressions, which Z3 writes into the buffer that m_subst returns.
|
|
299
284
|
const owners = this.bindingOwners;
|
|
300
285
|
shrink(owners, 0);
|
|
301
286
|
for (const binding of entry.bindings) owners.push(binding.owner);
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/smtlogics/quant_tactics.cpp, src/tactic/core/simplify_tactic.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. With (set-logic UFNIA), Z3's strategic solver runs the ufnia tactic:
|
|
3
|
-
// a preprocessor, then qe-lite, then the SMT kernel. Of the preprocessor, elim-uncnstr's
|
|
4
|
-
// elimination and the simplifier's local_ctx option are not ported, as they change almost none of
|
|
5
|
-
// tlapm's obligations.
|
|
1
|
+
// Ported from Z3 (src/tactic/smtlogics/quant_tactics.cpp, src/tactic/core/simplify_tactic.cpp), MIT license, see z3-license.txt.
|
|
6
2
|
import { type AstManager, KIND_APP, KIND_QUANTIFIER } from "./ast";
|
|
7
3
|
import { ctxSimplify } from "./ctx-simplify";
|
|
8
4
|
import { Goal } from "./goal";
|
|
@@ -11,7 +7,6 @@ import { applyQeLite } from "./qe-lite";
|
|
|
11
7
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
12
8
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
13
9
|
|
|
14
|
-
// The simplify tactic, with pull_cheap_ite where the preprocessor sets it.
|
|
15
10
|
const simplify = (manager: AstManager, goal: Goal, isPullingCheapIte = false) => {
|
|
16
11
|
if (goal.isInconsistent) return;
|
|
17
12
|
const rewriter = new Rewriter(manager, { ...TACTIC_REWRITER_OPTIONS, isPullingCheapIte });
|
|
@@ -28,15 +23,12 @@ const simplify = (manager: AstManager, goal: Goal, isPullingCheapIte = false) =>
|
|
|
28
23
|
rewriter.release();
|
|
29
24
|
};
|
|
30
25
|
|
|
31
|
-
// collect_occs: whether an uninterpreted constant occurs only once, where a term is visited once and
|
|
32
|
-
// a quantifier's patterns are not visited.
|
|
33
26
|
const hasUnconstrainedConst = (manager: AstManager, goal: Goal) => {
|
|
34
27
|
const visited = new Set<number>();
|
|
35
28
|
const consts: number[] = [];
|
|
36
29
|
const repeated = new Set<number>();
|
|
37
30
|
const todo = [...goal.forms.items];
|
|
38
|
-
|
|
39
|
-
const expr = todo.pop() as number;
|
|
31
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
40
32
|
const isConst = manager.isUninterpretedConst(expr);
|
|
41
33
|
if (visited.has(expr)) {
|
|
42
34
|
if (isConst) repeated.add(expr);
|
|
@@ -50,9 +42,7 @@ const hasUnconstrainedConst = (manager: AstManager, goal: Goal) => {
|
|
|
50
42
|
return consts.some((expr) => !repeated.has(expr));
|
|
51
43
|
};
|
|
52
44
|
|
|
53
|
-
//
|
|
54
|
-
// some constant is unconstrained, and counts its steps. The rewriter starts as if the formulas had
|
|
55
|
-
// changed, so it makes a second round.
|
|
45
|
+
// Z3's elim_uncnstr rewriter runs twice over the formulas and counts its steps, though the elimination is not ported.
|
|
56
46
|
const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
57
47
|
const isRewriting = hasUnconstrainedConst(manager, goal);
|
|
58
48
|
pinQuantifierBodies(manager, goal);
|
|
@@ -65,8 +55,6 @@ const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
|
65
55
|
rewriter.release();
|
|
66
56
|
};
|
|
67
57
|
|
|
68
|
-
// elim_uncnstr_tactic::disable_quantified: the tactic holds the body of each quantifier until it is
|
|
69
|
-
// destroyed after the search.
|
|
70
58
|
const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
|
|
71
59
|
const visited = new Set<number>();
|
|
72
60
|
const disabled = new Set<number>();
|
|
@@ -74,16 +62,14 @@ const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
|
|
|
74
62
|
if (disabled.has(body)) return;
|
|
75
63
|
manager.incRef(body);
|
|
76
64
|
const todo = [body];
|
|
77
|
-
|
|
78
|
-
const expr = todo.pop() as number;
|
|
65
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
79
66
|
if (disabled.has(expr)) continue;
|
|
80
67
|
disabled.add(expr);
|
|
81
68
|
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
82
69
|
}
|
|
83
70
|
};
|
|
84
71
|
const todo = [...goal.forms.items];
|
|
85
|
-
|
|
86
|
-
const expr = todo.pop() as number;
|
|
72
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
87
73
|
if (visited.has(expr)) continue;
|
|
88
74
|
visited.add(expr);
|
|
89
75
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -94,13 +80,10 @@ const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
|
|
|
94
80
|
}
|
|
95
81
|
};
|
|
96
82
|
|
|
97
|
-
// mk_ufnia_tactic, up to the SMT kernel: mk_quant_preprocessor without solve-eqs, then qe-lite.
|
|
98
83
|
export const applyUfniaTactic = (manager: AstManager, assertions: number[]) => {
|
|
99
84
|
const goal = new Goal(manager);
|
|
100
85
|
for (const assertion of assertions) goal.assert(assertion);
|
|
101
86
|
simplify(manager, goal);
|
|
102
|
-
// and_then runs the next tactic only on a goal that is not decided: one that is consistent and
|
|
103
|
-
// has formulas left.
|
|
104
87
|
const steps = [
|
|
105
88
|
() => propagateValues(manager, goal),
|
|
106
89
|
() => ctxSimplify(manager, goal),
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. The quantifier analyzer of the model finder, which collects how the
|
|
3
|
-
// variables of each quantifier occur, and the quantifier info where it records what it learns.
|
|
1
|
+
// Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
3
|
KIND_APP,
|
|
6
4
|
KIND_VAR,
|
|
@@ -25,11 +23,8 @@ import { Rational } from "./rational";
|
|
|
25
23
|
import { Rewriter } from "./rewriter";
|
|
26
24
|
import { AufSolver, type Evaluate, InstantiationSet, Node } from "./auf-solver";
|
|
27
25
|
|
|
28
|
-
// smt_params' mbqi_force_template: macros of quantifiers with at least this weight are used even
|
|
29
|
-
// in the AUF fragment.
|
|
30
26
|
export const MBQI_FORCE_TEMPLATE = 10;
|
|
31
27
|
|
|
32
|
-
// qinfo: a bit of information about how a variable occurs in a quantifier.
|
|
33
28
|
type QInfo =
|
|
34
29
|
| { kind: "f_var"; decl: number; argIndex: number; varIndex: number }
|
|
35
30
|
| { kind: "f_var_plus_offset"; decl: number; argIndex: number; varIndex: number; offset: number }
|
|
@@ -42,12 +37,10 @@ const isSameQInfo = (first: QInfo, second: QInfo) =>
|
|
|
42
37
|
const mkVarPair = (kind: "x_eq_y" | "x_neq_y" | "x_leq_y", first: number, second: number): QInfo =>
|
|
43
38
|
first > second ? { kind, first: second, second: first } : { kind, first, second };
|
|
44
39
|
|
|
45
|
-
// quantifier_info: what the analyzer learned about one quantifier.
|
|
46
40
|
export class QuantifierInfo {
|
|
47
41
|
readonly flatQ: number;
|
|
48
42
|
qinfos: QInfo[] = [];
|
|
49
43
|
isAuf = true;
|
|
50
|
-
hasXEqY = false;
|
|
51
44
|
readonly ngDecls = new Set<number>();
|
|
52
45
|
theOne: number | null = null;
|
|
53
46
|
private uvarInstSets: (InstantiationSet | null)[] | null = null;
|
|
@@ -59,14 +52,12 @@ export class QuantifierInfo {
|
|
|
59
52
|
readonly quantifier: number,
|
|
60
53
|
macroRewriter: Rewriter,
|
|
61
54
|
) {
|
|
62
|
-
// m_flat_q, which holds a reference.
|
|
63
55
|
const isNested = manager.hasQuantifierFlags[manager.getQuantifier(quantifier).body];
|
|
64
56
|
this.flatQ = isNested ? pullQuant(manager, quantifier) : quantifier;
|
|
65
57
|
if (!isNested) manager.incRef(quantifier);
|
|
66
58
|
this.condMacros = collectMacroCandidates(manager, macroRewriter, this.flatQ);
|
|
67
59
|
}
|
|
68
60
|
|
|
69
|
-
// ~quantifier_info: the conditional macros go before the flat quantifier.
|
|
70
61
|
release() {
|
|
71
62
|
releaseCondMacros(this.manager, this.condMacros);
|
|
72
63
|
this.manager.decRef(this.flatQ);
|
|
@@ -141,7 +132,6 @@ export class QuantifierInfo {
|
|
|
141
132
|
const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
|
|
142
133
|
const sJ = solver.getUvar(flatQ, info.varIndex).getRoot();
|
|
143
134
|
if (aFI === sJ) {
|
|
144
|
-
// There is no finite fixpoint, so the arguments minus the offset join the set.
|
|
145
135
|
for (const enode of context.enodesOf(info.decl))
|
|
146
136
|
if (context.isRelevant(enode.owner)) {
|
|
147
137
|
const arg = enode.getArg(info.argIndex);
|
|
@@ -161,7 +151,6 @@ export class QuantifierInfo {
|
|
|
161
151
|
case "x_eq_t": {
|
|
162
152
|
const sort = sorts[sorts.length - info.varIndex - 1];
|
|
163
153
|
if (manager.isUninterpretedSort(sort)) {
|
|
164
|
-
// Every term of the sort joins the set, see Section 4.1 of the paper.
|
|
165
154
|
const node = solver.getUvar(flatQ, info.varIndex);
|
|
166
155
|
for (const enode of context.enodes)
|
|
167
156
|
if (context.isRelevant(enode.owner) && manager.sorts[enode.owner] === sort)
|
|
@@ -177,7 +166,6 @@ export class QuantifierInfo {
|
|
|
177
166
|
break;
|
|
178
167
|
}
|
|
179
168
|
}
|
|
180
|
-
// The second pass for the offsets: A_f_i - k is in S_j and S_j + k is in A_f_i.
|
|
181
169
|
for (const info of this.qinfos) {
|
|
182
170
|
if (info.kind !== "f_var_plus_offset") continue;
|
|
183
171
|
const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
|
|
@@ -197,7 +185,6 @@ export class QuantifierInfo {
|
|
|
197
185
|
);
|
|
198
186
|
}
|
|
199
187
|
|
|
200
|
-
// populate_macro_based_inst_sets: the sets of a quantifier that a macro satisfies.
|
|
201
188
|
getMacroBasedInstSet(varIndex: number, evaluate: Evaluate) {
|
|
202
189
|
const theOne = this.theOne;
|
|
203
190
|
if (theOne === null) return null;
|
|
@@ -227,8 +214,6 @@ export class QuantifierInfo {
|
|
|
227
214
|
|
|
228
215
|
type Polarity = "pos" | "neg";
|
|
229
216
|
|
|
230
|
-
// quantifier_analyzer.
|
|
231
|
-
// One analyzer runs per quantifier and records what it learns in the quantifier's info.
|
|
232
217
|
export class QuantifierAnalyzer {
|
|
233
218
|
private posCache = new Set<number>();
|
|
234
219
|
private negCache = new Set<number>();
|
|
@@ -241,18 +226,13 @@ export class QuantifierAnalyzer {
|
|
|
241
226
|
private info: QuantifierInfo,
|
|
242
227
|
) {}
|
|
243
228
|
|
|
244
|
-
private isGround(expr: number) {
|
|
245
|
-
return this.manager.isGround(expr);
|
|
246
|
-
}
|
|
247
|
-
|
|
248
229
|
private isVar(expr: number) {
|
|
249
230
|
return this.manager.kinds[expr] === KIND_VAR;
|
|
250
231
|
}
|
|
251
232
|
|
|
252
|
-
// poly_rewriter::is_var_plus_ground.
|
|
253
233
|
private isVarPlusGround(expr: number) {
|
|
254
234
|
const manager = this.manager;
|
|
255
|
-
if (manager.getOp(expr) !== OP_ADD ||
|
|
235
|
+
if (manager.getOp(expr) !== OP_ADD || manager.isGround(expr)) return undefined;
|
|
256
236
|
const args: number[] = [];
|
|
257
237
|
let variable: number | undefined;
|
|
258
238
|
let isInverted = false;
|
|
@@ -267,7 +247,7 @@ export class QuantifierAnalyzer {
|
|
|
267
247
|
isStopped = true;
|
|
268
248
|
}
|
|
269
249
|
const negated = this.manager.getTimesMinusOneArg(arg);
|
|
270
|
-
if (this.isGround(arg)) args.push(arg);
|
|
250
|
+
if (this.manager.isGround(arg)) args.push(arg);
|
|
271
251
|
else if (this.isVar(arg)) {
|
|
272
252
|
if (variable !== undefined) return undefined;
|
|
273
253
|
variable = arg;
|
|
@@ -291,19 +271,19 @@ export class QuantifierAnalyzer {
|
|
|
291
271
|
}
|
|
292
272
|
|
|
293
273
|
private isVarAndGround(lhs: number, rhs: number) {
|
|
294
|
-
if (this.isVar(lhs) && this.isGround(rhs))
|
|
274
|
+
if (this.isVar(lhs) && this.manager.isGround(rhs))
|
|
295
275
|
return { variable: lhs, term: rhs, isInverted: false };
|
|
296
|
-
if (this.isVar(rhs) && this.isGround(lhs))
|
|
276
|
+
if (this.isVar(rhs) && this.manager.isGround(lhs))
|
|
297
277
|
return { variable: rhs, term: lhs, isInverted: false };
|
|
298
278
|
const left = this.isVarPlusGround(lhs);
|
|
299
|
-
if (left !== undefined && this.isGround(rhs))
|
|
279
|
+
if (left !== undefined && this.manager.isGround(rhs))
|
|
300
280
|
return {
|
|
301
281
|
variable: left.variable,
|
|
302
282
|
term: left.isInverted ? this.mkSub(left.term, rhs) : this.mkSub(rhs, left.term),
|
|
303
283
|
isInverted: left.isInverted,
|
|
304
284
|
};
|
|
305
285
|
const right = this.isVarPlusGround(rhs);
|
|
306
|
-
if (right !== undefined && this.isGround(lhs))
|
|
286
|
+
if (right !== undefined && this.manager.isGround(lhs))
|
|
307
287
|
return {
|
|
308
288
|
variable: right.variable,
|
|
309
289
|
term: right.isInverted ? this.mkSub(right.term, lhs) : this.mkSub(lhs, right.term),
|
|
@@ -357,7 +337,7 @@ export class QuantifierAnalyzer {
|
|
|
357
337
|
}
|
|
358
338
|
|
|
359
339
|
private visitFormula(expr: number, polarity: Polarity) {
|
|
360
|
-
if (this.isGround(expr)) return;
|
|
340
|
+
if (this.manager.isGround(expr)) return;
|
|
361
341
|
const cache = polarity === "pos" ? this.posCache : this.negCache;
|
|
362
342
|
if (cache.has(expr)) return;
|
|
363
343
|
this.ftodo.push([expr, polarity]);
|
|
@@ -365,7 +345,7 @@ export class QuantifierAnalyzer {
|
|
|
365
345
|
}
|
|
366
346
|
|
|
367
347
|
private visitTerm(expr: number) {
|
|
368
|
-
if (this.isGround(expr) || this.posCache.has(expr)) return;
|
|
348
|
+
if (this.manager.isGround(expr) || this.posCache.has(expr)) return;
|
|
369
349
|
this.ttodo.push(expr);
|
|
370
350
|
this.posCache.add(expr);
|
|
371
351
|
}
|
|
@@ -446,12 +426,13 @@ export class QuantifierAnalyzer {
|
|
|
446
426
|
? this.isVarAndVar(manager.getArg(atom, 0), manager.getArg(atom, 1))
|
|
447
427
|
: undefined;
|
|
448
428
|
if (xEqY !== undefined) {
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
429
|
+
info.insertQInfo(
|
|
430
|
+
mkVarPair(
|
|
431
|
+
isNegated ? "x_neq_y" : "x_eq_y",
|
|
432
|
+
manager.values[xEqY[0]],
|
|
433
|
+
manager.values[xEqY[1]],
|
|
434
|
+
),
|
|
435
|
+
);
|
|
455
436
|
return;
|
|
456
437
|
}
|
|
457
438
|
const xLeY =
|
|
@@ -532,7 +513,6 @@ export class QuantifierAnalyzer {
|
|
|
532
513
|
}
|
|
533
514
|
}
|
|
534
515
|
|
|
535
|
-
// is_clause: a disjunction of literals.
|
|
536
516
|
private isLiteral(expr: number) {
|
|
537
517
|
const manager = this.manager;
|
|
538
518
|
const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
|
|
@@ -551,7 +531,7 @@ export class QuantifierAnalyzer {
|
|
|
551
531
|
for (const literal of literals) {
|
|
552
532
|
const isNegated = manager.isNot(literal);
|
|
553
533
|
const atom = isNegated ? manager.getArg(literal, 0) : literal;
|
|
554
|
-
if (!this.isGround(atom)) this.processLiteral(atom, isNegated);
|
|
534
|
+
if (!this.manager.isGround(atom)) this.processLiteral(atom, isNegated);
|
|
555
535
|
}
|
|
556
536
|
} else this.visitFormula(body, "pos");
|
|
557
537
|
while (this.ftodo.length > 0 || this.ttodo.length > 0) {
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_quantifier.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. Z3's default quantifier plugin: patterns go to an eager matcher, except that a
|
|
3
|
-
// quantifier with only multi-patterns keeps one of them eager and sends the rest to a lazy matcher
|
|
4
|
-
// that runs in the final check. With MBQI, the model finder and the model checker turn candidate
|
|
5
|
-
// models into instances.
|
|
1
|
+
// Ported from Z3 (src/smt/smt_quantifier.cpp), MIT license, see z3-license.txt.
|
|
6
2
|
import {
|
|
7
3
|
CHECK_MODEL_RESTART,
|
|
8
4
|
CHECK_MODEL_SAT,
|
|
@@ -22,8 +18,6 @@ import { QiQueue } from "./qi-queue";
|
|
|
22
18
|
const QI_MAX_EAGER_MULTIPATTERNS = 0;
|
|
23
19
|
const QI_MAX_LAZY_MULTIPATTERN_MATCHING = 2;
|
|
24
20
|
|
|
25
|
-
// Model-based quantifier instantiation: the finder completes candidate models, the checker refutes
|
|
26
|
-
// them with instances.
|
|
27
21
|
interface Mbqi {
|
|
28
22
|
finder: ModelFinder;
|
|
29
23
|
checker: ModelChecker;
|
|
@@ -96,7 +90,6 @@ export class DefaultQuantifierManager {
|
|
|
96
90
|
}
|
|
97
91
|
}
|
|
98
92
|
|
|
99
|
-
// is_shared: a ground term of a pattern, once a quantifier was asserted.
|
|
100
93
|
isShared(node: Enode) {
|
|
101
94
|
return this.isActive && (this.mam.isShared(node) || this.lazyMam.isShared(node));
|
|
102
95
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/util.h), MIT license, see z3-license.txt.
|
|
2
|
-
// congruential generator, which the model finder and the simplex settings seed.
|
|
1
|
+
// Ported from Z3 (src/util/util.h), MIT license, see z3-license.txt.
|
|
3
2
|
export class RandomGen {
|
|
4
3
|
constructor(private seed: number) {}
|
|
5
4
|
|