tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d166e0ae9
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/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +14 -4
- package/dist/index.d.ts +14 -4
- 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 +69 -69
- package/dist/prove.js +79 -79
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +46 -44
- package/dist/transfer.js +42 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -78
- package/src/check.ts +474 -209
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +5 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +29 -9
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +96 -37
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +152 -55
- package/src/exit-codes.ts +29 -13
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +172 -83
- package/src/liveness.ts +52 -11
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +0 -2
- 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 +1 -1
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/source.ts +2 -0
- 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 +5 -0
- package/src/parser.ts +115 -145
- package/src/pretty-print.ts +1 -1
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +4 -8
- package/src/prover/isabelle/isar/context.ts +0 -4
- package/src/prover/isabelle/isar/induct.ts +0 -4
- package/src/prover/isabelle/isar/method.ts +0 -2
- package/src/prover/isabelle/isar/proof.ts +0 -2
- package/src/prover/isabelle/isar/rule-cases.ts +8 -8
- package/src/prover/isabelle/isar/toplevel.ts +0 -4
- 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 +0 -2
- 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 +3 -5
- 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 +3 -5
- 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/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -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 +0 -1
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +11 -4
- 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 +12 -3
- package/src/prover/smt/solver/asserted-formulas.ts +169 -59
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +0 -2
- package/src/prover/smt/solver/ast.ts +63 -15
- package/src/prover/smt/solver/auf-solver.ts +23 -13
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +0 -1
- package/src/prover/smt/solver/bound-simplifier.ts +11 -15
- package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +1 -3
- package/src/prover/smt/solver/bv1-blast.ts +0 -2
- 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 +35 -20
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +0 -2
- package/src/prover/smt/solver/check-logic.ts +0 -1
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -26
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +67 -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 +15 -8
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +0 -3
- package/src/prover/smt/solver/dependent-expr-state.ts +26 -18
- 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 +0 -1
- package/src/prover/smt/solver/dom-simplify.ts +0 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -22
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +0 -1
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -10
- package/src/prover/smt/solver/enode.ts +0 -1
- 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 +1 -3
- 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 +0 -2
- package/src/prover/smt/solver/euf/egraph.ts +4 -12
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -5
- package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -7
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -4
- package/src/prover/smt/solver/euf/q-mbi.ts +0 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +0 -3
- package/src/prover/smt/solver/euf/q-solver.ts +0 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -9
- 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 +36 -15
- package/src/prover/smt/solver/fd-solver.ts +148 -42
- 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 +0 -1
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -3
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +6 -4
- 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 +4 -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 +1 -2
- 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 +0 -1
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -1
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -2
- 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 +0 -1
- 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 +0 -2
- 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 +0 -3
- package/src/prover/smt/solver/mam-compiler.ts +1 -2
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +0 -2
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +3 -3
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +0 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +0 -1
- 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 +1 -2
- package/src/prover/smt/solver/model-evaluator.ts +2 -1
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +85 -44
- package/src/prover/smt/solver/model-macro-solver.ts +0 -1
- 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 +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +22 -46
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -3
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -4
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -11
- package/src/prover/smt/solver/muz/hnf.ts +2 -3
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -3
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -4
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -5
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +0 -1
- 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 +1 -1
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -3
- package/src/prover/smt/solver/muz/spacer-util.ts +0 -1
- package/src/prover/smt/solver/muz/substitution.ts +0 -2
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +3 -3
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -94
- 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 +375 -218
- 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 +77 -75
- 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 +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- 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 +22 -9
- package/src/prover/smt/solver/opt-nlsat.ts +29 -19
- package/src/prover/smt/solver/opt-pareto.ts +19 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +10 -7
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +1 -3
- package/src/prover/smt/solver/parallel-tactic.ts +1 -3
- package/src/prover/smt/solver/pattern-inference.ts +0 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -7
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +75 -19
- package/src/prover/smt/solver/probes.ts +90 -27
- package/src/prover/smt/solver/propagate-values.ts +0 -1
- package/src/prover/smt/solver/proto-model.ts +8 -9
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +0 -1
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -6
- 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 +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +0 -1
- package/src/prover/smt/solver/qe.ts +3 -4
- 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 +23 -9
- 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 +0 -1
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +0 -2
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +0 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -2
- package/src/prover/smt/solver/recfun-rewriter.ts +0 -1
- 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 +7 -7
- package/src/prover/smt/solver/rewriter.ts +31 -26
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +0 -2
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -2
- package/src/prover/smt/solver/sat/clause.ts +0 -3
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +1 -4
- package/src/prover/smt/solver/sat/consequences.ts +0 -1
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -29
- package/src/prover/smt/solver/sat/model-converter.ts +1 -3
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -3
- package/src/prover/smt/solver/sat/probing.ts +0 -2
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -8
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -9
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +1 -4
- package/src/prover/smt/solver/sat/solver.ts +25 -49
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +0 -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 +1 -2
- package/src/prover/smt/solver/seq-derive.ts +4 -9
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -3
- 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 +0 -2
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -2
- package/src/prover/smt/solver/seq-re-util.ts +1 -3
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +2 -4
- package/src/prover/smt/solver/seq-rewriter.ts +31 -31
- 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 +1 -3
- package/src/prover/smt/solver/smt-kernel.ts +48 -9
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +99 -15
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +589 -226
- package/src/prover/smt/solver/smtlib-script.ts +674 -197
- package/src/prover/smt/solver/solve-eqs.ts +36 -39
- package/src/prover/smt/solver/solver.ts +19 -5
- 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 +332 -191
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +0 -2
- package/src/prover/smt/solver/theory-bv.ts +13 -5
- 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 +1 -2
- 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 +1 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +10 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -4
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -2
- package/src/prover/smt/solver/theory-pb.ts +24 -9
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +0 -1
- package/src/prover/smt/solver/theory-seq-regex.ts +0 -1
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -3
- package/src/prover/smt/solver/theory-seq-state.ts +2 -23
- package/src/prover/smt/solver/theory-seq.ts +0 -1
- package/src/prover/smt/solver/theory.ts +0 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -2
- package/src/prover/smt/solver/var-subst.ts +0 -1
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1072 -253
- package/src/runtime.ts +11 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +38 -30
- package/src/sany/generator-proofs.ts +6 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +262 -144
- package/src/simulate.ts +168 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +56 -22
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/nlsat/tactic/nlsat_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import { type AstManager, FAMILY_ARITH, KIND_APP, OP_ATAN2, OP_PI, SORT_INT } from "./ast";
|
|
4
3
|
import type { Goal } from "./goal";
|
|
@@ -31,7 +30,7 @@ const mkModel = (
|
|
|
31
30
|
t2x: ReadonlyMap<number, number>,
|
|
32
31
|
a2b: ReadonlyMap<number, number>,
|
|
33
32
|
) => {
|
|
34
|
-
const model = new ProtoModel(manager);
|
|
33
|
+
const model = new ProtoModel(manager).mkModel();
|
|
35
34
|
for (const [term, variable] of t2x) {
|
|
36
35
|
if (!manager.isUninterpretedConst(term)) continue;
|
|
37
36
|
const value = solver.getValue(variable);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/normal_forms/nnf.cpp, name_exprs.cpp, defined_names.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { ActCache } from "./act-cache";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -15,6 +14,7 @@ import {
|
|
|
15
14
|
OP_OR,
|
|
16
15
|
OP_XOR,
|
|
17
16
|
SORT_BOOL,
|
|
17
|
+
type SmtSymbol,
|
|
18
18
|
QUANTIFIER_FORALL,
|
|
19
19
|
} from "./ast";
|
|
20
20
|
import { mkNot } from "./ast-util";
|
|
@@ -28,7 +28,10 @@ export class DefinedNames {
|
|
|
28
28
|
private nameRefs: RefVector;
|
|
29
29
|
private lims: number[] = [];
|
|
30
30
|
|
|
31
|
-
constructor(
|
|
31
|
+
constructor(
|
|
32
|
+
private manager: AstManager,
|
|
33
|
+
private prefix: SmtSymbol | null = "z3name",
|
|
34
|
+
) {
|
|
32
35
|
this.exprs = new RefVector(manager);
|
|
33
36
|
this.nameRefs = new RefVector(manager);
|
|
34
37
|
}
|
|
@@ -69,7 +72,7 @@ export class DefinedNames {
|
|
|
69
72
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
70
73
|
const sort = manager.sorts[expr];
|
|
71
74
|
const name = manager.mkApp(
|
|
72
|
-
manager.mkFreshFuncDecl(
|
|
75
|
+
manager.mkFreshFuncDecl(this.prefix, varSorts, sort),
|
|
73
76
|
freeVarSorts.map((varSort, index) =>
|
|
74
77
|
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
75
78
|
),
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// z3-license.txt. MaxSMT runs on the SMT core.
|
|
1
|
+
// MaxSMT runs on the SMT core.
|
|
3
2
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
3
|
import {
|
|
5
4
|
type AstManager,
|
|
@@ -26,7 +25,13 @@ import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
|
26
25
|
import type { MaxsatContext, MaxsatParams, MaxsatSolver } from "./maxsmt-base";
|
|
27
26
|
import { Maxsmt } from "./maxsmt";
|
|
28
27
|
import { isInNraFragment } from "./opt-nlsat";
|
|
29
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
canReuseNlsatSolver,
|
|
30
|
+
giaPareto,
|
|
31
|
+
ParetoNlsatSolver,
|
|
32
|
+
type ParetoObjective,
|
|
33
|
+
type ParetoSolver,
|
|
34
|
+
} from "./opt-pareto";
|
|
30
35
|
import type { ProtoModel } from "./proto-model";
|
|
31
36
|
import { Rational } from "./rational";
|
|
32
37
|
import { RefVector } from "./ref-vector";
|
|
@@ -132,7 +137,7 @@ export class OptContext {
|
|
|
132
137
|
private boxIndex = -1;
|
|
133
138
|
private pareto: ParetoSolver | null = null;
|
|
134
139
|
private internal: Objective[] = [];
|
|
135
|
-
private normalized:
|
|
140
|
+
private normalized: ParetoObjective[] = [];
|
|
136
141
|
private normalizedGoal: Goal | null = null;
|
|
137
142
|
private normalizedTerms: RefVector;
|
|
138
143
|
private hiddenDecls: number[] = [];
|
|
@@ -226,6 +231,11 @@ export class OptContext {
|
|
|
226
231
|
return pareto;
|
|
227
232
|
}
|
|
228
233
|
|
|
234
|
+
getReasonUnknown() {
|
|
235
|
+
if (this.reasonUnknown !== "") return this.reasonUnknown;
|
|
236
|
+
return (this.satSolver ?? this.optSolver)?.reasonUnknown ?? "unknown";
|
|
237
|
+
}
|
|
238
|
+
|
|
229
239
|
optimize(hard: readonly number[], options: OptOptions) {
|
|
230
240
|
if (this.pareto !== null) return this.executePareto();
|
|
231
241
|
if (this.boxIndex !== -1) {
|
|
@@ -250,6 +260,7 @@ export class OptContext {
|
|
|
250
260
|
checkSat: (assumptions) => getSolver().check(assumptions),
|
|
251
261
|
getModel: () => getSolver().getModel(),
|
|
252
262
|
getUnsatCore: () => getSolver().getUnsatCore(),
|
|
263
|
+
getNumAssertions: () => getSolver().getAssertions().length,
|
|
253
264
|
findMutexes: (vars) => ({ status: L_TRUE, mutexes: getSolver().findMutexes(vars) }),
|
|
254
265
|
};
|
|
255
266
|
return {
|
|
@@ -354,8 +365,6 @@ export class OptContext {
|
|
|
354
365
|
this.updateBound(optsmt, true);
|
|
355
366
|
const count = this.internal.length;
|
|
356
367
|
if (count > 1 && options.priority === "pareto") {
|
|
357
|
-
if (this.internal.some((objective) => objective.type === O_MAXSMT))
|
|
358
|
-
throw new SmtUnsupportedError("pareto optimization of soft constraints");
|
|
359
368
|
this.pareto = this.mkParetoSolver(solver, hard, options);
|
|
360
369
|
return this.executePareto();
|
|
361
370
|
}
|
|
@@ -695,6 +704,9 @@ export class OptContext {
|
|
|
695
704
|
this.normalized = this.internal.map((objective) => ({
|
|
696
705
|
term: objective.term,
|
|
697
706
|
isMax: objective.type === O_MAXIMIZE,
|
|
707
|
+
isMaxsmt: objective.type === O_MAXSMT,
|
|
708
|
+
terms: objective.terms,
|
|
709
|
+
weights: objective.weights,
|
|
698
710
|
}));
|
|
699
711
|
result.forms.reset();
|
|
700
712
|
return normalizedHard;
|
|
@@ -705,13 +717,14 @@ export class OptContext {
|
|
|
705
717
|
const maxsmt = objective?.maxsmt;
|
|
706
718
|
if (maxsmt !== null && maxsmt !== undefined)
|
|
707
719
|
return new ObjectiveValue(InfEps.of(isLower ? maxsmt.getLower() : maxsmt.getUpper()));
|
|
720
|
+
// Z3 reads the bounds of a solver it never set up, as when the hard constraints are false, as 0.
|
|
721
|
+
if (objective?.type === O_MAXSMT)
|
|
722
|
+
return new ObjectiveValue(InfEps.of(this.adjust(index, Rational.zero)));
|
|
708
723
|
const isMax = this.objectives[index].type === O_MAXIMIZE;
|
|
709
724
|
const optsmt = this.optsmt;
|
|
710
725
|
const value =
|
|
711
726
|
optsmt === null || objective === undefined
|
|
712
|
-
?
|
|
713
|
-
? ObjectiveValue.minusInfinity
|
|
714
|
-
: ObjectiveValue.infinity
|
|
727
|
+
? new ObjectiveValue(InfEps.of(Rational.zero))
|
|
715
728
|
: (isLower === isMax ? optsmt.lower : optsmt.upper)[objective.index];
|
|
716
729
|
return isMax ? value : value.negated(this.manager.am);
|
|
717
730
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/opt_nlsat.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -20,7 +19,8 @@ import {
|
|
|
20
19
|
import { Goal } from "./goal";
|
|
21
20
|
import { goal2nlsat } from "./goal2nlsat";
|
|
22
21
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
23
|
-
import {
|
|
22
|
+
import type { AlgebraicManager, Anum } from "./nlsat/algebraic";
|
|
23
|
+
import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
|
|
24
24
|
import { NlsatSolver } from "./nlsat/solver";
|
|
25
25
|
import { ProtoModel } from "./proto-model";
|
|
26
26
|
import { Rational } from "./rational";
|
|
@@ -98,10 +98,16 @@ export const isInNraFragment = (manager: AstManager, exprs: readonly number[]) =
|
|
|
98
98
|
return true;
|
|
99
99
|
};
|
|
100
100
|
|
|
101
|
-
const getCoarseInterval = (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
101
|
+
const getCoarseInterval = (
|
|
102
|
+
manager: AstManager,
|
|
103
|
+
am: AlgebraicManager,
|
|
104
|
+
value: Anum,
|
|
105
|
+
): [Rational, Rational] => {
|
|
106
|
+
const pm = new PolynomialManager(manager.limit);
|
|
107
|
+
const p = new PolynomialRef(pm);
|
|
108
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), 0));
|
|
109
|
+
const roots = am.isolateRoots(pm, p.get(), []);
|
|
110
|
+
p.reset();
|
|
105
111
|
const index = roots.findIndex((root) => am.compare(root, value) === 0);
|
|
106
112
|
const lower = index === 0 ? am.intLt(value) : am.select(roots[index - 1], value);
|
|
107
113
|
const upper = index + 1 === roots.length ? am.intGt(value) : am.select(value, roots[index + 1]);
|
|
@@ -109,8 +115,7 @@ const getCoarseInterval = (solver: NlsatSolver, value: Anum): [Rational, Rationa
|
|
|
109
115
|
};
|
|
110
116
|
|
|
111
117
|
export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) => {
|
|
112
|
-
const
|
|
113
|
-
const am = solver.am;
|
|
118
|
+
const am = manager.am;
|
|
114
119
|
if (am.isRational(value))
|
|
115
120
|
return manager.mkApp(OP_EQ, [term, manager.mkRealNumeral(am.toRational(value))], SORT_BOOL);
|
|
116
121
|
const coeffs = am.getPolynomial(value);
|
|
@@ -126,7 +131,7 @@ export const mkAlgebraicEq = (manager: AstManager, term: number, value: Anum) =>
|
|
|
126
131
|
SORT_REAL,
|
|
127
132
|
);
|
|
128
133
|
}
|
|
129
|
-
const [lower, upper] = getCoarseInterval(
|
|
134
|
+
const [lower, upper] = getCoarseInterval(manager, am, value);
|
|
130
135
|
return manager.mkApp(
|
|
131
136
|
OP_AND,
|
|
132
137
|
[
|
|
@@ -153,19 +158,24 @@ const isOccurring = (manager: AstManager, target: number, expr: number) => {
|
|
|
153
158
|
const mkLowerBound = (solver: NlsatSolver, variable: number, value: Anum, isStrict: boolean) => {
|
|
154
159
|
const am = solver.am;
|
|
155
160
|
const pm = solver.pm;
|
|
161
|
+
const p = new PolynomialRef(pm);
|
|
156
162
|
if (am.isRational(value)) {
|
|
157
163
|
const rational = am.toRational(value);
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
? solver.mkIneqLiteral("GT", [
|
|
161
|
-
: solver.mkIneqLiteral("LT", [
|
|
164
|
+
p.set(pm.mkLinear([rational.den], [variable], -rational.num));
|
|
165
|
+
const literal = isStrict
|
|
166
|
+
? solver.mkIneqLiteral("GT", [p.get()], [false])
|
|
167
|
+
: solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1;
|
|
168
|
+
p.reset();
|
|
169
|
+
return literal;
|
|
162
170
|
}
|
|
163
|
-
|
|
164
|
-
const index = am
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
171
|
+
p.set(pm.toPolynomial(am.getPolynomial(value), variable));
|
|
172
|
+
const index = am.isolateRoots(pm, p.get(), []).findIndex((root) => am.compare(root, value) === 0);
|
|
173
|
+
const literal =
|
|
174
|
+
index === -1
|
|
175
|
+
? null
|
|
176
|
+
: 2 * solver.mkRootAtom(isStrict ? "ROOT_GT" : "ROOT_GE", variable, index + 1, p.get());
|
|
177
|
+
p.reset();
|
|
178
|
+
return literal;
|
|
169
179
|
};
|
|
170
180
|
|
|
171
181
|
const getBracket = (solver: NlsatSolver, value: Anum): [Rational, Rational] => {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/opt_pareto.cpp, src/opt/opt_pareto_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -29,7 +27,9 @@ import { goal2nlsat } from "./goal2nlsat";
|
|
|
29
27
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
30
28
|
import { NlsatSolver } from "./nlsat/solver";
|
|
31
29
|
import { getModelValueBound } from "./opt-solver";
|
|
30
|
+
import { mkPbGe, mkPbLe } from "./pb-rewriter";
|
|
32
31
|
import { ProtoModel } from "./proto-model";
|
|
32
|
+
import { Rational } from "./rational";
|
|
33
33
|
import { RefVector } from "./ref-vector";
|
|
34
34
|
import { compileInternalTactic, type TacticEnvironment } from "./tactic";
|
|
35
35
|
|
|
@@ -55,6 +55,9 @@ const REUSABLE_OPS = new Set([
|
|
|
55
55
|
export interface ParetoObjective {
|
|
56
56
|
term: number;
|
|
57
57
|
isMax: boolean;
|
|
58
|
+
isMaxsmt: boolean;
|
|
59
|
+
terms: readonly number[];
|
|
60
|
+
weights: readonly Rational[];
|
|
58
61
|
}
|
|
59
62
|
|
|
60
63
|
export const canReuseNlsatSolver = (manager: AstManager, terms: readonly number[]) => {
|
|
@@ -240,6 +243,20 @@ export const giaPareto = (
|
|
|
240
243
|
return bound === undefined ? -1 : pin(manager.mkRealNumeral(bound));
|
|
241
244
|
};
|
|
242
245
|
const mkCmp = (isGe: boolean, model: ProtoModel, objective: ParetoObjective) => {
|
|
246
|
+
if (objective.isMaxsmt) {
|
|
247
|
+
let bound = Rational.zero;
|
|
248
|
+
for (const [index, term] of objective.terms.entries()) {
|
|
249
|
+
const value = model.eval(term, true);
|
|
250
|
+
if (value === manager.trueExpr) bound = bound.add(objective.weights[index]);
|
|
251
|
+
manager.decRef(value);
|
|
252
|
+
}
|
|
253
|
+
const terms = [...objective.terms];
|
|
254
|
+
return pin(
|
|
255
|
+
isGe
|
|
256
|
+
? mkPbGe(manager, objective.weights, terms, bound)
|
|
257
|
+
: mkPbLe(manager, objective.weights, terms, bound),
|
|
258
|
+
);
|
|
259
|
+
}
|
|
243
260
|
const isGreater = objective.isMax ? isGe : !isGe;
|
|
244
261
|
const evaluated = model.eval(objective.term, true);
|
|
245
262
|
pin(evaluated);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/opt_preprocess.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_OR, SORT_BOOL } from "./ast";
|
|
3
2
|
import { mkNot } from "./ast-util";
|
|
4
3
|
import { ObjMap } from "./hashtable";
|
|
@@ -91,7 +90,7 @@ export class Preprocess {
|
|
|
91
90
|
if (dual.size !== soft.size) soft = this.dualize(dual, fmls);
|
|
92
91
|
}
|
|
93
92
|
return {
|
|
94
|
-
soft: [...soft].map((
|
|
93
|
+
soft: [...soft].map((entry) => ({ expr: entry[0], weight: entry[1], value: L_UNDEF })),
|
|
95
94
|
lower: lower.value,
|
|
96
95
|
};
|
|
97
96
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtCanceledError, SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { type AstManager, FAMILY_ARITH, FAMILY_PB } from "./ast";
|
|
4
3
|
import { InfEps } from "./inf-eps";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
6
|
-
import { AlgebraicManager } from "./nlsat/algebraic";
|
|
5
|
+
import type { AlgebraicManager } from "./nlsat/algebraic";
|
|
7
6
|
import type { ParetoSolver } from "./opt-pareto";
|
|
8
7
|
import type { ProtoModel } from "./proto-model";
|
|
9
8
|
import { Rational } from "./rational";
|
|
@@ -41,7 +40,6 @@ export const getModelValueBound = (
|
|
|
41
40
|
|
|
42
41
|
export class OptSolver {
|
|
43
42
|
private readonly kernel: SmtKernel;
|
|
44
|
-
private readonly am = new AlgebraicManager();
|
|
45
43
|
private model: ProtoModel | null = null;
|
|
46
44
|
private objectiveVars: number[] = [];
|
|
47
45
|
private objectiveValues: InfEps[] = [];
|
|
@@ -78,7 +76,7 @@ export class OptSolver {
|
|
|
78
76
|
}
|
|
79
77
|
|
|
80
78
|
private getContextModel() {
|
|
81
|
-
return this.hold(this.kernel.context.
|
|
79
|
+
return this.hold(this.kernel.context.getSatModel());
|
|
82
80
|
}
|
|
83
81
|
|
|
84
82
|
// get_optimizer makes an arithmetic theory when the setup made none.
|
|
@@ -131,6 +129,10 @@ export class OptSolver {
|
|
|
131
129
|
return this.kernel.context.unsatCore;
|
|
132
130
|
}
|
|
133
131
|
|
|
132
|
+
get reasonUnknown() {
|
|
133
|
+
return this.kernel.context.getLastFailureMessage();
|
|
134
|
+
}
|
|
135
|
+
|
|
134
136
|
findMutexes(vars: readonly number[]) {
|
|
135
137
|
const mutexes = this.kernel.context.findMutexes(vars);
|
|
136
138
|
for (const mutex of mutexes) for (const literal of mutex) this.pinned.push(literal);
|
|
@@ -166,7 +168,7 @@ export class OptSolver {
|
|
|
166
168
|
|
|
167
169
|
private getModelValueLowerBound(model: ProtoModel, index: number) {
|
|
168
170
|
const value = model.eval(this.objectiveTerms[index], false);
|
|
169
|
-
const bound = getModelValueBound(this.manager, this.am, value, true);
|
|
171
|
+
const bound = getModelValueBound(this.manager, this.manager.am, value, true);
|
|
170
172
|
this.manager.decRef(value);
|
|
171
173
|
return bound;
|
|
172
174
|
}
|
|
@@ -230,7 +232,8 @@ export class OptSolver {
|
|
|
230
232
|
try {
|
|
231
233
|
this.kernel.push();
|
|
232
234
|
} catch (error) {
|
|
233
|
-
|
|
235
|
+
const isPushCanceled = error instanceof SmtDefaultError && error.message === "push canceled";
|
|
236
|
+
if (!(error instanceof SmtCanceledError || isPushCanceled)) throw error;
|
|
234
237
|
return L_UNDEF;
|
|
235
238
|
}
|
|
236
239
|
limit.push(this.dualBoundRlimit);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/optsmt.cpp, src/opt/opt_search.h, src/opt/opt_geometric.h), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import { type AstManager, OP_GE, OP_GT, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
5
3
|
import { InfEps, maxInfEps, minInfEps } from "./inf-eps";
|
|
@@ -19,7 +17,7 @@ const UNBOUNDED_CHECK_RLIMIT = 100000;
|
|
|
19
17
|
const UNBOUNDED_CHECK_ROUNDS = 8;
|
|
20
18
|
const MAX_ONE_SIDED_ROUNDS = 16;
|
|
21
19
|
|
|
22
|
-
|
|
20
|
+
interface OptsmtHost {
|
|
23
21
|
getBaseModel(): ProtoModel | null;
|
|
24
22
|
setModel(model: ProtoModel | null): void;
|
|
25
23
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/parallel_tactical.cpp, src/smt/smt_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import { type AstManager, OP_AND, OP_EQ, OP_ITE, OP_OR } from "./ast";
|
|
5
3
|
import { mkNot } from "./ast-util";
|
|
@@ -115,7 +113,7 @@ class ParallelSolver {
|
|
|
115
113
|
this.context.maxConflicts = this.threadsMaxConflicts;
|
|
116
114
|
const result = this.kernel.check([...this.assumptions, ...cube]);
|
|
117
115
|
if (result === L_TRUE) {
|
|
118
|
-
this.setSat(this.context.
|
|
116
|
+
this.setSat(this.context.getSatModel());
|
|
119
117
|
return false;
|
|
120
118
|
}
|
|
121
119
|
if (result === L_FALSE) {
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/pb_decl_plugin.h, src/ast/pb_decl_plugin.cpp,
|
|
2
|
-
// src/ast/rewriter/pb_rewriter.cpp, src/ast/rewriter/pb_rewriter_def.h), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import {
|
|
5
2
|
type AstManager,
|
|
6
|
-
FAMILY_PB,
|
|
7
3
|
OP_AT_LEAST_K,
|
|
8
4
|
OP_AT_MOST_K,
|
|
9
5
|
OP_PB_EQ,
|
|
@@ -22,8 +18,6 @@ interface PbArg {
|
|
|
22
18
|
coeff: Rational;
|
|
23
19
|
}
|
|
24
20
|
|
|
25
|
-
export const isPb = (manager: AstManager, expr: number) => manager.getFamily(expr) === FAMILY_PB;
|
|
26
|
-
|
|
27
21
|
export const getPbK = (manager: AstManager, decl: number) => manager.getPbParameters(decl)[0];
|
|
28
22
|
|
|
29
23
|
export const getPbCoeff = (manager: AstManager, decl: number, index: number) => {
|
|
@@ -34,7 +28,7 @@ export const getPbCoeff = (manager: AstManager, decl: number, index: number) =>
|
|
|
34
28
|
};
|
|
35
29
|
|
|
36
30
|
export const hasUnitCoefficients = (manager: AstManager, decl: number) =>
|
|
37
|
-
manager.funcDecls[decl].domain.every((
|
|
31
|
+
manager.funcDecls[decl].domain.every((_value, index) =>
|
|
38
32
|
getPbCoeff(manager, decl, index).equals(Rational.one),
|
|
39
33
|
);
|
|
40
34
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see z3-license.txt.
|
|
2
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
KIND_APP,
|
|
@@ -44,12 +42,14 @@ import {
|
|
|
44
42
|
SORT_INT,
|
|
45
43
|
} from "./ast";
|
|
46
44
|
import { isAstLess } from "./ast-lt";
|
|
45
|
+
import { ObjHashtable } from "./hashtable";
|
|
47
46
|
import { Rational } from "./rational";
|
|
48
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
49
48
|
|
|
50
49
|
export interface ArithRewriterOptions {
|
|
51
50
|
readonly isSom: boolean;
|
|
52
51
|
readonly isSortSums: boolean;
|
|
52
|
+
readonly isArithLhs: boolean;
|
|
53
53
|
readonly isArithIneqLhs: boolean;
|
|
54
54
|
readonly isGcdRounding: boolean;
|
|
55
55
|
readonly isAnumSimp: boolean;
|
|
@@ -233,17 +233,6 @@ export class PolyRewriter {
|
|
|
233
233
|
|
|
234
234
|
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
235
235
|
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
236
|
-
const manager = this.manager;
|
|
237
|
-
if (
|
|
238
|
-
this.options.isHoistIte === true &&
|
|
239
|
-
args.some(
|
|
240
|
-
(arg) =>
|
|
241
|
-
manager.getOp(arg) === OP_ITE ||
|
|
242
|
-
(this.isAdd(arg) &&
|
|
243
|
-
manager.getArgs(arg).some((inner) => manager.getOp(inner) === OP_ITE)),
|
|
244
|
-
)
|
|
245
|
-
)
|
|
246
|
-
throw new SmtUnsupportedError("hoisting an if-then-else out of a sum");
|
|
247
236
|
this.currSort = this.manager.sorts[args[0]];
|
|
248
237
|
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
249
238
|
return this.mkNflatAdd(args);
|
|
@@ -301,24 +290,29 @@ export class PolyRewriter {
|
|
|
301
290
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
302
291
|
}
|
|
303
292
|
}
|
|
304
|
-
return this.
|
|
293
|
+
return this.hoist(
|
|
305
294
|
this.mkAddApp(
|
|
306
295
|
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
307
296
|
),
|
|
308
297
|
);
|
|
309
298
|
}
|
|
310
|
-
if (isOrdered && this.options.isHoistMul !== true) {
|
|
299
|
+
if (isOrdered && this.options.isHoistMul !== true && this.options.isHoistIte !== true) {
|
|
311
300
|
if (numCoeffs === 0) return undefined;
|
|
312
301
|
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
313
302
|
return undefined;
|
|
314
303
|
}
|
|
315
304
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
316
305
|
for (const arg of args) if (!this.isNumeral(arg)) newArgs.push(arg);
|
|
317
|
-
return this.
|
|
306
|
+
return this.hoist(
|
|
318
307
|
this.mkAddApp(isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1)),
|
|
319
308
|
);
|
|
320
309
|
}
|
|
321
310
|
|
|
311
|
+
private hoist(sum: number): number | Rewrite {
|
|
312
|
+
const hoisted = this.hoistMultiplication(sum) ?? this.hoistIte(sum);
|
|
313
|
+
return hoisted === undefined ? sum : this.reduce(hoisted, Infinity);
|
|
314
|
+
}
|
|
315
|
+
|
|
322
316
|
// TO_BUFFER: the first argument takes the place of the term, and the others go at the end.
|
|
323
317
|
private getFlatArgs(expr: number, isSplit: (expr: number) => boolean) {
|
|
324
318
|
const manager = this.manager;
|
|
@@ -336,8 +330,8 @@ export class PolyRewriter {
|
|
|
336
330
|
return buffer;
|
|
337
331
|
}
|
|
338
332
|
|
|
339
|
-
private hoistMultiplication(sum: number)
|
|
340
|
-
if (this.options.isHoistMul !== true) return
|
|
333
|
+
private hoistMultiplication(sum: number) {
|
|
334
|
+
if (this.options.isHoistMul !== true) return undefined;
|
|
341
335
|
const isMul = (expr: number) => this.isMul(expr);
|
|
342
336
|
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
343
337
|
const isValid = adds.map(() => true);
|
|
@@ -373,7 +367,69 @@ export class PolyRewriter {
|
|
|
373
367
|
isChanged = true;
|
|
374
368
|
break;
|
|
375
369
|
}
|
|
376
|
-
return isChanged ? this.
|
|
370
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
private hoistIte(sum: number) {
|
|
374
|
+
if (this.options.isHoistIte !== true) return undefined;
|
|
375
|
+
const manager = this.manager;
|
|
376
|
+
const shared = new ObjHashtable((expr) => manager.hashes[expr]);
|
|
377
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
378
|
+
let isChanged = false;
|
|
379
|
+
for (let index = 0; index < adds.length; index++) {
|
|
380
|
+
const add = adds[index];
|
|
381
|
+
if (manager.getOp(add) !== OP_ITE) continue;
|
|
382
|
+
shared.clear();
|
|
383
|
+
if (!this.collectSharedSummands(add, shared)) continue;
|
|
384
|
+
const summands = [this.applyHoist(add, shared)];
|
|
385
|
+
for (const summand of shared) summands.push(summand);
|
|
386
|
+
const hoisted = this.mkAddApp(summands);
|
|
387
|
+
if (hoisted === add) continue;
|
|
388
|
+
adds[index] = hoisted;
|
|
389
|
+
isChanged = true;
|
|
390
|
+
}
|
|
391
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private collectSharedSummands(expr: number, shared: ObjHashtable): boolean {
|
|
395
|
+
const manager = this.manager;
|
|
396
|
+
if (manager.getOp(expr) === OP_ITE)
|
|
397
|
+
return (
|
|
398
|
+
this.collectSharedSummands(manager.getArg(expr, 1), shared) &&
|
|
399
|
+
this.collectSharedSummands(manager.getArg(expr, 2), shared)
|
|
400
|
+
);
|
|
401
|
+
if (this.isNumeral(expr) && this.getValue(expr).isInt()) return false;
|
|
402
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
403
|
+
if (shared.size === 0)
|
|
404
|
+
for (let index = 0; index < summands.length; index++) shared.add(summands[index]);
|
|
405
|
+
else {
|
|
406
|
+
const removed: number[] = [];
|
|
407
|
+
for (const summand of shared) if (!summands.includes(summand)) removed.push(summand);
|
|
408
|
+
for (let index = removed.length - 1; index >= 0; index--) shared.delete(removed[index]);
|
|
409
|
+
}
|
|
410
|
+
if (shared.size === 0) return false;
|
|
411
|
+
for (let index = 1; index < summands.length; index++)
|
|
412
|
+
if (summands.lastIndexOf(summands[index], index - 1) !== -1) return false;
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private applyHoist(expr: number, shared: ObjHashtable): number {
|
|
417
|
+
const manager = this.manager;
|
|
418
|
+
if (manager.getOp(expr) === OP_ITE) {
|
|
419
|
+
const thenExpr = this.applyHoist(manager.getArg(expr, 1), shared);
|
|
420
|
+
const elseExpr = this.applyHoist(manager.getArg(expr, 2), shared);
|
|
421
|
+
return manager.mkApp(
|
|
422
|
+
OP_ITE,
|
|
423
|
+
[manager.getArg(expr, 0), thenExpr, elseExpr],
|
|
424
|
+
manager.sorts[expr],
|
|
425
|
+
);
|
|
426
|
+
}
|
|
427
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
428
|
+
let size = 0;
|
|
429
|
+
for (let index = 0; index < summands.length; index++)
|
|
430
|
+
if (!shared.has(summands[index])) summands[size++] = summands[index];
|
|
431
|
+
summands.length = size;
|
|
432
|
+
return this.mkAddApp(summands);
|
|
377
433
|
}
|
|
378
434
|
|
|
379
435
|
private growStamps(expr: number) {
|