tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- 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 +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- 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 +118 -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 +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- 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 +224 -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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- 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 +6 -17
- 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 +0 -2
- 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/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 +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- 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 +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- 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 +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +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 +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- 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 +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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -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 +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- 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 +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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- 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 +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- 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 +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- 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 +56 -74
- package/src/runtime.ts +4 -0
- 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 +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -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/values.ts +62 -152
- 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
|
@@ -0,0 +1,844 @@
|
|
|
1
|
+
import { SmtInvariantError } from "../../../errors";
|
|
2
|
+
import { getEuclideanDiv, getEuclideanMod, getGcd, getLcm, Rational } from "./rational";
|
|
3
|
+
|
|
4
|
+
export const T_EQ = 0;
|
|
5
|
+
export const T_LT = 1;
|
|
6
|
+
export const T_LE = 2;
|
|
7
|
+
export const T_DIVIDES = 3;
|
|
8
|
+
export const T_MOD = 4;
|
|
9
|
+
export const T_DIV = 5;
|
|
10
|
+
|
|
11
|
+
export interface MboVar {
|
|
12
|
+
id: number;
|
|
13
|
+
coeff: Rational;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface MboRow {
|
|
17
|
+
vars: MboVar[];
|
|
18
|
+
coeff: Rational;
|
|
19
|
+
mod: Rational;
|
|
20
|
+
type: number;
|
|
21
|
+
value: Rational;
|
|
22
|
+
isAlive: boolean;
|
|
23
|
+
// The variable a mod or div row defines.
|
|
24
|
+
id: number;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export const DEF_ADD = 0;
|
|
28
|
+
export const DEF_MUL = 1;
|
|
29
|
+
export const DEF_DIV = 2;
|
|
30
|
+
export const DEF_CONST = 3;
|
|
31
|
+
export const DEF_VAR = 4;
|
|
32
|
+
|
|
33
|
+
interface AddDef {
|
|
34
|
+
readonly kind: typeof DEF_ADD;
|
|
35
|
+
readonly x: MboDef;
|
|
36
|
+
readonly y: MboDef;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
interface MulDef {
|
|
40
|
+
readonly kind: typeof DEF_MUL;
|
|
41
|
+
readonly x: MboDef;
|
|
42
|
+
readonly y: MboDef;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
interface DivDef {
|
|
46
|
+
readonly kind: typeof DEF_DIV;
|
|
47
|
+
readonly x: MboDef;
|
|
48
|
+
readonly div: Rational;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
interface ConstDef {
|
|
52
|
+
readonly kind: typeof DEF_CONST;
|
|
53
|
+
readonly value: Rational;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
interface VarDef {
|
|
57
|
+
readonly kind: typeof DEF_VAR;
|
|
58
|
+
readonly v: MboVar;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// A definition of a projected variable, a linear term of the other variables.
|
|
62
|
+
export type MboDef = AddDef | MulDef | DivDef | ConstDef | VarDef;
|
|
63
|
+
|
|
64
|
+
const mkAddDef = (x: MboDef, y: MboDef): MboDef => ({ kind: DEF_ADD, x, y });
|
|
65
|
+
|
|
66
|
+
const mkMulDef = (x: MboDef, y: MboDef): MboDef => ({ kind: DEF_MUL, x, y });
|
|
67
|
+
|
|
68
|
+
const mkConstDef = (value: Rational): MboDef => ({ kind: DEF_CONST, value });
|
|
69
|
+
|
|
70
|
+
const divDef = (def: MboDef, div: Rational): MboDef =>
|
|
71
|
+
div.equals(Rational.one) ? def : { kind: DEF_DIV, x: def, div };
|
|
72
|
+
|
|
73
|
+
const mulDefBy = (def: MboDef, factor: Rational) =>
|
|
74
|
+
factor.equals(Rational.one) ? def : mkMulDef(def, mkConstDef(factor));
|
|
75
|
+
|
|
76
|
+
const addDefConst = (def: MboDef, value: Rational) =>
|
|
77
|
+
value.isZero() ? def : mkAddDef(def, mkConstDef(value));
|
|
78
|
+
|
|
79
|
+
const substituteDef = (def: MboDef, id: number, other: MboDef): MboDef => {
|
|
80
|
+
if (def.kind === DEF_ADD || def.kind === DEF_MUL) {
|
|
81
|
+
const x = substituteDef(def.x, id, other);
|
|
82
|
+
const y = substituteDef(def.y, id, other);
|
|
83
|
+
if (x === def.x && y === def.y) return def;
|
|
84
|
+
return def.kind === DEF_ADD ? mkAddDef(x, y) : mkMulDef(x, y);
|
|
85
|
+
}
|
|
86
|
+
if (def.kind === DEF_DIV) {
|
|
87
|
+
const x = substituteDef(def.x, id, other);
|
|
88
|
+
return x === def.x ? def : divDef(x, def.div);
|
|
89
|
+
}
|
|
90
|
+
if (def.kind === DEF_VAR && def.v.id === id)
|
|
91
|
+
return def.v.coeff.equals(Rational.one) ? other : mulDefBy(other, def.v.coeff);
|
|
92
|
+
return def;
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
// def::from_row: x := (value - coeffs - coeff)/a for the row a*x + coeffs + coeff, rounded so the
|
|
96
|
+
// row holds.
|
|
97
|
+
const getDefFromRow = (row: MboRow, id: number) => {
|
|
98
|
+
let div = Rational.one;
|
|
99
|
+
let lc = Rational.of(row.coeff.den);
|
|
100
|
+
for (const innerVar of row.vars) {
|
|
101
|
+
lc = getRationalLcm(lc, Rational.of(innerVar.coeff.den));
|
|
102
|
+
if (innerVar.id === id) {
|
|
103
|
+
div = innerVar.coeff.neg();
|
|
104
|
+
break;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
div = div.mul(lc);
|
|
108
|
+
const isNegative = div.isNegative();
|
|
109
|
+
let coeff = lc.mul(row.coeff);
|
|
110
|
+
if (row.type === T_LT) coeff = coeff.add(div);
|
|
111
|
+
else if (row.type === T_LE && !isNegative) coeff = coeff.add(div).sub(Rational.one);
|
|
112
|
+
if (isNegative) {
|
|
113
|
+
div = div.neg();
|
|
114
|
+
lc = lc.neg();
|
|
115
|
+
coeff = coeff.neg();
|
|
116
|
+
}
|
|
117
|
+
let result = mkConstDef(coeff);
|
|
118
|
+
for (const innerVar of row.vars)
|
|
119
|
+
if (innerVar.id !== id)
|
|
120
|
+
result = mkAddDef(result, {
|
|
121
|
+
kind: DEF_VAR,
|
|
122
|
+
v: { id: innerVar.id, coeff: innerVar.coeff.mul(lc) },
|
|
123
|
+
});
|
|
124
|
+
return div.compare(Rational.one) > 0 ? divDef(result, div) : result;
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
const NONE = -1;
|
|
128
|
+
const OBJECTIVE_ID = 0;
|
|
129
|
+
|
|
130
|
+
const mkRow = (): MboRow => ({
|
|
131
|
+
vars: [],
|
|
132
|
+
coeff: Rational.zero,
|
|
133
|
+
mod: Rational.zero,
|
|
134
|
+
type: T_LE,
|
|
135
|
+
value: Rational.zero,
|
|
136
|
+
isAlive: false,
|
|
137
|
+
id: NONE,
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
// rational's gcd and lcm, which on fractions combine the numerators and the denominators.
|
|
141
|
+
const getRationalGcd = (first: Rational, second: Rational) =>
|
|
142
|
+
Rational.of(getGcd(first.num, second.num), getLcm(first.den, second.den));
|
|
143
|
+
|
|
144
|
+
const getRationalLcm = (first: Rational, second: Rational) =>
|
|
145
|
+
Rational.of(getLcm(first.num, second.num), getGcd(first.den, second.den));
|
|
146
|
+
|
|
147
|
+
const getMod = (value: Rational, divisor: Rational) =>
|
|
148
|
+
Rational.of(getEuclideanMod(value.num, divisor.num));
|
|
149
|
+
|
|
150
|
+
const getDiv = (value: Rational, divisor: Rational) =>
|
|
151
|
+
Rational.of(getEuclideanDiv(value.num, divisor.num));
|
|
152
|
+
|
|
153
|
+
const getNSign = (value: Rational) => (value.isPositive() ? Rational.minusOne : Rational.one);
|
|
154
|
+
|
|
155
|
+
const getRowCoefficient = (row: MboRow, varId: number) => {
|
|
156
|
+
const vars = row.vars;
|
|
157
|
+
if (vars.length === 0) return Rational.zero;
|
|
158
|
+
let low = 0;
|
|
159
|
+
let high = vars.length;
|
|
160
|
+
while (low < high) {
|
|
161
|
+
const mid = low + Math.floor((high - low) / 2);
|
|
162
|
+
const id = vars[mid].id;
|
|
163
|
+
if (id === varId) {
|
|
164
|
+
low = mid;
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
167
|
+
if (id < varId) low = mid + 1;
|
|
168
|
+
else high = mid;
|
|
169
|
+
}
|
|
170
|
+
if (low === vars.length) return Rational.zero;
|
|
171
|
+
return vars[low].id === varId ? vars[low].coeff : Rational.zero;
|
|
172
|
+
};
|
|
173
|
+
|
|
174
|
+
const sortVars = (vars: MboVar[]) => vars.sort((left, right) => left.id - right.id);
|
|
175
|
+
|
|
176
|
+
const areVarsEqual = (left: MboVar[], right: MboVar[]) =>
|
|
177
|
+
left.length === right.length &&
|
|
178
|
+
left.every(
|
|
179
|
+
(innerVar, index) =>
|
|
180
|
+
innerVar.id === right[index].id && innerVar.coeff.equals(right[index].coeff),
|
|
181
|
+
);
|
|
182
|
+
|
|
183
|
+
export class ModelBasedOpt {
|
|
184
|
+
private rows: MboRow[] = [mkRow()];
|
|
185
|
+
private var2RowIds: number[][] = [];
|
|
186
|
+
private var2Value: Rational[] = [];
|
|
187
|
+
private var2IsInt: boolean[] = [];
|
|
188
|
+
private retiredRows: number[] = [];
|
|
189
|
+
private result: (MboDef | null)[] = [];
|
|
190
|
+
|
|
191
|
+
addVar(value: Rational, isInt: boolean) {
|
|
192
|
+
const id = this.var2Value.length;
|
|
193
|
+
this.var2Value.push(value);
|
|
194
|
+
this.var2IsInt.push(isInt);
|
|
195
|
+
this.var2RowIds.push([]);
|
|
196
|
+
return id;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
getValue(id: number) {
|
|
200
|
+
return this.var2Value[id];
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
addConstraint(coeffs: MboVar[], coeff: Rational, type: number) {
|
|
204
|
+
this.addRow(coeffs, coeff, Rational.zero, type, 0);
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
addDivides(coeffs: MboVar[], coeff: Rational, mod: Rational) {
|
|
208
|
+
let gcd = coeff;
|
|
209
|
+
for (const innerVar of coeffs) gcd = getRationalGcd(innerVar.coeff, gcd);
|
|
210
|
+
if (gcd.div(mod).isInt()) return;
|
|
211
|
+
this.addRow(coeffs, coeff, mod, T_DIVIDES, 0);
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
addMod(coeffs: MboVar[], coeff: Rational, mod: Rational) {
|
|
215
|
+
const id = this.addVar(getMod(this.evalTerm(coeffs, coeff), mod), true);
|
|
216
|
+
this.addRow(coeffs, coeff, mod, T_MOD, id);
|
|
217
|
+
return id;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
addDiv(coeffs: MboVar[], coeff: Rational, mod: Rational) {
|
|
221
|
+
const id = this.addVar(getDiv(this.evalTerm(coeffs, coeff), mod), true);
|
|
222
|
+
this.addRow(coeffs, coeff, mod, T_DIV, id);
|
|
223
|
+
return id;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
getLiveRows() {
|
|
227
|
+
return this.rows.filter((row) => row.isAlive);
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
// With isComputingDef, also the definitions of the projected variables, in their order.
|
|
231
|
+
project(vars: readonly number[], isComputingDef: boolean) {
|
|
232
|
+
this.result = [];
|
|
233
|
+
for (const id of vars) {
|
|
234
|
+
const def = this.projectVar(id, isComputingDef);
|
|
235
|
+
this.result.push(def);
|
|
236
|
+
if (def !== null) this.eliminate(id, def);
|
|
237
|
+
}
|
|
238
|
+
return this.result;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
private eliminate(id: number, def: MboDef) {
|
|
242
|
+
this.result = this.result.map((other) => other && substituteDef(other, id, def));
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
private evalDef(def: MboDef): Rational {
|
|
246
|
+
if (def.kind === DEF_ADD) return this.evalDef(def.x).add(this.evalDef(def.y));
|
|
247
|
+
if (def.kind === DEF_DIV) return this.evalDef(def.x).div(def.div);
|
|
248
|
+
if (def.kind === DEF_MUL) return this.evalDef(def.x).mul(this.evalDef(def.y));
|
|
249
|
+
if (def.kind === DEF_VAR) return def.v.coeff.mul(this.var2Value[def.v.id]);
|
|
250
|
+
return def.value;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
private evalTerm(coeffs: readonly MboVar[], coeff: Rational) {
|
|
254
|
+
let value = coeff;
|
|
255
|
+
for (const innerVar of coeffs)
|
|
256
|
+
value = value.add(innerVar.coeff.mul(this.var2Value[innerVar.id]));
|
|
257
|
+
return value;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
private getCoefficient(rowId: number, varId: number) {
|
|
261
|
+
return getRowCoefficient(this.rows[rowId], varId);
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
private retireRow(rowId: number) {
|
|
265
|
+
this.rows[rowId].isAlive = false;
|
|
266
|
+
this.retiredRows.push(rowId);
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
private setRow(
|
|
270
|
+
rowId: number,
|
|
271
|
+
coeffs: readonly MboVar[],
|
|
272
|
+
coeff: Rational,
|
|
273
|
+
mod: Rational,
|
|
274
|
+
type: number,
|
|
275
|
+
) {
|
|
276
|
+
const row = this.rows[rowId];
|
|
277
|
+
let value = coeff;
|
|
278
|
+
for (const innerVar of coeffs) row.vars.push({ ...innerVar });
|
|
279
|
+
let isIntRow = coeffs.length > 0;
|
|
280
|
+
sortVars(row.vars);
|
|
281
|
+
for (const innerVar of coeffs) {
|
|
282
|
+
value = value.add(this.var2Value[innerVar.id].mul(innerVar.coeff));
|
|
283
|
+
isIntRow &&= this.var2IsInt[innerVar.id];
|
|
284
|
+
}
|
|
285
|
+
row.isAlive = true;
|
|
286
|
+
row.coeff = coeff;
|
|
287
|
+
row.value = value;
|
|
288
|
+
row.type = type;
|
|
289
|
+
row.mod = mod;
|
|
290
|
+
if (isIntRow && type === T_LT) {
|
|
291
|
+
row.type = T_LE;
|
|
292
|
+
row.coeff = row.coeff.add(Rational.one);
|
|
293
|
+
row.value = row.value.add(Rational.one);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
private newRow() {
|
|
298
|
+
const retired = this.retiredRows.pop();
|
|
299
|
+
if (retired === undefined) {
|
|
300
|
+
this.rows.push(mkRow());
|
|
301
|
+
return this.rows.length - 1;
|
|
302
|
+
}
|
|
303
|
+
const row = this.rows[retired];
|
|
304
|
+
row.vars = [];
|
|
305
|
+
row.coeff = Rational.zero;
|
|
306
|
+
row.value = Rational.zero;
|
|
307
|
+
row.isAlive = true;
|
|
308
|
+
return retired;
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
private copyRow(source: number) {
|
|
312
|
+
const target = this.newRow();
|
|
313
|
+
const row = this.rows[source];
|
|
314
|
+
this.setRow(target, row.vars, row.coeff, row.mod, row.type);
|
|
315
|
+
for (const innerVar of row.vars) this.var2RowIds[innerVar.id].push(target);
|
|
316
|
+
return target;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
// -x + lo <= 0
|
|
320
|
+
private addLowerBound(id: number, lower: Rational) {
|
|
321
|
+
this.addConstraint([{ id, coeff: Rational.minusOne }], lower, T_LE);
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
// x - hi <= 0
|
|
325
|
+
private addUpperBound(id: number, upper: Rational) {
|
|
326
|
+
this.addConstraint([{ id, coeff: Rational.one }], upper.neg(), T_LE);
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
private addRow(coeffs: MboVar[], coeff: Rational, mod: Rational, type: number, id: number) {
|
|
330
|
+
const last = this.rows[this.rows.length - 1];
|
|
331
|
+
if (
|
|
332
|
+
areVarsEqual(last.vars, coeffs) &&
|
|
333
|
+
last.coeff.equals(coeff) &&
|
|
334
|
+
last.mod.equals(mod) &&
|
|
335
|
+
last.type === type &&
|
|
336
|
+
last.id === id &&
|
|
337
|
+
last.isAlive
|
|
338
|
+
)
|
|
339
|
+
return this.rows.length - 1;
|
|
340
|
+
const rowId = this.newRow();
|
|
341
|
+
this.setRow(rowId, coeffs, coeff, mod, type);
|
|
342
|
+
this.rows[rowId].id = id;
|
|
343
|
+
for (const innerVar of coeffs) this.var2RowIds[innerVar.id].push(rowId);
|
|
344
|
+
this.normalize(rowId);
|
|
345
|
+
return rowId;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
private mul(rowId: number, factor: Rational) {
|
|
349
|
+
if (factor.equals(Rational.one)) return;
|
|
350
|
+
const row = this.rows[rowId];
|
|
351
|
+
for (const innerVar of row.vars) innerVar.coeff = innerVar.coeff.mul(factor);
|
|
352
|
+
row.mod = row.mod.mul(factor);
|
|
353
|
+
row.coeff = row.coeff.mul(factor);
|
|
354
|
+
if (row.type !== T_DIV && row.type !== T_MOD) row.value = row.value.mul(factor);
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
private add(rowId: number, value: Rational) {
|
|
358
|
+
const row = this.rows[rowId];
|
|
359
|
+
row.coeff = row.coeff.add(value);
|
|
360
|
+
row.value = row.value.add(value);
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
private normalize(rowId: number) {
|
|
364
|
+
const row = this.rows[rowId];
|
|
365
|
+
if (!row.isAlive) return;
|
|
366
|
+
if (row.vars.length === 0) {
|
|
367
|
+
this.retireRow(rowId);
|
|
368
|
+
return;
|
|
369
|
+
}
|
|
370
|
+
if (row.type === T_DIVIDES || row.type === T_MOD || row.type === T_DIV) return;
|
|
371
|
+
let gcd = row.vars[0].coeff.abs();
|
|
372
|
+
let isAllInt = gcd.isInt();
|
|
373
|
+
for (let index = 1; isAllInt && !gcd.equals(Rational.one) && index < row.vars.length; index++) {
|
|
374
|
+
const coeff = row.vars[index].coeff;
|
|
375
|
+
if (coeff.isInt()) gcd = getRationalGcd(gcd, coeff.abs());
|
|
376
|
+
else isAllInt = false;
|
|
377
|
+
}
|
|
378
|
+
if (isAllInt && !row.coeff.isZero()) {
|
|
379
|
+
if (row.coeff.isInt()) gcd = getRationalGcd(gcd, row.coeff.abs());
|
|
380
|
+
else isAllInt = false;
|
|
381
|
+
}
|
|
382
|
+
if (isAllInt && !gcd.equals(Rational.one)) this.mul(rowId, Rational.one.div(gcd));
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
// row1 <- row1 + factor*row2
|
|
386
|
+
private mulAddRows(isSameSign: boolean, rowId1: number, factor: Rational, rowId2: number) {
|
|
387
|
+
if (factor.isZero()) return;
|
|
388
|
+
const newVars: MboVar[] = [];
|
|
389
|
+
const row1 = this.rows[rowId1];
|
|
390
|
+
const row2 = this.rows[rowId2];
|
|
391
|
+
let first = 0;
|
|
392
|
+
let second = 0;
|
|
393
|
+
const pushScaled = (innerVar: MboVar) => {
|
|
394
|
+
newVars.push({ id: innerVar.id, coeff: innerVar.coeff.mul(factor) });
|
|
395
|
+
if (rowId1 !== OBJECTIVE_ID) this.var2RowIds[innerVar.id].push(rowId1);
|
|
396
|
+
};
|
|
397
|
+
while (first < row1.vars.length || second < row2.vars.length) {
|
|
398
|
+
if (second === row2.vars.length) {
|
|
399
|
+
newVars.push(...row1.vars.slice(first));
|
|
400
|
+
break;
|
|
401
|
+
}
|
|
402
|
+
if (first === row1.vars.length) {
|
|
403
|
+
for (; second < row2.vars.length; second++) pushScaled(row2.vars[second]);
|
|
404
|
+
break;
|
|
405
|
+
}
|
|
406
|
+
const var1 = row1.vars[first];
|
|
407
|
+
const var2 = row2.vars[second];
|
|
408
|
+
if (var1.id === var2.id) {
|
|
409
|
+
const coeff = var1.coeff.add(factor.mul(var2.coeff));
|
|
410
|
+
first++;
|
|
411
|
+
second++;
|
|
412
|
+
if (!coeff.isZero()) newVars.push({ id: var1.id, coeff });
|
|
413
|
+
} else if (var1.id < var2.id) {
|
|
414
|
+
newVars.push(var1);
|
|
415
|
+
first++;
|
|
416
|
+
} else {
|
|
417
|
+
pushScaled(var2);
|
|
418
|
+
second++;
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
row1.coeff = row1.coeff.add(factor.mul(row2.coeff));
|
|
422
|
+
row1.vars = newVars;
|
|
423
|
+
row1.value = row1.value.add(factor.mul(row2.value));
|
|
424
|
+
if (!isSameSign && row2.type === T_LT) row1.type = T_LT;
|
|
425
|
+
else if (isSameSign && row1.type === T_LT && row2.type === T_LT) row1.type = T_LE;
|
|
426
|
+
}
|
|
427
|
+
|
|
428
|
+
// Resolution for integer rows.
|
|
429
|
+
private mulAddInt(
|
|
430
|
+
id: number,
|
|
431
|
+
sourceCoeff: Rational,
|
|
432
|
+
rowSource: number,
|
|
433
|
+
targetCoeff: Rational,
|
|
434
|
+
rowTarget: number,
|
|
435
|
+
) {
|
|
436
|
+
const target = this.rows[rowTarget];
|
|
437
|
+
const source = this.rows[rowSource];
|
|
438
|
+
const absSource = sourceCoeff.abs();
|
|
439
|
+
const absTarget = targetCoeff.abs();
|
|
440
|
+
const value = this.var2Value[id];
|
|
441
|
+
const slack = absSource.sub(Rational.one).mul(absTarget.sub(Rational.one));
|
|
442
|
+
const targetValue = target.value.sub(value.mul(targetCoeff));
|
|
443
|
+
const sourceValue = source.value.sub(value.mul(sourceCoeff));
|
|
444
|
+
const distance = absSource.mul(targetValue).add(absTarget.mul(sourceValue)).add(slack);
|
|
445
|
+
if (
|
|
446
|
+
!distance.isPositive() ||
|
|
447
|
+
absSource.equals(Rational.one) ||
|
|
448
|
+
absTarget.equals(Rational.one)
|
|
449
|
+
) {
|
|
450
|
+
this.mul(rowTarget, absSource);
|
|
451
|
+
this.add(rowTarget, slack);
|
|
452
|
+
this.mulAddRows(false, rowTarget, absTarget, rowSource);
|
|
453
|
+
return;
|
|
454
|
+
}
|
|
455
|
+
// A finite disjunction for |b|: exists z in [0 .. |b|-2] . |b| | (z + s) && a*n_sign(b)(s + z) + |b|t <= 0.
|
|
456
|
+
if (absTarget.compare(absSource) <= 0) {
|
|
457
|
+
let slackValue = getMod(targetValue, absTarget);
|
|
458
|
+
if (!slackValue.isZero()) slackValue = absTarget.sub(slackValue);
|
|
459
|
+
const coeffs = target.vars.filter((innerVar) => innerVar.id !== id);
|
|
460
|
+
this.addDivides(coeffs, target.coeff.add(slackValue), absTarget);
|
|
461
|
+
this.add(rowTarget, slackValue);
|
|
462
|
+
this.mul(rowTarget, sourceCoeff.mul(getNSign(targetCoeff)));
|
|
463
|
+
this.mulAddRows(false, rowTarget, absTarget, rowSource);
|
|
464
|
+
return;
|
|
465
|
+
}
|
|
466
|
+
let slackValue = getMod(sourceValue, absSource);
|
|
467
|
+
if (!slackValue.isZero()) slackValue = absSource.sub(slackValue);
|
|
468
|
+
const coeffs = source.vars.filter((innerVar) => innerVar.id !== id);
|
|
469
|
+
this.addDivides(coeffs, source.coeff.add(slackValue), absSource);
|
|
470
|
+
this.mul(rowTarget, absSource);
|
|
471
|
+
this.add(rowTarget, slackValue.mul(targetCoeff).mul(getNSign(sourceCoeff)));
|
|
472
|
+
this.mulAddRows(false, rowTarget, targetCoeff.mul(getNSign(sourceCoeff)), rowSource);
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
private resolve(rowSource: number, coeff1: Rational, rowTarget: number, id: number) {
|
|
476
|
+
if (!this.rows[rowTarget].isAlive) return;
|
|
477
|
+
const coeff2 = this.getCoefficient(rowTarget, id);
|
|
478
|
+
if (this.var2IsInt[id]) {
|
|
479
|
+
if (coeff1.isPositive() !== coeff2.isPositive() || this.rows[rowSource].type === T_EQ)
|
|
480
|
+
this.mulAddInt(id, coeff1, rowSource, coeff2, rowTarget);
|
|
481
|
+
else {
|
|
482
|
+
this.mul(rowTarget, coeff1.abs());
|
|
483
|
+
this.mulAddRows(false, rowTarget, coeff2.abs().neg(), rowSource);
|
|
484
|
+
}
|
|
485
|
+
this.normalize(rowTarget);
|
|
486
|
+
return;
|
|
487
|
+
}
|
|
488
|
+
this.mulAddRows(
|
|
489
|
+
rowTarget !== OBJECTIVE_ID && coeff1.isPositive() === coeff2.isPositive(),
|
|
490
|
+
rowTarget,
|
|
491
|
+
coeff2.neg().div(coeff1),
|
|
492
|
+
rowSource,
|
|
493
|
+
);
|
|
494
|
+
}
|
|
495
|
+
|
|
496
|
+
private solve(rowSource: number, coeff1: Rational, rowTarget: number, id: number) {
|
|
497
|
+
if (!this.rows[rowTarget].isAlive) return;
|
|
498
|
+
const coeff2 = this.getCoefficient(rowTarget, id);
|
|
499
|
+
this.mul(rowTarget, coeff1);
|
|
500
|
+
this.mulAddRows(false, rowTarget, coeff2.neg(), rowSource);
|
|
501
|
+
this.normalize(rowTarget);
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
// Picks the glb or lub that represents the fewest inequalities.
|
|
505
|
+
private projectVar(id: number, isComputingDef: boolean): MboDef | null {
|
|
506
|
+
const lubRows: number[] = [];
|
|
507
|
+
const glbRows: number[] = [];
|
|
508
|
+
const divideRows: number[] = [];
|
|
509
|
+
const modRows: number[] = [];
|
|
510
|
+
const divRows: number[] = [];
|
|
511
|
+
let lubIndex = NONE;
|
|
512
|
+
let glbIndex = NONE;
|
|
513
|
+
let isLubStrict = false;
|
|
514
|
+
let isGlbStrict = false;
|
|
515
|
+
let lubValue = Rational.zero;
|
|
516
|
+
let glbValue = Rational.zero;
|
|
517
|
+
const value = this.var2Value[id];
|
|
518
|
+
const visited = new Set<number>();
|
|
519
|
+
let isLubUnit = true;
|
|
520
|
+
let isGlbUnit = true;
|
|
521
|
+
let eqRow = NONE;
|
|
522
|
+
for (const rowId of this.var2RowIds[id]) {
|
|
523
|
+
if (visited.has(rowId)) continue;
|
|
524
|
+
visited.add(rowId);
|
|
525
|
+
const row = this.rows[rowId];
|
|
526
|
+
if (!row.isAlive) continue;
|
|
527
|
+
const coeff = this.getCoefficient(rowId, id);
|
|
528
|
+
if (coeff.isZero()) continue;
|
|
529
|
+
if (row.type === T_EQ) eqRow = rowId;
|
|
530
|
+
else if (row.type === T_MOD) modRows.push(rowId);
|
|
531
|
+
else if (row.type === T_DIV) divRows.push(rowId);
|
|
532
|
+
else if (row.type === T_DIVIDES) divideRows.push(rowId);
|
|
533
|
+
else if (coeff.isPositive()) {
|
|
534
|
+
const bound = value.sub(row.value.div(coeff));
|
|
535
|
+
if (
|
|
536
|
+
lubRows.length === 0 ||
|
|
537
|
+
bound.compare(lubValue) < 0 ||
|
|
538
|
+
(bound.equals(lubValue) && row.type === T_LT && !isLubStrict)
|
|
539
|
+
) {
|
|
540
|
+
lubValue = bound;
|
|
541
|
+
lubIndex = rowId;
|
|
542
|
+
isLubStrict = row.type === T_LT;
|
|
543
|
+
}
|
|
544
|
+
lubRows.push(rowId);
|
|
545
|
+
isLubUnit &&= coeff.equals(Rational.one);
|
|
546
|
+
} else {
|
|
547
|
+
const bound = value.sub(row.value.div(coeff));
|
|
548
|
+
if (
|
|
549
|
+
glbRows.length === 0 ||
|
|
550
|
+
bound.compare(glbValue) > 0 ||
|
|
551
|
+
(bound.equals(glbValue) && row.type === T_LT && !isGlbStrict)
|
|
552
|
+
) {
|
|
553
|
+
glbValue = bound;
|
|
554
|
+
glbIndex = rowId;
|
|
555
|
+
isGlbStrict = row.type === T_LT;
|
|
556
|
+
}
|
|
557
|
+
glbRows.push(rowId);
|
|
558
|
+
isGlbUnit &&= coeff.equals(Rational.minusOne);
|
|
559
|
+
}
|
|
560
|
+
}
|
|
561
|
+
if (divideRows.length > 0) return this.solveDivides(id, divideRows, isComputingDef);
|
|
562
|
+
if (divRows.length > 0 || modRows.length > 0)
|
|
563
|
+
return this.solveModDiv(id, modRows, divRows, isComputingDef);
|
|
564
|
+
if (eqRow !== NONE) return this.solveFor(eqRow, id, isComputingDef);
|
|
565
|
+
const lubSize = lubRows.length;
|
|
566
|
+
const glbSize = glbRows.length;
|
|
567
|
+
const rowIndex = lubSize <= glbSize ? lubIndex : glbIndex;
|
|
568
|
+
if (rowIndex === NONE) {
|
|
569
|
+
if (isComputingDef) {
|
|
570
|
+
if (lubIndex !== NONE) return this.solveFor(lubIndex, id, true);
|
|
571
|
+
if (glbIndex !== NONE) return this.solveFor(glbIndex, id, true);
|
|
572
|
+
return mkConstDef(this.var2Value[id]);
|
|
573
|
+
}
|
|
574
|
+
for (const rowId of lubRows) this.retireRow(rowId);
|
|
575
|
+
for (const rowId of glbRows) this.retireRow(rowId);
|
|
576
|
+
return null;
|
|
577
|
+
}
|
|
578
|
+
const result = isComputingDef ? getDefFromRow(this.rows[rowIndex], id) : null;
|
|
579
|
+
if (
|
|
580
|
+
(lubSize <= 2 || glbSize <= 2) &&
|
|
581
|
+
lubSize <= 3 &&
|
|
582
|
+
glbSize <= 3 &&
|
|
583
|
+
(!this.var2IsInt[id] || isLubUnit || isGlbUnit)
|
|
584
|
+
) {
|
|
585
|
+
for (const [index, rowId1] of lubRows.entries()) {
|
|
586
|
+
const isLast = index + 1 === lubSize;
|
|
587
|
+
const coeff = this.getCoefficient(rowId1, id);
|
|
588
|
+
for (const rowId2 of glbRows) {
|
|
589
|
+
if (isLast) this.resolve(rowId1, coeff, rowId2, id);
|
|
590
|
+
else this.resolve(rowId1, coeff, this.copyRow(rowId2), id);
|
|
591
|
+
}
|
|
592
|
+
}
|
|
593
|
+
for (const rowId of lubRows) this.retireRow(rowId);
|
|
594
|
+
return result;
|
|
595
|
+
}
|
|
596
|
+
const coeff = this.getCoefficient(rowIndex, id);
|
|
597
|
+
for (const rowId of lubRows) if (rowId !== rowIndex) this.resolve(rowIndex, coeff, rowId, id);
|
|
598
|
+
for (const rowId of glbRows) if (rowId !== rowIndex) this.resolve(rowIndex, coeff, rowId, id);
|
|
599
|
+
this.retireRow(rowIndex);
|
|
600
|
+
return result;
|
|
601
|
+
}
|
|
602
|
+
|
|
603
|
+
// Replaces x by K*y + z, 0 <= z < K, for the lcm K of the mod and div rows.
|
|
604
|
+
private solveModDiv(
|
|
605
|
+
id: number,
|
|
606
|
+
modRowIds: readonly number[],
|
|
607
|
+
divRowIds: readonly number[],
|
|
608
|
+
isComputingDef: boolean,
|
|
609
|
+
) {
|
|
610
|
+
let modulus = Rational.one;
|
|
611
|
+
for (const rowId of divRowIds) modulus = getRationalLcm(modulus, this.rows[rowId].mod);
|
|
612
|
+
for (const rowId of modRowIds) modulus = getRationalLcm(modulus, this.rows[rowId].mod);
|
|
613
|
+
const value = this.var2Value[id];
|
|
614
|
+
const zValue = getMod(value, modulus);
|
|
615
|
+
const yValue = getDiv(value, modulus);
|
|
616
|
+
const zVar = this.addVar(zValue, true);
|
|
617
|
+
const yVar = this.addVar(yValue, true);
|
|
618
|
+
const visited = new Set<number>();
|
|
619
|
+
const divRows: number[] = [];
|
|
620
|
+
for (const rowId of divRowIds) {
|
|
621
|
+
if (visited.has(rowId)) continue;
|
|
622
|
+
const row = this.rows[rowId];
|
|
623
|
+
this.mul(rowId, modulus.div(row.mod));
|
|
624
|
+
row.isAlive = false;
|
|
625
|
+
visited.add(rowId);
|
|
626
|
+
divRows.push(rowId);
|
|
627
|
+
}
|
|
628
|
+
const modRows: number[] = [];
|
|
629
|
+
for (const rowId of modRowIds) {
|
|
630
|
+
if (visited.has(rowId)) continue;
|
|
631
|
+
this.rows[rowId].isAlive = false;
|
|
632
|
+
visited.add(rowId);
|
|
633
|
+
modRows.push(rowId);
|
|
634
|
+
}
|
|
635
|
+
for (const rowId of this.var2RowIds[id]) {
|
|
636
|
+
if (visited.has(rowId)) continue;
|
|
637
|
+
this.replaceVarByTwo(rowId, id, modulus, yVar, Rational.one, zVar);
|
|
638
|
+
visited.add(rowId);
|
|
639
|
+
this.normalize(rowId);
|
|
640
|
+
}
|
|
641
|
+
this.addLowerBound(zVar, Rational.zero);
|
|
642
|
+
this.addUpperBound(zVar, modulus.sub(Rational.one));
|
|
643
|
+
const defined: number[] = [];
|
|
644
|
+
for (const rowId of divRows) {
|
|
645
|
+
const coeff = this.getCoefficient(rowId, id);
|
|
646
|
+
this.replaceVarByConst(rowId, id, Rational.zero);
|
|
647
|
+
const coeffs = this.rows[rowId].vars.map((innerVar) => ({ ...innerVar }));
|
|
648
|
+
const constant = this.rows[rowId].coeff;
|
|
649
|
+
const isUnitModulus = modulus.equals(Rational.one);
|
|
650
|
+
let divVar = NONE;
|
|
651
|
+
let offset = Rational.zero;
|
|
652
|
+
if (isUnitModulus) offset = constant;
|
|
653
|
+
else if (coeffs.length === 0) offset = getDiv(constant, modulus);
|
|
654
|
+
else divVar = this.addDiv(coeffs, constant, modulus);
|
|
655
|
+
// v = a*y + w + k, k*K <= a*z + b mod K < (k+1)*K, for w = b div K.
|
|
656
|
+
const definedVar = this.rows[rowId].id;
|
|
657
|
+
const bValue = this.evalTerm(coeffs, constant);
|
|
658
|
+
const quotient = getDiv(coeff.mul(zValue).add(getMod(bValue, modulus)), modulus);
|
|
659
|
+
const divCoeffs: MboVar[] = [
|
|
660
|
+
{ id: definedVar, coeff: Rational.minusOne },
|
|
661
|
+
{ id: yVar, coeff },
|
|
662
|
+
];
|
|
663
|
+
if (divVar !== NONE) divCoeffs.push({ id: divVar, coeff: Rational.one });
|
|
664
|
+
else if (isUnitModulus) divCoeffs.push(...coeffs);
|
|
665
|
+
this.addConstraint(divCoeffs, quotient.add(offset), T_EQ);
|
|
666
|
+
let modVar = NONE;
|
|
667
|
+
offset = Rational.zero;
|
|
668
|
+
if (isUnitModulus) offset = Rational.zero;
|
|
669
|
+
else if (coeffs.length === 0) offset = getMod(constant, modulus);
|
|
670
|
+
else modVar = this.addMod(coeffs, constant, modulus);
|
|
671
|
+
const boundCoeffs: MboVar[] = [{ id: zVar, coeff }];
|
|
672
|
+
if (modVar !== NONE) boundCoeffs.push({ id: modVar, coeff: Rational.one });
|
|
673
|
+
this.addConstraint(
|
|
674
|
+
boundCoeffs,
|
|
675
|
+
Rational.one.sub(modulus.mul(quotient.add(Rational.one))).add(offset),
|
|
676
|
+
T_LE,
|
|
677
|
+
);
|
|
678
|
+
this.addConstraint(
|
|
679
|
+
boundCoeffs.map((innerVar) => ({ id: innerVar.id, coeff: innerVar.coeff.neg() })),
|
|
680
|
+
quotient.mul(modulus).sub(offset),
|
|
681
|
+
T_LE,
|
|
682
|
+
);
|
|
683
|
+
this.retireRow(rowId);
|
|
684
|
+
defined.push(definedVar);
|
|
685
|
+
}
|
|
686
|
+
for (const rowId of modRows) {
|
|
687
|
+
const coeff = this.getCoefficient(rowId, id);
|
|
688
|
+
this.replaceVarByConst(rowId, id, Rational.zero);
|
|
689
|
+
const rowMod = this.rows[rowId].mod;
|
|
690
|
+
const coeffs = this.rows[rowId].vars.map((innerVar) => ({ ...innerVar }));
|
|
691
|
+
const constant = this.rows[rowId].coeff;
|
|
692
|
+
const definedVar = this.rows[rowId].id;
|
|
693
|
+
const definedValue = this.var2Value[definedVar];
|
|
694
|
+
let modVar = NONE;
|
|
695
|
+
let offset = Rational.zero;
|
|
696
|
+
if (coeffs.length === 0 || rowMod.equals(Rational.one)) offset = getMod(constant, rowMod);
|
|
697
|
+
else modVar = this.addMod(coeffs, constant, rowMod);
|
|
698
|
+
const modValue = modVar === NONE ? offset : this.var2Value[modVar];
|
|
699
|
+
// v = a*z + w - V, for V = v_value - a*z_value - w_value.
|
|
700
|
+
const shift = definedValue.sub(coeff.mul(zValue)).sub(modValue);
|
|
701
|
+
const modCoeffs: MboVar[] = [
|
|
702
|
+
{ id: definedVar, coeff: Rational.minusOne },
|
|
703
|
+
{ id: zVar, coeff },
|
|
704
|
+
];
|
|
705
|
+
if (modVar !== NONE) modCoeffs.push({ id: modVar, coeff: Rational.one });
|
|
706
|
+
this.addConstraint(modCoeffs, shift.add(offset), T_EQ);
|
|
707
|
+
this.addLowerBound(definedVar, Rational.zero);
|
|
708
|
+
this.addUpperBound(definedVar, rowMod.sub(Rational.one));
|
|
709
|
+
this.retireRow(rowId);
|
|
710
|
+
defined.push(definedVar);
|
|
711
|
+
}
|
|
712
|
+
for (const definedVar of defined) {
|
|
713
|
+
const def = this.projectVar(definedVar, isComputingDef);
|
|
714
|
+
if (def !== null) this.eliminate(definedVar, def);
|
|
715
|
+
}
|
|
716
|
+
const zDef = this.projectVar(zVar, isComputingDef);
|
|
717
|
+
const yDef = this.projectVar(yVar, isComputingDef);
|
|
718
|
+
if (zDef === null || yDef === null) return null;
|
|
719
|
+
const substituted = substituteDef(zDef, yVar, yDef);
|
|
720
|
+
this.eliminate(yVar, yDef);
|
|
721
|
+
this.eliminate(zVar, substituted);
|
|
722
|
+
const result = mkAddDef(mulDefBy(yDef, modulus), substituted);
|
|
723
|
+
this.var2Value[id] = this.evalDef(result);
|
|
724
|
+
return result;
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
// x := D*x' + u, for the lcm D of the divisors and u = eval(x) mod D.
|
|
728
|
+
private solveDivides(id: number, divideRows: readonly number[], isComputingDef: boolean) {
|
|
729
|
+
let modulus = Rational.one;
|
|
730
|
+
for (const rowId of divideRows) modulus = getRationalLcm(modulus, this.rows[rowId].mod);
|
|
731
|
+
if (modulus.isZero()) throw new SmtInvariantError("modulo 0 is not defined");
|
|
732
|
+
modulus = modulus.abs();
|
|
733
|
+
const value = this.var2Value[id];
|
|
734
|
+
const remainder = getMod(value, modulus);
|
|
735
|
+
for (const rowId of divideRows) {
|
|
736
|
+
this.replaceVarByConst(rowId, id, remainder);
|
|
737
|
+
this.normalize(rowId);
|
|
738
|
+
}
|
|
739
|
+
const yVar = this.addVar(value.sub(remainder).div(modulus), true);
|
|
740
|
+
const visited = new Set<number>();
|
|
741
|
+
for (const rowId of this.var2RowIds[id]) {
|
|
742
|
+
if (visited.has(rowId)) continue;
|
|
743
|
+
this.replaceVarByOne(rowId, id, modulus, yVar, remainder);
|
|
744
|
+
visited.add(rowId);
|
|
745
|
+
this.normalize(rowId);
|
|
746
|
+
}
|
|
747
|
+
const def = this.projectVar(yVar, isComputingDef);
|
|
748
|
+
if (def === null) return null;
|
|
749
|
+
const result = addDefConst(mulDefBy(def, modulus), remainder);
|
|
750
|
+
this.var2Value[id] = this.evalDef(result);
|
|
751
|
+
return result;
|
|
752
|
+
}
|
|
753
|
+
|
|
754
|
+
// x |-> C
|
|
755
|
+
private replaceVarByConst(rowId: number, id: number, value: Rational) {
|
|
756
|
+
const row = this.rows[rowId];
|
|
757
|
+
let coeff = Rational.zero;
|
|
758
|
+
row.vars = row.vars.filter((innerVar) => {
|
|
759
|
+
if (innerVar.id !== id) return true;
|
|
760
|
+
coeff = innerVar.coeff;
|
|
761
|
+
return false;
|
|
762
|
+
});
|
|
763
|
+
row.coeff = row.coeff.add(coeff.mul(value));
|
|
764
|
+
row.value = row.value.add(coeff.mul(value.sub(this.var2Value[id])));
|
|
765
|
+
}
|
|
766
|
+
|
|
767
|
+
// x |-> A*y + B
|
|
768
|
+
private replaceVarByOne(
|
|
769
|
+
rowId: number,
|
|
770
|
+
id: number,
|
|
771
|
+
factor: Rational,
|
|
772
|
+
yVar: number,
|
|
773
|
+
constant: Rational,
|
|
774
|
+
) {
|
|
775
|
+
const row = this.rows[rowId];
|
|
776
|
+
const coeff = this.getCoefficient(rowId, id);
|
|
777
|
+
if (coeff.isZero() || !row.isAlive) return;
|
|
778
|
+
this.replaceVarByConst(rowId, id, constant);
|
|
779
|
+
row.vars.push({ id: yVar, coeff: coeff.mul(factor) });
|
|
780
|
+
row.value = row.value.add(coeff.mul(factor).mul(this.var2Value[yVar]));
|
|
781
|
+
if (row.vars.length > 0 && row.vars[row.vars.length - 1].id > yVar) sortVars(row.vars);
|
|
782
|
+
this.var2RowIds[yVar].push(rowId);
|
|
783
|
+
}
|
|
784
|
+
|
|
785
|
+
// x |-> A*y + B*z
|
|
786
|
+
private replaceVarByTwo(
|
|
787
|
+
rowId: number,
|
|
788
|
+
id: number,
|
|
789
|
+
yFactor: Rational,
|
|
790
|
+
yVar: number,
|
|
791
|
+
zFactor: Rational,
|
|
792
|
+
zVar: number,
|
|
793
|
+
) {
|
|
794
|
+
const row = this.rows[rowId];
|
|
795
|
+
const coeff = this.getCoefficient(rowId, id);
|
|
796
|
+
if (coeff.isZero() || !row.isAlive) return;
|
|
797
|
+
this.replaceVarByConst(rowId, id, Rational.zero);
|
|
798
|
+
if (!yFactor.isZero()) row.vars.push({ id: yVar, coeff: coeff.mul(yFactor) });
|
|
799
|
+
if (!zFactor.isZero()) row.vars.push({ id: zVar, coeff: coeff.mul(zFactor) });
|
|
800
|
+
row.value = row.value.add(coeff.mul(yFactor).mul(this.var2Value[yVar]));
|
|
801
|
+
row.value = row.value.add(coeff.mul(zFactor).mul(this.var2Value[zVar]));
|
|
802
|
+
sortVars(row.vars);
|
|
803
|
+
if (!yFactor.isZero()) this.var2RowIds[yVar].push(rowId);
|
|
804
|
+
if (!zFactor.isZero()) this.var2RowIds[zVar].push(rowId);
|
|
805
|
+
}
|
|
806
|
+
|
|
807
|
+
private solveFor(rowId1: number, id: number, isComputingDef: boolean) {
|
|
808
|
+
let coeff = this.getCoefficient(rowId1, id);
|
|
809
|
+
const row1 = this.rows[rowId1];
|
|
810
|
+
const type = row1.type;
|
|
811
|
+
if (coeff.isNegative()) {
|
|
812
|
+
coeff = coeff.neg();
|
|
813
|
+
for (const innerVar of row1.vars) innerVar.coeff = innerVar.coeff.neg();
|
|
814
|
+
row1.coeff = row1.coeff.neg();
|
|
815
|
+
row1.value = row1.value.neg();
|
|
816
|
+
}
|
|
817
|
+
if (type === T_LT) {
|
|
818
|
+
row1.coeff = row1.coeff.sub(row1.value);
|
|
819
|
+
row1.type = T_LE;
|
|
820
|
+
row1.value = Rational.zero;
|
|
821
|
+
}
|
|
822
|
+
if (this.var2IsInt[id] && !coeff.equals(Rational.one)) {
|
|
823
|
+
row1.coeff = row1.coeff.sub(row1.value);
|
|
824
|
+
row1.value = Rational.zero;
|
|
825
|
+
const coeffs = row1.vars.filter((innerVar) => innerVar.id !== id);
|
|
826
|
+
const remainder = getMod(this.evalTerm(coeffs, Rational.zero).neg(), coeff);
|
|
827
|
+
this.addDivides(coeffs, remainder, coeff);
|
|
828
|
+
}
|
|
829
|
+
const visited = new Set([rowId1]);
|
|
830
|
+
for (const rowId2 of this.var2RowIds[id]) {
|
|
831
|
+
if (visited.has(rowId2)) continue;
|
|
832
|
+
visited.add(rowId2);
|
|
833
|
+
const row = this.rows[rowId2];
|
|
834
|
+
if (!row.isAlive || this.getCoefficient(rowId2, id).isZero()) continue;
|
|
835
|
+
if (row.type === T_EQ || row.type === T_LT || row.type === T_LE)
|
|
836
|
+
this.solve(rowId1, coeff, rowId2, id);
|
|
837
|
+
else throw new SmtInvariantError("model_based_opt: mod reduction left a row");
|
|
838
|
+
}
|
|
839
|
+
const result = isComputingDef ? getDefFromRow(row1, id) : null;
|
|
840
|
+
if (result !== null) this.var2Value[id] = this.evalDef(result);
|
|
841
|
+
this.retireRow(rowId1);
|
|
842
|
+
return result;
|
|
843
|
+
}
|
|
844
|
+
}
|