tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- 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 +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- 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 +45 -20
- 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 +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- 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 +13 -7
- 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 +4 -11
- 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 +26 -7
- 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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- 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 +18 -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 +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- 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 +59 -10
- 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 +66 -11
- 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 +167 -85
- 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 +220 -0
- 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 +324 -0
- 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 +163 -99
- 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 +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- 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 +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- 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 +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- 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 +20 -5
- package/src/prover/zenon/parse.ts +6 -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 +7 -5
- 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 +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -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 +36 -30
- package/src/sany/generator-proofs.ts +5 -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 +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- 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/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./context";
|
|
1
|
+
import { OP_POWER, OP_POWER0 } from "./ast";
|
|
2
|
+
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./theory";
|
|
4
3
|
import { TheoryJustification } from "./enode";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
6
5
|
import { getVar, Literal, negate } from "./literal";
|
|
7
|
-
import {
|
|
6
|
+
import { Rational } from "./rational";
|
|
7
|
+
import { mkBoundAtom, mkTermEqSides } from "./arith-terms";
|
|
8
8
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LT, KIND_NE } from "./lp/constraints";
|
|
9
9
|
import type { Explanation } from "./lp/explanation";
|
|
10
10
|
import { IntSolver } from "./lp/int-solver";
|
|
@@ -16,7 +16,12 @@ import { TheoryLraModel } from "./theory-lra-model";
|
|
|
16
16
|
export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
17
17
|
private lia = new IntSolver(this.solver);
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
// Level 2 also runs nlsat's full check.
|
|
20
|
+
override numFinalCheckLevels() {
|
|
21
|
+
return 2;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
override finalCheckEh(level: number) {
|
|
20
25
|
const context = this.context;
|
|
21
26
|
if (this.propagateCore()) return FC_CONTINUE;
|
|
22
27
|
this.isModelInitialized = false;
|
|
@@ -40,10 +45,47 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
40
45
|
if (nlaStatus === FC_GIVEUP) result = FC_GIVEUP;
|
|
41
46
|
if (this.assumeEqs()) return FC_CONTINUE;
|
|
42
47
|
if (this.unsupportedTerms.length > 0) this.initVariableValues();
|
|
43
|
-
|
|
48
|
+
for (const term of this.unsupportedTerms) {
|
|
49
|
+
if (!context.isRelevant(term)) continue;
|
|
50
|
+
const status = this.evalUnsupported(term);
|
|
51
|
+
if (status === FC_CONTINUE) return FC_CONTINUE;
|
|
52
|
+
if (status === FC_GIVEUP) result = FC_GIVEUP;
|
|
53
|
+
}
|
|
54
|
+
return result;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
private evalUnsupported(term: number) {
|
|
58
|
+
const manager = this.manager;
|
|
59
|
+
const op = manager.getOp(term);
|
|
60
|
+
if (op === OP_POWER0) return FC_DONE;
|
|
61
|
+
if (op !== OP_POWER) return FC_GIVEUP;
|
|
62
|
+
const base = manager.getArg(term, 0);
|
|
63
|
+
const exponent = manager.getArg(term, 1);
|
|
64
|
+
const isZero = (expr: number) =>
|
|
65
|
+
manager.isNumeral(expr) && manager.getRationalValue(expr).isZero();
|
|
66
|
+
if (isZero(base) && isZero(exponent)) return FC_DONE;
|
|
67
|
+
const nla = this.nla;
|
|
68
|
+
if (nla === undefined) return FC_GIVEUP;
|
|
69
|
+
const status = nla.checkPower(
|
|
70
|
+
this.getLpVar(term),
|
|
71
|
+
this.getLpVar(base),
|
|
72
|
+
this.getLpVar(exponent),
|
|
73
|
+
);
|
|
74
|
+
if (status === L_TRUE) return FC_DONE;
|
|
75
|
+
if (status === L_FALSE) {
|
|
76
|
+
this.addLemmas(nla);
|
|
77
|
+
return FC_CONTINUE;
|
|
78
|
+
}
|
|
79
|
+
return FC_GIVEUP;
|
|
44
80
|
}
|
|
45
81
|
|
|
46
|
-
private
|
|
82
|
+
private getLpVar(expr: number) {
|
|
83
|
+
const thVar = this.mkVar(expr);
|
|
84
|
+
this.solver.registerExistingTerms();
|
|
85
|
+
return this.registerVar(thVar);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
protected checkNla(level: number) {
|
|
47
89
|
if (this.context.checkCanceled()) return FC_GIVEUP;
|
|
48
90
|
const nla = this.nla;
|
|
49
91
|
if (nla === undefined || !nla.hasRelevantMonomial()) return FC_DONE;
|
|
@@ -121,13 +163,9 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
121
163
|
|
|
122
164
|
private mkTermEq(term: LarTerm, offset: Rational) {
|
|
123
165
|
const manager = this.manager;
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
const left = this.coeffsToApp(coeffs, isInt);
|
|
128
|
-
const right = manager.mkNumeralOfSort(offset, isInt ? SORT_INT : SORT_REAL);
|
|
129
|
-
if (left === right) return manager.trueExpr;
|
|
130
|
-
const atom = manager.mkEq(left, right);
|
|
166
|
+
const sides = mkTermEqSides(manager, this.solver, term, offset, (thVar) => this.getExpr(thVar));
|
|
167
|
+
if (sides[0] === sides[1]) return manager.trueExpr;
|
|
168
|
+
const atom = manager.mkEq(sides[0], sides[1]);
|
|
131
169
|
this.context.internalize(atom, true);
|
|
132
170
|
this.context.markAsRelevant(atom);
|
|
133
171
|
return atom;
|
|
@@ -138,7 +176,6 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
138
176
|
const literals = lemma.ineqs.map((ineq) => negate(this.mkNlaLiteral(ineq)));
|
|
139
177
|
this.resetEvidence();
|
|
140
178
|
this.coreLiterals.push(...literals);
|
|
141
|
-
this.numConflicts++;
|
|
142
179
|
for (const constraint of lemma.expl) this.setEvidence(constraint);
|
|
143
180
|
const clause: Literal[] = [];
|
|
144
181
|
for (const literal of this.coreLiterals) {
|
|
@@ -160,7 +197,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
160
197
|
const atom = this.mkBound(this.lia.term, move.offset, !move.isUpper);
|
|
161
198
|
this.context.assign(
|
|
162
199
|
this.context.getLiteral(atom),
|
|
163
|
-
new TheoryJustification(this.coreLiterals, []),
|
|
200
|
+
new TheoryJustification(this.id, this.coreLiterals, []),
|
|
164
201
|
);
|
|
165
202
|
} else if (move.kind === "conflict") {
|
|
166
203
|
this.explanation.clear();
|
|
@@ -170,65 +207,13 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
170
207
|
return move.kind === "sat";
|
|
171
208
|
}
|
|
172
209
|
|
|
173
|
-
private mkBound(lpTerm: LarTerm,
|
|
174
|
-
const manager = this.manager;
|
|
210
|
+
private mkBound(lpTerm: LarTerm, offset: Rational, isLower: boolean) {
|
|
175
211
|
const context = this.context;
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
let isLower = inputIsLower;
|
|
179
|
-
let lcm = offset.den;
|
|
180
|
-
const isInt = coeffs.every((entry) => this.isIntVar(entry[0]));
|
|
181
|
-
if (isInt) {
|
|
182
|
-
for (const entry of coeffs) lcm = getLcm(lcm, entry[1].den);
|
|
183
|
-
if (lcm !== 1n) {
|
|
184
|
-
const scale = Rational.of(lcm);
|
|
185
|
-
offset = offset.mul(scale);
|
|
186
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].mul(scale)]);
|
|
187
|
-
}
|
|
188
|
-
let gcd = 0n;
|
|
189
|
-
for (const entry of coeffs) gcd = getGcd(gcd, entry[1].num);
|
|
190
|
-
if (gcd !== 0n && gcd !== 1n) {
|
|
191
|
-
const divisor = Rational.of(gcd);
|
|
192
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].div(divisor)]);
|
|
193
|
-
offset = isLower ? offset.div(divisor).ceil() : offset.div(divisor).floor();
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
if (coeffs.length > 0 && coeffs[0][1].isNegative()) {
|
|
197
|
-
offset = offset.neg();
|
|
198
|
-
isLower = !isLower;
|
|
199
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].neg()]);
|
|
200
|
-
}
|
|
201
|
-
const sort = isInt ? SORT_INT : SORT_REAL;
|
|
202
|
-
const term = this.coeffsToApp(coeffs, isInt);
|
|
203
|
-
const atom = manager.mkApp(
|
|
204
|
-
isLower ? OP_GE : OP_LE,
|
|
205
|
-
[term, manager.mkNumeralOfSort(offset, sort)],
|
|
206
|
-
SORT_BOOL,
|
|
212
|
+
const atom = mkBoundAtom(this.manager, this.solver, lpTerm, offset, isLower, (thVar) =>
|
|
213
|
+
this.getExpr(thVar),
|
|
207
214
|
);
|
|
208
215
|
context.internalize(atom, true);
|
|
209
216
|
context.markAsRelevant(atom);
|
|
210
217
|
return atom;
|
|
211
218
|
}
|
|
212
|
-
|
|
213
|
-
private coeffsToApp(coeffs: [number, Rational][], isInt: boolean) {
|
|
214
|
-
const manager = this.manager;
|
|
215
|
-
const sort = isInt ? SORT_INT : SORT_REAL;
|
|
216
|
-
const summands = coeffs
|
|
217
|
-
.filter((entry) => !entry[1].isZero())
|
|
218
|
-
.map((entry) => {
|
|
219
|
-
const original = this.getExpr(entry[0]);
|
|
220
|
-
const expr =
|
|
221
|
-
!isInt && manager.isInt(original)
|
|
222
|
-
? manager.mkApp(OP_TO_REAL, [original], SORT_REAL)
|
|
223
|
-
: original;
|
|
224
|
-
return entry[1].equals(Rational.one)
|
|
225
|
-
? expr
|
|
226
|
-
: manager.mkApp(OP_MUL, [manager.mkNumeralOfSort(entry[1], sort), expr], sort);
|
|
227
|
-
});
|
|
228
|
-
return summands.length === 0
|
|
229
|
-
? manager.mkNumeralOfSort(Rational.zero, sort)
|
|
230
|
-
: summands.length === 1
|
|
231
|
-
? summands[0]
|
|
232
|
-
: manager.mkApp(OP_ADD, summands, sort);
|
|
233
|
-
}
|
|
234
219
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_ARITH,
|
|
3
|
+
KIND_APP,
|
|
4
4
|
OP_ADD,
|
|
5
|
+
OP_ATAN2,
|
|
5
6
|
OP_DIV,
|
|
6
7
|
OP_DIV0,
|
|
7
8
|
OP_IDIV,
|
|
@@ -10,6 +11,9 @@ import {
|
|
|
10
11
|
OP_MOD0,
|
|
11
12
|
OP_MUL,
|
|
12
13
|
OP_NUM,
|
|
14
|
+
OP_PI,
|
|
15
|
+
OP_POWER,
|
|
16
|
+
OP_REM,
|
|
13
17
|
OP_SUB,
|
|
14
18
|
OP_TO_INT,
|
|
15
19
|
OP_TO_REAL,
|
|
@@ -17,7 +21,7 @@ import {
|
|
|
17
21
|
SORT_INT,
|
|
18
22
|
SORT_REAL,
|
|
19
23
|
} from "./ast";
|
|
20
|
-
import {
|
|
24
|
+
import { getExtendedNumeral } from "./ast-util";
|
|
21
25
|
import { BoolVar, getVar, Literal } from "./literal";
|
|
22
26
|
import { Rational } from "./rational";
|
|
23
27
|
import { RefVector } from "./ref-vector";
|
|
@@ -25,6 +29,7 @@ import { type ConstraintKind, KIND_GE, KIND_LE } from "./lp/constraints";
|
|
|
25
29
|
import { NULL_LPVAR } from "./lp/lar-solver";
|
|
26
30
|
import { NlaCore } from "./lp/nla-core";
|
|
27
31
|
import type { Division } from "./lp/nla-divisions";
|
|
32
|
+
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
28
33
|
import { TheoryLraAxioms } from "./theory-lra-axioms";
|
|
29
34
|
|
|
30
35
|
export interface ApiBound {
|
|
@@ -33,6 +38,8 @@ export interface ApiBound {
|
|
|
33
38
|
readonly column: number;
|
|
34
39
|
readonly isInt: boolean;
|
|
35
40
|
readonly value: Rational;
|
|
41
|
+
// The infinitesimal of the true literal's bound, value + eps*delta.
|
|
42
|
+
readonly eps: Rational;
|
|
36
43
|
readonly isLower: boolean;
|
|
37
44
|
readonly constraintTrue: number;
|
|
38
45
|
readonly constraintFalse: number;
|
|
@@ -45,6 +52,8 @@ interface Scope {
|
|
|
45
52
|
numVars: number;
|
|
46
53
|
}
|
|
47
54
|
|
|
55
|
+
const MAX_POWER_DEGREE = 10n;
|
|
56
|
+
|
|
48
57
|
interface LinearizedSum {
|
|
49
58
|
vars: number[];
|
|
50
59
|
coeffs: Rational[];
|
|
@@ -93,20 +102,16 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
93
102
|
return column;
|
|
94
103
|
}
|
|
95
104
|
|
|
96
|
-
|
|
97
|
-
return node.thVar >= 0 && this.varEnodes[node.thVar] === node;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
private mkVar(expr: number) {
|
|
105
|
+
protected mkVar(expr: number) {
|
|
101
106
|
const node = this.getInternalizedEnode(expr);
|
|
102
|
-
if (this.isAttachedToVar(node)) return node.
|
|
107
|
+
if (this.isAttachedToVar(node)) return node.getThVar(this.id);
|
|
103
108
|
const thVar = this.varEnodes.length;
|
|
104
109
|
this.varEnodes.push(node);
|
|
105
110
|
while (this.bounds.length <= thVar) {
|
|
106
111
|
this.bounds.push([]);
|
|
107
112
|
this.unassignedBounds.push(0);
|
|
108
113
|
}
|
|
109
|
-
this.context.attachThVar(node, thVar);
|
|
114
|
+
this.context.attachThVar(node, this, thVar);
|
|
110
115
|
return thVar;
|
|
111
116
|
}
|
|
112
117
|
|
|
@@ -150,7 +155,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
150
155
|
const op = manager.getOp(expr);
|
|
151
156
|
const zero = manager.mkNumeral(0n);
|
|
152
157
|
const dividend =
|
|
153
|
-
op === OP_MOD
|
|
158
|
+
op === OP_MOD || op === OP_REM
|
|
159
|
+
? manager.mkApp(op, [manager.getArg(expr, 0), zero], SORT_INT)
|
|
160
|
+
: expr;
|
|
154
161
|
const byZero =
|
|
155
162
|
op === OP_DIV
|
|
156
163
|
? manager.mkApp(OP_DIV0, manager.getArgs(expr), SORT_REAL)
|
|
@@ -198,16 +205,53 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
198
205
|
return thVar;
|
|
199
206
|
}
|
|
200
207
|
|
|
208
|
+
private getPowerDegree(power: number) {
|
|
209
|
+
const manager = this.manager;
|
|
210
|
+
if (manager.kinds[manager.getArg(power, 0)] !== KIND_APP) return undefined;
|
|
211
|
+
const degree = getExtendedNumeral(manager, manager.getArg(power, 1));
|
|
212
|
+
return degree !== undefined &&
|
|
213
|
+
degree.isInt() &&
|
|
214
|
+
degree.num > 0n &&
|
|
215
|
+
degree.num <= MAX_POWER_DEGREE
|
|
216
|
+
? Number(degree.num)
|
|
217
|
+
: undefined;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
private internalizePower(power: number, degree: number) {
|
|
221
|
+
this.internalizeArgs(power);
|
|
222
|
+
const hasVar = this.context.isEInternalized(power) && this.isAttachedExpr(power);
|
|
223
|
+
this.mkEnode(power);
|
|
224
|
+
const thVar = this.mkVar(power);
|
|
225
|
+
if (hasVar) return thVar;
|
|
226
|
+
const base = this.manager.getArg(power, 0);
|
|
227
|
+
this.internalizeTermCore(base);
|
|
228
|
+
const baseVar = this.mkVar(base);
|
|
229
|
+
const vars = Array.from({ length: degree }, () => this.registerVar(baseVar));
|
|
230
|
+
const nla = this.ensureNla();
|
|
231
|
+
this.solver.registerExistingTerms();
|
|
232
|
+
nla.addMonic(this.registerVar(thVar), vars);
|
|
233
|
+
return thVar;
|
|
234
|
+
}
|
|
235
|
+
|
|
201
236
|
private ensureNla() {
|
|
202
237
|
if (this.nla !== undefined) return this.nla;
|
|
203
238
|
const nla = new NlaCore(this.solver, this.manager.limit);
|
|
204
239
|
for (let index = 0; index < this.scopes.length; index++) nla.push();
|
|
205
240
|
nla.isRelevant = (lpVar) =>
|
|
206
241
|
this.context.isRelevant(this.getExpr(this.solver.getExternal(lpVar)));
|
|
242
|
+
nla.grobner.updateParams();
|
|
243
|
+
nla.addMulDefHook = (vars) => this.addMulDef(vars);
|
|
207
244
|
this.nla = nla;
|
|
208
245
|
return nla;
|
|
209
246
|
}
|
|
210
247
|
|
|
248
|
+
private addMulDef(vars: readonly number[]) {
|
|
249
|
+
const isInt = vars.every((lpVar) => this.isIntVar(this.solver.getExternal(lpVar)));
|
|
250
|
+
const product = this.manager.mkFreshConst("mul!", isInt ? SORT_INT : SORT_REAL);
|
|
251
|
+
this.mkEnode(product);
|
|
252
|
+
return this.registerVar(this.mkVar(product));
|
|
253
|
+
}
|
|
254
|
+
|
|
211
255
|
private registerDivision(quotient: number, remainder: number): Division {
|
|
212
256
|
const register = (expr: number) => {
|
|
213
257
|
this.internalizeTermCore(expr);
|
|
@@ -296,6 +340,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
296
340
|
} else if (op === OP_MUL) {
|
|
297
341
|
addVar(index, this.internalizeMul(term));
|
|
298
342
|
index++;
|
|
343
|
+
} else if (op === OP_POWER && this.getPowerDegree(term) !== undefined) {
|
|
344
|
+
addVar(index, this.internalizePower(term, this.getPowerDegree(term)!));
|
|
345
|
+
index++;
|
|
299
346
|
} else if (op === OP_NUM) {
|
|
300
347
|
addVar(index, this.internalizeNumeral(term, manager.getRationalValue(term)));
|
|
301
348
|
index++;
|
|
@@ -316,7 +363,8 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
316
363
|
const isFirst = !context.isEInternalized(term);
|
|
317
364
|
this.internalizeArgs(term);
|
|
318
365
|
this.mkEnode(term);
|
|
319
|
-
|
|
366
|
+
const thVar = this.mkVar(term);
|
|
367
|
+
addVar(index, thVar);
|
|
320
368
|
index++;
|
|
321
369
|
if (isFirst) {
|
|
322
370
|
if (op === OP_DIV) {
|
|
@@ -356,9 +404,39 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
356
404
|
context.internalize(quotient, false);
|
|
357
405
|
nla.divisions.addDivisibility(this.registerDivision(quotient, term));
|
|
358
406
|
}
|
|
407
|
+
} else if (op === OP_REM) {
|
|
408
|
+
if (!this.isNonzeroNumeral(manager.getArg(term, 1))) this.foundUnderspecified(term);
|
|
359
409
|
} else if (op === OP_IDIV0 || op === OP_MOD0) {
|
|
360
410
|
manager.pushArgs(term, toEnsureVar);
|
|
411
|
+
} else if (TRANSCENDENTAL_OPS.has(op)) {
|
|
412
|
+
const nla = this.ensureNla();
|
|
413
|
+
const arg = manager.getArg(term, 0);
|
|
414
|
+
this.internalizeTermCore(arg);
|
|
415
|
+
const argVar = this.mkVar(arg);
|
|
416
|
+
nla.transcendentals.add(
|
|
417
|
+
TRANSCENDENTAL_OPS.get(op)!,
|
|
418
|
+
this.registerVar(argVar),
|
|
419
|
+
this.registerVar(thVar),
|
|
420
|
+
);
|
|
421
|
+
toEnsureVar.push(arg);
|
|
422
|
+
} else if (op === OP_ATAN2) {
|
|
423
|
+
const nla = this.ensureNla();
|
|
424
|
+
const y = manager.getArg(term, 0);
|
|
425
|
+
const x = manager.getArg(term, 1);
|
|
426
|
+
this.internalizeTermCore(y);
|
|
427
|
+
this.internalizeTermCore(x);
|
|
428
|
+
const yVar = this.mkVar(y);
|
|
429
|
+
const xVar = this.mkVar(x);
|
|
430
|
+
nla.transcendentals.addAtan2(
|
|
431
|
+
this.registerVar(yVar),
|
|
432
|
+
this.registerVar(xVar),
|
|
433
|
+
this.registerVar(thVar),
|
|
434
|
+
);
|
|
435
|
+
toEnsureVar.push(y, x);
|
|
436
|
+
} else if (op === OP_PI) {
|
|
437
|
+
this.ensureNla().transcendentals.addPi(this.registerVar(thVar));
|
|
361
438
|
} else if (op !== OP_TO_INT && op !== OP_DIV0) {
|
|
439
|
+
if (op === OP_POWER) this.ensureNla();
|
|
362
440
|
this.foundUnsupported(term);
|
|
363
441
|
manager.pushArgs(term, toEnsureVar);
|
|
364
442
|
}
|
|
@@ -1,16 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
FAMILY_ARITH,
|
|
4
|
-
FAMILY_BASIC,
|
|
5
|
-
OP_DIV,
|
|
6
|
-
OP_DIV0,
|
|
7
|
-
OP_IDIV,
|
|
8
|
-
OP_IDIV0,
|
|
9
|
-
OP_ITE,
|
|
10
|
-
OP_MOD,
|
|
11
|
-
OP_MOD0,
|
|
12
|
-
} from "./ast";
|
|
13
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
1
|
+
import { OP_DIV, OP_DIV0, OP_IDIV, OP_IDIV0, OP_MOD, OP_MOD0, OP_POWER0, OP_REM } from "./ast";
|
|
14
2
|
import type { Enode } from "./enode";
|
|
15
3
|
import type { ProtoModel } from "./proto-model";
|
|
16
4
|
import { Rational } from "./rational";
|
|
@@ -35,7 +23,7 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
35
23
|
}
|
|
36
24
|
|
|
37
25
|
private isRelevantAndShared(node: Enode) {
|
|
38
|
-
return this.context.isRelevant(node.owner) && this.isShared(node);
|
|
26
|
+
return this.context.isRelevant(node.owner) && this.context.isShared(node);
|
|
39
27
|
}
|
|
40
28
|
|
|
41
29
|
private randomUpdate() {
|
|
@@ -137,19 +125,21 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
137
125
|
}
|
|
138
126
|
|
|
139
127
|
mkValue(node: Enode) {
|
|
140
|
-
|
|
128
|
+
const thVar = this.getThVar(node);
|
|
129
|
+
if (thVar < 0) return undefined;
|
|
141
130
|
const nla = this.nla;
|
|
142
131
|
if (
|
|
143
132
|
nla === undefined ||
|
|
144
133
|
!nla.isUsingNraModel ||
|
|
145
|
-
this.solver.externalToLocalColumn(
|
|
134
|
+
this.solver.externalToLocalColumn(thVar) === NULL_LPVAR
|
|
146
135
|
)
|
|
147
|
-
return this.getValueExpr(
|
|
148
|
-
const value = this.getNlValue(nla,
|
|
149
|
-
if (this.isIntVar(
|
|
150
|
-
return this.manager.mkNumeral(
|
|
151
|
-
|
|
152
|
-
|
|
136
|
+
return this.getValueExpr(thVar);
|
|
137
|
+
const value = this.getNlValue(nla, thVar);
|
|
138
|
+
if (this.isIntVar(thVar))
|
|
139
|
+
return this.manager.mkNumeral(
|
|
140
|
+
value.value instanceof Rational && value.value.isInt() ? value.value.num : 0n,
|
|
141
|
+
);
|
|
142
|
+
return this.manager.mkAlgebraicNumeral(value);
|
|
153
143
|
}
|
|
154
144
|
|
|
155
145
|
private isEq(first: number, second: number) {
|
|
@@ -191,22 +181,11 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
191
181
|
: this.manager.mkRealNumeral(value);
|
|
192
182
|
}
|
|
193
183
|
|
|
194
|
-
|
|
195
|
-
const root = node.root;
|
|
196
|
-
if (this.manager.getOp(root.owner) === OP_ITE) return true;
|
|
197
|
-
if (root.thVar < 0) return false;
|
|
198
|
-
if (this.context.qmanager.isShared(root)) return true;
|
|
199
|
-
for (const parent of root.parents) {
|
|
200
|
-
const family = this.manager.getFamily(parent.owner);
|
|
201
|
-
if (family !== FAMILY_ARITH && family !== FAMILY_BASIC) return true;
|
|
202
|
-
}
|
|
203
|
-
return this.isSharedWithUnderspecified(root);
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
private isSharedWithUnderspecified(root: Enode) {
|
|
184
|
+
override isShared(thVar: number) {
|
|
207
185
|
const manager = this.manager;
|
|
208
186
|
const count = this.underspecifiedTerms.length;
|
|
209
187
|
if (count === 0) return false;
|
|
188
|
+
const root = this.getEnode(thVar).root;
|
|
210
189
|
if (root.parents.length > 2 * count)
|
|
211
190
|
return this.underspecifiedTerms.some((term) =>
|
|
212
191
|
manager.someArg(term, (arg) => this.context.getEnode(arg)?.root === root),
|
|
@@ -214,11 +193,17 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
214
193
|
return root.parents.some((parent) => this.isUnderspecified(parent.owner));
|
|
215
194
|
}
|
|
216
195
|
|
|
196
|
+
override includeFuncInterp(decl: number) {
|
|
197
|
+
const op = this.manager.funcDecls[decl].op;
|
|
198
|
+
return op === OP_DIV0 || op === OP_IDIV0 || op === OP_POWER0 || op === OP_MOD0;
|
|
199
|
+
}
|
|
200
|
+
|
|
217
201
|
private isUnderspecified(expr: number) {
|
|
218
202
|
const op = this.manager.getOp(expr);
|
|
219
203
|
return (
|
|
220
204
|
op === OP_DIV ||
|
|
221
205
|
op === OP_IDIV ||
|
|
206
|
+
op === OP_REM ||
|
|
222
207
|
op === OP_MOD ||
|
|
223
208
|
op === OP_DIV0 ||
|
|
224
209
|
op === OP_IDIV0 ||
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_ITE, OP_SUB, SORT_BOOL } from "./ast";
|
|
3
2
|
import { TheoryJustification } from "./enode";
|
|
4
|
-
import { getIdentityHash, ObjMap } from "./hashtable";
|
|
5
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
6
4
|
import { Literal, negate } from "./literal";
|
|
7
5
|
import { Rational } from "./rational";
|
|
@@ -10,8 +8,8 @@ import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./lp/co
|
|
|
10
8
|
import { LP_INFEASIBLE } from "./lp/core-solver";
|
|
11
9
|
import { Dependency, linearize, mkJoin, mkLeaf } from "./lp/dependency";
|
|
12
10
|
import { Explanation } from "./lp/explanation";
|
|
13
|
-
import type { LarTerm } from "./lp/lar-term";
|
|
14
11
|
import { getAtomLiteral, TheoryLraBounds } from "./theory-lra-bounds";
|
|
12
|
+
import { getTermCoeffs } from "./arith-terms";
|
|
15
13
|
import type { ApiBound } from "./theory-lra-internalize";
|
|
16
14
|
|
|
17
15
|
const NULL_THEORY_VAR = -1;
|
|
@@ -35,10 +33,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
35
33
|
private delayIneqsQhead = 0;
|
|
36
34
|
protected explanation = new Explanation();
|
|
37
35
|
protected coreLiterals: Literal[] = [];
|
|
38
|
-
protected numConflicts = 0;
|
|
39
36
|
private lowerTerms: (TermBound | undefined)[] = [];
|
|
40
37
|
private upperTerms: (TermBound | undefined)[] = [];
|
|
41
38
|
protected isModelInitialized = false;
|
|
39
|
+
private activeInfEpsConstraints: number[] = [];
|
|
42
40
|
|
|
43
41
|
canPropagate() {
|
|
44
42
|
return (
|
|
@@ -121,6 +119,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
121
119
|
const constraint = isTrue ? bound.constraintTrue : bound.constraintFalse;
|
|
122
120
|
if (solver.constraintIsRedundant(constraint)) return solver.status !== LP_INFEASIBLE;
|
|
123
121
|
solver.activate(constraint);
|
|
122
|
+
if (isTrue && !bound.eps.isZero()) {
|
|
123
|
+
this.context.pushTrail(() => this.activeInfEpsConstraints.pop());
|
|
124
|
+
this.activeInfEpsConstraints.push(constraint);
|
|
125
|
+
}
|
|
124
126
|
if (solver.status === LP_INFEASIBLE) return false;
|
|
125
127
|
const kind = this.getBoundKind(bound, isTrue);
|
|
126
128
|
const value = isTrue
|
|
@@ -128,7 +130,8 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
128
130
|
: bound.isLower
|
|
129
131
|
? bound.value.sub(Rational.one)
|
|
130
132
|
: bound.value.add(Rational.one);
|
|
131
|
-
if (
|
|
133
|
+
if (isTrue ? bound.eps.isZero() : bound.isInt)
|
|
134
|
+
this.propagateEqs(bound.column, constraint, kind, bound, value);
|
|
132
135
|
return true;
|
|
133
136
|
}
|
|
134
137
|
|
|
@@ -231,7 +234,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
231
234
|
|
|
232
235
|
private propagateOffsetEq(column: number, dep: Dependency, value: Rational) {
|
|
233
236
|
if (!value.isZero() || !this.solver.hasTerm(column)) return false;
|
|
234
|
-
const coeffs =
|
|
237
|
+
const coeffs = getTermCoeffs(this.solver, this.solver.getTerm(column));
|
|
235
238
|
if (coeffs.length !== 2) return false;
|
|
236
239
|
const first = coeffs[0];
|
|
237
240
|
const second = coeffs[1];
|
|
@@ -244,28 +247,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
244
247
|
return true;
|
|
245
248
|
}
|
|
246
249
|
|
|
247
|
-
protected getTermCoeffs(term: LarTerm) {
|
|
248
|
-
const coeffs = new ObjMap<Rational>(getIdentityHash);
|
|
249
|
-
const visit = (current: LarTerm, coeff: Rational) => {
|
|
250
|
-
for (const entry of current.coeffs) {
|
|
251
|
-
if (this.solver.hasTerm(entry[0])) {
|
|
252
|
-
visit(this.solver.getTerm(entry[0]), coeff.mul(entry[1]));
|
|
253
|
-
continue;
|
|
254
|
-
}
|
|
255
|
-
const thVar = this.solver.getExternal(entry[0]);
|
|
256
|
-
const sum = (coeffs.get(thVar) ?? Rational.zero).add(entry[1].mul(coeff));
|
|
257
|
-
if (coeffs.has(thVar)) coeffs.replace(thVar, sum);
|
|
258
|
-
else coeffs.set(thVar, sum);
|
|
259
|
-
}
|
|
260
|
-
};
|
|
261
|
-
visit(term, Rational.one);
|
|
262
|
-
return [...coeffs];
|
|
263
|
-
}
|
|
264
|
-
|
|
265
250
|
private assignEq(first: number, second: number) {
|
|
266
251
|
this.context.pushEq(this.getEnode(first), this.getEnode(second), {
|
|
267
252
|
kind: "justification",
|
|
268
|
-
justification: new TheoryJustification(this.coreLiterals, []),
|
|
253
|
+
justification: new TheoryJustification(this.id, this.coreLiterals, []),
|
|
269
254
|
});
|
|
270
255
|
}
|
|
271
256
|
|
|
@@ -326,7 +311,19 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
326
311
|
}
|
|
327
312
|
}
|
|
328
313
|
|
|
314
|
+
// An implied bound keeps only a rational and a strict bit, so one explained by a bound with an
|
|
315
|
+
// infinitesimal could strengthen x >= r - eps into x > r.
|
|
329
316
|
private propagateLpSolverBound(implied: ImpliedBound) {
|
|
317
|
+
const epsConstraints = this.activeInfEpsConstraints;
|
|
318
|
+
if (
|
|
319
|
+
epsConstraints.length > 0 &&
|
|
320
|
+
implied
|
|
321
|
+
.explain()
|
|
322
|
+
.some((entry) =>
|
|
323
|
+
linearize([entry[1]]).some((constraint) => epsConstraints.includes(constraint)),
|
|
324
|
+
)
|
|
325
|
+
)
|
|
326
|
+
return;
|
|
330
327
|
const thVar = this.solver.getExternal(implied.column);
|
|
331
328
|
if (thVar === NULL_THEORY_VAR || this.unassignedBounds[thVar] === 0) return;
|
|
332
329
|
const context = this.context;
|
|
@@ -346,7 +343,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
346
343
|
this.explanation.addPair(constraint, entry[0]);
|
|
347
344
|
}
|
|
348
345
|
}
|
|
349
|
-
context.assign(literal, new TheoryJustification(this.coreLiterals, []));
|
|
346
|
+
context.assign(literal, new TheoryJustification(this.id, this.coreLiterals, []));
|
|
350
347
|
}
|
|
351
348
|
}
|
|
352
349
|
|
|
@@ -384,8 +381,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
384
381
|
|
|
385
382
|
protected setConflict() {
|
|
386
383
|
this.resetEvidence();
|
|
387
|
-
this.numConflicts++;
|
|
388
384
|
for (const constraint of this.explanation) this.setEvidence(constraint);
|
|
389
|
-
this.context.setConflict(new TheoryJustification(this.coreLiterals, []), null);
|
|
385
|
+
this.context.setConflict(new TheoryJustification(this.id, this.coreLiterals, []), null);
|
|
390
386
|
}
|
|
391
387
|
}
|
|
@@ -1,33 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
import type { AstManager } from "./ast";
|
|
1
|
+
import { FAMILY_ARITH } from "./ast";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
|
-
import type { Enode } from "./enode";
|
|
5
3
|
import { LarSolver } from "./lp/lar-solver";
|
|
4
|
+
import { Theory } from "./theory";
|
|
6
5
|
|
|
7
|
-
export abstract class TheoryLraState {
|
|
8
|
-
|
|
6
|
+
export abstract class TheoryLraState extends Theory {
|
|
7
|
+
readonly name = "arithmetic";
|
|
9
8
|
protected solver: LarSolver;
|
|
10
9
|
|
|
11
|
-
constructor(
|
|
10
|
+
constructor(context: Context) {
|
|
11
|
+
super(context, FAMILY_ARITH);
|
|
12
12
|
this.solver = new LarSolver(() => context.checkCanceled());
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
protected get manager(): AstManager {
|
|
16
|
-
return this.context.manager;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
getEnode(thVar: number) {
|
|
20
|
-
return this.varEnodes[thVar];
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
protected getExpr(thVar: number) {
|
|
24
|
-
return this.varEnodes[thVar].owner;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
protected getNumVars() {
|
|
28
|
-
return this.varEnodes.length;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
15
|
protected isIntExpr(expr: number) {
|
|
32
16
|
return this.manager.isInt(expr);
|
|
33
17
|
}
|