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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/solve_eqs.cpp, src/ast/simplifiers/extract_eqs.cpp,
|
|
2
|
-
// src/ast/simplifiers/solve_context_eqs.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -38,8 +36,9 @@ import { getSubterms } from "./recfun-decl-plugin";
|
|
|
38
36
|
import { RefVector } from "./ref-vector";
|
|
39
37
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
40
38
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
39
|
+
import { DependentExprState, finishSimplifier } from "./dependent-expr-state";
|
|
41
40
|
|
|
42
|
-
|
|
41
|
+
interface SolveEqsOptions {
|
|
43
42
|
isTheorySolver: boolean;
|
|
44
43
|
isIteSolver: boolean;
|
|
45
44
|
isContextSolve: boolean;
|
|
@@ -109,6 +108,7 @@ export class SolveEqs {
|
|
|
109
108
|
private orPositive = new Set<number>();
|
|
110
109
|
private orNegative = new Set<number>();
|
|
111
110
|
private rewriter: Rewriter;
|
|
111
|
+
private state: DependentExprState;
|
|
112
112
|
|
|
113
113
|
constructor(
|
|
114
114
|
private manager: AstManager,
|
|
@@ -120,6 +120,7 @@ export class SolveEqs {
|
|
|
120
120
|
this.bounds = new BoundManager(manager);
|
|
121
121
|
this.substitution = new ObjMap((expr) => manager.hashes[expr]);
|
|
122
122
|
this.rewriter = new Rewriter(manager, options.rewriter);
|
|
123
|
+
this.state = new DependentExprState(manager, goal);
|
|
123
124
|
}
|
|
124
125
|
|
|
125
126
|
private pin(expr: number) {
|
|
@@ -297,7 +298,7 @@ export class SolveEqs {
|
|
|
297
298
|
)
|
|
298
299
|
)
|
|
299
300
|
continue;
|
|
300
|
-
const others = factors.filter((
|
|
301
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== factorIndex);
|
|
301
302
|
const term = this.mkSubTerm(x, index, y);
|
|
302
303
|
this.push(
|
|
303
304
|
eqs,
|
|
@@ -330,7 +331,7 @@ export class SolveEqs {
|
|
|
330
331
|
!factors.every((other, otherIndex) => otherIndex === index || this.isNonzeroFactor(other))
|
|
331
332
|
)
|
|
332
333
|
continue;
|
|
333
|
-
const others = factors.filter((
|
|
334
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== index);
|
|
334
335
|
this.push(
|
|
335
336
|
eqs,
|
|
336
337
|
orig,
|
|
@@ -438,8 +439,7 @@ export class SolveEqs {
|
|
|
438
439
|
const manager = this.manager;
|
|
439
440
|
const visited = new Set<number>();
|
|
440
441
|
const todo = [root];
|
|
441
|
-
|
|
442
|
-
const expr = todo.pop() as number;
|
|
442
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
443
443
|
if (visited.has(expr)) continue;
|
|
444
444
|
visited.add(expr);
|
|
445
445
|
if (isMatch(expr)) return true;
|
|
@@ -518,12 +518,15 @@ export class SolveEqs {
|
|
|
518
518
|
|
|
519
519
|
private getEqs() {
|
|
520
520
|
const eqs: DependentEq[] = [];
|
|
521
|
-
const
|
|
522
|
-
if (!this.goal.isProofsEnabled)
|
|
523
|
-
|
|
521
|
+
const state = this.state;
|
|
522
|
+
if (!this.goal.isProofsEnabled)
|
|
523
|
+
state.forEachIndex((index) => this.getArithEqs(state.get(index), eqs));
|
|
524
|
+
state.forEachIndex((index) => this.getBasicEqs(state.get(index), eqs));
|
|
524
525
|
if (!this.goal.isProofsEnabled) {
|
|
525
|
-
|
|
526
|
-
|
|
526
|
+
state.forEachIndex((index) => this.getBvEqs(state.get(index), eqs));
|
|
527
|
+
state.forEachIndex((index) => this.checkArrayEqs(state.get(index)));
|
|
528
|
+
// ff_extract_eq finds no equations without finite fields, but its pass still counts steps.
|
|
529
|
+
state.forEachIndex(() => {});
|
|
527
530
|
}
|
|
528
531
|
return eqs;
|
|
529
532
|
}
|
|
@@ -555,8 +558,7 @@ export class SolveEqs {
|
|
|
555
558
|
initLevel -= size + 1;
|
|
556
559
|
let currLevel = initLevel;
|
|
557
560
|
todo.push(id);
|
|
558
|
-
|
|
559
|
-
const next = todo.pop() as number;
|
|
561
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
560
562
|
if (this.id2level[next] !== Infinity) continue;
|
|
561
563
|
this.id2level[next] = currLevel++;
|
|
562
564
|
for (const eq of this.next[next]) {
|
|
@@ -564,8 +566,7 @@ export class SolveEqs {
|
|
|
564
566
|
let isSafe = true;
|
|
565
567
|
const visited = new Set<number>();
|
|
566
568
|
const stack = [eq.term];
|
|
567
|
-
|
|
568
|
-
const expr = stack.pop() as number;
|
|
569
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
569
570
|
if (visited.has(expr)) continue;
|
|
570
571
|
visited.add(expr);
|
|
571
572
|
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, stack);
|
|
@@ -597,7 +598,7 @@ export class SolveEqs {
|
|
|
597
598
|
const replacer = new SubstReplacer(manager, this.substitution);
|
|
598
599
|
this.substIds.sort((first, second) => this.id2level[second] - this.id2level[first]);
|
|
599
600
|
for (const id of this.substIds) {
|
|
600
|
-
manager.limit.
|
|
601
|
+
if (!manager.limit.inc()) break;
|
|
601
602
|
const eq = this.next[id][0];
|
|
602
603
|
const definition = replacer.rewrite(eq.term);
|
|
603
604
|
this.pinned.pushOwned(definition);
|
|
@@ -609,19 +610,19 @@ export class SolveEqs {
|
|
|
609
610
|
}
|
|
610
611
|
|
|
611
612
|
private applySubst() {
|
|
612
|
-
if (this.substIds.length === 0) return;
|
|
613
613
|
const manager = this.manager;
|
|
614
|
+
if (!manager.limit.inc() || this.substIds.length === 0) return;
|
|
614
615
|
const replacer = new SubstReplacer(manager, this.substitution);
|
|
615
616
|
const goal = this.goal;
|
|
616
|
-
const
|
|
617
|
-
|
|
618
|
-
const form =
|
|
617
|
+
const state = this.state;
|
|
618
|
+
state.forEachIndex((index) => {
|
|
619
|
+
const form = state.get(index);
|
|
619
620
|
const replaced = replacer.rewrite(form);
|
|
620
621
|
const simplified = this.rewriter.rewrite(replaced);
|
|
621
622
|
manager.decRef(replaced);
|
|
622
623
|
if (simplified !== form) goal.update(index, simplified);
|
|
623
624
|
manager.decRef(simplified);
|
|
624
|
-
}
|
|
625
|
+
});
|
|
625
626
|
replacer.release();
|
|
626
627
|
}
|
|
627
628
|
|
|
@@ -659,18 +660,16 @@ export class SolveEqs {
|
|
|
659
660
|
this.markPositive(form);
|
|
660
661
|
this.bounds.add(form);
|
|
661
662
|
}
|
|
662
|
-
|
|
663
|
+
const limit = this.manager.limit;
|
|
664
|
+
let count = 0;
|
|
665
|
+
do {
|
|
663
666
|
this.runRound(() => this.getEqs());
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
if (this.options.isContextSolve && !goal.isProofsEnabled)
|
|
667
|
+
count++;
|
|
668
|
+
} while (this.substIds.length > 0 && count < 20 && limit.inc());
|
|
669
|
+
if (limit.inc() && this.options.isContextSolve && !goal.isProofsEnabled)
|
|
668
670
|
this.runRound(() => this.collectNestedEqualities());
|
|
669
671
|
this.eqTerms.reset();
|
|
670
|
-
goal.
|
|
671
|
-
goal.elimRedundancies();
|
|
672
|
-
goal.depth++;
|
|
673
|
-
if (this.definitions.length > 0) goal.addDefinitions(this.definitions);
|
|
672
|
+
finishSimplifier(goal, this.definitions);
|
|
674
673
|
}
|
|
675
674
|
|
|
676
675
|
private markPositive(form: number) {
|
|
@@ -739,8 +738,7 @@ export class SolveEqs {
|
|
|
739
738
|
private containsConjunctively(form: number, isNegated: boolean, eq: number, conjuncts: Signed[]) {
|
|
740
739
|
const manager = this.manager;
|
|
741
740
|
const todo: Signed[] = [{ isNegated, expr: form }];
|
|
742
|
-
|
|
743
|
-
const item = todo.pop() as Signed;
|
|
741
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
744
742
|
if (!item.isNegated && item.expr === eq) return true;
|
|
745
743
|
const marks = item.isNegated ? this.andNegative : this.andPositive;
|
|
746
744
|
if (marks.has(item.expr)) continue;
|
|
@@ -760,8 +758,7 @@ export class SolveEqs {
|
|
|
760
758
|
private isDisjunctivelySafe(depth: number, root: number, isNegated: boolean, eq: number) {
|
|
761
759
|
const manager = this.manager;
|
|
762
760
|
const todo: Signed[] = [{ isNegated, expr: root }];
|
|
763
|
-
|
|
764
|
-
const item = todo.pop() as Signed;
|
|
761
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
765
762
|
const marks = item.isNegated ? this.orNegative : this.orPositive;
|
|
766
763
|
if (marks.has(item.expr)) continue;
|
|
767
764
|
marks.add(item.expr);
|
|
@@ -880,8 +877,7 @@ export class SolveEqs {
|
|
|
880
877
|
const seen = new Set<number>();
|
|
881
878
|
for (const index of order) {
|
|
882
879
|
const todo = [forms[index]];
|
|
883
|
-
|
|
884
|
-
const expr = todo.pop() as number;
|
|
880
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
885
881
|
if (seen.has(expr)) continue;
|
|
886
882
|
seen.add(expr);
|
|
887
883
|
occurrence.set(expr, index);
|
|
@@ -895,11 +891,11 @@ export class SolveEqs {
|
|
|
895
891
|
};
|
|
896
892
|
record(
|
|
897
893
|
firstOccurrence,
|
|
898
|
-
forms.map((
|
|
894
|
+
forms.map((_value, index) => index),
|
|
899
895
|
);
|
|
900
896
|
record(
|
|
901
897
|
lastOccurrence,
|
|
902
|
-
forms.map((
|
|
898
|
+
forms.map((_value, index) => forms.length - 1 - index),
|
|
903
899
|
);
|
|
904
900
|
const kept: DependentEq[] = [];
|
|
905
901
|
let lastVar = -1;
|
|
@@ -924,6 +920,7 @@ export class SolveEqs {
|
|
|
924
920
|
}
|
|
925
921
|
|
|
926
922
|
release() {
|
|
923
|
+
this.state.release();
|
|
927
924
|
this.rewriter.release();
|
|
928
925
|
this.pinned.reset();
|
|
929
926
|
this.eqTerms.reset();
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// It decides like `z3 -smt2 AUTO_CONFIG=false smt.MBQI=true`.
|
|
1
|
+
// The solver decides like `z3 -smt2 AUTO_CONFIG=false smt.MBQI=true`.
|
|
3
2
|
import {
|
|
4
3
|
isStackOverflow,
|
|
5
4
|
SmtCanceledError,
|
|
@@ -10,7 +9,7 @@ import type { DecideOptions, Verdict } from "../../verdict";
|
|
|
10
9
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
11
10
|
import { AstManager } from "./ast";
|
|
12
11
|
import { Context, MBQI_MAX_ITERATIONS } from "./context";
|
|
13
|
-
import { L_FALSE, L_TRUE } from "./lbool";
|
|
12
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
14
13
|
import { applyUfniaTactic } from "./quant-tactics";
|
|
15
14
|
import { ResourceLimit } from "./rlimit";
|
|
16
15
|
import { parseSmtlib } from "./smtlib-parser";
|
|
@@ -21,6 +20,8 @@ export interface KernelParams {
|
|
|
21
20
|
mbqiMaxIterations: number;
|
|
22
21
|
isFindingMacros: boolean;
|
|
23
22
|
relevancyLevel?: 0 | 2;
|
|
23
|
+
isCoreMinimizing?: boolean;
|
|
24
|
+
randomSeed?: number;
|
|
24
25
|
// A kernel without a setup runs as with auto_config false.
|
|
25
26
|
setup?: SmtSetup;
|
|
26
27
|
}
|
|
@@ -31,6 +32,11 @@ const DEFAULT_KERNEL_PARAMS: KernelParams = {
|
|
|
31
32
|
isFindingMacros: false,
|
|
32
33
|
};
|
|
33
34
|
|
|
35
|
+
const assertForms = (context: Context, asserted: AssertedFormulas, forms: number[]) => {
|
|
36
|
+
for (const form of forms) if (!context.checkCanceled()) asserted.assertExpr(form);
|
|
37
|
+
return !context.checkCanceled();
|
|
38
|
+
};
|
|
39
|
+
|
|
34
40
|
interface SmtCheck {
|
|
35
41
|
verdict: Verdict;
|
|
36
42
|
numInstances: number;
|
|
@@ -44,8 +50,12 @@ export const solveGoal = (manager: AstManager, forms: number[], params: KernelPa
|
|
|
44
50
|
isMbqi: params.isMbqi,
|
|
45
51
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
46
52
|
relevancyLevel: 2,
|
|
53
|
+
randomSeed: params.randomSeed,
|
|
47
54
|
});
|
|
48
|
-
|
|
55
|
+
if (!assertForms(context, asserted, forms)) {
|
|
56
|
+
manager.limit.release();
|
|
57
|
+
return { result: L_UNDEF, context, reasonUnknown: "canceled" };
|
|
58
|
+
}
|
|
49
59
|
context.setupContext(params.setup, true, asserted);
|
|
50
60
|
context.internalizeAssertions(asserted);
|
|
51
61
|
const theoryAssumptions: number[] = [];
|
|
@@ -82,8 +92,12 @@ export const solveAssuming = (
|
|
|
82
92
|
isMbqi: params.isMbqi,
|
|
83
93
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
84
94
|
relevancyLevel: 2,
|
|
95
|
+
randomSeed: params.randomSeed,
|
|
85
96
|
});
|
|
86
|
-
|
|
97
|
+
if (!assertForms(context, asserted, assertions)) {
|
|
98
|
+
manager.limit.release();
|
|
99
|
+
return { result: L_UNDEF, context, reasonUnknown: "canceled" };
|
|
100
|
+
}
|
|
87
101
|
context.setupContext(params.setup, false, asserted);
|
|
88
102
|
context.internalizeAssertions(asserted);
|
|
89
103
|
const result = context.checkResearching(asserted, assumptions);
|