tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- 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 +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- 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 +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- 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 +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- 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 +1 -3
- 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 +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- 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 +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- 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 +14 -13
- 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 +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- 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 +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- 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 +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 +734 -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 +886 -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 +178 -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 +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +1 -10
- 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 +1 -2
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- 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 +68 -17
- 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 +122 -90
- 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 +310 -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 +106 -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 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 +9 -8
- 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 +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -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 +39 -19
- 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 +829 -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 +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- 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 +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +1210 -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 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- 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 +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -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 +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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;
|
|
@@ -83,6 +125,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
83
125
|
this.context.setTrueFirstFlag(getVar(literal));
|
|
84
126
|
}
|
|
85
127
|
for (const lemma of nla.lemmas) this.falseCaseOfCheckNla(lemma);
|
|
128
|
+
if (!this.isPropagatingEqs()) return;
|
|
86
129
|
for (const equality of nla.fixedEqualities)
|
|
87
130
|
this.addEquality(equality.lpVar, equality.value, equality.explanation);
|
|
88
131
|
for (const equality of nla.equalities)
|
|
@@ -121,13 +164,9 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
121
164
|
|
|
122
165
|
private mkTermEq(term: LarTerm, offset: Rational) {
|
|
123
166
|
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);
|
|
167
|
+
const sides = mkTermEqSides(manager, this.solver, term, offset, (thVar) => this.getExpr(thVar));
|
|
168
|
+
if (sides[0] === sides[1]) return manager.trueExpr;
|
|
169
|
+
const atom = manager.mkEq(sides[0], sides[1]);
|
|
131
170
|
this.context.internalize(atom, true);
|
|
132
171
|
this.context.markAsRelevant(atom);
|
|
133
172
|
return atom;
|
|
@@ -160,7 +199,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
160
199
|
const atom = this.mkBound(this.lia.term, move.offset, !move.isUpper);
|
|
161
200
|
this.context.assign(
|
|
162
201
|
this.context.getLiteral(atom),
|
|
163
|
-
new TheoryJustification(this.coreLiterals, []),
|
|
202
|
+
new TheoryJustification(this.id, this.coreLiterals, []),
|
|
164
203
|
);
|
|
165
204
|
} else if (move.kind === "conflict") {
|
|
166
205
|
this.explanation.clear();
|
|
@@ -170,65 +209,13 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
170
209
|
return move.kind === "sat";
|
|
171
210
|
}
|
|
172
211
|
|
|
173
|
-
private mkBound(lpTerm: LarTerm,
|
|
174
|
-
const manager = this.manager;
|
|
212
|
+
private mkBound(lpTerm: LarTerm, offset: Rational, isLower: boolean) {
|
|
175
213
|
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,
|
|
214
|
+
const atom = mkBoundAtom(this.manager, this.solver, lpTerm, offset, isLower, (thVar) =>
|
|
215
|
+
this.getExpr(thVar),
|
|
207
216
|
);
|
|
208
217
|
context.internalize(atom, true);
|
|
209
218
|
context.markAsRelevant(atom);
|
|
210
219
|
return atom;
|
|
211
220
|
}
|
|
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
221
|
}
|
|
@@ -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[];
|
|
@@ -77,10 +86,12 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
77
86
|
|
|
78
87
|
init() {
|
|
79
88
|
const manager = this.manager;
|
|
89
|
+
this.solver.settings.isPropagatingEqs = this.context.config.isArithPropagatingEqs;
|
|
80
90
|
this.oneVar = this.addConst(manager.mkNumeral(1n));
|
|
81
91
|
this.realOneVar = this.addConst(manager.mkRealNumeral(Rational.one));
|
|
82
92
|
this.zeroVar = this.addConst(manager.mkNumeral(0n));
|
|
83
93
|
this.realZeroVar = this.addConst(manager.mkRealNumeral(Rational.zero));
|
|
94
|
+
this.solver.settings.setRandomSeed(this.context.params.randomSeed ?? 0);
|
|
84
95
|
}
|
|
85
96
|
|
|
86
97
|
private addConst(expr: number) {
|
|
@@ -93,20 +104,16 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
93
104
|
return column;
|
|
94
105
|
}
|
|
95
106
|
|
|
96
|
-
|
|
97
|
-
return node.thVar >= 0 && this.varEnodes[node.thVar] === node;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
private mkVar(expr: number) {
|
|
107
|
+
protected mkVar(expr: number) {
|
|
101
108
|
const node = this.getInternalizedEnode(expr);
|
|
102
|
-
if (this.isAttachedToVar(node)) return node.
|
|
109
|
+
if (this.isAttachedToVar(node)) return node.getThVar(this.id);
|
|
103
110
|
const thVar = this.varEnodes.length;
|
|
104
111
|
this.varEnodes.push(node);
|
|
105
112
|
while (this.bounds.length <= thVar) {
|
|
106
113
|
this.bounds.push([]);
|
|
107
114
|
this.unassignedBounds.push(0);
|
|
108
115
|
}
|
|
109
|
-
this.context.attachThVar(node, thVar);
|
|
116
|
+
this.context.attachThVar(node, this, thVar);
|
|
110
117
|
return thVar;
|
|
111
118
|
}
|
|
112
119
|
|
|
@@ -150,7 +157,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
150
157
|
const op = manager.getOp(expr);
|
|
151
158
|
const zero = manager.mkNumeral(0n);
|
|
152
159
|
const dividend =
|
|
153
|
-
op === OP_MOD
|
|
160
|
+
op === OP_MOD || op === OP_REM
|
|
161
|
+
? manager.mkApp(op, [manager.getArg(expr, 0), zero], SORT_INT)
|
|
162
|
+
: expr;
|
|
154
163
|
const byZero =
|
|
155
164
|
op === OP_DIV
|
|
156
165
|
? manager.mkApp(OP_DIV0, manager.getArgs(expr), SORT_REAL)
|
|
@@ -198,16 +207,53 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
198
207
|
return thVar;
|
|
199
208
|
}
|
|
200
209
|
|
|
210
|
+
private getPowerDegree(power: number) {
|
|
211
|
+
const manager = this.manager;
|
|
212
|
+
if (manager.kinds[manager.getArg(power, 0)] !== KIND_APP) return undefined;
|
|
213
|
+
const degree = getExtendedNumeral(manager, manager.getArg(power, 1));
|
|
214
|
+
return degree !== undefined &&
|
|
215
|
+
degree.isInt() &&
|
|
216
|
+
degree.num > 0n &&
|
|
217
|
+
degree.num <= MAX_POWER_DEGREE
|
|
218
|
+
? Number(degree.num)
|
|
219
|
+
: undefined;
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
private internalizePower(power: number, degree: number) {
|
|
223
|
+
this.internalizeArgs(power);
|
|
224
|
+
const hasVar = this.context.isEInternalized(power) && this.isAttachedExpr(power);
|
|
225
|
+
this.mkEnode(power);
|
|
226
|
+
const thVar = this.mkVar(power);
|
|
227
|
+
if (hasVar) return thVar;
|
|
228
|
+
const base = this.manager.getArg(power, 0);
|
|
229
|
+
this.internalizeTermCore(base);
|
|
230
|
+
const baseVar = this.mkVar(base);
|
|
231
|
+
const vars = Array.from({ length: degree }, () => this.registerVar(baseVar));
|
|
232
|
+
const nla = this.ensureNla();
|
|
233
|
+
this.solver.registerExistingTerms();
|
|
234
|
+
nla.addMonic(this.registerVar(thVar), vars);
|
|
235
|
+
return thVar;
|
|
236
|
+
}
|
|
237
|
+
|
|
201
238
|
private ensureNla() {
|
|
202
239
|
if (this.nla !== undefined) return this.nla;
|
|
203
240
|
const nla = new NlaCore(this.solver, this.manager.limit);
|
|
204
241
|
for (let index = 0; index < this.scopes.length; index++) nla.push();
|
|
205
242
|
nla.isRelevant = (lpVar) =>
|
|
206
243
|
this.context.isRelevant(this.getExpr(this.solver.getExternal(lpVar)));
|
|
244
|
+
nla.grobner.updateParams();
|
|
245
|
+
nla.addMulDefHook = (vars) => this.addMulDef(vars);
|
|
207
246
|
this.nla = nla;
|
|
208
247
|
return nla;
|
|
209
248
|
}
|
|
210
249
|
|
|
250
|
+
private addMulDef(vars: readonly number[]) {
|
|
251
|
+
const isInt = vars.every((lpVar) => this.isIntVar(this.solver.getExternal(lpVar)));
|
|
252
|
+
const product = this.manager.mkFreshConst("mul!", isInt ? SORT_INT : SORT_REAL);
|
|
253
|
+
this.mkEnode(product);
|
|
254
|
+
return this.registerVar(this.mkVar(product));
|
|
255
|
+
}
|
|
256
|
+
|
|
211
257
|
private registerDivision(quotient: number, remainder: number): Division {
|
|
212
258
|
const register = (expr: number) => {
|
|
213
259
|
this.internalizeTermCore(expr);
|
|
@@ -265,10 +311,8 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
265
311
|
toEnsureEnode.push(term);
|
|
266
312
|
const op = manager.getOp(term);
|
|
267
313
|
if (op === OP_ADD) {
|
|
268
|
-
for (let argIndex = 0; argIndex < manager.getNumArgs(term); argIndex++)
|
|
269
|
-
|
|
270
|
-
push(arg, coeffs[index]);
|
|
271
|
-
}
|
|
314
|
+
for (let argIndex = 0; argIndex < manager.getNumArgs(term); argIndex++)
|
|
315
|
+
push(manager.getArg(term, argIndex), coeffs[index]);
|
|
272
316
|
if (terms.size !== index + 1) {
|
|
273
317
|
terms.set(index, terms.items[terms.size - 1]);
|
|
274
318
|
coeffs[index] = coeffs[coeffs.length - 1];
|
|
@@ -298,6 +342,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
298
342
|
} else if (op === OP_MUL) {
|
|
299
343
|
addVar(index, this.internalizeMul(term));
|
|
300
344
|
index++;
|
|
345
|
+
} else if (op === OP_POWER && this.getPowerDegree(term) !== undefined) {
|
|
346
|
+
addVar(index, this.internalizePower(term, this.getPowerDegree(term)!));
|
|
347
|
+
index++;
|
|
301
348
|
} else if (op === OP_NUM) {
|
|
302
349
|
addVar(index, this.internalizeNumeral(term, manager.getRationalValue(term)));
|
|
303
350
|
index++;
|
|
@@ -318,16 +365,14 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
318
365
|
const isFirst = !context.isEInternalized(term);
|
|
319
366
|
this.internalizeArgs(term);
|
|
320
367
|
this.mkEnode(term);
|
|
321
|
-
|
|
368
|
+
const thVar = this.mkVar(term);
|
|
369
|
+
addVar(index, thVar);
|
|
322
370
|
index++;
|
|
323
371
|
if (isFirst) {
|
|
324
372
|
if (op === OP_DIV) {
|
|
325
373
|
const divisor = context.rewriter.rewrite(manager.getArg(term, 1));
|
|
326
374
|
if (!this.isNonzeroNumeral(divisor)) this.foundUnderspecified(term);
|
|
327
|
-
|
|
328
|
-
const arg = manager.getArg(term, argIndex);
|
|
329
|
-
toEnsureVar.push(arg);
|
|
330
|
-
}
|
|
375
|
+
manager.pushArgs(term, toEnsureVar);
|
|
331
376
|
} else if (op === OP_IDIV) {
|
|
332
377
|
if (!this.isNonzeroNumeral(manager.getArg(term, 1))) this.foundUnderspecified(term);
|
|
333
378
|
const remainder = manager.mkApp(OP_MOD, manager.getArgs(term), SORT_INT);
|
|
@@ -361,17 +406,41 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
361
406
|
context.internalize(quotient, false);
|
|
362
407
|
nla.divisions.addDivisibility(this.registerDivision(quotient, term));
|
|
363
408
|
}
|
|
409
|
+
} else if (op === OP_REM) {
|
|
410
|
+
if (!this.isNonzeroNumeral(manager.getArg(term, 1))) this.foundUnderspecified(term);
|
|
364
411
|
} else if (op === OP_IDIV0 || op === OP_MOD0) {
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
412
|
+
manager.pushArgs(term, toEnsureVar);
|
|
413
|
+
} else if (TRANSCENDENTAL_OPS.has(op)) {
|
|
414
|
+
const nla = this.ensureNla();
|
|
415
|
+
const arg = manager.getArg(term, 0);
|
|
416
|
+
this.internalizeTermCore(arg);
|
|
417
|
+
const argVar = this.mkVar(arg);
|
|
418
|
+
nla.transcendentals.add(
|
|
419
|
+
TRANSCENDENTAL_OPS.get(op)!,
|
|
420
|
+
this.registerVar(argVar),
|
|
421
|
+
this.registerVar(thVar),
|
|
422
|
+
);
|
|
423
|
+
toEnsureVar.push(arg);
|
|
424
|
+
} else if (op === OP_ATAN2) {
|
|
425
|
+
const nla = this.ensureNla();
|
|
426
|
+
const y = manager.getArg(term, 0);
|
|
427
|
+
const x = manager.getArg(term, 1);
|
|
428
|
+
this.internalizeTermCore(y);
|
|
429
|
+
this.internalizeTermCore(x);
|
|
430
|
+
const yVar = this.mkVar(y);
|
|
431
|
+
const xVar = this.mkVar(x);
|
|
432
|
+
nla.transcendentals.addAtan2(
|
|
433
|
+
this.registerVar(yVar),
|
|
434
|
+
this.registerVar(xVar),
|
|
435
|
+
this.registerVar(thVar),
|
|
436
|
+
);
|
|
437
|
+
toEnsureVar.push(y, x);
|
|
438
|
+
} else if (op === OP_PI) {
|
|
439
|
+
this.ensureNla().transcendentals.addPi(this.registerVar(thVar));
|
|
369
440
|
} else if (op !== OP_TO_INT && op !== OP_DIV0) {
|
|
441
|
+
if (op === OP_POWER) this.ensureNla();
|
|
370
442
|
this.foundUnsupported(term);
|
|
371
|
-
|
|
372
|
-
const arg = manager.getArg(term, argIndex);
|
|
373
|
-
toEnsureVar.push(arg);
|
|
374
|
-
}
|
|
443
|
+
manager.pushArgs(term, toEnsureVar);
|
|
375
444
|
}
|
|
376
445
|
if (!context.relevancy.isEnabled && op !== OP_MOD) this.relevantEh(term);
|
|
377
446
|
}
|
|
@@ -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,11 @@ 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[] = [];
|
|
40
|
+
protected numConflicts = 0;
|
|
42
41
|
|
|
43
42
|
canPropagate() {
|
|
44
43
|
return (
|
|
@@ -121,6 +120,10 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
121
120
|
const constraint = isTrue ? bound.constraintTrue : bound.constraintFalse;
|
|
122
121
|
if (solver.constraintIsRedundant(constraint)) return solver.status !== LP_INFEASIBLE;
|
|
123
122
|
solver.activate(constraint);
|
|
123
|
+
if (isTrue && !bound.eps.isZero()) {
|
|
124
|
+
this.context.pushTrail(() => this.activeInfEpsConstraints.pop());
|
|
125
|
+
this.activeInfEpsConstraints.push(constraint);
|
|
126
|
+
}
|
|
124
127
|
if (solver.status === LP_INFEASIBLE) return false;
|
|
125
128
|
const kind = this.getBoundKind(bound, isTrue);
|
|
126
129
|
const value = isTrue
|
|
@@ -128,10 +131,16 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
128
131
|
: bound.isLower
|
|
129
132
|
? bound.value.sub(Rational.one)
|
|
130
133
|
: bound.value.add(Rational.one);
|
|
131
|
-
if (
|
|
134
|
+
if (this.isPropagatingEqs() && (isTrue ? bound.eps.isZero() : bound.isInt))
|
|
135
|
+
this.propagateEqs(bound.column, constraint, kind, bound, value);
|
|
132
136
|
return true;
|
|
133
137
|
}
|
|
134
138
|
|
|
139
|
+
protected isPropagatingEqs() {
|
|
140
|
+
const config = this.context.config;
|
|
141
|
+
return config.isArithPropagatingEqs && this.numConflicts < config.arithPropagationThreshold;
|
|
142
|
+
}
|
|
143
|
+
|
|
135
144
|
private propagateEqs(
|
|
136
145
|
column: number,
|
|
137
146
|
constraint: number,
|
|
@@ -231,7 +240,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
231
240
|
|
|
232
241
|
private propagateOffsetEq(column: number, dep: Dependency, value: Rational) {
|
|
233
242
|
if (!value.isZero() || !this.solver.hasTerm(column)) return false;
|
|
234
|
-
const coeffs =
|
|
243
|
+
const coeffs = getTermCoeffs(this.solver, this.solver.getTerm(column));
|
|
235
244
|
if (coeffs.length !== 2) return false;
|
|
236
245
|
const first = coeffs[0];
|
|
237
246
|
const second = coeffs[1];
|
|
@@ -244,33 +253,15 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
244
253
|
return true;
|
|
245
254
|
}
|
|
246
255
|
|
|
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
256
|
private assignEq(first: number, second: number) {
|
|
266
257
|
this.context.pushEq(this.getEnode(first), this.getEnode(second), {
|
|
267
258
|
kind: "justification",
|
|
268
|
-
justification: new TheoryJustification(this.coreLiterals, []),
|
|
259
|
+
justification: new TheoryJustification(this.id, this.coreLiterals, []),
|
|
269
260
|
});
|
|
270
261
|
}
|
|
271
262
|
|
|
272
263
|
protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
|
|
273
|
-
if (this.context.isInconsistent()) return false;
|
|
264
|
+
if (this.context.isInconsistent() || !this.isPropagatingEqs()) return false;
|
|
274
265
|
const v1 = this.solver.getExternal(first);
|
|
275
266
|
const v2 = this.solver.getExternal(second);
|
|
276
267
|
if (v1 === NULL_THEORY_VAR || v2 === NULL_THEORY_VAR) return false;
|
|
@@ -313,6 +304,9 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
313
304
|
}
|
|
314
305
|
|
|
315
306
|
private propagateBoundsWithLpSolver() {
|
|
307
|
+
const config = this.context.config;
|
|
308
|
+
if (!config.isArithBoundPropagating || this.numConflicts >= config.arithPropagationThreshold)
|
|
309
|
+
return;
|
|
316
310
|
this.bp.init();
|
|
317
311
|
this.bp.propagateBoundsForTouchedRows();
|
|
318
312
|
if (this.context.checkCanceled()) return;
|
|
@@ -321,12 +315,25 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
321
315
|
return;
|
|
322
316
|
}
|
|
323
317
|
for (const implied of this.bp.ibounds) {
|
|
318
|
+
this.manager.limit.inc();
|
|
324
319
|
if (this.context.isInconsistent()) break;
|
|
325
320
|
this.propagateLpSolverBound(implied);
|
|
326
321
|
}
|
|
327
322
|
}
|
|
328
323
|
|
|
324
|
+
// An implied bound keeps only a rational and a strict bit, so one explained by a bound with an
|
|
325
|
+
// infinitesimal could strengthen x >= r - eps into x > r.
|
|
329
326
|
private propagateLpSolverBound(implied: ImpliedBound) {
|
|
327
|
+
const epsConstraints = this.activeInfEpsConstraints;
|
|
328
|
+
if (
|
|
329
|
+
epsConstraints.length > 0 &&
|
|
330
|
+
implied
|
|
331
|
+
.explain()
|
|
332
|
+
.some((entry) =>
|
|
333
|
+
linearize([entry[1]]).some((constraint) => epsConstraints.includes(constraint)),
|
|
334
|
+
)
|
|
335
|
+
)
|
|
336
|
+
return;
|
|
330
337
|
const thVar = this.solver.getExternal(implied.column);
|
|
331
338
|
if (thVar === NULL_THEORY_VAR || this.unassignedBounds[thVar] === 0) return;
|
|
332
339
|
const context = this.context;
|
|
@@ -346,7 +353,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
346
353
|
this.explanation.addPair(constraint, entry[0]);
|
|
347
354
|
}
|
|
348
355
|
}
|
|
349
|
-
context.assign(literal, new TheoryJustification(this.coreLiterals, []));
|
|
356
|
+
context.assign(literal, new TheoryJustification(this.id, this.coreLiterals, []));
|
|
350
357
|
}
|
|
351
358
|
}
|
|
352
359
|
|
|
@@ -386,6 +393,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
386
393
|
this.resetEvidence();
|
|
387
394
|
this.numConflicts++;
|
|
388
395
|
for (const constraint of this.explanation) this.setEvidence(constraint);
|
|
389
|
-
this.context.setConflict(new TheoryJustification(this.coreLiterals, []), null);
|
|
396
|
+
this.context.setConflict(new TheoryJustification(this.id, this.coreLiterals, []), null);
|
|
390
397
|
}
|
|
391
398
|
}
|