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,345 @@
|
|
|
1
|
+
interface QfnraSolver {
|
|
2
|
+
simpleCheck: number;
|
|
3
|
+
heuristic?: number;
|
|
4
|
+
orders: [number, number][];
|
|
5
|
+
ls: number;
|
|
6
|
+
smt: number;
|
|
7
|
+
seeds: number;
|
|
8
|
+
seedLimit: number;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const BV2SAT =
|
|
12
|
+
"(using-params (and-then simplify propagate-values solve-eqs max-bv-sharing bit-blast aig " +
|
|
13
|
+
"(using-params sat :flat false :som false :gc dyn_psm)) :flat false :som false :gc dyn_psm)";
|
|
14
|
+
|
|
15
|
+
const QFLIA_PREAMBLE =
|
|
16
|
+
"(and-then simplify propagate-values (using-params ctx-simplify :max_depth 30 " +
|
|
17
|
+
":max_steps 5000000) (using-params simplify :pull_cheap_ite true :push_ite_arith false " +
|
|
18
|
+
":local_ctx true :local_ctx_limit 10000000 :hoist_ite true) solve-eqs (using-params lia2card " +
|
|
19
|
+
":lia2card.max_range 1 :lia2card.max_ite_nesting 1) elim-uncnstr)";
|
|
20
|
+
|
|
21
|
+
const getNoCutSmt = (seed: number) =>
|
|
22
|
+
`(using-params smt :smt.logic QF_LIA :arith.branch_cut_ratio 10000000 :random_seed ${seed})`;
|
|
23
|
+
|
|
24
|
+
const LIA2SAT =
|
|
25
|
+
"(and-then (fail-if is-unbounded) (fail-if produce-proofs) (fail-if produce-unsat-cores) " +
|
|
26
|
+
"propagate-ineqs normalize-bounds lia2pb (using-params pb2bv :pb2bv_all_clauses_limit 8) " +
|
|
27
|
+
`(fail-if (not is-qfbv)) (using-params ${BV2SAT} :ite_extra true))`;
|
|
28
|
+
|
|
29
|
+
const ILP_MODEL_FINDER =
|
|
30
|
+
"(and-then (fail-if (not (and is-ilp is-unbounded))) (fail-if produce-proofs) " +
|
|
31
|
+
`(fail-if produce-unsat-cores) propagate-ineqs (or-else (try-for ${getNoCutSmt(100)} 2000) ` +
|
|
32
|
+
`(and-then (using-params add-bounds :add_bound_lower -16 :add_bound_upper 15) ` +
|
|
33
|
+
`(try-for ${LIA2SAT} 5000)) (try-for ${getNoCutSmt(200)} 5000) (and-then ` +
|
|
34
|
+
`(using-params add-bounds :add_bound_lower -32 :add_bound_upper 31) (try-for ${LIA2SAT} ` +
|
|
35
|
+
"10000))) fail-if-undecided)";
|
|
36
|
+
|
|
37
|
+
const PB =
|
|
38
|
+
"(and-then (fail-if (not is-pb)) (fail-if produce-proofs) (fail-if produce-unsat-cores) " +
|
|
39
|
+
"(or-else (and-then (fail-if (>= num-exprs 80000)) (fail-if (not is-ilp)) " +
|
|
40
|
+
"fail-if-undecided) (and-then (using-params pb2bv :pb2bv_all_clauses_limit 8) " +
|
|
41
|
+
`(fail-if (not is-qfbv)) (using-params ${BV2SAT} :ite_extra true))))`;
|
|
42
|
+
|
|
43
|
+
const BOUNDED =
|
|
44
|
+
`(and-then (fail-if is-unbounded) (or-else (try-for ${getNoCutSmt(100)} 5000) (try-for ` +
|
|
45
|
+
"(using-params smt :arith.branch_cut_ratio 10000000 :random_seed 200 :relevancy 0) 5000) " +
|
|
46
|
+
`(try-for ${getNoCutSmt(300)} 15000)) fail-if-undecided)`;
|
|
47
|
+
|
|
48
|
+
const QFLIA =
|
|
49
|
+
`(using-params (and-then ${QFLIA_PREAMBLE} (using-params simplify :arith_lhs true) ` +
|
|
50
|
+
`(or-else ${ILP_MODEL_FINDER} ${PB} (and-then (fail-if (not is-quasi-pb)) ` +
|
|
51
|
+
`(using-params ${LIA2SAT} :lia2pb_max_bits 64) fail-if-undecided) ${BOUNDED} smt)) ` +
|
|
52
|
+
":elim_and true :som true :blast_distinct true :blast_distinct_threshold 128 " +
|
|
53
|
+
":lia2card.max_range 1 :lia2card.max_ite_nesting 1)";
|
|
54
|
+
|
|
55
|
+
const QFIDL_BV_SOLVER =
|
|
56
|
+
"(using-params (and-then simplify propagate-values solve-eqs max-bv-sharing bit-blast aig " +
|
|
57
|
+
"sat) :flat false :som false :gc dyn_psm)";
|
|
58
|
+
|
|
59
|
+
const QFIDL =
|
|
60
|
+
"(if (and (< num-consts 5000) (not produce-proofs) (not produce-unsat-cores)) " +
|
|
61
|
+
"(using-params (and-then (and-then (and-then simplify fix-dl-var propagate-values " +
|
|
62
|
+
"elim-uncnstr) (and-then solve-eqs (using-params simplify :arith_lhs true) propagate-values " +
|
|
63
|
+
"normalize-bounds solve-eqs)) (or-else (using-params diff-neq :diff_neq_max_k 25) (and-then " +
|
|
64
|
+
"(using-params lia2pb :lia2pb_max_bits 4) propagate-ineqs (using-params pb2bv " +
|
|
65
|
+
`:pb2bv_all_clauses_limit 8) (fail-if (not is-qfbv)) ${QFIDL_BV_SOLVER}) smt)) ` +
|
|
66
|
+
":elim_and true :blast_distinct true :som true) smt)";
|
|
67
|
+
|
|
68
|
+
const getQfnraNlsat = (isFactoring: boolean) =>
|
|
69
|
+
"(and-then (and-then (using-params simplify :elim_and true :blast_distinct true) " +
|
|
70
|
+
"(using-params purify-arith :complete false) propagate-values solve-eqs elim-uncnstr " +
|
|
71
|
+
"elim-term-ite (using-params purify-arith :complete false)) (and-then " +
|
|
72
|
+
`${isFactoring ? "factor" : "skip"} solve-eqs (using-params purify-arith :complete false) ` +
|
|
73
|
+
"(using-params simplify :elim_and true :blast_distinct true) tseitin-cnf-core " +
|
|
74
|
+
"(using-params simplify :elim_and true :blast_distinct true) nlsat))";
|
|
75
|
+
|
|
76
|
+
const QFNRA_NLSAT = getQfnraNlsat(true);
|
|
77
|
+
|
|
78
|
+
const getQfnraSolver = (solver: QfnraSolver) =>
|
|
79
|
+
[
|
|
80
|
+
`(try-for (and-then (using-params ${QFNRA_NLSAT} :simple_check true) fail-if-undecided) ` +
|
|
81
|
+
`${solver.simpleCheck})`,
|
|
82
|
+
...(solver.heuristic === undefined ? [] : [`(try-for ${QFNRA_NLSAT} ${solver.heuristic})`]),
|
|
83
|
+
...solver.orders.map(
|
|
84
|
+
([strategy, limit]) =>
|
|
85
|
+
`(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${strategy}) ${limit})`,
|
|
86
|
+
),
|
|
87
|
+
`(using-params smt :use_ls true :ls_time ${solver.ls})`,
|
|
88
|
+
`(and-then (try-for (using-params smt :arith.greatest_error_pivot true) ${solver.smt}) ` +
|
|
89
|
+
"fail-if-undecided)",
|
|
90
|
+
...Array.from(
|
|
91
|
+
{ length: solver.seeds },
|
|
92
|
+
(_unused, seed) =>
|
|
93
|
+
`(try-for (using-params ${QFNRA_NLSAT} :seed ${seed} :shuffle_vars true) ` +
|
|
94
|
+
`${solver.seedLimit})`,
|
|
95
|
+
),
|
|
96
|
+
QFNRA_NLSAT,
|
|
97
|
+
].join(" ");
|
|
98
|
+
|
|
99
|
+
const QFNRA_VERY_SMALL = getQfnraSolver({
|
|
100
|
+
simpleCheck: 10000,
|
|
101
|
+
heuristic: 4000,
|
|
102
|
+
orders: [
|
|
103
|
+
[4, 4000],
|
|
104
|
+
[3, 6000],
|
|
105
|
+
[1, 8000],
|
|
106
|
+
[5, 8000],
|
|
107
|
+
[2, 10000],
|
|
108
|
+
],
|
|
109
|
+
ls: 60,
|
|
110
|
+
smt: 300000,
|
|
111
|
+
seeds: 200,
|
|
112
|
+
seedLimit: 3000,
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
const QFNRA_SMALL = getQfnraSolver({
|
|
116
|
+
simpleCheck: 20000,
|
|
117
|
+
heuristic: 5000,
|
|
118
|
+
orders: [
|
|
119
|
+
[4, 5000],
|
|
120
|
+
[3, 10000],
|
|
121
|
+
[1, 15000],
|
|
122
|
+
[5, 15000],
|
|
123
|
+
[2, 20000],
|
|
124
|
+
],
|
|
125
|
+
ls: 70,
|
|
126
|
+
smt: 350000,
|
|
127
|
+
seeds: 100,
|
|
128
|
+
seedLimit: 5000,
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
const QFNRA_MIDDLE = getQfnraSolver({
|
|
132
|
+
simpleCheck: 30000,
|
|
133
|
+
heuristic: 10000,
|
|
134
|
+
orders: [
|
|
135
|
+
[4, 15000],
|
|
136
|
+
[3, 15000],
|
|
137
|
+
[1, 20000],
|
|
138
|
+
[5, 20000],
|
|
139
|
+
[2, 25000],
|
|
140
|
+
],
|
|
141
|
+
ls: 80,
|
|
142
|
+
smt: 375000,
|
|
143
|
+
seeds: 40,
|
|
144
|
+
seedLimit: 10000,
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
const QFNRA_LARGE = getQfnraSolver({
|
|
148
|
+
simpleCheck: 50000,
|
|
149
|
+
orders: [
|
|
150
|
+
[4, 15000],
|
|
151
|
+
[3, 30000],
|
|
152
|
+
[1, 40000],
|
|
153
|
+
[5, 40000],
|
|
154
|
+
[2, 50000],
|
|
155
|
+
],
|
|
156
|
+
ls: 90,
|
|
157
|
+
smt: 400000,
|
|
158
|
+
seeds: 10,
|
|
159
|
+
seedLimit: 20000,
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
const QFNRA_VERY_LARGE = getQfnraSolver({
|
|
163
|
+
simpleCheck: 100000,
|
|
164
|
+
orders: [
|
|
165
|
+
[1, 80000],
|
|
166
|
+
[5, 80000],
|
|
167
|
+
[2, 100000],
|
|
168
|
+
],
|
|
169
|
+
ls: 100,
|
|
170
|
+
smt: 425000,
|
|
171
|
+
seeds: 0,
|
|
172
|
+
seedLimit: 0,
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
const QFNRA =
|
|
176
|
+
"(and-then simplify propagate-values (if (< memory 30) (or-else " +
|
|
177
|
+
`${QFNRA_VERY_SMALL}) (if (< memory 80) (or-else ${QFNRA_SMALL}) (if (< memory 300) (or-else ` +
|
|
178
|
+
`${QFNRA_MIDDLE}) (if (< memory 600) (or-else ${QFNRA_LARGE}) (or-else ${QFNRA_VERY_LARGE}))))))`;
|
|
179
|
+
|
|
180
|
+
const NRA =
|
|
181
|
+
"(and-then simplify propagate-values qe-light simplify (if is-qfnra (or-else (try-for " +
|
|
182
|
+
`${QFNRA_NLSAT} 5000) (try-for (using-params ${getQfnraNlsat(false)} :seed 11 ` +
|
|
183
|
+
`:factor false) 10000) (using-params ${getQfnraNlsat(false)} :seed 13 :factor false)) ` +
|
|
184
|
+
"(or-else nlqsat smt)))";
|
|
185
|
+
|
|
186
|
+
const QFNIA_BV_SOLVER =
|
|
187
|
+
"(using-params (and-then simplify propagate-values (using-params simplify :local_ctx true " +
|
|
188
|
+
":local_ctx_limit 10000000) max-bv-sharing (using-params bit-blast :max_memory 100 " +
|
|
189
|
+
":max_conflicts 500) (using-params sat :max_memory 100 :max_conflicts 500)) :flat false " +
|
|
190
|
+
":hi_div0 true :elim_and true :blast_distinct true)";
|
|
191
|
+
|
|
192
|
+
const QFNIA_SMT_SOLVER = "(and-then (using-params simplify :som true) smt)";
|
|
193
|
+
|
|
194
|
+
const QFNIA =
|
|
195
|
+
"(and-then (and-then simplify propagate-values solve-eqs (using-params ctx-simplify " +
|
|
196
|
+
":max_depth 30 :max_steps 5000000) (using-params simplify :pull_cheap_ite true :local_ctx " +
|
|
197
|
+
"true :local_ctx_limit 10000000) elim-uncnstr (using-params lia2card :lia2card.max_range 1 " +
|
|
198
|
+
":lia2card.max_ite_nesting 1) card2bv (skip-if-failed (using-params cofactor-term-ite " +
|
|
199
|
+
":max_memory 20))) (or-else (and-then (using-params simplify :hoist_mul true) (using-params " +
|
|
200
|
+
`nla2bv :nla2bv_max_bv_size 64) (skip-if-failed ${QFNIA_BV_SOLVER}) fail-if-undecided) ` +
|
|
201
|
+
`(try-for ${QFNIA_SMT_SOLVER} 2000) (and-then (using-params simplify :som true) (try-for ` +
|
|
202
|
+
`(using-params ${getQfnraNlsat(false)} :som true) 3000) fail-if-undecided) ` +
|
|
203
|
+
`${QFNIA_SMT_SOLVER}))`;
|
|
204
|
+
|
|
205
|
+
const QUANT_PREPROCESSOR = (isSolvingEqs: boolean) =>
|
|
206
|
+
"(and-then simplify propagate-values (using-params ctx-simplify :max_depth 30 :max_steps " +
|
|
207
|
+
"5000000) (using-params simplify :pull_cheap_ite true :local_ctx true :local_ctx_limit " +
|
|
208
|
+
`10000000) ${isSolvingEqs ? "(when (not has-patterns) solve-eqs)" : "skip"} elim-uncnstr ` +
|
|
209
|
+
"simplify)";
|
|
210
|
+
|
|
211
|
+
const LRA =
|
|
212
|
+
`(and-then ${QUANT_PREPROCESSOR(true)} qe-light (if has-quantifiers (if is-lira (or-else ` +
|
|
213
|
+
"qsat smt) smt) smt))";
|
|
214
|
+
|
|
215
|
+
const DER_FP = "(repeat (and-then der simplify) 5)";
|
|
216
|
+
|
|
217
|
+
const UFBV_PREPROCESSOR =
|
|
218
|
+
"(and-then (and-then simplify propagate-values (and-then (if-no-proofs (if-no-unsat-cores " +
|
|
219
|
+
"(using-params macro-finder :elim_and false))) simplify) (and-then snf simplify) elim-and " +
|
|
220
|
+
`solve-eqs (and-then ${DER_FP} simplify) (and-then distribute-forall simplify)) ` +
|
|
221
|
+
"(if-no-unsat-cores (and-then (and-then reduce-args simplify) (and-then macro-finder " +
|
|
222
|
+
"simplify) (and-then ufbv-rewriter simplify) (and-then quasi-macros simplify))) " +
|
|
223
|
+
`(and-then ${DER_FP} simplify) simplify)`;
|
|
224
|
+
|
|
225
|
+
const UFBV =
|
|
226
|
+
`(using-params (and-then (repeat ${UFBV_PREPROCESSOR} 2) smt) :mbqi true ` +
|
|
227
|
+
":mbqi.max_iterations 4294967295 :elim_and true)";
|
|
228
|
+
|
|
229
|
+
const QFBV_PREAMBLE =
|
|
230
|
+
"(and-then (using-params simplify :flat_and_or false) (using-params propagate-values " +
|
|
231
|
+
":flat_and_or false) (using-params solve-eqs :solve_eqs_max_occs 2) elim-uncnstr " +
|
|
232
|
+
"bv-divrem-bounds (if-no-proofs (if-no-unsat-cores reduce-bv-size)) (using-params simplify " +
|
|
233
|
+
":som true :pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000 " +
|
|
234
|
+
":flat true :hoist_mul false :flat_and_or false) (using-params simplify :hoist_mul true :som " +
|
|
235
|
+
"false :flat_and_or false) max-bv-sharing (if-no-proofs (if-no-unsat-cores ackermannize_bv)))";
|
|
236
|
+
|
|
237
|
+
// Z3 skips this simplification past 300 MB of memory, which the port does not track.
|
|
238
|
+
const QFBV =
|
|
239
|
+
`(using-params (and-then ${QFBV_PREAMBLE} (if is-qfbv-eq (and-then bv1-blast (using-params ` +
|
|
240
|
+
"smt :preprocess false)) (if is-qfbv (and-then bit-blast (and-then (using-params (and-then " +
|
|
241
|
+
"simplify solve-eqs) :local_ctx true :flat false :flat_and_or false) (if-no-proofs aig)) " +
|
|
242
|
+
"(if produce-proofs (and-then simplify smt) psat)) smt))) :elim_and true " +
|
|
243
|
+
":push_ite_bv true :blast_distinct true)";
|
|
244
|
+
|
|
245
|
+
export const QFAUFBV =
|
|
246
|
+
"(using-params (and-then (and-then simplify propagate-values solve-eqs elim-uncnstr " +
|
|
247
|
+
"bv-divrem-bounds (if-no-proofs (if-no-unsat-cores reduce-bv-size)) (using-params simplify " +
|
|
248
|
+
":som true :pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000) " +
|
|
249
|
+
"max-bv-sharing (if-no-proofs (if-no-unsat-cores ackermannize_bv))) (if is-qfbv qfbv smt)) " +
|
|
250
|
+
":elim_and true :sort_store true)";
|
|
251
|
+
|
|
252
|
+
export const QFUFBV_ACKR_PREAMBLE =
|
|
253
|
+
"(and-then (using-params simplify :flat_and_or false) (using-params propagate-values " +
|
|
254
|
+
":flat_and_or false) (if-no-proofs (if-no-unsat-cores bv_bound_chk)) solve-eqs elim-uncnstr " +
|
|
255
|
+
"(if-no-proofs (if-no-unsat-cores reduce-bv-size)) max-bv-sharing (using-params simplify " +
|
|
256
|
+
":pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000 " +
|
|
257
|
+
":ite_extra_rules true :mul2concat true :flat_and_or false))";
|
|
258
|
+
|
|
259
|
+
const QFAUFLIA =
|
|
260
|
+
"(and-then (using-params (and-then simplify propagate-values solve-eqs elim-uncnstr simplify) " +
|
|
261
|
+
":elim_and true :som true :sort_store true) (using-params smt :array.simplify false))";
|
|
262
|
+
|
|
263
|
+
const QFUF =
|
|
264
|
+
"(and-then simplify propagate-values solve-eqs (using-params simplify :pull_cheap_ite true " +
|
|
265
|
+
":local_ctx true :local_ctx_limit 10000000) (if-no-proofs (if-no-unsat-cores " +
|
|
266
|
+
"symmetry-reduce)) smt)";
|
|
267
|
+
|
|
268
|
+
const DEFAULT =
|
|
269
|
+
"(and-then simplify (if (and is-propositional (not produce-proofs)) qffd (if is-qfbv qfbv " +
|
|
270
|
+
"(if is-qfaufbv qfaufbv (if is-qflia qflia (if is-qfauflia qfauflia (if is-qflra qflra (if " +
|
|
271
|
+
"is-qfnra qfnra (if is-qfnia qfnia (if is-lira lira (if is-nra nra (if is-qffp qffp (if " +
|
|
272
|
+
`is-qffplra qffplra (and-then ${QFLIA_PREAMBLE} smt))))))))))))))`;
|
|
273
|
+
|
|
274
|
+
const QFFP_SIMPLIFY = "(using-params simplify :arith_lhs true :elim_and true)";
|
|
275
|
+
|
|
276
|
+
const QFFP =
|
|
277
|
+
`(and-then (and-then ${QFFP_SIMPLIFY} propagate-values fpa2bv propagate-values ${QFFP_SIMPLIFY} ` +
|
|
278
|
+
"(if-no-proofs (if-no-unsat-cores ackermannize_bv))) bit-blast " +
|
|
279
|
+
`${QFFP_SIMPLIFY} (if is-propositional (if produce-proofs smt psat) (if is-fp-qfnra qfnra smt)))`;
|
|
280
|
+
|
|
281
|
+
export const LOGIC_TACTICS: ReadonlyMap<string, string> = new Map([
|
|
282
|
+
["qflia", QFLIA],
|
|
283
|
+
["qfidl", QFIDL],
|
|
284
|
+
["qfnia", QFNIA],
|
|
285
|
+
["qfnra-nlsat", QFNRA_NLSAT],
|
|
286
|
+
["qfnra", QFNRA],
|
|
287
|
+
["nra", NRA],
|
|
288
|
+
["qflra", "(using-params smt :arith.greatest_error_pivot true)"],
|
|
289
|
+
["lra", LRA],
|
|
290
|
+
["lia", LRA],
|
|
291
|
+
["lira", LRA],
|
|
292
|
+
["uflra", `(and-then ${QUANT_PREPROCESSOR(true)} smt)`],
|
|
293
|
+
["auflira", `(and-then ${QUANT_PREPROCESSOR(true)} smt)`],
|
|
294
|
+
["aufnira", `(and-then ${QUANT_PREPROCESSOR(true)} smt)`],
|
|
295
|
+
[
|
|
296
|
+
"auflia",
|
|
297
|
+
`(and-then ${QUANT_PREPROCESSOR(false)} (or-else (and-then (fail-if (> num-exprs 128)) ` +
|
|
298
|
+
"(using-params smt :qi.cost 0) fail-if-undecided) smt))",
|
|
299
|
+
],
|
|
300
|
+
["ufnia", `(and-then ${QUANT_PREPROCESSOR(false)} qe-light smt)`],
|
|
301
|
+
["ufbv", UFBV],
|
|
302
|
+
["bv", UFBV],
|
|
303
|
+
["qfbv", QFBV],
|
|
304
|
+
["qfaufbv", QFAUFBV],
|
|
305
|
+
["qfauflia", QFAUFLIA],
|
|
306
|
+
["qfuf", QFUF],
|
|
307
|
+
["qffp", QFFP],
|
|
308
|
+
["qffpbv", QFFP],
|
|
309
|
+
["qffplra", QFFP],
|
|
310
|
+
["default", DEFAULT],
|
|
311
|
+
]);
|
|
312
|
+
|
|
313
|
+
const LOGIC_STRATEGIES = new Map([
|
|
314
|
+
["QF_UF", "qfuf"],
|
|
315
|
+
["QF_BV", "qfbv"],
|
|
316
|
+
["QF_IDL", "qfidl"],
|
|
317
|
+
["QF_LIA", "qflia"],
|
|
318
|
+
["QF_LRA", "qflra"],
|
|
319
|
+
["QF_NIA", "qfnia"],
|
|
320
|
+
["QF_NRA", "qfnra"],
|
|
321
|
+
["QF_NTA", "qfnra"],
|
|
322
|
+
["QF_AUFLIA", "qfauflia"],
|
|
323
|
+
["QF_AUFBV", "qfaufbv"],
|
|
324
|
+
["QF_ABV", "qfaufbv"],
|
|
325
|
+
["QF_UFBV", "qfufbv"],
|
|
326
|
+
["AUFLIA", "auflia"],
|
|
327
|
+
["AUFLIRA", "auflira"],
|
|
328
|
+
["AUFNIRA", "aufnira"],
|
|
329
|
+
["UFNIA", "ufnia"],
|
|
330
|
+
["UFLRA", "uflra"],
|
|
331
|
+
["LRA", "lra"],
|
|
332
|
+
["NRA", "nra"],
|
|
333
|
+
["LIA", "lia"],
|
|
334
|
+
["UFBV", "ufbv"],
|
|
335
|
+
["BV", "bv"],
|
|
336
|
+
["QF_FP", "qffp"],
|
|
337
|
+
["QF_FPBV", "qffpbv"],
|
|
338
|
+
["QF_BVFP", "qffpbv"],
|
|
339
|
+
["HORN", "horn"],
|
|
340
|
+
]);
|
|
341
|
+
|
|
342
|
+
export const getLogicStrategy = (logic: string | undefined, isProofsEnabled: boolean) =>
|
|
343
|
+
(logic === "QF_FD" || logic === "SAT") && !isProofsEnabled
|
|
344
|
+
? "qffd"
|
|
345
|
+
: (LOGIC_STRATEGIES.get(logic ?? "") ?? "default");
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/bound_analyzer_on_row.h, src/math/lp/lp_bound_propagator.h, src/math/lp/implied_bound.h, and propagate_bounds_for_touched_rows in src/math/lp/lar_solver.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
4
3
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
|
|
2
|
-
// src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
|
|
6
3
|
import type { LpSettings } from "./lp-settings";
|
|
@@ -45,12 +42,30 @@ export class CoreSolver {
|
|
|
45
42
|
infeasibleSumSign = 0;
|
|
46
43
|
infeasibleCombination: [Rational, number][] = [];
|
|
47
44
|
reducedCosts: Rational[] | undefined;
|
|
45
|
+
private backup: Impq[] = [];
|
|
48
46
|
private isBlandMode = false;
|
|
49
47
|
private leftBasis = new IndexedUintSet();
|
|
50
48
|
private leftBasisRepeated = 0;
|
|
51
49
|
|
|
52
50
|
constructor(readonly settings: LpSettings) {}
|
|
53
51
|
|
|
52
|
+
getColumnCount() {
|
|
53
|
+
return this.matrix.getColumnCount();
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
backupX() {
|
|
57
|
+
this.backup = this.x.slice();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
restoreX() {
|
|
61
|
+
const count = Math.min(this.backup.length, this.getColumnCount());
|
|
62
|
+
for (let column = 0; column < count; column++) this.x[column] = this.backup[column];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
getBackupSize() {
|
|
66
|
+
return this.backup.length;
|
|
67
|
+
}
|
|
68
|
+
|
|
54
69
|
addColumn(isBasic: boolean) {
|
|
55
70
|
const column = this.matrix.getColumnCount();
|
|
56
71
|
this.matrix.addColumn();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
|
|
2
1
|
// Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
|
|
3
2
|
// so an extracted common factor may list its variables in another order.
|
|
4
3
|
import { Rational } from "../rational";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
|
|
2
|
-
// src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
import { type Dependency, linearize, mkJoin } from "./dependency";
|
|
6
3
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/dioph_eq.cpp, src/math/lp/var_register.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
5
3
|
import { IndexedUintSet, UnorderedUintMap } from "./containers";
|
|
@@ -278,10 +276,7 @@ export class DiophantineSolver {
|
|
|
278
276
|
return;
|
|
279
277
|
}
|
|
280
278
|
explanation.pushDependency(
|
|
281
|
-
this.explainFixedInMetaTerm(
|
|
282
|
-
this.getRowMonomials(this.lMatrix, this.conflictRow),
|
|
283
|
-
this.conflictGcd,
|
|
284
|
-
),
|
|
279
|
+
this.explainFixedInMetaTerm(this.lMatrix.rows[this.conflictRow], this.conflictGcd),
|
|
285
280
|
);
|
|
286
281
|
}
|
|
287
282
|
|
|
@@ -801,10 +796,6 @@ export class DiophantineSolver {
|
|
|
801
796
|
return this.getCoeffInERow(row, column).isPositive() ? 1 : -1;
|
|
802
797
|
}
|
|
803
798
|
|
|
804
|
-
private getRowMonomials(matrix: StaticMatrix, row: number): Monomial[] {
|
|
805
|
-
return matrix.rows[row].map((cell) => ({ coeff: cell.coeff, column: cell.column }));
|
|
806
|
-
}
|
|
807
|
-
|
|
808
799
|
private tightenTermsWithS(): DioMove {
|
|
809
800
|
const solver = this.solver;
|
|
810
801
|
const sortedTerms: number[] = [];
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf_cutter.cpp, and get_equality_and_right_side_for_term_on_current_x in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import type { Dependency } from "./dependency";
|
|
4
3
|
import { GeneralMatrix, getDeterminantOfRectangularMatrix, getHermiteNormalForm } from "./hnf";
|
|
@@ -87,7 +86,7 @@ export const makeHnfCut = (lia: IntSolver): LiaMove => {
|
|
|
87
86
|
const deps = isFullRank
|
|
88
87
|
? tightTerms.map((tight) => tight.dep)
|
|
89
88
|
: basisRows.map((row) => tightTerms[row].dep);
|
|
90
|
-
const hermite = getHermiteNormalForm(matrix, determinant,
|
|
89
|
+
const hermite = getHermiteNormalForm(matrix, determinant, settings.isCanceled);
|
|
91
90
|
if (hermite === undefined) return { kind: "undef" };
|
|
92
91
|
const rightSides = isFullRank
|
|
93
92
|
? tightTerms.map((tight) => tight.rightSide)
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/hnf.h, src/math/lp/general_matrix.h,
|
|
2
|
-
// src/math/lp/permutation_matrix.h, and the extended gcd of src/util/mpz.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { Rational } from "../rational";
|
|
5
2
|
|
|
6
3
|
export const getRemainder = (first: Rational, second: Rational) =>
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_cube.cpp, and tighten_term_bounds_by_delta and round_to_integer_solution in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "../rational";
|
|
3
2
|
import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
|
|
4
|
-
import { LP_FEASIBLE, LP_OPTIMAL } from "./core-solver";
|
|
3
|
+
import { LP_FEASIBLE, LP_OPTIMAL, LP_UNBOUNDED } from "./core-solver";
|
|
5
4
|
import { type LarSolver, NULL_LPVAR } from "./lar-solver";
|
|
6
5
|
import type { LarTerm } from "./lar-term";
|
|
7
6
|
import { maximizeTerm } from "./maximize-term";
|
|
@@ -259,7 +258,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
259
258
|
solver.pop(1);
|
|
260
259
|
return false;
|
|
261
260
|
}
|
|
262
|
-
if (maximum ===
|
|
261
|
+
if (maximum.status === LP_UNBOUNDED) {
|
|
263
262
|
addVarBound(solver, edge, KIND_GE, Rational.one);
|
|
264
263
|
const boundedStatus = solver.findFeasibleSolution();
|
|
265
264
|
solver.pop(1);
|
|
@@ -268,7 +267,7 @@ export const findLargestCube = (solver: LarSolver) => {
|
|
|
268
267
|
: false;
|
|
269
268
|
}
|
|
270
269
|
solver.pop(1);
|
|
271
|
-
return maximum.compare(new Impq(Rational.one)) >= 0
|
|
270
|
+
return maximum.value.compare(new Impq(Rational.one)) >= 0
|
|
272
271
|
? roundCenter(solver)
|
|
273
272
|
: roundAndRepair(solver);
|
|
274
273
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/int_solver.cpp, src/math/lp/int_gcd_test.cpp,
|
|
2
|
-
// src/math/lp/int_branch.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getGcd, getLcm, Rational } from "../rational";
|
|
4
2
|
import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
|
|
5
3
|
import { DiophantineSolver } from "./dioph-eq";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_solver.h, src/math/lp/lar_solver.cpp, src/math/lp/column.h, src/math/lp/var_register.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
3
2
|
import { Rational } from "../rational";
|
|
4
3
|
import { IndexedUintSet, StackedVector } from "./containers";
|
|
@@ -131,6 +130,18 @@ export class LarSolver {
|
|
|
131
130
|
return this.localIsInt[column];
|
|
132
131
|
}
|
|
133
132
|
|
|
133
|
+
getLowerBoundOf(column: number) {
|
|
134
|
+
return column < this.columns.length && this.columns[column].lowerWitness !== null
|
|
135
|
+
? this.core.lowerBounds[column]
|
|
136
|
+
: undefined;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
getUpperBoundOf(column: number) {
|
|
140
|
+
return column < this.columns.length && this.columns[column].upperWitness !== null
|
|
141
|
+
? this.core.upperBounds[column]
|
|
142
|
+
: undefined;
|
|
143
|
+
}
|
|
144
|
+
|
|
134
145
|
isBase(column: number) {
|
|
135
146
|
return this.core.isBase(column);
|
|
136
147
|
}
|
|
@@ -229,6 +240,15 @@ export class LarSolver {
|
|
|
229
240
|
}
|
|
230
241
|
}
|
|
231
242
|
|
|
243
|
+
areEqual(first: number, second: number) {
|
|
244
|
+
const term = new LarTerm([
|
|
245
|
+
[first, Rational.one],
|
|
246
|
+
[second, Rational.minusOne],
|
|
247
|
+
]);
|
|
248
|
+
this.substKnownTerms(term);
|
|
249
|
+
return term.size === 0;
|
|
250
|
+
}
|
|
251
|
+
|
|
232
252
|
addTerm(coeffs: [number, Rational][], external: number) {
|
|
233
253
|
const term = new LarTerm(coeffs);
|
|
234
254
|
this.substKnownTerms(term);
|
|
@@ -352,9 +372,10 @@ export class LarSolver {
|
|
|
352
372
|
return { kind, bound };
|
|
353
373
|
}
|
|
354
374
|
|
|
355
|
-
|
|
375
|
+
// A non-zero eps makes the bound rhs + eps*delta.
|
|
376
|
+
mkVarBound(column: number, kind: ConstraintKind, rhs: Rational, eps = Rational.zero) {
|
|
356
377
|
const adjusted = this.adjustBoundForInt(column, kind, rhs);
|
|
357
|
-
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound));
|
|
378
|
+
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound, eps));
|
|
358
379
|
}
|
|
359
380
|
|
|
360
381
|
constraintIsRedundant(index: number) {
|
|
@@ -530,7 +551,7 @@ export class LarSolver {
|
|
|
530
551
|
for (const column of toRemove) this.fixedBaseVarSet.delete(column);
|
|
531
552
|
}
|
|
532
553
|
|
|
533
|
-
|
|
554
|
+
removeFromBasis(column: number) {
|
|
534
555
|
const core = this.core;
|
|
535
556
|
for (const cell of core.matrix.rows[core.heading[column]]) {
|
|
536
557
|
if (cell.column === column || this.isFixed(cell.column)) continue;
|
|
@@ -605,6 +626,21 @@ export class LarSolver {
|
|
|
605
626
|
}
|
|
606
627
|
}
|
|
607
628
|
|
|
629
|
+
hasIntVar() {
|
|
630
|
+
return this.localIsInt.includes(true);
|
|
631
|
+
}
|
|
632
|
+
|
|
633
|
+
// Columns added after the backup get basic values from their rows, as the tableau requires.
|
|
634
|
+
restoreX() {
|
|
635
|
+
const core = this.core;
|
|
636
|
+
const isGrown = core.getBackupSize() < core.getColumnCount();
|
|
637
|
+
core.restoreX();
|
|
638
|
+
if (!isGrown) return;
|
|
639
|
+
for (let rowIndex = 0; rowIndex < this.getRowCount(); rowIndex++)
|
|
640
|
+
core.x[core.basis[rowIndex]] = this.getBasicVarValueFromRow(rowIndex);
|
|
641
|
+
this.moveNonBasicColumnsToBounds();
|
|
642
|
+
}
|
|
643
|
+
|
|
608
644
|
hasInfInt() {
|
|
609
645
|
for (let column = 0; column < this.getColumnCount(); column++)
|
|
610
646
|
if (this.isInt(column) && !this.core.x[column].isInt()) return true;
|