tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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 +8 -0
- 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 +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_solver.h, src/math/lp/lar_solver.cpp, src/math/lp/column.h,
|
|
2
|
-
// src/math/lp/var_register.h), MIT license, see z3-license.txt. Columns for theory variables and
|
|
3
|
-
// for terms, whose rows the tableau keeps, bounds with dependencies on the constraints that set
|
|
4
|
-
// them, and the push and pop of all of it.
|
|
5
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
6
2
|
import { Rational } from "../rational";
|
|
7
3
|
import { IndexedUintSet, StackedVector } from "./containers";
|
|
@@ -28,7 +24,7 @@ import {
|
|
|
28
24
|
LP_UNKNOWN,
|
|
29
25
|
type ColumnType,
|
|
30
26
|
} from "./core-solver";
|
|
31
|
-
import { Dependency, linearize, mkJoin } from "./dependency";
|
|
27
|
+
import { type Dependency, linearize, mkJoin } from "./dependency";
|
|
32
28
|
import type { Explanation } from "./explanation";
|
|
33
29
|
import { LarTerm } from "./lar-term";
|
|
34
30
|
import { LpSettings } from "./lp-settings";
|
|
@@ -42,7 +38,6 @@ interface AdjustedBound {
|
|
|
42
38
|
bound: Rational;
|
|
43
39
|
}
|
|
44
40
|
|
|
45
|
-
// The column of a term, under its normalized term, with the first coefficient it was divided by.
|
|
46
41
|
interface NormalizedTermColumn {
|
|
47
42
|
coeff: Rational;
|
|
48
43
|
column: number;
|
|
@@ -60,6 +55,23 @@ const getTermKey = (term: LarTerm) =>
|
|
|
60
55
|
.sort()
|
|
61
56
|
.join(",");
|
|
62
57
|
|
|
58
|
+
const updateDelta = (delta: Rational, low: Impq, high: Impq) => {
|
|
59
|
+
if (low.x.compare(high.x) >= 0 || low.y.compare(high.y) <= 0) return delta;
|
|
60
|
+
const candidate = high.x.sub(low.x).div(low.y.sub(high.y));
|
|
61
|
+
return candidate.compare(delta) < 0 ? candidate : delta;
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const getBoundsDelta = (core: CoreSolver, columnCount: number) => {
|
|
65
|
+
let delta = Rational.one;
|
|
66
|
+
for (let column = 0; column < columnCount; column++) {
|
|
67
|
+
if (core.hasLowerBound(column))
|
|
68
|
+
delta = updateDelta(delta, core.lowerBounds[column], core.x[column]);
|
|
69
|
+
if (core.hasUpperBound(column))
|
|
70
|
+
delta = updateDelta(delta, core.x[column], core.upperBounds[column]);
|
|
71
|
+
}
|
|
72
|
+
return delta;
|
|
73
|
+
};
|
|
74
|
+
|
|
63
75
|
export class LarSolver {
|
|
64
76
|
readonly settings: LpSettings;
|
|
65
77
|
readonly core: CoreSolver;
|
|
@@ -70,8 +82,8 @@ export class LarSolver {
|
|
|
70
82
|
readonly columnsWithChangedBounds = new IndexedUintSet();
|
|
71
83
|
rowBoundsToReplay: number[] = [];
|
|
72
84
|
status = LP_UNKNOWN;
|
|
73
|
-
crossedBoundsColumn = NULL_LPVAR;
|
|
74
|
-
crossedBoundsDeps: Dependency = null;
|
|
85
|
+
private crossedBoundsColumn = NULL_LPVAR;
|
|
86
|
+
private crossedBoundsDeps: Dependency = null;
|
|
75
87
|
private externalToLocal = new Map<number, number>();
|
|
76
88
|
private localToExternal: number[] = [];
|
|
77
89
|
private localIsInt: boolean[] = [];
|
|
@@ -83,15 +95,12 @@ export class LarSolver {
|
|
|
83
95
|
private fixedBaseVarSet = new IndexedUintSet();
|
|
84
96
|
private normalizedTermsToColumns = new Map<string, NormalizedTermColumn>();
|
|
85
97
|
private isRegisteringTerms = false;
|
|
86
|
-
// m_delta: zero until init_model sets it.
|
|
87
98
|
private delta = Rational.zero;
|
|
88
|
-
// The callback of nla for the columns whose bounds changed.
|
|
89
99
|
onChangedBounds: ((columns: IndexedUintSet) => void) | undefined;
|
|
90
|
-
// m_add_term_callback and m_update_column_bound_callback, which the Diophantine solver sets.
|
|
91
100
|
onAddTerm: ((term: LarTerm) => void) | undefined;
|
|
92
101
|
onColumnBoundUpdate: ((column: number) => void) | undefined;
|
|
93
102
|
|
|
94
|
-
constructor(isCanceled: () => boolean) {
|
|
103
|
+
constructor(isCanceled: (cost?: number) => boolean) {
|
|
95
104
|
this.settings = new LpSettings(isCanceled);
|
|
96
105
|
this.core = new CoreSolver(this.settings);
|
|
97
106
|
this.core.touchedRows = this.touchedRows;
|
|
@@ -121,6 +130,18 @@ export class LarSolver {
|
|
|
121
130
|
return this.localIsInt[column];
|
|
122
131
|
}
|
|
123
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
|
+
|
|
124
145
|
isBase(column: number) {
|
|
125
146
|
return this.core.isBase(column);
|
|
126
147
|
}
|
|
@@ -163,8 +184,6 @@ export class LarSolver {
|
|
|
163
184
|
return column < this.usageInTerms.values.length ? this.usageInTerms.get(column) : 0;
|
|
164
185
|
}
|
|
165
186
|
|
|
166
|
-
// Columns.
|
|
167
|
-
|
|
168
187
|
private registerExternal(external: number, isInt: boolean) {
|
|
169
188
|
const local = this.localToExternal.length;
|
|
170
189
|
this.localToExternal.push(external);
|
|
@@ -174,7 +193,7 @@ export class LarSolver {
|
|
|
174
193
|
|
|
175
194
|
private addNewVarToCoreFields(isBasic: boolean) {
|
|
176
195
|
this.core.addColumn(isBasic);
|
|
177
|
-
if (isBasic) this.
|
|
196
|
+
if (isBasic) this.touchedRows.add(this.getRowCount() - 1);
|
|
178
197
|
}
|
|
179
198
|
|
|
180
199
|
private pushUndoAddColumn() {
|
|
@@ -209,7 +228,6 @@ export class LarSolver {
|
|
|
209
228
|
return true;
|
|
210
229
|
}
|
|
211
230
|
|
|
212
|
-
// subst_known_terms: replaces term columns by their terms, the smallest column first.
|
|
213
231
|
private substKnownTerms(term: LarTerm) {
|
|
214
232
|
const seen = new Set<number>();
|
|
215
233
|
for (const entry of term.coeffs) if (this.hasTerm(entry[0])) seen.add(entry[0]);
|
|
@@ -222,6 +240,15 @@ export class LarSolver {
|
|
|
222
240
|
}
|
|
223
241
|
}
|
|
224
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
|
+
|
|
225
252
|
addTerm(coeffs: [number, Rational][], external: number) {
|
|
226
253
|
const term = new LarTerm(coeffs);
|
|
227
254
|
this.substKnownTerms(term);
|
|
@@ -276,8 +303,6 @@ export class LarSolver {
|
|
|
276
303
|
return this.normalizedTermsToColumns.get(getTermKey(term));
|
|
277
304
|
}
|
|
278
305
|
|
|
279
|
-
// Removing the last column on pop.
|
|
280
|
-
|
|
281
306
|
private removeLastColumnFromTableau() {
|
|
282
307
|
const core = this.core;
|
|
283
308
|
const matrix = core.matrix;
|
|
@@ -306,8 +331,6 @@ export class LarSolver {
|
|
|
306
331
|
core.removeLastColumn(column);
|
|
307
332
|
}
|
|
308
333
|
|
|
309
|
-
// Bounds.
|
|
310
|
-
|
|
311
334
|
private setUpperBoundWitness(column: number, dep: Dependency, bound: Impq) {
|
|
312
335
|
const info = this.columns[column];
|
|
313
336
|
const savedBound = this.core.upperBounds[column];
|
|
@@ -342,7 +365,6 @@ export class LarSolver {
|
|
|
342
365
|
this.crossedBoundsDeps = mkJoin(isLower ? info.lowerWitness : info.upperWitness, dep);
|
|
343
366
|
}
|
|
344
367
|
|
|
345
|
-
// adjust_bound_for_int: a strict or fractional bound on an integer column, rounded.
|
|
346
368
|
private adjustBoundForInt(column: number, kind: ConstraintKind, bound: Rational): AdjustedBound {
|
|
347
369
|
if (!this.isInt(column) || bound.isInt()) return { kind, bound };
|
|
348
370
|
if (kind === KIND_LT || kind === KIND_LE) return { kind: KIND_LE, bound: bound.floor() };
|
|
@@ -350,12 +372,12 @@ export class LarSolver {
|
|
|
350
372
|
return { kind, bound };
|
|
351
373
|
}
|
|
352
374
|
|
|
353
|
-
|
|
375
|
+
// A non-zero eps makes the bound rhs + eps*delta.
|
|
376
|
+
mkVarBound(column: number, kind: ConstraintKind, rhs: Rational, eps = Rational.zero) {
|
|
354
377
|
const adjusted = this.adjustBoundForInt(column, kind, rhs);
|
|
355
|
-
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound));
|
|
378
|
+
return this.constraints.add(column, adjusted.kind, new Impq(adjusted.bound, eps));
|
|
356
379
|
}
|
|
357
380
|
|
|
358
|
-
// constraint_is_redundant: the current bound of the column is at least as strong.
|
|
359
381
|
constraintIsRedundant(index: number) {
|
|
360
382
|
const constraint = this.constraints.constraints[index];
|
|
361
383
|
const column = constraint.column;
|
|
@@ -390,7 +412,6 @@ export class LarSolver {
|
|
|
390
412
|
);
|
|
391
413
|
}
|
|
392
414
|
|
|
393
|
-
// activate_check_on_equal: also the other column fixed to the same value, if there is one.
|
|
394
415
|
activateCheckOnEqual(index: number) {
|
|
395
416
|
this.activate(index);
|
|
396
417
|
const column = this.constraints.constraints[index].column;
|
|
@@ -458,16 +479,6 @@ export class LarSolver {
|
|
|
458
479
|
this.onColumnBoundUpdate?.(column);
|
|
459
480
|
}
|
|
460
481
|
|
|
461
|
-
addTouchedRow(rowIndex: number) {
|
|
462
|
-
this.touchedRows.add(rowIndex);
|
|
463
|
-
}
|
|
464
|
-
|
|
465
|
-
addColumnRowsToTouchedRows(column: number) {
|
|
466
|
-
for (const cell of this.core.matrix.columns[column]) this.addTouchedRow(cell.row);
|
|
467
|
-
}
|
|
468
|
-
|
|
469
|
-
// Solving.
|
|
470
|
-
|
|
471
482
|
private changeBasicColumnsDependingOn(column: number, delta: Impq) {
|
|
472
483
|
const core = this.core;
|
|
473
484
|
for (const cell of core.matrix.columns[column])
|
|
@@ -495,16 +506,12 @@ export class LarSolver {
|
|
|
495
506
|
core.solve();
|
|
496
507
|
this.status = core.status;
|
|
497
508
|
if (this.status === LP_INFEASIBLE || this.status === LP_CANCELLED) return this.status;
|
|
498
|
-
|
|
499
|
-
if (core.isBase(column)) this.addTouchedRow(core.heading[column]);
|
|
500
|
-
else this.addColumnRowsToTouchedRows(column);
|
|
501
|
-
}
|
|
509
|
+
this.collectMoreRowsForLpPropagation();
|
|
502
510
|
this.onChangedBounds?.(this.columnsWithChangedBounds);
|
|
503
511
|
this.columnsWithChangedBounds.clear();
|
|
504
512
|
return this.status;
|
|
505
513
|
}
|
|
506
514
|
|
|
507
|
-
// get_infeasibility_explanation: the crossed bounds, or the bounds of the infeasible row.
|
|
508
515
|
getInfeasibilityExplanation(explanation: Explanation) {
|
|
509
516
|
explanation.clear();
|
|
510
517
|
if (this.crossedBoundsColumn !== NULL_LPVAR) {
|
|
@@ -523,7 +530,6 @@ export class LarSolver {
|
|
|
523
530
|
}
|
|
524
531
|
}
|
|
525
532
|
|
|
526
|
-
// remove_fixed_vars_from_base: pivots fixed basic columns out of the basis.
|
|
527
533
|
removeFixedVarsFromBase() {
|
|
528
534
|
const core = this.core;
|
|
529
535
|
const columnCount = this.getColumnCount();
|
|
@@ -545,7 +551,6 @@ export class LarSolver {
|
|
|
545
551
|
for (const column of toRemove) this.fixedBaseVarSet.delete(column);
|
|
546
552
|
}
|
|
547
553
|
|
|
548
|
-
// remove_from_basis: pivots a basic column with the first non-fixed column of its row.
|
|
549
554
|
removeFromBasis(column: number) {
|
|
550
555
|
const core = this.core;
|
|
551
556
|
for (const cell of core.matrix.rows[core.heading[column]]) {
|
|
@@ -562,8 +567,6 @@ export class LarSolver {
|
|
|
562
567
|
return !(core.hasLowerBound(column) && value.compare(core.lowerBounds[column]) < 0);
|
|
563
568
|
}
|
|
564
569
|
|
|
565
|
-
// try_to_patch: sets a column to a value unless the column or a basic column it moves is blocked,
|
|
566
|
-
// reporting each changed column.
|
|
567
570
|
tryToPatch(
|
|
568
571
|
column: number,
|
|
569
572
|
value: Rational,
|
|
@@ -591,9 +594,9 @@ export class LarSolver {
|
|
|
591
594
|
}
|
|
592
595
|
|
|
593
596
|
moveNonBasicColumnsToBounds() {
|
|
594
|
-
const core = this.core;
|
|
595
597
|
let isChanged = false;
|
|
596
|
-
for (const column of core.nbasis)
|
|
598
|
+
for (const column of this.core.nbasis)
|
|
599
|
+
if (this.moveNonBasicColumnToBounds(column)) isChanged = true;
|
|
597
600
|
if (isChanged) this.findFeasibleSolution();
|
|
598
601
|
}
|
|
599
602
|
|
|
@@ -623,30 +626,32 @@ export class LarSolver {
|
|
|
623
626
|
}
|
|
624
627
|
}
|
|
625
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
|
+
|
|
626
644
|
hasInfInt() {
|
|
627
645
|
for (let column = 0; column < this.getColumnCount(); column++)
|
|
628
646
|
if (this.isInt(column) && !this.core.x[column].isInt()) return true;
|
|
629
647
|
return false;
|
|
630
648
|
}
|
|
631
649
|
|
|
632
|
-
// The model.
|
|
633
|
-
|
|
634
|
-
// init_model: a δ that keeps strict bounds strict and distinct values distinct.
|
|
635
650
|
initModel() {
|
|
636
|
-
if (this.
|
|
651
|
+
if (!this.isFeasible()) return false;
|
|
637
652
|
if (this.columnsWithChangedBounds.size > 0) return false;
|
|
638
653
|
const core = this.core;
|
|
639
|
-
let delta =
|
|
640
|
-
const updateDelta = (low: Impq, high: Impq) => {
|
|
641
|
-
if (low.x.compare(high.x) < 0 && low.y.compare(high.y) > 0) {
|
|
642
|
-
const candidate = high.x.sub(low.x).div(low.y.sub(high.y));
|
|
643
|
-
if (candidate.compare(delta) < 0) delta = candidate;
|
|
644
|
-
}
|
|
645
|
-
};
|
|
646
|
-
for (let column = 0; column < this.getColumnCount(); column++) {
|
|
647
|
-
if (core.hasLowerBound(column)) updateDelta(core.lowerBounds[column], core.x[column]);
|
|
648
|
-
if (core.hasUpperBound(column)) updateDelta(core.x[column], core.upperBounds[column]);
|
|
649
|
-
}
|
|
654
|
+
let delta = getBoundsDelta(core, this.getColumnCount());
|
|
650
655
|
const pairs = new Map<string, Impq>();
|
|
651
656
|
for (const value of core.x) pairs.set(value.toString(), value);
|
|
652
657
|
for (;;) {
|
|
@@ -664,7 +669,6 @@ export class LarSolver {
|
|
|
664
669
|
return value.x.add(this.delta.mul(value.y));
|
|
665
670
|
}
|
|
666
671
|
|
|
667
|
-
// has_value: the value of a column, or of the term of a column, when δ does not occur in it.
|
|
668
672
|
getExactValue(column: number) {
|
|
669
673
|
const term = this.columns[column].term;
|
|
670
674
|
if (term === null) {
|
|
@@ -680,7 +684,6 @@ export class LarSolver {
|
|
|
680
684
|
return result;
|
|
681
685
|
}
|
|
682
686
|
|
|
683
|
-
// has_lower_bound and has_upper_bound: the witness, value and strictness of a bound.
|
|
684
687
|
getBound(column: number, isUpper: boolean) {
|
|
685
688
|
if (column >= this.columns.length) return undefined;
|
|
686
689
|
const info = this.columns[column];
|
|
@@ -694,38 +697,25 @@ export class LarSolver {
|
|
|
694
697
|
};
|
|
695
698
|
}
|
|
696
699
|
|
|
697
|
-
// get_rid_of_inf_eps: the values with δ instantiated small enough to keep strict bounds strict.
|
|
698
700
|
getRidOfInfEps() {
|
|
699
701
|
const core = this.core;
|
|
700
702
|
const columnCount = this.getColumnCount();
|
|
701
703
|
if (core.x.slice(0, columnCount).every((value) => value.y.isZero())) return;
|
|
702
|
-
|
|
703
|
-
const updateDelta = (low: Impq, high: Impq) => {
|
|
704
|
-
if (low.x.compare(high.x) < 0 && low.y.compare(high.y) > 0) {
|
|
705
|
-
const candidate = high.x.sub(low.x).div(low.y.sub(high.y));
|
|
706
|
-
if (candidate.compare(delta) < 0) delta = candidate;
|
|
707
|
-
}
|
|
708
|
-
};
|
|
709
|
-
for (let column = 0; column < columnCount; column++) {
|
|
710
|
-
if (core.hasLowerBound(column)) updateDelta(core.lowerBounds[column], core.x[column]);
|
|
711
|
-
if (core.hasUpperBound(column)) updateDelta(core.x[column], core.upperBounds[column]);
|
|
712
|
-
}
|
|
704
|
+
const delta = getBoundsDelta(core, columnCount);
|
|
713
705
|
for (let column = 0; column < columnCount; column++) {
|
|
714
706
|
const value = core.x[column];
|
|
715
707
|
if (!value.y.isZero()) core.x[column] = new Impq(value.x.add(delta.mul(value.y)));
|
|
716
708
|
}
|
|
717
709
|
}
|
|
718
710
|
|
|
719
|
-
// get_bound_constraint_witnesses_for_column: the witnesses of both bounds.
|
|
720
711
|
getBoundWitnesses(column: number) {
|
|
721
712
|
return mkJoin(this.columns[column].lowerWitness, this.columns[column].upperWitness);
|
|
722
713
|
}
|
|
723
714
|
|
|
724
|
-
// collect_more_rows_for_lp_propagation: the rows of the columns whose bounds nla changed.
|
|
725
715
|
collectMoreRowsForLpPropagation() {
|
|
726
716
|
for (const column of this.columnsWithChangedBounds.elems) {
|
|
727
|
-
if (this.core.isBase(column)) this.
|
|
728
|
-
else this.
|
|
717
|
+
if (this.core.isBase(column)) this.touchedRows.add(this.core.heading[column]);
|
|
718
|
+
else for (const cell of this.core.matrix.columns[column]) this.touchedRows.add(cell.row);
|
|
729
719
|
}
|
|
730
720
|
}
|
|
731
721
|
|
|
@@ -737,8 +727,6 @@ export class LarSolver {
|
|
|
737
727
|
return this.columns[column].upperWitness;
|
|
738
728
|
}
|
|
739
729
|
|
|
740
|
-
// Scopes.
|
|
741
|
-
|
|
742
730
|
pushTrail(undo: () => void) {
|
|
743
731
|
this.trail.push(undo);
|
|
744
732
|
}
|
|
@@ -769,7 +757,7 @@ export class LarSolver {
|
|
|
769
757
|
for (const table of [this.fixedVarTableInt, this.fixedVarTableReal])
|
|
770
758
|
for (const entry of table)
|
|
771
759
|
if (entry[1] >= columnCount || !this.isFixed(entry[1])) table.delete(entry[0]);
|
|
772
|
-
for (const rowIndex of this.rowBoundsToReplay) this.
|
|
760
|
+
for (const rowIndex of this.rowBoundsToReplay) this.touchedRows.add(rowIndex);
|
|
773
761
|
this.rowBoundsToReplay = [];
|
|
774
762
|
const rowCount = this.getRowCount();
|
|
775
763
|
for (const rowIndex of this.touchedRows.elems.filter((row) => row >= rowCount))
|
|
@@ -797,7 +785,6 @@ export class LarSolver {
|
|
|
797
785
|
if (core.columnIsFeasible(column)) core.infHeap.erase(column);
|
|
798
786
|
}
|
|
799
787
|
|
|
800
|
-
// add_equality: the term j - k bounded above and below by 0.
|
|
801
788
|
addEquality(first: number, second: number) {
|
|
802
789
|
const column = this.addTerm(
|
|
803
790
|
[
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lar_term.h), MIT license, see z3-license.txt. A linear combination of
|
|
2
|
-
// columns, kept in a u_map so that its iteration order is Z3's.
|
|
3
1
|
import { getIdentityHash, ObjMap } from "../hashtable";
|
|
4
2
|
import { Rational } from "../rational";
|
|
5
3
|
import { Impq } from "./numeric-pair";
|
|
@@ -32,14 +30,12 @@ export class LarTerm {
|
|
|
32
30
|
else this.coeffs.replace(column, sum);
|
|
33
31
|
}
|
|
34
32
|
|
|
35
|
-
// apply: the value of the term at the column values.
|
|
36
33
|
apply(values: Impq[]) {
|
|
37
34
|
let value = Impq.zero;
|
|
38
35
|
for (const entry of this.coeffs) value = value.add(values[entry[0]].mul(entry[1]));
|
|
39
36
|
return value;
|
|
40
37
|
}
|
|
41
38
|
|
|
42
|
-
// subst_by_term: replaces the term column by its definition.
|
|
43
39
|
substByTerm(term: LarTerm, termColumn: number) {
|
|
44
40
|
const coeff = this.coeffs.get(termColumn);
|
|
45
41
|
if (coeff === undefined) return;
|
|
@@ -47,7 +43,6 @@ export class LarTerm {
|
|
|
47
43
|
for (const entry of term.coeffs) this.addMonomial(coeff.mul(entry[1]), entry[0]);
|
|
48
44
|
}
|
|
49
45
|
|
|
50
|
-
// get_normalized_by_min_var: the term divided by its first coefficient, and that coefficient.
|
|
51
46
|
getNormalized() {
|
|
52
47
|
const entries = [...this.coeffs];
|
|
53
48
|
if (entries.length === 0) return { term: this, coeff: Rational.one };
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/lp_settings.h, src/math/lp/lp_settings.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. The settings that theory_lra's UFNIA configuration gives the lp solver, its
|
|
3
|
-
// random generator and its statistics.
|
|
4
1
|
import { RandomGen } from "../random-gen";
|
|
5
2
|
|
|
6
3
|
export interface LpStats {
|
|
@@ -23,10 +20,8 @@ export interface LpStats {
|
|
|
23
20
|
lcubeFlipSuccess: number;
|
|
24
21
|
nlaCalls: number;
|
|
25
22
|
nlaAddBounds: number;
|
|
26
|
-
nlaPropagateBounds: number;
|
|
27
23
|
nlaPropagateEq: number;
|
|
28
24
|
nlaLemmas: number;
|
|
29
|
-
nlaBoundsImprovements: number;
|
|
30
25
|
nlaThrottledLemmas: number;
|
|
31
26
|
nraCalls: number;
|
|
32
27
|
}
|
|
@@ -53,37 +48,32 @@ export class LpSettings {
|
|
|
53
48
|
lcubeFlipSuccess: 0,
|
|
54
49
|
nlaCalls: 0,
|
|
55
50
|
nlaAddBounds: 0,
|
|
56
|
-
nlaPropagateBounds: 0,
|
|
57
51
|
nlaPropagateEq: 0,
|
|
58
52
|
nlaLemmas: 0,
|
|
59
|
-
nlaBoundsImprovements: 0,
|
|
60
53
|
nlaThrottledLemmas: 0,
|
|
61
54
|
nraCalls: 0,
|
|
62
55
|
};
|
|
63
56
|
readonly maxRowLengthForBoundPropagation = 300;
|
|
64
|
-
|
|
65
|
-
readonly isPropagatingEqs = true;
|
|
57
|
+
isPropagatingEqs = true;
|
|
66
58
|
readonly intFindCubePeriod = 4;
|
|
67
|
-
// lp.lcube_flips: the most flips that repair a rounded cube center.
|
|
68
59
|
readonly lcubeFlips = 16;
|
|
69
60
|
readonly hnfCutPeriod = 4;
|
|
70
61
|
readonly limitOnRowsForHnfCutter = 75;
|
|
71
62
|
readonly limitOnColumnsForHnfCutter = 150;
|
|
72
63
|
readonly intGomoryCutPeriod = 4;
|
|
73
|
-
// lp.dio_calls_period, which the Diophantine solver's results move, its decrease, and
|
|
74
|
-
// lp.dio_gomory_enable_period.
|
|
75
64
|
dioCallsPeriod = 1;
|
|
76
65
|
readonly dioCallsPeriodDecrease = 2;
|
|
77
66
|
readonly dioGomoryEnablePeriod = 16;
|
|
78
|
-
// m_run_gomory_with_dio: Gomory cuts run once the Diophantine solver keeps failing.
|
|
79
67
|
isRunningGomoryWithDio = false;
|
|
80
|
-
// lp.dio_ignore_big_nums and lp.dio_undo_max_work.
|
|
81
68
|
readonly isDioIgnoringBigNums = true;
|
|
82
69
|
readonly dioUndoMaxWork = 1000000;
|
|
83
70
|
|
|
84
|
-
constructor(readonly isCanceled: () => boolean) {}
|
|
71
|
+
constructor(readonly isCanceled: (cost?: number) => boolean) {}
|
|
72
|
+
|
|
73
|
+
setRandomSeed(seed: number) {
|
|
74
|
+
this.random = new RandomGen(seed);
|
|
75
|
+
}
|
|
85
76
|
|
|
86
|
-
// random_next: random_gen's next value, or that value modulo a bound.
|
|
87
77
|
getRandomNext(bound?: number) {
|
|
88
78
|
const value = this.random.next();
|
|
89
79
|
return bound === undefined ? value : value % bound;
|