tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d618a2d79
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 +29 -29
- package/dist/deciders.js +29 -29
- package/dist/prove.cjs +17 -17
- package/dist/prove.js +57 -57
- package/dist/run.cjs +15 -15
- package/dist/run.js +38 -38
- package/dist/transfer.cjs +12 -12
- package/dist/transfer.js +5 -5
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/check-trace.ts +2 -16
- package/src/check.ts +23 -6
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/environment.ts +10 -5
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +27 -4
- 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/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/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/pretty-print.ts +1 -1
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +0 -4
- 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 +0 -2
- 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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +0 -2
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- 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/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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/ast-lt.ts +0 -1
- package/src/prover/smt/solver/ast-util.ts +0 -2
- package/src/prover/smt/solver/ast.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- 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 +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +0 -1
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- 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 +0 -3
- package/src/prover/smt/solver/dependent-expr-state.ts +0 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- 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 +0 -2
- 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-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- 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 +0 -2
- 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 +2 -3
- package/src/prover/smt/solver/euf/euf-solver.ts +0 -3
- package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
- package/src/prover/smt/solver/euf/mam.ts +0 -2
- package/src/prover/smt/solver/euf/q-ematch.ts +0 -2
- 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 -2
- 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 +0 -1
- package/src/prover/smt/solver/factor.ts +0 -1
- package/src/prover/smt/solver/fd-solver.ts +0 -3
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- 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 +0 -1
- 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 +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 +0 -1
- 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 +25 -6
- 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 +0 -2
- 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 +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +0 -1
- package/src/prover/smt/solver/macro-finder.ts +0 -3
- package/src/prover/smt/solver/mam-compiler.ts +0 -1
- 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 +1 -2
- 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 +0 -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 +0 -1
- package/src/prover/smt/solver/model-checker.ts +0 -1
- package/src/prover/smt/solver/model-evaluator.ts +0 -1
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +0 -2
- 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 +0 -1
- 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 +0 -2
- package/src/prover/smt/solver/muz/hnf.ts +0 -1
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +0 -2
- package/src/prover/smt/solver/muz/horn-tactic.ts +0 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +0 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -2
- 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 +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +0 -2
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +0 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +5 -13
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- 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 +1 -2
- package/src/prover/smt/solver/opt-nlsat.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +0 -2
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +0 -1
- package/src/prover/smt/solver/pb-rewriter.ts +0 -3
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +0 -1
- package/src/prover/smt/solver/probes.ts +2 -4
- package/src/prover/smt/solver/propagate-values.ts +0 -1
- package/src/prover/smt/solver/proto-model.ts +0 -1
- 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/qe-arith-plugin.ts +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/qe.ts +0 -2
- 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 +0 -1
- 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 +0 -1
- 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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/rewriter.ts +0 -1
- package/src/prover/smt/solver/rlimit.ts +13 -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 +0 -3
- 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 -2
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +0 -1
- package/src/prover/smt/solver/sat/model-converter.ts +0 -2
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +0 -2
- package/src/prover/smt/solver/sat/probing.ts +0 -2
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +0 -2
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +0 -3
- package/src/prover/smt/solver/sat/solver.ts +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/seq-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/seq-derive.ts +3 -8
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +0 -1
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +0 -2
- package/src/prover/smt/solver/seq-re-rewriter.ts +0 -1
- package/src/prover/smt/solver/seq-re-util.ts +0 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +0 -1
- package/src/prover/smt/solver/seq-regex-live.ts +0 -2
- package/src/prover/smt/solver/seq-rewriter.ts +0 -2
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +3 -5
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +0 -2
- package/src/prover/smt/solver/smtlib-script.ts +0 -2
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- 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 +0 -1
- 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 -1
- 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 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -1
- package/src/prover/smt/solver/theory-pb.ts +0 -2
- 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 +0 -2
- package/src/prover/smt/solver/theory-seq-state.ts +0 -2
- 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 +0 -2
- package/src/prover/smt/solver/var-subst.ts +0 -1
- 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 +2 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- 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 +0 -2
- 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 +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +29 -20
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +2 -3
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
import { SmtInvariantError } from "../../../../errors";
|
|
2
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
3
|
-
import
|
|
3
|
+
import { ResourceLimit } from "../rlimit";
|
|
4
4
|
import { Rational } from "../rational";
|
|
5
5
|
import { IndexedUintSet } from "./containers";
|
|
6
6
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
@@ -144,6 +144,7 @@ export class NlaCore {
|
|
|
144
144
|
private readonly patcher: Patcher;
|
|
145
145
|
private readonly horner: Horner;
|
|
146
146
|
readonly grobner: Grobner;
|
|
147
|
+
readonly nraLimit = new ResourceLimit(Infinity);
|
|
147
148
|
readonly nra = new NraSolver(this);
|
|
148
149
|
readonly transcendentals = new NlaTranscendentals(this);
|
|
149
150
|
isUsingNraModel = false;
|
|
@@ -151,6 +152,9 @@ export class NlaCore {
|
|
|
151
152
|
private checkAssignmentFailCount = 0;
|
|
152
153
|
private squeezeSchedule = new SqueezeSchedule();
|
|
153
154
|
isRelevant: (lpVar: number) => boolean = () => true;
|
|
155
|
+
addMulDefHook: (vars: number[]) => number = () => {
|
|
156
|
+
throw new SmtInvariantError("nla has no hook to define a product");
|
|
157
|
+
};
|
|
154
158
|
|
|
155
159
|
constructor(
|
|
156
160
|
readonly lra: LarSolver,
|
|
@@ -345,6 +349,12 @@ export class NlaCore {
|
|
|
345
349
|
this.monicsWithChangedBounds.add(lpVar);
|
|
346
350
|
}
|
|
347
351
|
|
|
352
|
+
addMulDef(vars: number[]) {
|
|
353
|
+
const lpVar = this.addMulDefHook(vars);
|
|
354
|
+
this.addMonic(lpVar, vars);
|
|
355
|
+
return lpVar;
|
|
356
|
+
}
|
|
357
|
+
|
|
348
358
|
checkMonic(monic: Monic) {
|
|
349
359
|
const value = this.lra.getValue(monic.variable);
|
|
350
360
|
if (this.lra.isInt(monic.variable) && !value.x.isInt()) return true;
|
|
@@ -758,7 +768,9 @@ export class NlaCore {
|
|
|
758
768
|
NLA_PARAMS.nraCheckAssignment &&
|
|
759
769
|
this.checkAssignmentFailCount < NLA_PARAMS.nraCheckAssignmentMaxFail
|
|
760
770
|
) {
|
|
771
|
+
this.limit.pushChild(this.nraLimit);
|
|
761
772
|
result = this.nra.checkAssignment();
|
|
773
|
+
this.limit.popChild(this.nraLimit);
|
|
762
774
|
if (result !== L_TRUE) this.checkAssignmentFailCount++;
|
|
763
775
|
}
|
|
764
776
|
if (hasNoEffect() && this.shouldRunBoundedNlsat()) result = this.boundedNlsat();
|
|
@@ -778,7 +790,9 @@ export class NlaCore {
|
|
|
778
790
|
result = this.boundedNlsat();
|
|
779
791
|
}
|
|
780
792
|
if (hasNoEffect() && NLA_PARAMS.nra && level >= 2) {
|
|
781
|
-
|
|
793
|
+
this.limit.pushChild(this.nraLimit);
|
|
794
|
+
result = this.nra.check(Infinity);
|
|
795
|
+
this.limit.popChild(this.nraLimit);
|
|
782
796
|
stats.nraCalls++;
|
|
783
797
|
}
|
|
784
798
|
if (result === L_UNDEF && !hasNoEffect()) result = L_FALSE;
|
|
@@ -791,10 +805,15 @@ export class NlaCore {
|
|
|
791
805
|
}
|
|
792
806
|
|
|
793
807
|
private boundedNlsat() {
|
|
794
|
-
const
|
|
795
|
-
|
|
808
|
+
const rlimitBudget = 100000;
|
|
809
|
+
this.limit.pushChild(this.nraLimit);
|
|
810
|
+
this.nraLimit.push(rlimitBudget);
|
|
811
|
+
const result = this.nra.check(100);
|
|
812
|
+
const rlimitConsumed = this.nraLimit.count;
|
|
813
|
+
this.nraLimit.pop();
|
|
814
|
+
this.limit.popChild(this.nraLimit);
|
|
796
815
|
this.stats.nraCalls++;
|
|
797
|
-
this.nlsatBackoff.update(result === L_FALSE ||
|
|
816
|
+
this.nlsatBackoff.update(result === L_FALSE || rlimitConsumed < rlimitBudget / 10);
|
|
798
817
|
if (result === L_TRUE) this.clear();
|
|
799
818
|
return result;
|
|
800
819
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_divisions.h, src/math/lp/nla_divisions.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { getEuclideanDiv, Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { NULL_LPVAR } from "./lar-solver";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/monic.h, src/math/lp/emonics.h, src/math/lp/emonics.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { getSignedVarVar, isSignedVarNegated, negateSignedVar, type VarEqs } from "./nla-var-eqs";
|
|
3
2
|
import { TrailStack, UnionFind } from "./union-find";
|
|
4
3
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_grobner.h, src/math/lp/nla_grobner.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// Deviation from Z3: its nlsat conflict check (is_nla_conflict) is not ported.
|
|
3
1
|
import { PddMemoryOutError } from "../../../../errors";
|
|
4
2
|
import { getEuclideanMod, getGcd, getLcm, Rational } from "../rational";
|
|
5
3
|
import { KIND_EQ, KIND_GE, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/horner.h, src/math/lp/horner.cpp, and nexvar, create_sum_from_row,
|
|
2
|
-
// and add_deps_of_fixed from src/math/lp/nla_common.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { CrossNested } from "./cross-nested";
|
|
5
3
|
import { type Dependency, mkJoin } from "./dependency";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/monomial_bounds.{h,cpp}, src/util/mpq.h root), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { type ConstraintKind, KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
5
3
|
import {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_monotone_lemmas.h, src/math/lp/nla_monotone_lemmas.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
4
3
|
import { type NlaCore } from "./nla-core";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_order_lemmas.h, src/math/lp/nla_order_lemmas.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { LarTerm } from "./lar-term";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_tangent_lemmas.h, src/math/lp/nla_tangent_lemmas.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { LarTerm } from "./lar-term";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_types.h, src/math/lp/nla_defs.h, src/math/lp/nla_common.h, and
|
|
2
|
-
// lemma_builder of src/math/lp/nla_core.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
5
3
|
import { Explanation } from "./explanation";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/var_eqs.h, src/math/lp/nla_defs.h), MIT license, see z3-license.txt.
|
|
2
1
|
import type { Dependency } from "./dependency";
|
|
3
2
|
import type { Explanation } from "./explanation";
|
|
4
3
|
import { TrailStack, UnionFind, type UnionFindHandler } from "./union-find";
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
// Deviations from Z3: unsupported nlsat input answers unknown where Z3 exits (levelwise.cpp,
|
|
4
|
-
// add_linear_approximations), check_assignment has no satisfied branch and no add_mul_def, the
|
|
5
|
-
// budget counts only nlsat's own steps, and transcendental functions are not supported.
|
|
6
|
-
import { NlsatUnsupportedError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { NlsatUnsupportedError, SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
7
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
8
3
|
import { Rational, getLcm } from "../rational";
|
|
9
4
|
import { Anum } from "../nlsat/algebraic";
|
|
@@ -88,6 +83,9 @@ const hasLargeDyadicDenominator = (value: Rational) => {
|
|
|
88
83
|
return den >= 1n << 24n && (den & (den - 1n)) === 0n;
|
|
89
84
|
};
|
|
90
85
|
|
|
86
|
+
const getSortedVars = (vars: readonly number[]) =>
|
|
87
|
+
[...vars].sort((first, second) => first - second);
|
|
88
|
+
|
|
91
89
|
const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
|
|
92
90
|
constraint.isAuxiliary &&
|
|
93
91
|
(hasLargeDyadicDenominator(constraint.rhs.x) ||
|
|
@@ -97,6 +95,8 @@ export class NraSolver {
|
|
|
97
95
|
private solver = new NlsatSolver();
|
|
98
96
|
private values: Anum[] = [];
|
|
99
97
|
private lp2nl = new Map<number, number>();
|
|
98
|
+
private literal2constraint = new Map<number, number>();
|
|
99
|
+
private vars2mon = new Map<string, number>();
|
|
100
100
|
|
|
101
101
|
constructor(private core: NlaCore) {}
|
|
102
102
|
|
|
@@ -104,8 +104,10 @@ export class NraSolver {
|
|
|
104
104
|
return this.solver.am;
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
private reset() {
|
|
108
|
+
this.solver = new NlsatSolver(this.core.nraLimit);
|
|
109
|
+
this.values = [];
|
|
110
|
+
this.lp2nl.clear();
|
|
109
111
|
}
|
|
110
112
|
|
|
111
113
|
private mkDefinitions(isIncluded: (lpVar: number) => boolean) {
|
|
@@ -208,13 +210,20 @@ export class NraSolver {
|
|
|
208
210
|
if (transcendentals.piVar !== NULL_LPVAR) solver.addPi(this.getNlVar(transcendentals.piVar));
|
|
209
211
|
}
|
|
210
212
|
|
|
211
|
-
check(maxConflicts: number
|
|
213
|
+
check(maxConflicts: number) {
|
|
214
|
+
try {
|
|
215
|
+
return this.checkCore(maxConflicts);
|
|
216
|
+
} catch (error) {
|
|
217
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
218
|
+
throw error;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
private checkCore(maxConflicts: number) {
|
|
212
223
|
const core = this.core;
|
|
213
224
|
const lra = core.lra;
|
|
214
|
-
this.
|
|
225
|
+
this.reset();
|
|
215
226
|
this.solver.maxConflicts = maxConflicts;
|
|
216
|
-
this.values = [];
|
|
217
|
-
this.lp2nl.clear();
|
|
218
227
|
const cone = getConeOfInfluence(core);
|
|
219
228
|
const definitions = this.mkDefinitions((lpVar) => cone.vars.has(lpVar));
|
|
220
229
|
const skipped = new Set<number>();
|
|
@@ -226,14 +235,7 @@ export class NraSolver {
|
|
|
226
235
|
this.addConstraint(constraintIndex, definitions.definitions, definitions.denominators);
|
|
227
236
|
}
|
|
228
237
|
this.registerTranscendentals();
|
|
229
|
-
const result = (
|
|
230
|
-
try {
|
|
231
|
-
return this.solver.check();
|
|
232
|
-
} catch (error) {
|
|
233
|
-
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
234
|
-
throw error;
|
|
235
|
-
}
|
|
236
|
-
})();
|
|
238
|
+
const result = this.solver.check();
|
|
237
239
|
if (result === L_TRUE) {
|
|
238
240
|
this.solver.restoreOrder();
|
|
239
241
|
core.setUseNraModel(true);
|
|
@@ -321,50 +323,93 @@ export class NraSolver {
|
|
|
321
323
|
: sign === 0;
|
|
322
324
|
}
|
|
323
325
|
|
|
324
|
-
private
|
|
326
|
+
private setupAssignmentSolver() {
|
|
325
327
|
const core = this.core;
|
|
326
328
|
const lra = core.lra;
|
|
327
|
-
this.
|
|
328
|
-
this.
|
|
329
|
+
this.reset();
|
|
330
|
+
this.literal2constraint.clear();
|
|
331
|
+
this.vars2mon.clear();
|
|
329
332
|
const cone = getConeOfInfluence(core);
|
|
330
333
|
const definitions = this.mkDefinitions(() => true);
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
+
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
335
|
+
this.values.push(new Anum(core.val(lpVar)));
|
|
336
|
+
if (core.emons.isMonicVar(lpVar))
|
|
337
|
+
this.vars2mon.set(getSortedVars(core.emons.get(lpVar).vars).join(","), lpVar);
|
|
338
|
+
}
|
|
334
339
|
for (const constraintIndex of cone.constraints) {
|
|
335
340
|
const literal = this.addConstraint(
|
|
336
341
|
constraintIndex,
|
|
337
342
|
definitions.definitions,
|
|
338
343
|
definitions.denominators,
|
|
339
344
|
);
|
|
340
|
-
|
|
345
|
+
this.literal2constraint.set(literal, constraintIndex);
|
|
341
346
|
}
|
|
342
347
|
this.registerTranscendentals();
|
|
343
|
-
const result = this.solver.checkAssignment(values);
|
|
344
|
-
if (result.result !== L_FALSE) return null;
|
|
345
|
-
return { clause: result.clause, literalConstraints };
|
|
346
348
|
}
|
|
347
349
|
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
350
|
+
private processPolynomialCheckAssignment(
|
|
351
|
+
polynomial: Polynomial,
|
|
352
|
+
nl2lp: readonly number[],
|
|
353
|
+
term: LarTerm,
|
|
354
|
+
) {
|
|
355
|
+
let bound = Rational.zero;
|
|
356
|
+
for (let index = 0; index < polynomial.size; index++) {
|
|
357
|
+
const monomial = polynomial.ms[index];
|
|
358
|
+
const coeff = Rational.of(polynomial.as[index]);
|
|
359
|
+
// A linear cell leaves every new lemma polynomial linear, so like Z3 this ignores degrees.
|
|
360
|
+
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
361
|
+
else if (monomial.size === 1) term.addMonomial(coeff, nl2lp[monomial.vars[0]]);
|
|
362
|
+
else {
|
|
363
|
+
const vars = getSortedVars(monomial.vars.map((variable) => nl2lp[variable]));
|
|
364
|
+
term.addMonomial(coeff, this.vars2mon.get(vars.join(",")) ?? this.core.addMulDef(vars));
|
|
355
365
|
}
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
|
|
366
|
+
}
|
|
367
|
+
return bound;
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
private reverseLp2nl() {
|
|
371
|
+
const nl2lp: number[] = [];
|
|
372
|
+
for (const entry of this.lp2nl) nl2lp[entry[1]] = entry[0];
|
|
373
|
+
return nl2lp;
|
|
359
374
|
}
|
|
360
375
|
|
|
361
|
-
|
|
376
|
+
checkAssignment() {
|
|
377
|
+
try {
|
|
378
|
+
return this.checkAssignmentCore();
|
|
379
|
+
} catch (error) {
|
|
380
|
+
// Deviation from Z3: a linear cell around an irrational section answers unknown, where Z3 exits.
|
|
381
|
+
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
382
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
383
|
+
throw error;
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
|
|
387
|
+
private checkAssignmentCore() {
|
|
388
|
+
const core = this.core;
|
|
389
|
+
const lra = core.lra;
|
|
390
|
+
this.setupAssignmentSolver();
|
|
391
|
+
const result = this.solver.checkAssignment(this.values);
|
|
392
|
+
if (result.result === L_TRUE) {
|
|
393
|
+
core.setUseNraModel(true);
|
|
394
|
+
lra.initModel();
|
|
395
|
+
for (const constraint of lra.constraints.constraints)
|
|
396
|
+
if (constraint.isActive && !this.isConstraintSatisfied(constraint)) return L_UNDEF;
|
|
397
|
+
for (const monic of core.emons.monics)
|
|
398
|
+
if (!this.isMonicSatisfied(monic.variable, monic.vars)) return L_UNDEF;
|
|
399
|
+
core.setUseNraModel(true);
|
|
400
|
+
}
|
|
401
|
+
if (result.result === L_FALSE) return this.addLemma(result.clause);
|
|
402
|
+
return result.result;
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
private addLemma(clause: readonly number[]) {
|
|
362
406
|
const core = this.core;
|
|
363
407
|
const solver = this.solver;
|
|
364
|
-
const
|
|
408
|
+
const nl2lp = this.reverseLp2nl();
|
|
409
|
+
let result = L_FALSE;
|
|
365
410
|
const lemma = new LemmaBuilder(core);
|
|
366
411
|
for (const literal of clause) {
|
|
367
|
-
const constraintIndex =
|
|
412
|
+
const constraintIndex = this.literal2constraint.get(literal ^ 1);
|
|
368
413
|
if (constraintIndex !== undefined) {
|
|
369
414
|
const explanation = new Explanation();
|
|
370
415
|
explanation.push(constraintIndex);
|
|
@@ -373,23 +418,12 @@ export class NraSolver {
|
|
|
373
418
|
}
|
|
374
419
|
const atom = solver.getAtom(literal);
|
|
375
420
|
if (atom === null) throw new SmtInvariantError(`nlsat literal ${literal} has no atom`);
|
|
376
|
-
if (
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
pm.totalDegree(atom.polynomials[0]) > 1
|
|
380
|
-
) {
|
|
381
|
-
core.lemmas.pop();
|
|
382
|
-
return L_UNDEF;
|
|
421
|
+
if (!isIneqAtom(atom) || atom.polynomials.length !== 1) {
|
|
422
|
+
result = L_UNDEF;
|
|
423
|
+
break;
|
|
383
424
|
}
|
|
384
|
-
const polynomial = atom.polynomials[0];
|
|
385
425
|
const term = new LarTerm();
|
|
386
|
-
|
|
387
|
-
for (let index = 0; index < polynomial.size; index++) {
|
|
388
|
-
const monomial = polynomial.ms[index];
|
|
389
|
-
const coeff = Rational.of(polynomial.as[index]);
|
|
390
|
-
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
391
|
-
else term.addMonomial(coeff, monomial.vars[0]);
|
|
392
|
-
}
|
|
426
|
+
const bound = this.processPolynomialCheckAssignment(atom.polynomials[0], nl2lp, term);
|
|
393
427
|
const isNegated = (literal & 1) === 1;
|
|
394
428
|
const kind =
|
|
395
429
|
atom.kind === "EQ"
|
|
@@ -405,12 +439,13 @@ export class NraSolver {
|
|
|
405
439
|
: KIND_GT;
|
|
406
440
|
const ineq = mkIneq(term, kind, bound);
|
|
407
441
|
if (core.ineqHolds(ineq)) {
|
|
408
|
-
|
|
409
|
-
|
|
442
|
+
result = L_UNDEF;
|
|
443
|
+
break;
|
|
410
444
|
}
|
|
411
445
|
lemma.addIneq(ineq);
|
|
412
446
|
}
|
|
413
|
-
core.isCheckFeasible = true;
|
|
414
|
-
|
|
447
|
+
if (result === L_FALSE) core.isCheckFeasible = true;
|
|
448
|
+
if (result === L_UNDEF) core.lemmas.pop();
|
|
449
|
+
return result;
|
|
415
450
|
}
|
|
416
451
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_simplifier.h, src/math/grobner/pdd_simplifier.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkJoin } from "./dependency";
|
|
3
2
|
import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
4
3
|
import { shrink } from "../array";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_solver.h, src/math/grobner/pdd_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { PddMemoryOutError } from "../../../../errors";
|
|
4
2
|
import { type Dependency, mkJoin } from "./dependency";
|
|
5
3
|
import type { Pdd, PddManager } from "./pdd";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
1
|
+
// Deviation from Z3: nodes are never freed, so node indices match Z3 only until its first
|
|
2
|
+
// collection.
|
|
3
3
|
import { PddMemoryOutError } from "../../../../errors";
|
|
4
4
|
import { getGcd, Rational } from "../rational";
|
|
5
5
|
import { shrink } from "../array";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/random_updater_def.h, and shift_var and
|
|
2
|
-
// get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { IndexedUintSet } from "./containers";
|
|
5
3
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/macros/macro_finder.cpp, src/ast/macros/macro_manager.cpp,
|
|
2
|
-
// src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp,
|
|
3
|
-
// src/tactic/ufbv/macro_finder_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import {
|
|
5
2
|
FAMILY_USER,
|
|
6
3
|
KIND_APP,
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/max_bv_sharing_tactic.h, src/ast/simplifiers/max_bv_sharing.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import type { AstManager } from "./ast";
|
|
4
2
|
import { runSimplifier } from "./dependent-expr-state";
|
|
5
3
|
import type { Goal } from "./goal";
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// with Z3's default parameters is ported.
|
|
1
|
+
// Only the maxres strategy with Z3's default parameters is ported.
|
|
3
2
|
import { OP_AND, OP_EQ, OP_IMPLIES, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { mkNot } from "./ast-util";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_term_graph.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, KIND_APP, OP_AND, OP_DISTINCT, OP_EQ, SORT_BOOL } from "../ast";
|
|
3
2
|
import { getNumExprs, isAppOf } from "../ast-util";
|
|
4
3
|
import { RefVector } from "../ref-vector";
|