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,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_context.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// search: a CDCL loop over Boolean variables combined with an E-graph for congruence closure,
|
|
3
|
-
// relevancy propagation, the arithmetic theory and quantifier instantiation, with Z3's default
|
|
4
|
-
// parameters for UFNIA.
|
|
1
|
+
// Ported from Z3 (src/smt/smt_context.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import type { AssertedFormulas } from "./asserted-formulas";
|
|
6
3
|
import { AstManager, FAMILY_ARITH, KIND_APP, KIND_QUANTIFIER, KIND_VAR } from "./ast";
|
|
7
4
|
import { getCongruenceJustification, isCongruent } from "./cg-table";
|
|
@@ -46,14 +43,10 @@ const INV_ACTIVITY_LIMIT = 1e-100;
|
|
|
46
43
|
const INV_DECAY = 1.052;
|
|
47
44
|
const RESTART_INITIAL = 100;
|
|
48
45
|
const RESTART_FACTOR = 1.1;
|
|
49
|
-
// phase_caching_on and phase_caching_off: the numbers of conflicts while phase caching is on and off.
|
|
50
46
|
const PHASE_CACHING_ON = 400;
|
|
51
47
|
const PHASE_CACHING_OFF = 100;
|
|
52
48
|
const AGILITY_FACTOR = 0.9999;
|
|
53
|
-
// The LGC_FIXED lemma garbage collection: lemma_gc_initial conflicts between collections, and the
|
|
54
|
-
// activity and unassigned literal thresholds of del_inactive_lemmas2.
|
|
55
49
|
const LEMMA_GC_INITIAL = 5000;
|
|
56
|
-
// theory_lra::num_final_check_levels: level 2 also runs nlsat's full check.
|
|
57
50
|
const NUM_ARITH_FINAL_CHECK_LEVELS = 2;
|
|
58
51
|
const NEW_OLD_RATIO = 16;
|
|
59
52
|
const OLD_CLAUSE_ACTIVITY = 500;
|
|
@@ -65,7 +58,6 @@ export const CHECK_MODEL_SAT = 0;
|
|
|
65
58
|
export const CHECK_MODEL_UNKNOWN = 1;
|
|
66
59
|
export const CHECK_MODEL_RESTART = 2;
|
|
67
60
|
|
|
68
|
-
// The reasons a search may stop without an answer that MBQI cares about.
|
|
69
61
|
const FAILURE_OK = 0;
|
|
70
62
|
const FAILURE_THEORY = 1;
|
|
71
63
|
const FAILURE_QUANTIFIERS = 2;
|
|
@@ -77,12 +69,6 @@ type SearchFailure =
|
|
|
77
69
|
| typeof FAILURE_QUANTIFIERS
|
|
78
70
|
| typeof FAILURE_CANCELED;
|
|
79
71
|
|
|
80
|
-
// smt_params: the kernel runs model-based quantifier instantiation with relevancy level 2 and the
|
|
81
|
-
// CS_ACTIVITY_DELAY_NEW case split queue. The model checker's auxiliary context runs neither, as Z3
|
|
82
|
-
// sets its relevancy level to 0 and its case split strategy to CS_ACTIVITY.
|
|
83
|
-
// m_model_generator's model, m_proto_model and m_model. The model generator holds the last model it
|
|
84
|
-
// made. From mk_proto_model to reset_model the context holds that model too as its proto model, and
|
|
85
|
-
// get_model adds the model the proto model makes.
|
|
86
72
|
type ModelState =
|
|
87
73
|
| { kind: "none" }
|
|
88
74
|
| { kind: "generated"; generated: GeneratedModel }
|
|
@@ -95,8 +81,6 @@ interface SmtParams {
|
|
|
95
81
|
}
|
|
96
82
|
|
|
97
83
|
export class Context extends Internalizer {
|
|
98
|
-
// setup_context makes the theories after the first formulas are asserted, so the field starts
|
|
99
|
-
// unassigned.
|
|
100
84
|
theory!: TheoryLra;
|
|
101
85
|
readonly qmanager: DefaultQuantifierManager;
|
|
102
86
|
readonly conflictResolution: ConflictResolution = new ConflictResolution(this);
|
|
@@ -105,7 +89,6 @@ export class Context extends Internalizer {
|
|
|
105
89
|
private scopeAssignedLimits: number[] = [];
|
|
106
90
|
private scopeAuxClauseLimits: number[] = [];
|
|
107
91
|
private scopeTrailLimits: number[] = [];
|
|
108
|
-
// The number of lemmas when each user scope began.
|
|
109
92
|
private baseScopeLemmaLimits: number[] = [];
|
|
110
93
|
private atomPropagationQueue: Literal[] = [];
|
|
111
94
|
private thEqQueue: number[] = [];
|
|
@@ -130,19 +113,15 @@ export class Context extends Internalizer {
|
|
|
130
113
|
this.qmanager = new DefaultQuantifierManager(this, params.isMbqi);
|
|
131
114
|
}
|
|
132
115
|
|
|
133
|
-
// register_plugin initializes each theory it registers.
|
|
134
116
|
setupContext() {
|
|
135
117
|
this.theory = new TheoryLra(this);
|
|
136
118
|
this.theory.init();
|
|
137
119
|
}
|
|
138
120
|
|
|
139
|
-
// The search stops with unknown when the manager's resource limit cancels it.
|
|
140
121
|
checkCanceled() {
|
|
141
122
|
return !this.manager.limit.inc();
|
|
142
123
|
}
|
|
143
124
|
|
|
144
|
-
// Assignment and propagation.
|
|
145
|
-
|
|
146
125
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
147
126
|
const value = this.assignment[literal];
|
|
148
127
|
if (value === L_FALSE) this.setConflict(justification, negate(literal));
|
|
@@ -189,7 +168,6 @@ export class Context extends Internalizer {
|
|
|
189
168
|
}
|
|
190
169
|
const list = this.watches[literal];
|
|
191
170
|
if (list === undefined) continue;
|
|
192
|
-
// Nothing below makes a clause, so the clause data stays in place.
|
|
193
171
|
const data = this.clauses.data;
|
|
194
172
|
let kept = 0;
|
|
195
173
|
let index = 0;
|
|
@@ -260,7 +238,7 @@ export class Context extends Internalizer {
|
|
|
260
238
|
const lhs = this.exprToEnode[this.manager.getArg(eq, 0)];
|
|
261
239
|
const rhs = this.exprToEnode[this.manager.getArg(eq, 1)];
|
|
262
240
|
if (lhs !== undefined && rhs !== undefined) {
|
|
263
|
-
if (value === L_TRUE) this.addEq(lhs, rhs, { kind: "equation", literal
|
|
241
|
+
if (value === L_TRUE) this.addEq(lhs, rhs, { kind: "equation", literal });
|
|
264
242
|
else if (!this.addDiseq(lhs, rhs) && !this.isInconsistent())
|
|
265
243
|
this.setConflict(new EqPropagationJustification(lhs, rhs), mkLiteral(boolVar, true));
|
|
266
244
|
}
|
|
@@ -379,8 +357,6 @@ export class Context extends Internalizer {
|
|
|
379
357
|
}
|
|
380
358
|
}
|
|
381
359
|
|
|
382
|
-
// Equalities.
|
|
383
|
-
|
|
384
360
|
private getClosestVar(start: Enode) {
|
|
385
361
|
for (let node: Enode | null = start; node !== null; node = node.transTarget)
|
|
386
362
|
if (node.thVar >= 0) return node.thVar;
|
|
@@ -449,7 +425,6 @@ export class Context extends Internalizer {
|
|
|
449
425
|
|
|
450
426
|
attachThVar(node: Enode, thVar: number) {
|
|
451
427
|
const oldVar = node.thVar;
|
|
452
|
-
// A variable that an equality moved to the node's list, which the node's own replaces.
|
|
453
428
|
if (oldVar >= 0) {
|
|
454
429
|
node.thVar = thVar;
|
|
455
430
|
this.pushTrail(() => {
|
|
@@ -524,8 +499,6 @@ export class Context extends Internalizer {
|
|
|
524
499
|
}
|
|
525
500
|
}
|
|
526
501
|
|
|
527
|
-
// n1 = n2, justified by the justification, implied r1 = r2. A congruence that makes a false
|
|
528
|
-
// equality true is the root of a conflict, which dynamic Ackermannization counts.
|
|
529
502
|
private reinsertParentsIntoCgTable(
|
|
530
503
|
r1: Enode,
|
|
531
504
|
r2: Enode,
|
|
@@ -677,7 +650,6 @@ export class Context extends Internalizer {
|
|
|
677
650
|
return true;
|
|
678
651
|
}
|
|
679
652
|
|
|
680
|
-
// Theory combination: assume that two shared terms are equal.
|
|
681
653
|
assumeEq(lhs: Enode, rhs: Enode) {
|
|
682
654
|
if (lhs.root === rhs.root) return false;
|
|
683
655
|
const eq = this.mkEqAtom(lhs.owner, rhs.owner);
|
|
@@ -703,8 +675,6 @@ export class Context extends Internalizer {
|
|
|
703
675
|
return isNew;
|
|
704
676
|
}
|
|
705
677
|
|
|
706
|
-
// Search.
|
|
707
|
-
|
|
708
678
|
incBvarActivity(boolVar: BoolVar) {
|
|
709
679
|
this.activity[boolVar] += this.bvarInc;
|
|
710
680
|
if (this.activity[boolVar] > ACTIVITY_LIMIT) {
|
|
@@ -888,7 +858,6 @@ export class Context extends Internalizer {
|
|
|
888
858
|
return true;
|
|
889
859
|
}
|
|
890
860
|
|
|
891
|
-
// is_unit_clause: exactly one literal is unassigned and the rest are false.
|
|
892
861
|
private isUnitClause(clause: Clause) {
|
|
893
862
|
const store = this.clauses;
|
|
894
863
|
let isFound = false;
|
|
@@ -903,7 +872,6 @@ export class Context extends Internalizer {
|
|
|
903
872
|
return isFound;
|
|
904
873
|
}
|
|
905
874
|
|
|
906
|
-
// guess with PS_CACHING_CONSERVATIVE: the cached phase while phase caching is on, else false.
|
|
907
875
|
private guess(boolVar: BoolVar) {
|
|
908
876
|
if (this.manager.kinds[this.boolVar2Expr[boolVar]] === KIND_QUANTIFIER) return false;
|
|
909
877
|
if (this.hasBoolVarFlag(boolVar, BV_TRUE_FIRST)) return true;
|
|
@@ -966,7 +934,6 @@ export class Context extends Internalizer {
|
|
|
966
934
|
? negate(this.getLiteral(atoms[index]))
|
|
967
935
|
: this.getLiteral(atoms[index]);
|
|
968
936
|
}
|
|
969
|
-
// restore_relevancy: marking propagates, so it only marks the literals that lost relevancy.
|
|
970
937
|
for (let index = 0; index < literals.length; index++)
|
|
971
938
|
if (wasRelevant[index] && !this.isRelevant(this.boolVar2Expr[getVar(literals[index])]))
|
|
972
939
|
this.markLiteralAsRelevant(literals[index]);
|
|
@@ -989,16 +956,13 @@ export class Context extends Internalizer {
|
|
|
989
956
|
let maxLevel = 1;
|
|
990
957
|
for (;;) {
|
|
991
958
|
const isTheory = this.finalCheckIndex === 0;
|
|
992
|
-
// Z3
|
|
993
|
-
// the theories between arithmetic and the quantifiers, theory_finite_set makes a set.range
|
|
994
|
-
// declaration, and its assume_eqs draws a random value.
|
|
959
|
+
// Z3's theory_finite_set makes a set.range declaration here, and its assume_eqs draws a random value.
|
|
995
960
|
if (!isTheory) {
|
|
996
961
|
this.manager.initFiniteSetPlugin();
|
|
997
962
|
this.getRandomValue();
|
|
998
963
|
}
|
|
999
964
|
const check = isTheory ? this.theory.finalCheckEh(level) : qmanager.finalCheckEh(true);
|
|
1000
965
|
if (isTheory) maxLevel = Math.max(maxLevel, NUM_ARITH_FINAL_CHECK_LEVELS);
|
|
1001
|
-
// Z3 reads the cancel flag after each theory's final check, and a canceled check gives up.
|
|
1002
966
|
const isCanceled = isTheory && this.checkCanceled();
|
|
1003
967
|
if (isCanceled) failure = FAILURE_CANCELED;
|
|
1004
968
|
else if (isTheory && check === FC_GIVEUP) failure = FAILURE_THEORY;
|
|
@@ -1007,7 +971,6 @@ export class Context extends Internalizer {
|
|
|
1007
971
|
if (check === FC_GIVEUP || isCanceled) result = FC_GIVEUP;
|
|
1008
972
|
if (this.finalCheckIndex !== oldIndex) continue;
|
|
1009
973
|
if (level >= maxLevel || result === FC_DONE || this.canPropagate()) break;
|
|
1010
|
-
// A higher level reruns every check with the give-up state of the lower one cleared.
|
|
1011
974
|
level++;
|
|
1012
975
|
result = FC_DONE;
|
|
1013
976
|
failure = FAILURE_OK;
|
|
@@ -1044,15 +1007,13 @@ export class Context extends Internalizer {
|
|
|
1044
1007
|
}
|
|
1045
1008
|
}
|
|
1046
1009
|
|
|
1047
|
-
// resource_limits_exceeded
|
|
1048
|
-
// read twice.
|
|
1010
|
+
// Z3's resource_limits_exceeded reads the cancel flag twice while searching.
|
|
1049
1011
|
private isResourceLimitExceeded() {
|
|
1050
1012
|
if (this.isSearching && (this.lastSearchFailure !== FAILURE_OK || this.checkCanceled()))
|
|
1051
1013
|
return true;
|
|
1052
1014
|
return this.checkCanceled();
|
|
1053
1015
|
}
|
|
1054
1016
|
|
|
1055
|
-
// reset_model: the model generator still holds the proto model.
|
|
1056
1017
|
private resetModel() {
|
|
1057
1018
|
const state = this.modelState;
|
|
1058
1019
|
if (state.kind === "none" || state.kind === "generated") return;
|
|
@@ -1061,8 +1022,6 @@ export class Context extends Internalizer {
|
|
|
1061
1022
|
this.modelState = { kind: "generated", generated: state.generated };
|
|
1062
1023
|
}
|
|
1063
1024
|
|
|
1064
|
-
// mk_proto_model: the model of the current assignment, which the quantifier manager adjusts. The
|
|
1065
|
-
// model generator releases the last model first.
|
|
1066
1025
|
private mkProtoModel() {
|
|
1067
1026
|
if (this.modelState.kind !== "none") this.modelState.generated.model.decRef();
|
|
1068
1027
|
const generated = mkModel(this);
|
|
@@ -1076,8 +1035,6 @@ export class Context extends Internalizer {
|
|
|
1076
1035
|
return generated;
|
|
1077
1036
|
}
|
|
1078
1037
|
|
|
1079
|
-
// get_model: the model that the proto model makes, which the caller holds too. add_rec_funs gives
|
|
1080
|
-
// each named expression without an interpretation its expression.
|
|
1081
1038
|
getModel() {
|
|
1082
1039
|
if (this.modelState.kind === "final") return this.modelState.model;
|
|
1083
1040
|
const generated =
|
|
@@ -1090,13 +1047,11 @@ export class Context extends Internalizer {
|
|
|
1090
1047
|
return model;
|
|
1091
1048
|
}
|
|
1092
1049
|
|
|
1093
|
-
// validate_model: every relevant ground literal of the assignment holds in the model.
|
|
1094
1050
|
validateModel(model: ProtoModel) {
|
|
1095
1051
|
const manager = this.manager;
|
|
1096
1052
|
for (const literal of this.assignedLiterals) {
|
|
1097
1053
|
const atom = this.boolVar2Expr[getVar(literal)];
|
|
1098
1054
|
if (!this.isRelevant(atom)) continue;
|
|
1099
|
-
// n and res of Z3's loop hold the literal and its value.
|
|
1100
1055
|
const expr = isNegated(literal) ? manager.mkNot(atom) : atom;
|
|
1101
1056
|
manager.incRef(expr);
|
|
1102
1057
|
const value = manager.isGround(expr) ? model.eval(expr, false) : -1;
|
|
@@ -1107,9 +1062,6 @@ export class Context extends Internalizer {
|
|
|
1107
1062
|
return true;
|
|
1108
1063
|
}
|
|
1109
1064
|
|
|
1110
|
-
// restart: decides whether the search goes on after a bounded search. A candidate model of a
|
|
1111
|
-
// problem with quantifiers goes to model-based quantifier instantiation, which may add instances
|
|
1112
|
-
// and force a restart.
|
|
1113
1065
|
private restart(status: number, currentLevel: number): number | undefined {
|
|
1114
1066
|
const qmanager = this.qmanager;
|
|
1115
1067
|
this.resetModel();
|
|
@@ -1143,7 +1095,6 @@ export class Context extends Internalizer {
|
|
|
1143
1095
|
return L_UNDEF;
|
|
1144
1096
|
}
|
|
1145
1097
|
}
|
|
1146
|
-
// inc_limits with RS_IN_OUT_GEOMETRIC.
|
|
1147
1098
|
if (this.numConflictsSinceRestart >= this.restartThreshold) {
|
|
1148
1099
|
this.restartThreshold = Math.trunc(this.restartThreshold * RESTART_FACTOR);
|
|
1149
1100
|
if (this.restartThreshold > this.restartOuterThreshold) {
|
|
@@ -1164,7 +1115,6 @@ export class Context extends Internalizer {
|
|
|
1164
1115
|
return undefined;
|
|
1165
1116
|
}
|
|
1166
1117
|
|
|
1167
|
-
// can_delete: a lemma that justifies neither of its watched literals.
|
|
1168
1118
|
private isDeletable(clause: Clause) {
|
|
1169
1119
|
const store = this.clauses;
|
|
1170
1120
|
if (store.isReinit(clause)) return false;
|
|
@@ -1183,8 +1133,6 @@ export class Context extends Internalizer {
|
|
|
1183
1133
|
return false;
|
|
1184
1134
|
}
|
|
1185
1135
|
|
|
1186
|
-
// del_inactive_lemmas2: deletes the lemmas of the current user scope with low activity and many
|
|
1187
|
-
// unassigned literals. The newest sixteenth of them tolerates more unassigned literals.
|
|
1188
1136
|
private delInactiveLemmas() {
|
|
1189
1137
|
const lemmas = this.lemmas;
|
|
1190
1138
|
const startAt = this.baseLevel === 0 ? 0 : this.baseScopeLemmaLimits[this.baseLevel - 1];
|
|
@@ -1212,7 +1160,6 @@ export class Context extends Internalizer {
|
|
|
1212
1160
|
this.numConflictsSinceLemmaGc = 0;
|
|
1213
1161
|
}
|
|
1214
1162
|
|
|
1215
|
-
// push: a user scope, which pop removes with everything asserted in it.
|
|
1216
1163
|
push() {
|
|
1217
1164
|
this.popToBaseLevel();
|
|
1218
1165
|
this.pushScope();
|
|
@@ -1226,13 +1173,10 @@ export class Context extends Internalizer {
|
|
|
1226
1173
|
this.popScope(numScopes);
|
|
1227
1174
|
}
|
|
1228
1175
|
|
|
1229
|
-
// pop_to_base_lvl: undoes the decisions of the last search, before new assertions.
|
|
1230
1176
|
popToBaseLevel() {
|
|
1231
1177
|
if (this.scopeLevel > this.baseLevel) this.popScope(this.scopeLevel - this.baseLevel);
|
|
1232
1178
|
}
|
|
1233
1179
|
|
|
1234
|
-
// internalize_assertions: the formulas of the asserted formulas, after preprocessing. When they
|
|
1235
|
-
// are inconsistent, none is internalized and the context has an axiom conflict.
|
|
1236
1180
|
internalizeAssertions(asserted: AssertedFormulas) {
|
|
1237
1181
|
const formulas = asserted.reduce();
|
|
1238
1182
|
if (asserted.isInconsistent) {
|
|
@@ -1245,7 +1189,6 @@ export class Context extends Internalizer {
|
|
|
1245
1189
|
}
|
|
1246
1190
|
}
|
|
1247
1191
|
|
|
1248
|
-
// init_assumptions: the search runs above a scope where the assumptions hold.
|
|
1249
1192
|
initAssumptions(assumptions: number[]) {
|
|
1250
1193
|
if (assumptions.length > 0) {
|
|
1251
1194
|
this.propagate();
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/ctx_simplify_tactic.cpp, src/ast/num_occurs.cpp,
|
|
2
|
-
// src/tactic/goal_num_occurs.cpp), MIT license, see z3-license.txt. The ctx-simplify tactic with
|
|
3
|
-
// ctx_propagate_assertions: in the context of a formula or a branch, a shared term that the context
|
|
4
|
-
// asserts becomes true, false or the value it equals.
|
|
1
|
+
// Ported from Z3 (src/tactic/core/ctx_simplify_tactic.cpp, src/ast/num_occurs.cpp, src/tactic/goal_num_occurs.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_OR, type AstManager } from "./ast";
|
|
6
3
|
import type { Goal } from "./goal";
|
|
7
4
|
import { RefVector } from "./ref-vector";
|
|
8
5
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
9
6
|
import { shrink } from "./array";
|
|
10
7
|
|
|
11
|
-
// The max_depth and max_steps that mk_quant_preprocessor gives ctx-simplify.
|
|
12
8
|
const MAX_DEPTH = 30;
|
|
13
9
|
const MAX_STEPS = 5000000;
|
|
14
10
|
|
|
@@ -18,22 +14,15 @@ interface CachedResult {
|
|
|
18
14
|
}
|
|
19
15
|
|
|
20
16
|
class CtxSimplifier {
|
|
21
|
-
// goal_num_occurs: how often each term with more than one reference occurs outside quantifiers.
|
|
22
|
-
// m_pinned holds the formulas it counted.
|
|
23
17
|
private occs = new Map<number, number>();
|
|
24
18
|
private pinned: RefVector;
|
|
25
|
-
// ctx_propagate_assertions: the value of each shared term in the current context, and the terms
|
|
26
|
-
// given one, which the trail holds.
|
|
27
19
|
private assertions = new Map<number, number>();
|
|
28
20
|
private trail: RefVector;
|
|
29
21
|
private scopes: number[] = [];
|
|
30
|
-
// m_cache: the results of a shared term, the innermost level last, and the terms cached at each
|
|
31
|
-
// level. A cached term and its results are held.
|
|
32
22
|
private cache = new Map<number, CachedResult[]>();
|
|
33
23
|
private cacheUndo: number[][] = [];
|
|
34
24
|
private depth = 0;
|
|
35
25
|
private numSteps = 0;
|
|
36
|
-
// m_mk_app: mk_simplified_app, one reduction of the theory rewriters.
|
|
37
26
|
private rewriter: Rewriter;
|
|
38
27
|
|
|
39
28
|
constructor(private manager: AstManager) {
|
|
@@ -42,42 +31,36 @@ class CtxSimplifier {
|
|
|
42
31
|
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
43
32
|
}
|
|
44
33
|
|
|
45
|
-
// operator(): a forward pass over the formulas, then a backward pass that also counts the
|
|
46
|
-
// occurrences of the forward pass's results.
|
|
47
34
|
apply(goal: Goal) {
|
|
48
|
-
const manager = this.manager;
|
|
49
35
|
if (goal.isInconsistent) return;
|
|
50
36
|
this.countOccurrences(goal);
|
|
51
37
|
const size = goal.forms.size;
|
|
52
|
-
for (let index = 0; !goal.isInconsistent && index < size; index++)
|
|
53
|
-
this.
|
|
54
|
-
const result = this.simplify(goal.forms.items[index]);
|
|
55
|
-
if (index < size - 1 && !manager.isTrue(result) && !manager.isFalse(result))
|
|
56
|
-
this.assertExpr(result, false);
|
|
57
|
-
goal.update(index, result);
|
|
58
|
-
manager.decRef(result);
|
|
59
|
-
}
|
|
38
|
+
for (let index = 0; !goal.isInconsistent && index < size; index++)
|
|
39
|
+
this.simplifyForm(goal, index, index < size - 1);
|
|
60
40
|
this.pop(this.scopes.length);
|
|
61
41
|
this.countOccurrences(goal);
|
|
62
42
|
for (let index = goal.forms.size; !goal.isInconsistent && index > 0;) {
|
|
63
|
-
this.depth = 0;
|
|
64
43
|
index--;
|
|
65
|
-
|
|
66
|
-
if (index > 0 && !manager.isTrue(result) && !manager.isFalse(result))
|
|
67
|
-
this.assertExpr(result, false);
|
|
68
|
-
goal.update(index, result);
|
|
69
|
-
manager.decRef(result);
|
|
44
|
+
this.simplifyForm(goal, index, index > 0);
|
|
70
45
|
}
|
|
71
46
|
this.pop(this.scopes.length);
|
|
72
47
|
}
|
|
73
48
|
|
|
74
|
-
|
|
49
|
+
private simplifyForm(goal: Goal, index: number, isAsserted: boolean) {
|
|
50
|
+
const manager = this.manager;
|
|
51
|
+
this.depth = 0;
|
|
52
|
+
const result = this.simplify(goal.forms.items[index]);
|
|
53
|
+
if (isAsserted && !manager.isTrue(result) && !manager.isFalse(result))
|
|
54
|
+
this.assertExpr(result, false);
|
|
55
|
+
goal.update(index, result);
|
|
56
|
+
manager.decRef(result);
|
|
57
|
+
}
|
|
58
|
+
|
|
75
59
|
release() {
|
|
76
60
|
this.restoreCache(0);
|
|
77
61
|
this.pinned.reset();
|
|
78
62
|
}
|
|
79
63
|
|
|
80
|
-
// goal_num_occurs::operator() with ignore_ref_count1 and ignore_quantifiers.
|
|
81
64
|
private countOccurrences(goal: Goal) {
|
|
82
65
|
const manager = this.manager;
|
|
83
66
|
const visited = new Set<number>();
|
|
@@ -104,8 +87,6 @@ class CtxSimplifier {
|
|
|
104
87
|
return this.manager.getRefCount(expr) > 1 && (this.occs.get(expr) ?? 0) > 1;
|
|
105
88
|
}
|
|
106
89
|
|
|
107
|
-
// ctx_propagate_assertions::assert_expr: a shared atom gets its truth value, and a shared term
|
|
108
|
-
// that a positive equality equates with a value gets the value.
|
|
109
90
|
private assertExpr(expr: number, isNegated: boolean) {
|
|
110
91
|
const manager = this.manager;
|
|
111
92
|
let atom = expr;
|
|
@@ -137,7 +118,6 @@ class CtxSimplifier {
|
|
|
137
118
|
this.trail.push(term);
|
|
138
119
|
}
|
|
139
120
|
|
|
140
|
-
// pop: the assertions of the scopes, and then the results cached in them, the innermost first.
|
|
141
121
|
private pop(numScopes: number) {
|
|
142
122
|
if (numScopes === 0) return;
|
|
143
123
|
let level = this.scopes.length;
|
|
@@ -182,19 +162,16 @@ class CtxSimplifier {
|
|
|
182
162
|
return top !== undefined && top.level === this.scopes.length ? top.to : undefined;
|
|
183
163
|
}
|
|
184
164
|
|
|
185
|
-
// m_mk_app, with a reference to the result.
|
|
186
165
|
private mkApp(decl: number, args: number[], sort: number) {
|
|
187
166
|
return this.manager.withTemporaries(() => this.rewriter.mkApp(decl, args, sort));
|
|
188
167
|
}
|
|
189
168
|
|
|
190
|
-
// The result comes with a reference, which the caller releases.
|
|
191
169
|
private simplify(expr: number): number {
|
|
192
170
|
const manager = this.manager;
|
|
193
171
|
if (this.depth >= MAX_DEPTH || this.numSteps >= MAX_STEPS || manager.kinds[expr] !== KIND_APP) {
|
|
194
172
|
manager.incRef(expr);
|
|
195
173
|
return expr;
|
|
196
174
|
}
|
|
197
|
-
// tactic::checkpoint.
|
|
198
175
|
manager.limit.checkpoint();
|
|
199
176
|
const known = this.getCached(expr) ?? this.assertions.get(expr);
|
|
200
177
|
if (known !== undefined) {
|
|
@@ -214,8 +191,6 @@ class CtxSimplifier {
|
|
|
214
191
|
return result;
|
|
215
192
|
}
|
|
216
193
|
|
|
217
|
-
// simplify_or_and: each argument is simplified in the context of the others before it, then of
|
|
218
|
-
// those after it. A disjunct is asserted false and a conjunct true.
|
|
219
194
|
private simplifyOrAnd(expr: number, isOr: boolean) {
|
|
220
195
|
const manager = this.manager;
|
|
221
196
|
const level = this.scopes.length;
|
|
@@ -269,7 +244,6 @@ class CtxSimplifier {
|
|
|
269
244
|
return simplified;
|
|
270
245
|
}
|
|
271
246
|
|
|
272
|
-
// simplify_ite: the branches are simplified in the context of the condition and its negation.
|
|
273
247
|
private simplifyIte(expr: number) {
|
|
274
248
|
const manager = this.manager;
|
|
275
249
|
const condition = manager.getArg(expr, 0);
|
|
@@ -326,7 +300,6 @@ class CtxSimplifier {
|
|
|
326
300
|
}
|
|
327
301
|
}
|
|
328
302
|
|
|
329
|
-
// The ctx-simplify tactic, which the clean tactical resets when it is done.
|
|
330
303
|
export const ctxSimplify = (manager: AstManager, goal: Goal) => {
|
|
331
304
|
const simplifier = new CtxSimplifier(manager);
|
|
332
305
|
simplifier.apply(goal);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/der.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// resolution: a quantified variable that a literal of the body defines is replaced by its
|
|
3
|
-
// definition.
|
|
1
|
+
// Ported from Z3 (src/ast/rewriter/der.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import { KIND_QUANTIFIER, KIND_VAR, OP_EQ, SORT_BOOL, type AstManager } from "./ast";
|
|
5
3
|
import { flattenAndVector, flattenOrVector } from "./ast-util";
|
|
6
4
|
import { RefVector } from "./ref-vector";
|
|
@@ -11,7 +9,6 @@ interface VarDefinition {
|
|
|
11
9
|
definition: number;
|
|
12
10
|
}
|
|
13
11
|
|
|
14
|
-
// der::is_var_diseq for a universal quantifier and der::is_var_eq for an existential one.
|
|
15
12
|
const getVarDefinition = (
|
|
16
13
|
manager: AstManager,
|
|
17
14
|
literal: number,
|
|
@@ -60,8 +57,6 @@ const getVarDefinition = (
|
|
|
60
57
|
export const isOccurring = (manager: AstManager, index: number, expr: number) =>
|
|
61
58
|
collectUsedVars(manager, expr, index + 1)[index];
|
|
62
59
|
|
|
63
|
-
// der_sort_vars: the definitions in an order where each only uses the ones before it, dropping the
|
|
64
|
-
// definitions on a cycle.
|
|
65
60
|
const getEliminationOrder = (manager: AstManager, definitions: (number | undefined)[]) => {
|
|
66
61
|
for (let index = 0; index < definitions.length; index++) {
|
|
67
62
|
const definition = definitions[index];
|
|
@@ -94,8 +89,7 @@ const getEliminationOrder = (manager: AstManager, definitions: (number | undefin
|
|
|
94
89
|
return;
|
|
95
90
|
}
|
|
96
91
|
for (let index = 0; index < manager.getNumArgs(expr); index++) {
|
|
97
|
-
|
|
98
|
-
visit(arg);
|
|
92
|
+
visit(manager.getArg(expr, index));
|
|
99
93
|
}
|
|
100
94
|
done.add(expr);
|
|
101
95
|
};
|
|
@@ -105,8 +99,6 @@ const getEliminationOrder = (manager: AstManager, definitions: (number | undefin
|
|
|
105
99
|
return order;
|
|
106
100
|
};
|
|
107
101
|
|
|
108
|
-
// der: destructive equality resolution. Its var_subst keeps the cache of its last substitution, and
|
|
109
|
-
// m_map, m_subst_map and m_new_args keep their expressions, until der next fills them.
|
|
110
102
|
export class Der {
|
|
111
103
|
private subst: VarSubst;
|
|
112
104
|
private map: RefVector;
|
|
@@ -120,8 +112,6 @@ export class Der {
|
|
|
120
112
|
this.newArgs = new RefVector(manager);
|
|
121
113
|
}
|
|
122
114
|
|
|
123
|
-
// der::operator(): reduces until nothing changes, then drops the eliminated variables. The result
|
|
124
|
-
// is a temporary.
|
|
125
115
|
apply(expr: number) {
|
|
126
116
|
const manager = this.manager;
|
|
127
117
|
let current = expr;
|
|
@@ -132,7 +122,6 @@ export class Der {
|
|
|
132
122
|
return current === expr ? expr : elimUnusedVars(manager, current);
|
|
133
123
|
}
|
|
134
124
|
|
|
135
|
-
// ~der.
|
|
136
125
|
release() {
|
|
137
126
|
this.newArgs.reset();
|
|
138
127
|
this.substMap.reset();
|
|
@@ -140,7 +129,6 @@ export class Der {
|
|
|
140
129
|
this.subst.release();
|
|
141
130
|
}
|
|
142
131
|
|
|
143
|
-
// der::reduce1.
|
|
144
132
|
private reduce(expr: number) {
|
|
145
133
|
const manager = this.manager;
|
|
146
134
|
const data = manager.getQuantifier(expr);
|
|
@@ -152,7 +140,6 @@ export class Der {
|
|
|
152
140
|
!isOccurring(manager, single.index, single.definition)
|
|
153
141
|
)
|
|
154
142
|
return data.isForall ? manager.falseExpr : manager.trueExpr;
|
|
155
|
-
// The literals vector holds its expressions until reduce1 returns, and releases them in order.
|
|
156
143
|
const vector = new RefVector(manager);
|
|
157
144
|
manager.withoutTemporaries(() => {
|
|
158
145
|
vector.push(data.body);
|
|
@@ -164,7 +151,6 @@ export class Der {
|
|
|
164
151
|
return result;
|
|
165
152
|
}
|
|
166
153
|
|
|
167
|
-
// The rest of der::reduce1, on the flattened literals of the body.
|
|
168
154
|
private reduceLiterals(expr: number, literals: number[]) {
|
|
169
155
|
const manager = this.manager;
|
|
170
156
|
const data = manager.getQuantifier(expr);
|
|
@@ -179,23 +165,18 @@ export class Der {
|
|
|
179
165
|
return found.index;
|
|
180
166
|
});
|
|
181
167
|
if (positions.every((position) => position === -1)) return expr;
|
|
182
|
-
// der_sort_vars drops the definitions on a cycle from m_map.
|
|
183
168
|
const definitions = map.items.map((definition) => (definition === -1 ? undefined : definition));
|
|
184
169
|
const order = getEliminationOrder(manager, definitions);
|
|
185
170
|
definitions.forEach((definition, index) => {
|
|
186
171
|
if (definition === undefined && map.items[index] !== -1) map.set(index, -1);
|
|
187
172
|
});
|
|
188
173
|
if (order.length === 0) return expr;
|
|
189
|
-
// create_substitution: (:var i) becomes the entry at size - i - 1, with the definitions before it
|
|
190
|
-
// in the order substituted.
|
|
191
174
|
const size = map.size;
|
|
192
175
|
const substMap = this.substMap;
|
|
193
176
|
substMap.reset();
|
|
194
177
|
substMap.resize(size);
|
|
195
178
|
for (const index of order)
|
|
196
179
|
substMap.setOwned(size - index - 1, this.subst.apply(map.items[index], substMap.items));
|
|
197
|
-
// apply_substitution: m_new_args holds the kept literals, and the junction of them is held
|
|
198
|
-
// until it returns.
|
|
199
180
|
this.newArgs.reset();
|
|
200
181
|
literals.forEach((literal, position) => {
|
|
201
182
|
const index = positions[position];
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/dyn_ack.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// reduction with Z3's default DACK_ROOT strategy: a pair of applications whose congruence is the
|
|
3
|
-
// root of conflicts often enough gets the clause f(a) = f(b) or some a_i != b_i, so the search can
|
|
4
|
-
// learn from it without the E-graph. dack.eq is off by default, so equalities are not tracked.
|
|
1
|
+
// Ported from Z3 (src/smt/dyn_ack.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { OP_EQ } from "./ast";
|
|
6
3
|
import { CLS_TH_LEMMA } from "./clause";
|
|
7
4
|
import type { Context } from "./context";
|
|
8
5
|
import { Literal, negate } from "./literal";
|
|
9
6
|
|
|
10
|
-
// dyn_ack_params defaults: dack.threshold, dack.factor, dack.gc and dack.gc_inv_decay.
|
|
11
7
|
const DACK_THRESHOLD = 10;
|
|
12
8
|
const DACK_FACTOR = 0.1;
|
|
13
9
|
const DACK_GC = 2000;
|
|
@@ -21,7 +17,6 @@ interface AppPair {
|
|
|
21
17
|
|
|
22
18
|
export class DynAckManager {
|
|
23
19
|
private appPair2NumOccs = new Map<string, number>();
|
|
24
|
-
// The pairs that hold references to their applications. A pair can appear more than once.
|
|
25
20
|
private appPairs: AppPair[] = [];
|
|
26
21
|
private toInstantiate: AppPair[] = [];
|
|
27
22
|
private qhead = 0;
|
|
@@ -49,8 +44,6 @@ export class DynAckManager {
|
|
|
49
44
|
this.numPropagationsSinceLastGc = 0;
|
|
50
45
|
}
|
|
51
46
|
|
|
52
|
-
// cg_conflict_eh, which DACK_ROOT turns into cg_eh: the congruence of the two applications is the
|
|
53
|
-
// root of a conflict.
|
|
54
47
|
cgConflictEh(inputFirst: number, inputSecond: number) {
|
|
55
48
|
const manager = this.context.manager;
|
|
56
49
|
if (manager.decls[inputFirst] === OP_EQ) return;
|
|
@@ -71,8 +64,6 @@ export class DynAckManager {
|
|
|
71
64
|
if (numOccs === DACK_THRESHOLD) this.toInstantiate.push(pair);
|
|
72
65
|
}
|
|
73
66
|
|
|
74
|
-
// gc: decays every count, drops the pairs that fall to 1 or below, and queues the frequent ones,
|
|
75
|
-
// most frequent first.
|
|
76
67
|
private gc() {
|
|
77
68
|
const manager = this.context.manager;
|
|
78
69
|
this.toInstantiate = [];
|
|
@@ -132,7 +123,6 @@ export class DynAckManager {
|
|
|
132
123
|
negate(this.mkEq(manager.getArg(pair.first, index), manager.getArg(pair.second, index))),
|
|
133
124
|
);
|
|
134
125
|
this.appPair2NumOccs.delete(pair.key);
|
|
135
|
-
// The pair stays in appPairs, which still holds its references.
|
|
136
126
|
this.instantiated.add(pair.key);
|
|
137
127
|
literals.push(this.mkEq(pair.first, pair.second));
|
|
138
128
|
for (const literal of literals) context.markLiteralAsRelevant(literal);
|