tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +3 -6
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +1 -4
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +2 -3
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_config.h, src/sat/sat_config.cpp, src/params/sat_params.pyg,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg, src/sat/sat_asymm_branch_params.pyg,
|
|
3
|
-
// src/sat/sat_scc_params.pyg), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../../errors";
|
|
2
|
+
import { UINT_MAX } from "./clause";
|
|
5
3
|
|
|
6
4
|
export const PS_ALWAYS_TRUE = 0;
|
|
7
5
|
export const PS_ALWAYS_FALSE = 1;
|
|
@@ -13,7 +11,7 @@ export const PS_RANDOM = 6;
|
|
|
13
11
|
export const RS_GEOMETRIC = 0;
|
|
14
12
|
export const RS_LUBY = 1;
|
|
15
13
|
export const RS_EMA = 2;
|
|
16
|
-
|
|
14
|
+
const RS_STATIC = 3;
|
|
17
15
|
|
|
18
16
|
export const GC_DYN_PSM = 0;
|
|
19
17
|
export const GC_PSM = 1;
|
|
@@ -21,8 +19,6 @@ export const GC_GLUE = 2;
|
|
|
21
19
|
export const GC_GLUE_PSM = 3;
|
|
22
20
|
export const GC_PSM_GLUE = 4;
|
|
23
21
|
|
|
24
|
-
const UINT_MAX = 4294967295;
|
|
25
|
-
|
|
26
22
|
export type SatParams = ReadonlyMap<string, boolean | number | string>;
|
|
27
23
|
|
|
28
24
|
const PHASES = new Map([
|
|
@@ -91,11 +87,12 @@ export const getSatConfig = (params: SatParams) => ({
|
|
|
91
87
|
"invalid phase selection strategy: always_false, always_true, basic_caching, caching, random",
|
|
92
88
|
),
|
|
93
89
|
rephaseBase: getNumber(params, "rephase.base", 1000),
|
|
94
|
-
activityScale: getNumber(params, "reorder.activity_scale", 100),
|
|
95
90
|
searchSatConflicts: getNumber(params, "search.sat.conflicts", 400),
|
|
96
91
|
searchUnsatConflicts: getNumber(params, "search.unsat.conflicts", 400),
|
|
97
92
|
restartInitial: getNumber(params, "restart.initial", 2),
|
|
98
93
|
restartFactor: getNumber(params, "restart.factor", 1.5),
|
|
94
|
+
restartMax: getNumber(params, "restart.max", UINT_MAX),
|
|
95
|
+
inprocessMax: getNumber(params, "inprocess.max", UINT_MAX),
|
|
99
96
|
randomFreq: getNumber(params, "random_freq", 0.01),
|
|
100
97
|
randomSeed: getNumber(params, "random_seed", 0),
|
|
101
98
|
burstSearch: getNumber(params, "burst_search", 100),
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver.cpp, src/util/uint_set.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { getIdentityHash, ObjHashtable } from "../hashtable";
|
|
4
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
@@ -133,7 +132,7 @@ class ConsequenceFinder {
|
|
|
133
132
|
solver.initSearch();
|
|
134
133
|
solver.propagate(false);
|
|
135
134
|
if (solver.isInconsistent) return L_FALSE;
|
|
136
|
-
solver.initAssumptions(asms.length > 0 ? asms : [2 * solver.mkVar(true
|
|
135
|
+
solver.initAssumptions(asms.length > 0 ? asms : [2 * solver.mkVar(true)]);
|
|
137
136
|
solver.propagate(false);
|
|
138
137
|
if (solver.checkInconsistent()) return L_FALSE;
|
|
139
138
|
this.extractFixedConsequences(unfixedLits, assumptions, unfixedVars);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/goal2sat.h, src/sat/tactic/goal2sat.cpp,
|
|
2
|
-
// src/ast/expr2var.cpp, src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -185,7 +183,7 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
185
183
|
|
|
186
184
|
private addVar(isExternal: boolean, expr: number) {
|
|
187
185
|
const replayed = this.expr2varReplay?.get(expr);
|
|
188
|
-
return replayed ?? this.solver.mkVar(isExternal
|
|
186
|
+
return replayed ?? this.solver.mkVar(isExternal);
|
|
189
187
|
}
|
|
190
188
|
|
|
191
189
|
private mkBoolVar(expr: number) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver/inc_sat_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
|
|
4
3
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
@@ -11,7 +10,7 @@ import { convertModel, mkIncSatEufPreprocess, mkIncSatPreprocess } from "../tact
|
|
|
11
10
|
import type { SatParams } from "./config";
|
|
12
11
|
import { Goal2Sat } from "./goal2sat";
|
|
13
12
|
import { getConsequences } from "./consequences";
|
|
14
|
-
import { sat2goal } from "./sat2goal";
|
|
13
|
+
import { isLiteral, sat2goal } from "./sat2goal";
|
|
15
14
|
import { Solver } from "./solver";
|
|
16
15
|
|
|
17
16
|
const BIT_BLAST_PARAMS = {
|
|
@@ -68,18 +67,10 @@ export class IncSatSolver {
|
|
|
68
67
|
this.internalized = new RefVector(manager);
|
|
69
68
|
}
|
|
70
69
|
|
|
71
|
-
private isLiteral(expr: number) {
|
|
72
|
-
const manager = this.manager;
|
|
73
|
-
return (
|
|
74
|
-
manager.isUninterpretedConst(expr) ||
|
|
75
|
-
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
|
|
76
|
-
);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
70
|
private isClause(expr: number): boolean {
|
|
80
71
|
const manager = this.manager;
|
|
81
72
|
if (manager.depths[expr] > 4) return false;
|
|
82
|
-
if (
|
|
73
|
+
if (isLiteral(manager, expr)) return true;
|
|
83
74
|
if (!manager.isApp(expr)) return false;
|
|
84
75
|
const op = manager.getOp(expr);
|
|
85
76
|
const isConnective =
|
|
@@ -199,7 +190,7 @@ export class IncSatSolver {
|
|
|
199
190
|
const literals: number[] = [];
|
|
200
191
|
const asm2fml = new Map<number, number>();
|
|
201
192
|
for (const assumption of assumptions) {
|
|
202
|
-
if (this.
|
|
193
|
+
if (isLiteral(this.manager, assumption)) {
|
|
203
194
|
literals.push(assumption);
|
|
204
195
|
asm2fml.set(assumption, assumption);
|
|
205
196
|
continue;
|
|
@@ -254,7 +245,7 @@ export class IncSatSolver {
|
|
|
254
245
|
const consequences: number[] = [];
|
|
255
246
|
const internalized = this.internalizeFormulas();
|
|
256
247
|
if (internalized !== L_TRUE) return { result: internalized, consequences };
|
|
257
|
-
if (!assumptions.every((assumption) => this.
|
|
248
|
+
if (!assumptions.every((assumption) => isLiteral(this.manager, assumption)))
|
|
258
249
|
throw new SmtUnsupportedError("get-consequences assumptions that are not literals");
|
|
259
250
|
this.internalizeAssumptions(assumptions);
|
|
260
251
|
const found = getConsequences(
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_model_converter.h, src/sat/sat_model_converter.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
4
2
|
import { NULL_BOOL_VAR, NULL_LITERAL } from "./clause";
|
|
5
3
|
|
|
@@ -8,13 +6,12 @@ export const MC_BCE = 1;
|
|
|
8
6
|
export const MC_CCE = 2;
|
|
9
7
|
export const MC_ACCE = 3;
|
|
10
8
|
export const MC_ABCE = 4;
|
|
11
|
-
|
|
9
|
+
const MC_ATE = 5;
|
|
12
10
|
|
|
13
11
|
export interface McEntry {
|
|
14
12
|
boolVar: number;
|
|
15
13
|
kind: number;
|
|
16
14
|
clauses: number[];
|
|
17
|
-
clause: number[];
|
|
18
15
|
elimStacks: (number[] | undefined)[];
|
|
19
16
|
}
|
|
20
17
|
|
|
@@ -26,7 +23,6 @@ const getLitValue = (lit: number, model: Int8Array) => {
|
|
|
26
23
|
export class ModelConverter {
|
|
27
24
|
entries: McEntry[] = [];
|
|
28
25
|
exposedLim = 0;
|
|
29
|
-
private mark: boolean[] = [];
|
|
30
26
|
elimStack: number[] = [];
|
|
31
27
|
|
|
32
28
|
private processStack(model: Int8Array, clause: number[], stack: number[]) {
|
|
@@ -74,7 +70,7 @@ export class ModelConverter {
|
|
|
74
70
|
}
|
|
75
71
|
|
|
76
72
|
mk(kind: number, boolVar: number) {
|
|
77
|
-
const entry: McEntry = { boolVar, kind, clauses: [],
|
|
73
|
+
const entry: McEntry = { boolVar, kind, clauses: [], elimStacks: [] };
|
|
78
74
|
this.entries.push(entry);
|
|
79
75
|
return entry;
|
|
80
76
|
}
|
|
@@ -89,10 +85,6 @@ export class ModelConverter {
|
|
|
89
85
|
this.elimStack = [];
|
|
90
86
|
}
|
|
91
87
|
|
|
92
|
-
setClause(entry: McEntry, lits: number[]) {
|
|
93
|
-
entry.clause.push(...lits);
|
|
94
|
-
}
|
|
95
|
-
|
|
96
88
|
insert(entry: McEntry, lits: number[]) {
|
|
97
89
|
entry.clauses.push(...lits, NULL_LITERAL);
|
|
98
90
|
this.addElimStack(entry);
|
|
@@ -105,14 +97,6 @@ export class ModelConverter {
|
|
|
105
97
|
source.exposedLim = 0;
|
|
106
98
|
}
|
|
107
99
|
|
|
108
|
-
addClause(lits: number[]) {
|
|
109
|
-
if (this.entries.length === 0) return;
|
|
110
|
-
for (const lit of lits) {
|
|
111
|
-
while (this.mark.length <= lit >> 1) this.mark.push(false);
|
|
112
|
-
this.mark[lit >> 1] = true;
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
100
|
private swap(boolVar: number, size: number, clause: number[]) {
|
|
117
101
|
for (let index = 0; index < size; index++)
|
|
118
102
|
if (clause[index] >> 1 === boolVar) {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/pb_constraint.h, src/sat/smt/pb_constraint.cpp,
|
|
2
|
-
// src/sat/smt/pb_card.h, src/sat/smt/pb_card.cpp, src/sat/smt/pb_pb.h, src/sat/smt/pb_pb.cpp),
|
|
3
|
-
// MIT license, see z3-license.txt.
|
|
4
1
|
import { L_FALSE } from "../lbool";
|
|
5
2
|
import { NULL_LITERAL } from "./clause";
|
|
6
3
|
import { WATCH_EXT_CONSTRAINT, type WatchList } from "./watch-list";
|
|
@@ -1,11 +1,17 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/pb_solver.h, src/sat/smt/pb_solver.cpp,
|
|
2
|
-
// src/sat/smt/pb_internalize.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../../errors";
|
|
4
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
type AstManager,
|
|
4
|
+
OP_AT_LEAST_K,
|
|
5
|
+
OP_AT_MOST_K,
|
|
6
|
+
OP_PB_EQ,
|
|
7
|
+
OP_PB_GE,
|
|
8
|
+
OP_PB_LE,
|
|
9
|
+
SORT_BOOL,
|
|
10
|
+
} from "../ast";
|
|
5
11
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
|
-
import { getPbCoeff, getPbK, hasUnitCoefficients } from "../pb-rewriter";
|
|
12
|
+
import { getPbCoeff, getPbK, hasUnitCoefficients, mkPbGe } from "../pb-rewriter";
|
|
7
13
|
import { Rational } from "../rational";
|
|
8
|
-
import { NULL_LITERAL } from "./clause";
|
|
14
|
+
import { NULL_LITERAL, UINT_MAX } from "./clause";
|
|
9
15
|
import { Card, type Constraint, type ConstraintHost, Pbc } from "./pb-constraint";
|
|
10
16
|
import {
|
|
11
17
|
JUSTIFICATION_BINARY,
|
|
@@ -16,7 +22,6 @@ import {
|
|
|
16
22
|
type Solver,
|
|
17
23
|
} from "./solver";
|
|
18
24
|
|
|
19
|
-
const UINT_MAX = 4294967295;
|
|
20
25
|
const INT_MAX = 2147483647;
|
|
21
26
|
const INT_MIN = -2147483648;
|
|
22
27
|
|
|
@@ -1005,14 +1010,6 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1005
1010
|
this.initWatch(constraint);
|
|
1006
1011
|
}
|
|
1007
1012
|
|
|
1008
|
-
private numNonlearnedBin(lit: number) {
|
|
1009
|
-
const wlist = this.getWlist(lit ^ 1);
|
|
1010
|
-
let count = 0;
|
|
1011
|
-
for (let index = 0; index < wlist.size; index++)
|
|
1012
|
-
if (wlist.isBinary(index) && !wlist.isLearned(index)) count++;
|
|
1013
|
-
return count;
|
|
1014
|
-
}
|
|
1015
|
-
|
|
1016
1013
|
private initUseLists() {
|
|
1017
1014
|
const solver = this.solver;
|
|
1018
1015
|
const arena = solver.arena;
|
|
@@ -1071,7 +1068,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1071
1068
|
this.value(lit) !== L_UNDEF ||
|
|
1072
1069
|
this.cnstrUseList[lit].length === 0 ||
|
|
1073
1070
|
this.useCount(lit ^ 1) !== 0 ||
|
|
1074
|
-
this.
|
|
1071
|
+
this.getWlist(lit).numNonlearnedBin() !== 0
|
|
1075
1072
|
)
|
|
1076
1073
|
return false;
|
|
1077
1074
|
this.solver.assignScoped(lit);
|
|
@@ -1323,6 +1320,33 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1323
1320
|
if (isChanged) lits.splice(0, lits.length, ...members);
|
|
1324
1321
|
}
|
|
1325
1322
|
|
|
1323
|
+
toFormulas(lit2expr: (lit: number) => number, formulas: number[]) {
|
|
1324
|
+
const manager = this.manager;
|
|
1325
|
+
for (const constraint of this.constraints) {
|
|
1326
|
+
const args = constraint.lits.map(lit2expr);
|
|
1327
|
+
const formula =
|
|
1328
|
+
constraint instanceof Pbc
|
|
1329
|
+
? mkPbGe(
|
|
1330
|
+
manager,
|
|
1331
|
+
constraint.coeffs.map((coeff) => Rational.fromNumber(coeff)),
|
|
1332
|
+
args,
|
|
1333
|
+
Rational.fromNumber(constraint.k),
|
|
1334
|
+
)
|
|
1335
|
+
: manager.mkApp(
|
|
1336
|
+
manager.mkPbDecl(
|
|
1337
|
+
OP_AT_LEAST_K,
|
|
1338
|
+
[Rational.fromNumber(constraint.k)],
|
|
1339
|
+
args.map(() => SORT_BOOL),
|
|
1340
|
+
),
|
|
1341
|
+
args,
|
|
1342
|
+
SORT_BOOL,
|
|
1343
|
+
);
|
|
1344
|
+
formulas.push(
|
|
1345
|
+
constraint.lit === NULL_LITERAL ? formula : manager.mkEq(lit2expr(constraint.lit), formula),
|
|
1346
|
+
);
|
|
1347
|
+
}
|
|
1348
|
+
}
|
|
1349
|
+
|
|
1326
1350
|
private active2card() {
|
|
1327
1351
|
const wlits: { coeff: number; lit: number }[] = [];
|
|
1328
1352
|
let sum = 0;
|
|
@@ -1419,7 +1443,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1419
1443
|
private convertPbWlits(expr: number): WLits {
|
|
1420
1444
|
const manager = this.manager;
|
|
1421
1445
|
const lits = this.convertPbArgs(expr);
|
|
1422
|
-
const coeffs = lits.map((
|
|
1446
|
+
const coeffs = lits.map((_value, index) =>
|
|
1423
1447
|
this.checkUnsigned(getPbCoeff(manager, manager.decls[expr], index)),
|
|
1424
1448
|
);
|
|
1425
1449
|
return { coeffs, lits };
|
|
@@ -1450,7 +1474,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1450
1474
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1451
1475
|
return NULL_LITERAL;
|
|
1452
1476
|
}
|
|
1453
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1477
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1454
1478
|
this.addPbGe(lit, wlits, bound, false);
|
|
1455
1479
|
return isSign ? lit ^ 1 : lit;
|
|
1456
1480
|
}
|
|
@@ -1462,7 +1486,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1462
1486
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1463
1487
|
return NULL_LITERAL;
|
|
1464
1488
|
}
|
|
1465
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1489
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1466
1490
|
this.addPbGe(lit, wlits, bound, false);
|
|
1467
1491
|
return isSign ? lit ^ 1 : lit;
|
|
1468
1492
|
}
|
|
@@ -1472,8 +1496,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1472
1496
|
let k = getPbK(this.manager, this.manager.decls[expr]);
|
|
1473
1497
|
const wlits = this.convertPbWlits(expr);
|
|
1474
1498
|
const isBaseAssert = isRoot && !isSign;
|
|
1475
|
-
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1476
|
-
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1499
|
+
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1500
|
+
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1477
1501
|
this.addPbGe(lit1, wlits, Number(BigInt.asUintN(32, k.num)), false);
|
|
1478
1502
|
k = k.neg();
|
|
1479
1503
|
for (let index = 0; index < wlits.lits.length; index++) {
|
|
@@ -1481,7 +1505,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1481
1505
|
k = k.add(Rational.of(BigInt(wlits.coeffs[index])));
|
|
1482
1506
|
}
|
|
1483
1507
|
if (k.isNegative()) {
|
|
1484
|
-
const lit = 2 * solver.mkVar(false
|
|
1508
|
+
const lit = 2 * solver.mkVar(false);
|
|
1485
1509
|
solver.assignUnit(lit ^ 1);
|
|
1486
1510
|
this.si.cache(expr, lit);
|
|
1487
1511
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1493,7 +1517,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1493
1517
|
|
|
1494
1518
|
private mkConjunction(expr: number, lit1: number, lit2: number, isSign: boolean) {
|
|
1495
1519
|
const solver = this.solver;
|
|
1496
|
-
const lit = 2 * solver.mkVar(false
|
|
1520
|
+
const lit = 2 * solver.mkVar(false);
|
|
1497
1521
|
solver.mkClause([lit ^ 1, lit1]);
|
|
1498
1522
|
solver.mkClause([lit ^ 1, lit2]);
|
|
1499
1523
|
solver.mkClause([lit1 ^ 1, lit2 ^ 1, lit]);
|
|
@@ -1512,7 +1536,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1512
1536
|
this.addAtLeast(NULL_LITERAL, lits, bound, false);
|
|
1513
1537
|
return NULL_LITERAL;
|
|
1514
1538
|
}
|
|
1515
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1539
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1516
1540
|
this.addAtLeast(lit, lits, bound, false);
|
|
1517
1541
|
this.si.cache(expr, lit);
|
|
1518
1542
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1531,7 +1555,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1531
1555
|
this.addAtLeast(NULL_LITERAL, lits, bound, false);
|
|
1532
1556
|
return NULL_LITERAL;
|
|
1533
1557
|
}
|
|
1534
|
-
const lit = 2 * this.solver.mkVar(true
|
|
1558
|
+
const lit = 2 * this.solver.mkVar(true);
|
|
1535
1559
|
this.addAtLeast(lit, lits, bound, false);
|
|
1536
1560
|
this.si.cache(expr, lit);
|
|
1537
1561
|
return isSign ? lit ^ 1 : lit;
|
|
@@ -1541,8 +1565,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1541
1565
|
const solver = this.solver;
|
|
1542
1566
|
const lits = this.convertPbArgs(expr);
|
|
1543
1567
|
const isBaseAssert = isRoot && !isSign;
|
|
1544
|
-
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1545
|
-
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true
|
|
1568
|
+
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1569
|
+
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1546
1570
|
const bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
1547
1571
|
this.addAtLeast(lit1, lits, bound, false);
|
|
1548
1572
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_probing.h, src/sat/sat_probing.cpp,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg), MIT license, see z3-license.txt.
|
|
3
1
|
import { L_UNDEF } from "../lbool";
|
|
4
2
|
import { Big } from "./big";
|
|
5
3
|
import { getBool, getNumber, type SatParams } from "./config";
|
|
@@ -135,26 +133,30 @@ export class Probing {
|
|
|
135
133
|
this.big.init(solver, true);
|
|
136
134
|
const numVars = solver.numVars();
|
|
137
135
|
this.assigned = new Uint8Array(2 * numVars);
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
this.
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
if (
|
|
148
|
-
this.
|
|
149
|
-
|
|
136
|
+
try {
|
|
137
|
+
for (let index = 0; index < numVars; index++) {
|
|
138
|
+
const boolVar = (this.stoppedAt + index) % numVars;
|
|
139
|
+
if (this.counter < -this.limit) {
|
|
140
|
+
this.stoppedAt = boolVar;
|
|
141
|
+
isComplete = false;
|
|
142
|
+
break;
|
|
143
|
+
}
|
|
144
|
+
if (solver.isInconsistent) break;
|
|
145
|
+
if (solver.valueVar(boolVar) !== L_UNDEF || solver.wasEliminated(boolVar)) {
|
|
146
|
+
if (this.isCaching) {
|
|
147
|
+
this.resetCache(2 * boolVar);
|
|
148
|
+
this.resetCache(2 * boolVar + 1);
|
|
149
|
+
}
|
|
150
|
+
continue;
|
|
150
151
|
}
|
|
151
|
-
|
|
152
|
+
solver.checkpoint();
|
|
153
|
+
const oldCounter = this.counter;
|
|
154
|
+
const oldNumAssigned = this.numAssigned;
|
|
155
|
+
this.processCore(boolVar);
|
|
156
|
+
if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
|
|
152
157
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const oldNumAssigned = this.numAssigned;
|
|
156
|
-
this.processCore(boolVar);
|
|
157
|
-
if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
|
|
158
|
+
} finally {
|
|
159
|
+
solver.isProbing = wasProbing;
|
|
158
160
|
}
|
|
159
161
|
if (isComplete) this.stoppedAt = 0;
|
|
160
162
|
this.counter = -this.counter;
|
|
@@ -163,7 +165,6 @@ export class Probing {
|
|
|
163
165
|
this.assignedLits.length = 0;
|
|
164
166
|
this.toAssert.length = 0;
|
|
165
167
|
this.cachedBins = [];
|
|
166
|
-
solver.isProbing = wasProbing;
|
|
167
168
|
return isComplete;
|
|
168
169
|
}
|
|
169
170
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/sat_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError } from "../../../../errors";
|
|
3
2
|
import type { AstManager } from "../ast";
|
|
4
3
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
5
4
|
import { OVER, type Goal } from "../goal";
|
|
6
|
-
import { L_FALSE, L_TRUE } from "../lbool";
|
|
5
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
7
6
|
import { ProtoModel } from "../proto-model";
|
|
8
7
|
import type { SatParams } from "./config";
|
|
9
8
|
import { Goal2Sat } from "./goal2sat";
|
|
@@ -21,6 +20,7 @@ export const createSatTactic =
|
|
|
21
20
|
goal2sat.run(goal.forms.items);
|
|
22
21
|
goal.reset();
|
|
23
22
|
const result = solver.check();
|
|
23
|
+
if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
|
|
24
24
|
const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
|
|
25
25
|
if (result === L_FALSE) goal.assert(manager.falseExpr);
|
|
26
26
|
else if (result === L_TRUE && unhandledFuns.length === 0) {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/sat2goal.h, src/sat/tactic/sat2goal.cpp,
|
|
2
|
-
// src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { type AstManager, SORT_BOOL } from "../ast";
|
|
5
3
|
import type { Definition, Goal } from "../goal";
|
|
@@ -10,6 +8,10 @@ import type { Solver } from "./solver";
|
|
|
10
8
|
const mkNot = (manager: AstManager, expr: number) =>
|
|
11
9
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkNot(expr);
|
|
12
10
|
|
|
11
|
+
export const isLiteral = (manager: AstManager, expr: number) =>
|
|
12
|
+
manager.isUninterpretedConst(expr) ||
|
|
13
|
+
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
|
|
14
|
+
|
|
13
15
|
class Sat2GoalConverter {
|
|
14
16
|
readonly smc = new ModelConverter();
|
|
15
17
|
var2expr: number[] = [];
|
|
@@ -17,14 +19,6 @@ class Sat2GoalConverter {
|
|
|
17
19
|
|
|
18
20
|
constructor(private manager: AstManager) {}
|
|
19
21
|
|
|
20
|
-
private isLiteral(expr: number) {
|
|
21
|
-
const manager = this.manager;
|
|
22
|
-
return (
|
|
23
|
-
manager.isUninterpretedConst(expr) ||
|
|
24
|
-
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
|
|
25
|
-
);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
22
|
private add(expr: number, def: number) {
|
|
29
23
|
const manager = this.manager;
|
|
30
24
|
manager.incRef(def);
|
|
@@ -60,7 +54,7 @@ class Sat2GoalConverter {
|
|
|
60
54
|
def = manager.mkNot(def);
|
|
61
55
|
}
|
|
62
56
|
const expr = this.lit2expr(first);
|
|
63
|
-
if (
|
|
57
|
+
if (isLiteral(manager, expr)) this.add(expr, def);
|
|
64
58
|
clause.length = 0;
|
|
65
59
|
continue;
|
|
66
60
|
}
|
|
@@ -79,7 +73,7 @@ class Sat2GoalConverter {
|
|
|
79
73
|
root ^= 1;
|
|
80
74
|
}
|
|
81
75
|
const expr = this.lit2expr(first);
|
|
82
|
-
if (
|
|
76
|
+
if (isLiteral(manager, expr)) this.add(expr, this.lit2expr(root));
|
|
83
77
|
index += 5;
|
|
84
78
|
continue;
|
|
85
79
|
}
|
|
@@ -164,5 +158,8 @@ export const sat2goal = (
|
|
|
164
158
|
checkpoint();
|
|
165
159
|
goal.assert(manager.mkOr(arena.getLits(clause).map(getExpr)));
|
|
166
160
|
}
|
|
161
|
+
const formulas: number[] = [];
|
|
162
|
+
solver.ext?.toFormulas(getExpr, formulas);
|
|
163
|
+
for (const formula of formulas) goal.assert(formula);
|
|
167
164
|
goal.addDefinitions(converter.entries);
|
|
168
165
|
};
|