tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- 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 -16
- 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 +615 -53
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- 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 +338 -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 +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- 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 +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -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 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- 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 +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 -21
- 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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -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 +308 -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 +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- 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 +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +43 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -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 +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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,19 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
// values that it assumes.
|
|
4
|
-
import {
|
|
5
|
-
FAMILY_ARITH,
|
|
6
|
-
FAMILY_BASIC,
|
|
7
|
-
OP_DIV,
|
|
8
|
-
OP_DIV0,
|
|
9
|
-
OP_IDIV,
|
|
10
|
-
OP_IDIV0,
|
|
11
|
-
OP_ITE,
|
|
12
|
-
OP_MOD,
|
|
13
|
-
OP_MOD0,
|
|
14
|
-
} from "./ast";
|
|
15
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
16
|
-
import { Enode } from "./enode";
|
|
1
|
+
import { OP_DIV, OP_DIV0, OP_IDIV, OP_IDIV0, OP_MOD, OP_MOD0, OP_POWER0, OP_REM } from "./ast";
|
|
2
|
+
import type { Enode } from "./enode";
|
|
17
3
|
import type { ProtoModel } from "./proto-model";
|
|
18
4
|
import { Rational } from "./rational";
|
|
19
5
|
import { NULL_LPVAR } from "./lp/lar-solver";
|
|
@@ -30,18 +16,16 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
30
16
|
protected initVariableValues() {
|
|
31
17
|
this.isModelInitialized = false;
|
|
32
18
|
if (this.context.checkCanceled() || this.getNumVars() === 0) return;
|
|
33
|
-
const saved = this.isModelInitialized;
|
|
34
19
|
this.context.pushTrail(() => {
|
|
35
|
-
this.isModelInitialized =
|
|
20
|
+
this.isModelInitialized = false;
|
|
36
21
|
});
|
|
37
22
|
this.isModelInitialized = this.solver.initModel();
|
|
38
23
|
}
|
|
39
24
|
|
|
40
25
|
private isRelevantAndShared(node: Enode) {
|
|
41
|
-
return this.context.isRelevant(node.owner) && this.isShared(node);
|
|
26
|
+
return this.context.isRelevant(node.owner) && this.context.isShared(node);
|
|
42
27
|
}
|
|
43
28
|
|
|
44
|
-
// random_update: moves the values of shared variables that collide with others.
|
|
45
29
|
private randomUpdate() {
|
|
46
30
|
if (this.nla?.hasRelevantMonomial()) return;
|
|
47
31
|
const solver = this.solver;
|
|
@@ -70,7 +54,6 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
70
54
|
if (columns.length > 0) randomUpdate(solver, columns);
|
|
71
55
|
}
|
|
72
56
|
|
|
73
|
-
// assume_eqs: model-based theory combination.
|
|
74
57
|
protected assumeEqs() {
|
|
75
58
|
if (this.delayedAssumeEqs()) return true;
|
|
76
59
|
this.randomUpdate();
|
|
@@ -86,7 +69,6 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
86
69
|
const thVar = (index + start) % numVars;
|
|
87
70
|
if (!this.isRelevantAndShared(this.getEnode(thVar))) continue;
|
|
88
71
|
const column = this.registerVar(thVar);
|
|
89
|
-
// m_model_eqs: with nlsat's model, the values are compared one by one.
|
|
90
72
|
const key = `${this.isIntVar(thVar)}:${solver.getValue(column)}`;
|
|
91
73
|
const other = this.nla?.isUsingNraModel
|
|
92
74
|
? representatives.find(
|
|
@@ -130,8 +112,6 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
130
112
|
return false;
|
|
131
113
|
}
|
|
132
114
|
|
|
133
|
-
// init_model: the model knows the value of every theory variable without δ, so fresh numbers
|
|
134
|
-
// avoid them. Like get_value(enode*, expr_ref&), it skips an integer with a fractional value.
|
|
135
115
|
initModel(model: ProtoModel) {
|
|
136
116
|
this.initVariableValues();
|
|
137
117
|
if (!this.isModelInitialized) return;
|
|
@@ -144,25 +124,24 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
144
124
|
}
|
|
145
125
|
}
|
|
146
126
|
|
|
147
|
-
// mk_value: the value of the class of a root, rounded down for an integer.
|
|
148
127
|
mkValue(node: Enode) {
|
|
149
|
-
|
|
128
|
+
const thVar = this.getThVar(node);
|
|
129
|
+
if (thVar < 0) return undefined;
|
|
150
130
|
const nla = this.nla;
|
|
151
131
|
if (
|
|
152
132
|
nla === undefined ||
|
|
153
133
|
!nla.isUsingNraModel ||
|
|
154
|
-
this.solver.externalToLocalColumn(
|
|
134
|
+
this.solver.externalToLocalColumn(thVar) === NULL_LPVAR
|
|
155
135
|
)
|
|
156
|
-
return this.getValueExpr(
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return this.manager.
|
|
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);
|
|
163
143
|
}
|
|
164
144
|
|
|
165
|
-
// is_eq: whether two variables have the same value, in nlsat's model when nla uses it.
|
|
166
145
|
private isEq(first: number, second: number) {
|
|
167
146
|
const nla = this.nla;
|
|
168
147
|
if (nla !== undefined && nla.isUsingNraModel)
|
|
@@ -173,7 +152,6 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
173
152
|
.equals(solver.getValue(this.registerVar(second)));
|
|
174
153
|
}
|
|
175
154
|
|
|
176
|
-
// nl_value: the value of a variable in nlsat's model, a term's the sum over its columns.
|
|
177
155
|
private getNlValue(nla: NlaCore, thVar: number) {
|
|
178
156
|
const solver = this.solver;
|
|
179
157
|
const am = nla.nra.am;
|
|
@@ -181,8 +159,7 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
181
159
|
if (!solver.hasTerm(column)) return nla.nra.value(column);
|
|
182
160
|
let result = new Anum(Rational.zero);
|
|
183
161
|
const todo: [number, Rational][] = [[column, Rational.one]];
|
|
184
|
-
|
|
185
|
-
const pending = todo.pop()!;
|
|
162
|
+
for (let pending = todo.pop(); pending !== undefined; pending = todo.pop()) {
|
|
186
163
|
for (const entry of solver.getTerm(pending[0]).coeffs) {
|
|
187
164
|
const coeff = entry[1].mul(pending[1]);
|
|
188
165
|
if (solver.hasTerm(entry[0])) todo.push([entry[0], coeff]);
|
|
@@ -204,23 +181,11 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
204
181
|
: this.manager.mkRealNumeral(value);
|
|
205
182
|
}
|
|
206
183
|
|
|
207
|
-
|
|
208
|
-
const root = node.root;
|
|
209
|
-
if (this.manager.getOp(root.owner) === OP_ITE) return true;
|
|
210
|
-
if (root.thVar < 0) return false;
|
|
211
|
-
if (this.context.qmanager.isShared(root)) return true;
|
|
212
|
-
for (const parent of root.parents) {
|
|
213
|
-
const family = this.manager.getFamily(parent.owner);
|
|
214
|
-
if (family !== FAMILY_ARITH && family !== FAMILY_BASIC) return true;
|
|
215
|
-
}
|
|
216
|
-
return this.isSharedWithUnderspecified(root);
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
// theory_lra::is_shared: whether the class is an argument of a division by a term or by zero.
|
|
220
|
-
private isSharedWithUnderspecified(root: Enode) {
|
|
184
|
+
override isShared(thVar: number) {
|
|
221
185
|
const manager = this.manager;
|
|
222
186
|
const count = this.underspecifiedTerms.length;
|
|
223
187
|
if (count === 0) return false;
|
|
188
|
+
const root = this.getEnode(thVar).root;
|
|
224
189
|
if (root.parents.length > 2 * count)
|
|
225
190
|
return this.underspecifiedTerms.some((term) =>
|
|
226
191
|
manager.someArg(term, (arg) => this.context.getEnode(arg)?.root === root),
|
|
@@ -228,12 +193,17 @@ export abstract class TheoryLraModel extends TheoryLraPropagate {
|
|
|
228
193
|
return root.parents.some((parent) => this.isUnderspecified(parent.owner));
|
|
229
194
|
}
|
|
230
195
|
|
|
231
|
-
|
|
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
|
+
|
|
232
201
|
private isUnderspecified(expr: number) {
|
|
233
202
|
const op = this.manager.getOp(expr);
|
|
234
203
|
return (
|
|
235
204
|
op === OP_DIV ||
|
|
236
205
|
op === OP_IDIV ||
|
|
206
|
+
op === OP_REM ||
|
|
237
207
|
op === OP_MOD ||
|
|
238
208
|
op === OP_DIV0 ||
|
|
239
209
|
op === OP_IDIV0 ||
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt. How theory_lra
|
|
2
|
-
// propagates: asserted bounds go to the lp solver, the tableau is made feasible, and implied bounds
|
|
3
|
-
// and equalities of fixed columns come back as literals and equalities.
|
|
4
1
|
import { OP_ITE, OP_SUB, SORT_BOOL } from "./ast";
|
|
5
2
|
import { TheoryJustification } from "./enode";
|
|
6
|
-
import { getIdentityHash, ObjMap } from "./hashtable";
|
|
7
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
8
4
|
import { Literal, negate } from "./literal";
|
|
9
5
|
import { Rational } from "./rational";
|
|
@@ -12,8 +8,8 @@ import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./lp/co
|
|
|
12
8
|
import { LP_INFEASIBLE } from "./lp/core-solver";
|
|
13
9
|
import { Dependency, linearize, mkJoin, mkLeaf } from "./lp/dependency";
|
|
14
10
|
import { Explanation } from "./lp/explanation";
|
|
15
|
-
import type { LarTerm } from "./lp/lar-term";
|
|
16
11
|
import { getAtomLiteral, TheoryLraBounds } from "./theory-lra-bounds";
|
|
12
|
+
import { getTermCoeffs } from "./arith-terms";
|
|
17
13
|
import type { ApiBound } from "./theory-lra-internalize";
|
|
18
14
|
|
|
19
15
|
const NULL_THEORY_VAR = -1;
|
|
@@ -41,6 +37,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
41
37
|
private lowerTerms: (TermBound | undefined)[] = [];
|
|
42
38
|
private upperTerms: (TermBound | undefined)[] = [];
|
|
43
39
|
protected isModelInitialized = false;
|
|
40
|
+
private activeInfEpsConstraints: number[] = [];
|
|
44
41
|
|
|
45
42
|
canPropagate() {
|
|
46
43
|
return (
|
|
@@ -55,7 +52,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
55
52
|
this.propagateCore();
|
|
56
53
|
}
|
|
57
54
|
|
|
58
|
-
// propagate_core: whether there was anything to propagate.
|
|
59
55
|
protected propagateCore() {
|
|
60
56
|
const context = this.context;
|
|
61
57
|
this.isModelInitialized = false;
|
|
@@ -124,6 +120,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
124
120
|
const constraint = isTrue ? bound.constraintTrue : bound.constraintFalse;
|
|
125
121
|
if (solver.constraintIsRedundant(constraint)) return solver.status !== LP_INFEASIBLE;
|
|
126
122
|
solver.activate(constraint);
|
|
123
|
+
if (isTrue && !bound.eps.isZero()) {
|
|
124
|
+
this.context.pushTrail(() => this.activeInfEpsConstraints.pop());
|
|
125
|
+
this.activeInfEpsConstraints.push(constraint);
|
|
126
|
+
}
|
|
127
127
|
if (solver.status === LP_INFEASIBLE) return false;
|
|
128
128
|
const kind = this.getBoundKind(bound, isTrue);
|
|
129
129
|
const value = isTrue
|
|
@@ -131,11 +131,11 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
131
131
|
: bound.isLower
|
|
132
132
|
? bound.value.sub(Rational.one)
|
|
133
133
|
: bound.value.add(Rational.one);
|
|
134
|
-
if (
|
|
134
|
+
if (isTrue ? bound.eps.isZero() : bound.isInt)
|
|
135
|
+
this.propagateEqs(bound.column, constraint, kind, bound, value);
|
|
135
136
|
return true;
|
|
136
137
|
}
|
|
137
138
|
|
|
138
|
-
// propagate_eqs: a bound that fixes a column, with the opposite bound of the same value.
|
|
139
139
|
private propagateEqs(
|
|
140
140
|
column: number,
|
|
141
141
|
constraint: number,
|
|
@@ -151,7 +151,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
151
151
|
this.fixedVarEh(bound.thVar, column, mkJoin(mkLeaf(constraint), opposite), value);
|
|
152
152
|
}
|
|
153
153
|
|
|
154
|
-
// set_bound: records the bound of a term column, or checks that a column has the bound.
|
|
155
154
|
private setTermBound(column: number, constraint: number, value: Rational, isLower: boolean) {
|
|
156
155
|
const solver = this.solver;
|
|
157
156
|
if (!solver.hasTerm(column)) {
|
|
@@ -172,7 +171,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
172
171
|
return true;
|
|
173
172
|
}
|
|
174
173
|
|
|
175
|
-
// has_bound: the dependency of a bound of the column with the value, if it has one.
|
|
176
174
|
private getFixingBound(
|
|
177
175
|
column: number,
|
|
178
176
|
value: Rational,
|
|
@@ -199,7 +197,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
199
197
|
return this.getEnode(first).root === this.getEnode(second).root;
|
|
200
198
|
}
|
|
201
199
|
|
|
202
|
-
// report_equality_of_fixed_vars: two columns fixed to the same value are equal.
|
|
203
200
|
protected reportEqualityOfFixedVars(first: number, second: number) {
|
|
204
201
|
const solver = this.solver;
|
|
205
202
|
const v1 = solver.getExternal(first);
|
|
@@ -220,8 +217,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
220
217
|
this.assignEq(v1, v2);
|
|
221
218
|
}
|
|
222
219
|
|
|
223
|
-
// fixed_var_eh: a column fixed to a value is equal to an offset term, or to the variable of the
|
|
224
|
-
// numeral with that value.
|
|
225
220
|
private fixedVarEh(thVar: number, column: number, dep: Dependency, value: Rational) {
|
|
226
221
|
if (this.propagateOffsetEq(column, dep, value)) return;
|
|
227
222
|
const isInt = this.isIntVar(thVar);
|
|
@@ -238,10 +233,9 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
238
233
|
this.assignEq(thVar, other);
|
|
239
234
|
}
|
|
240
235
|
|
|
241
|
-
// propagate_offset_eq: x - y fixed to 0 makes x and y equal.
|
|
242
236
|
private propagateOffsetEq(column: number, dep: Dependency, value: Rational) {
|
|
243
237
|
if (!value.isZero() || !this.solver.hasTerm(column)) return false;
|
|
244
|
-
const coeffs =
|
|
238
|
+
const coeffs = getTermCoeffs(this.solver, this.solver.getTerm(column));
|
|
245
239
|
if (coeffs.length !== 2) return false;
|
|
246
240
|
const first = coeffs[0];
|
|
247
241
|
const second = coeffs[1];
|
|
@@ -254,34 +248,13 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
254
248
|
return true;
|
|
255
249
|
}
|
|
256
250
|
|
|
257
|
-
// term2coeffs: the coefficients of the theory variables of a term, with term columns expanded,
|
|
258
|
-
// in the slot order of Z3's u_map.
|
|
259
|
-
protected getTermCoeffs(term: LarTerm) {
|
|
260
|
-
const coeffs = new ObjMap<Rational>(getIdentityHash);
|
|
261
|
-
const visit = (current: LarTerm, coeff: Rational) => {
|
|
262
|
-
for (const entry of current.coeffs) {
|
|
263
|
-
if (this.solver.hasTerm(entry[0])) {
|
|
264
|
-
visit(this.solver.getTerm(entry[0]), coeff.mul(entry[1]));
|
|
265
|
-
continue;
|
|
266
|
-
}
|
|
267
|
-
const thVar = this.solver.getExternal(entry[0]);
|
|
268
|
-
const sum = (coeffs.get(thVar) ?? Rational.zero).add(entry[1].mul(coeff));
|
|
269
|
-
if (coeffs.has(thVar)) coeffs.replace(thVar, sum);
|
|
270
|
-
else coeffs.set(thVar, sum);
|
|
271
|
-
}
|
|
272
|
-
};
|
|
273
|
-
visit(term, Rational.one);
|
|
274
|
-
return [...coeffs];
|
|
275
|
-
}
|
|
276
|
-
|
|
277
251
|
private assignEq(first: number, second: number) {
|
|
278
252
|
this.context.pushEq(this.getEnode(first), this.getEnode(second), {
|
|
279
253
|
kind: "justification",
|
|
280
|
-
justification: new TheoryJustification(this.coreLiterals, []),
|
|
254
|
+
justification: new TheoryJustification(this.id, this.coreLiterals, []),
|
|
281
255
|
});
|
|
282
256
|
}
|
|
283
257
|
|
|
284
|
-
// add_eq: an equality that the lp solver implies, with its explanation.
|
|
285
258
|
protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
|
|
286
259
|
if (this.context.isInconsistent()) return false;
|
|
287
260
|
const v1 = this.solver.getExternal(first);
|
|
@@ -339,7 +312,19 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
339
312
|
}
|
|
340
313
|
}
|
|
341
314
|
|
|
315
|
+
// An implied bound keeps only a rational and a strict bit, so one explained by a bound with an
|
|
316
|
+
// infinitesimal could strengthen x >= r - eps into x > r.
|
|
342
317
|
private propagateLpSolverBound(implied: ImpliedBound) {
|
|
318
|
+
const epsConstraints = this.activeInfEpsConstraints;
|
|
319
|
+
if (
|
|
320
|
+
epsConstraints.length > 0 &&
|
|
321
|
+
implied
|
|
322
|
+
.explain()
|
|
323
|
+
.some((entry) =>
|
|
324
|
+
linearize([entry[1]]).some((constraint) => epsConstraints.includes(constraint)),
|
|
325
|
+
)
|
|
326
|
+
)
|
|
327
|
+
return;
|
|
343
328
|
const thVar = this.solver.getExternal(implied.column);
|
|
344
329
|
if (thVar === NULL_THEORY_VAR || this.unassignedBounds[thVar] === 0) return;
|
|
345
330
|
const context = this.context;
|
|
@@ -359,11 +344,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
359
344
|
this.explanation.addPair(constraint, entry[0]);
|
|
360
345
|
}
|
|
361
346
|
}
|
|
362
|
-
context.assign(literal, new TheoryJustification(this.coreLiterals, []));
|
|
347
|
+
context.assign(literal, new TheoryJustification(this.id, this.coreLiterals, []));
|
|
363
348
|
}
|
|
364
349
|
}
|
|
365
350
|
|
|
366
|
-
// is_bound_implied: the literal of the bound that the implied bound makes true or false.
|
|
367
351
|
private isBoundImplied(kind: ConstraintKind, value: Rational, bound: ApiBound) {
|
|
368
352
|
const literal = getAtomLiteral(bound);
|
|
369
353
|
const comparison = value.compare(bound.value);
|
|
@@ -400,6 +384,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
400
384
|
this.resetEvidence();
|
|
401
385
|
this.numConflicts++;
|
|
402
386
|
for (const constraint of this.explanation) this.setEvidence(constraint);
|
|
403
|
-
this.context.setConflict(new TheoryJustification(this.coreLiterals, []), null);
|
|
387
|
+
this.context.setConflict(new TheoryJustification(this.id, this.coreLiterals, []), null);
|
|
404
388
|
}
|
|
405
389
|
}
|
|
@@ -1,38 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
// that every part of it shares: the lp solver, the theory variables and their enodes, the bounds of
|
|
3
|
-
// atoms, and what the scopes undo. The theory is a chain of classes, one file each, from this state
|
|
4
|
-
// to TheoryLra, so each part reaches the ones before it.
|
|
5
|
-
import { AstManager } from "./ast";
|
|
1
|
+
import { FAMILY_ARITH } from "./ast";
|
|
6
2
|
import type { Context } from "./context";
|
|
7
|
-
import { Enode } from "./enode";
|
|
8
3
|
import { LarSolver } from "./lp/lar-solver";
|
|
4
|
+
import { Theory } from "./theory";
|
|
9
5
|
|
|
10
|
-
export abstract class TheoryLraState {
|
|
11
|
-
|
|
6
|
+
export abstract class TheoryLraState extends Theory {
|
|
7
|
+
readonly name = "arithmetic";
|
|
12
8
|
protected solver: LarSolver;
|
|
13
9
|
|
|
14
|
-
constructor(
|
|
10
|
+
constructor(context: Context) {
|
|
11
|
+
super(context, FAMILY_ARITH);
|
|
15
12
|
this.solver = new LarSolver(() => context.checkCanceled());
|
|
16
13
|
}
|
|
17
14
|
|
|
18
|
-
protected get manager(): AstManager {
|
|
19
|
-
return this.context.manager;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
// get_enode, get_expr and get_num_vars: the theory reaches enodes only through these and
|
|
23
|
-
// isEqual.
|
|
24
|
-
getEnode(thVar: number) {
|
|
25
|
-
return this.varEnodes[thVar];
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
protected getExpr(thVar: number) {
|
|
29
|
-
return this.varEnodes[thVar].owner;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
protected getNumVars() {
|
|
33
|
-
return this.varEnodes.length;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
15
|
protected isIntExpr(expr: number) {
|
|
37
16
|
return this.manager.isInt(expr);
|
|
38
17
|
}
|
|
@@ -1,15 +1,195 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp, src/smt/arith_eq_adapter.cpp, src/math/lp/lp_api.h), MIT
|
|
2
|
-
// license, see z3-license.txt. Linear integer and real arithmetic, as the theory_lra solver that
|
|
3
|
-
// Z3's default configuration uses for UFNIA. Terms become columns of the lp solver, integer or not
|
|
4
|
-
// by their sort, atoms become bounds on them, propagation makes the tableau feasible and propagates
|
|
5
|
-
// implied bounds and equalities, and the final check runs the integer solver and assumes equalities
|
|
6
|
-
// between shared terms with equal values. Nonlinear products and divisions go to nla
|
|
7
|
-
// (src/math/lp/nla_core.cpp), which refines the model with lemmas, and runs nlsat on what they
|
|
8
|
-
// leave open. This class adds the scopes to the chain of classes that theory-lra-state.ts starts.
|
|
9
1
|
import { shrink } from "./array";
|
|
2
|
+
import { coeffsToApp, getTermCoeffs } from "./arith-terms";
|
|
3
|
+
import { OP_GE, OP_GT, OP_LE, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
4
|
+
import type { Enode } from "./enode";
|
|
5
|
+
import { InfEps } from "./inf-eps";
|
|
6
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
7
|
+
import type { BoolVar } from "./literal";
|
|
8
|
+
import { LP_FEASIBLE, LP_OPTIMAL, LP_UNBOUNDED } from "./lp/core-solver";
|
|
9
|
+
import { type Dependency, linearize } from "./lp/dependency";
|
|
10
|
+
import { NULL_LPVAR } from "./lp/lar-solver";
|
|
11
|
+
import { maximizeTerm } from "./lp/maximize-term";
|
|
12
|
+
import { Impq } from "./lp/numeric-pair";
|
|
13
|
+
import { Rational } from "./rational";
|
|
14
|
+
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./theory";
|
|
10
15
|
import { TheoryLraFinalCheck } from "./theory-lra-final-check";
|
|
11
16
|
|
|
17
|
+
export interface ArithBound {
|
|
18
|
+
value: Rational;
|
|
19
|
+
isStrict: boolean;
|
|
20
|
+
}
|
|
21
|
+
|
|
12
22
|
export class TheoryLra extends TheoryLraFinalCheck {
|
|
23
|
+
private getColumnOf(node: Enode) {
|
|
24
|
+
const thVar = node.getThVar(this.id);
|
|
25
|
+
return thVar < 0 ? NULL_LPVAR : this.solver.externalToLocalColumn(thVar);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
getLower(node: Enode): ArithBound | undefined {
|
|
29
|
+
const column = this.getColumnOf(node);
|
|
30
|
+
const bound = column === NULL_LPVAR ? undefined : this.solver.getLowerBoundOf(column);
|
|
31
|
+
return bound === undefined ? undefined : { value: bound.x, isStrict: bound.y.isPositive() };
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
getUpper(node: Enode): ArithBound | undefined {
|
|
35
|
+
const column = this.getColumnOf(node);
|
|
36
|
+
const bound = column === NULL_LPVAR ? undefined : this.solver.getUpperBoundOf(column);
|
|
37
|
+
return bound === undefined ? undefined : { value: bound.x, isStrict: bound.y.isNegative() };
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
getValueOf(node: Enode) {
|
|
41
|
+
const column = this.getColumnOf(node);
|
|
42
|
+
const value = column === NULL_LPVAR ? undefined : this.solver.getExactValue(column);
|
|
43
|
+
if (value === undefined) return undefined;
|
|
44
|
+
return this.isIntVar(node.getThVar(this.id)) && !value.isInt() ? undefined : value;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// The phase that holds in the current assignment, so that the decision takes no pivot.
|
|
48
|
+
getPhase(boolVar: BoolVar) {
|
|
49
|
+
const bound = this.boolVarToBound[boolVar];
|
|
50
|
+
if (bound === undefined) return L_UNDEF;
|
|
51
|
+
const comparison = this.solver
|
|
52
|
+
.getValue(this.registerVar(bound.thVar))
|
|
53
|
+
.compare(new Impq(bound.value, Rational.zero));
|
|
54
|
+
return (bound.isLower ? comparison >= 0 : comparison <= 0) ? L_TRUE : L_FALSE;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
addObjective(term: number) {
|
|
58
|
+
const thVar = this.internalizeDef(term);
|
|
59
|
+
this.registerVar(thVar);
|
|
60
|
+
return thVar;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// With isComputingUpper, the maximum of the linear relaxation is also an upper bound of the
|
|
64
|
+
// objective when the bounds that prove it hold; it holds globally when they hold at the base
|
|
65
|
+
// level.
|
|
66
|
+
maximize(thVar: number, isComputingUpper = false) {
|
|
67
|
+
const solver = this.solver;
|
|
68
|
+
if (solver.hasIntVar()) solver.core.backupX();
|
|
69
|
+
const column = solver.externalToLocalColumn(thVar);
|
|
70
|
+
if (column === NULL_LPVAR || !this.manager.limit.inc())
|
|
71
|
+
return { ...this.getMaxResult(thVar, LP_UNBOUNDED, Impq.zero), upper: null };
|
|
72
|
+
const maximum = this.maximizeWithLp(column, isComputingUpper);
|
|
73
|
+
const result =
|
|
74
|
+
this.nla !== undefined && (maximum.status === LP_OPTIMAL || maximum.status === LP_UNBOUNDED)
|
|
75
|
+
? this.maximizeWithNla(thVar, column, maximum.value)
|
|
76
|
+
: this.getMaxResult(thVar, maximum.status, maximum.value);
|
|
77
|
+
return { ...result, upper: maximum.upper };
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
private maximizeWithLp(column: number, isComputingUpper: boolean) {
|
|
81
|
+
const solver = this.solver;
|
|
82
|
+
if (!solver.isFeasible() || solver.columnsWithChangedBounds.size > 0) this.makeFeasible();
|
|
83
|
+
const isDual = isComputingUpper && this.nla !== undefined;
|
|
84
|
+
const maximum = maximizeTerm(solver, column, true, isDual);
|
|
85
|
+
const premises =
|
|
86
|
+
isDual && maximum.status === LP_OPTIMAL && !this.manager.limit.isExhausted()
|
|
87
|
+
? this.getBoundPremises(maximum.dependency)
|
|
88
|
+
: null;
|
|
89
|
+
const upper =
|
|
90
|
+
premises === null ? null : { value: maximum.value.x, isGlobal: premises.isGlobal };
|
|
91
|
+
if (!solver.hasIntVar() || !solver.hasInfInt()) return { ...maximum, upper };
|
|
92
|
+
solver.restoreX();
|
|
93
|
+
return { status: LP_FEASIBLE, value: maximum.value, upper };
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
private getBoundPremises(dependency: Dependency) {
|
|
97
|
+
const context = this.context;
|
|
98
|
+
let isGlobal = true;
|
|
99
|
+
for (const constraint of linearize([dependency])) {
|
|
100
|
+
const literal = this.constraintSources[constraint];
|
|
101
|
+
if (literal === undefined) return null;
|
|
102
|
+
if (literal === null) continue;
|
|
103
|
+
if (context.getAssignment(literal) !== L_TRUE) return null;
|
|
104
|
+
isGlobal &&= context.getAssignLevel(literal) <= context.baseLevel;
|
|
105
|
+
}
|
|
106
|
+
return { isGlobal };
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// The optimum of the linear relaxation is only a hint here, and its epsilon comes from the
|
|
110
|
+
// linearization, so it is dropped.
|
|
111
|
+
private maximizeWithNla(thVar: number, column: number, value: Impq) {
|
|
112
|
+
const solver = this.solver;
|
|
113
|
+
const relaxed = solver.getValue(column);
|
|
114
|
+
const nlaStatus = this.checkNla(2);
|
|
115
|
+
if (nlaStatus === FC_GIVEUP) {
|
|
116
|
+
solver.restoreX();
|
|
117
|
+
return this.getMaxResult(thVar, LP_UNBOUNDED, value);
|
|
118
|
+
}
|
|
119
|
+
if (nlaStatus === FC_CONTINUE) solver.restoreX();
|
|
120
|
+
return {
|
|
121
|
+
value: InfEps.of(relaxed.x),
|
|
122
|
+
blocker: this.mkGt(thVar, nlaStatus === FC_DONE ? solver.getValue(column) : relaxed),
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
private getMaxResult(thVar: number, status: number, value: Impq) {
|
|
127
|
+
if (status === LP_UNBOUNDED) return { value: InfEps.infinity, blocker: this.manager.falseExpr };
|
|
128
|
+
if (status === LP_OPTIMAL) this.initVariableValues();
|
|
129
|
+
return { value: InfEps.of(value.x, value.y), blocker: this.mkGt(thVar, value) };
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
private mkGt(thVar: number, value: Impq) {
|
|
133
|
+
const manager = this.manager;
|
|
134
|
+
const term = this.getExpr(thVar);
|
|
135
|
+
if (manager.isInt(term)) {
|
|
136
|
+
const bound = value.x.isInt() ? value.x.add(Rational.one) : value.x.ceil();
|
|
137
|
+
return manager.mkApp(OP_GE, [term, manager.mkNumeralOfSort(bound, SORT_INT)], SORT_BOOL);
|
|
138
|
+
}
|
|
139
|
+
const bound = manager.mkNumeralOfSort(value.x, SORT_REAL);
|
|
140
|
+
return manager.mkApp(value.y.isNegative() ? OP_GE : OP_GT, [term, bound], SORT_BOOL);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
// The objective as a sum over the variables of its term, so the bound reads as the objective.
|
|
144
|
+
private mkObjective(thVar: number) {
|
|
145
|
+
const column = this.solver.externalToLocalColumn(thVar);
|
|
146
|
+
const term = this.getExpr(thVar);
|
|
147
|
+
if (!this.solver.hasTerm(column)) return term;
|
|
148
|
+
return coeffsToApp(
|
|
149
|
+
this.manager,
|
|
150
|
+
getTermCoeffs(this.solver, this.solver.getTerm(column)),
|
|
151
|
+
this.manager.isInt(term),
|
|
152
|
+
(other) => this.getExpr(other),
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// A negative infinitesimal is the lower bound r - delta that validates a strict supremum r. No
|
|
157
|
+
// atom states it, and the atom v >= r may already hold the problem's own bound, so the bound gets
|
|
158
|
+
// a predicate of its own.
|
|
159
|
+
mkGe(thVar: number, bound: InfEps) {
|
|
160
|
+
const manager = this.manager;
|
|
161
|
+
const isStrict = bound.epsilon.isPositive();
|
|
162
|
+
const isLowerEps = bound.epsilon.isNegative();
|
|
163
|
+
const expr = this.getExpr(thVar);
|
|
164
|
+
const isInt = manager.isInt(expr);
|
|
165
|
+
const atom = isLowerEps
|
|
166
|
+
? manager.mkApp(
|
|
167
|
+
manager.mkFuncDecl(
|
|
168
|
+
`${bound.value.toString()} + ${bound.epsilon.toString()}*eps <= ${manager.toString(expr)} (opt)`,
|
|
169
|
+
[],
|
|
170
|
+
SORT_BOOL,
|
|
171
|
+
),
|
|
172
|
+
[],
|
|
173
|
+
SORT_BOOL,
|
|
174
|
+
)
|
|
175
|
+
: manager.mkApp(
|
|
176
|
+
isStrict ? OP_LE : OP_GE,
|
|
177
|
+
[
|
|
178
|
+
this.mkObjective(thVar),
|
|
179
|
+
manager.mkNumeralOfSort(bound.value, isInt ? SORT_INT : SORT_REAL),
|
|
180
|
+
],
|
|
181
|
+
SORT_BOOL,
|
|
182
|
+
);
|
|
183
|
+
this.mkObjectiveBound(
|
|
184
|
+
atom,
|
|
185
|
+
thVar,
|
|
186
|
+
!isStrict,
|
|
187
|
+
bound.value,
|
|
188
|
+
isLowerEps ? bound.epsilon : Rational.zero,
|
|
189
|
+
);
|
|
190
|
+
return isStrict ? manager.mkNot(atom) : atom;
|
|
191
|
+
}
|
|
192
|
+
|
|
13
193
|
pushScopeEh() {
|
|
14
194
|
this.scopes.push({
|
|
15
195
|
boundsLimit: this.boundsTrail.length,
|