tla-ts 0.0.9 → 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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -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 +3 -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 +1156 -888
- 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 +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +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 +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- 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 -322
- package/src/liveness.ts +230 -133
- 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 +36 -60
- package/src/parallel.ts +64 -73
- 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 +135 -40
- 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 +299 -108
- 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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- 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,9 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (maximize_term and its helpers in src/math/lp/lar_solver.cpp, and the tableau
|
|
2
|
-
// part of src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_def.h,
|
|
3
|
-
// src/math/lp/lp_primal_core_solver_tableau_def.h), MIT license, see z3-license.txt. The primal
|
|
4
|
-
// simplex with the tableau_costs strategy: from a feasible solution, a non-basic column whose
|
|
5
|
-
// reduced cost improves the objective enters, the ratio test picks the basic column that leaves,
|
|
6
|
-
// and the reduced costs follow every pivot.
|
|
7
1
|
import { Rational } from "../rational";
|
|
8
2
|
import {
|
|
9
3
|
COLUMN_BOXED,
|
|
@@ -18,16 +12,14 @@ import {
|
|
|
18
12
|
LP_OPTIMAL,
|
|
19
13
|
LP_UNBOUNDED,
|
|
20
14
|
} from "./core-solver";
|
|
15
|
+
import { type Dependency, mkJoin } from "./dependency";
|
|
21
16
|
import type { LarSolver } from "./lar-solver";
|
|
22
17
|
import { LarTerm } from "./lar-term";
|
|
23
18
|
import { Impq } from "./numeric-pair";
|
|
24
19
|
|
|
25
|
-
// m_nbasis_sort_counter: the non-basic columns are sorted again after this many choices.
|
|
26
20
|
const NBASIS_SORT_PERIOD = 20;
|
|
27
|
-
// percent_of_entering_to_check, for more than 300 non-basic columns.
|
|
28
21
|
const PERCENT_OF_ENTERING_TO_CHECK = 5;
|
|
29
22
|
|
|
30
|
-
// The theta of a ratio test, and whether a bound limits it yet.
|
|
31
23
|
interface ThetaLimit {
|
|
32
24
|
theta: Impq;
|
|
33
25
|
isUnlimited: boolean;
|
|
@@ -59,8 +51,6 @@ class CostsSimplex {
|
|
|
59
51
|
private readonly reducedCosts: Rational[],
|
|
60
52
|
) {}
|
|
61
53
|
|
|
62
|
-
// lar_core_solver::solve and lp_primal_core_solver::solve, not only looking for a feasible
|
|
63
|
-
// solution.
|
|
64
54
|
solve() {
|
|
65
55
|
const core = this.core;
|
|
66
56
|
const settings = core.settings;
|
|
@@ -70,7 +60,7 @@ class CostsSimplex {
|
|
|
70
60
|
core.status = LP_CANCELLED;
|
|
71
61
|
return;
|
|
72
62
|
}
|
|
73
|
-
this.
|
|
63
|
+
this.oneIterationTableau();
|
|
74
64
|
if (settings.isCanceled()) {
|
|
75
65
|
core.status = LP_CANCELLED;
|
|
76
66
|
return;
|
|
@@ -82,24 +72,22 @@ class CostsSimplex {
|
|
|
82
72
|
);
|
|
83
73
|
}
|
|
84
74
|
|
|
85
|
-
|
|
86
|
-
private oneIteration() {
|
|
75
|
+
private oneIterationTableau() {
|
|
87
76
|
const core = this.core;
|
|
88
|
-
const entering = this.
|
|
77
|
+
const entering = this.chooseEnteringColumnTableau();
|
|
89
78
|
if (entering === -1) {
|
|
90
79
|
core.status = core.isFeasible() ? LP_OPTIMAL : LP_INFEASIBLE;
|
|
91
80
|
return;
|
|
92
81
|
}
|
|
93
82
|
const limit: ThetaLimit = { theta: Impq.zero, isUnlimited: true };
|
|
94
|
-
const leaving = this.
|
|
83
|
+
const leaving = this.findLeavingAndTTableau(entering, limit);
|
|
95
84
|
if (leaving === -1) {
|
|
96
85
|
core.status = LP_UNBOUNDED;
|
|
97
86
|
return;
|
|
98
87
|
}
|
|
99
|
-
this.
|
|
88
|
+
this.advanceOnEnteringAndLeavingTableau(entering, leaving, limit.theta);
|
|
100
89
|
}
|
|
101
90
|
|
|
102
|
-
// sort_non_basis: the non-basic columns by the size of their columns, the empty ones last.
|
|
103
91
|
private sortNonBasis() {
|
|
104
92
|
const core = this.core;
|
|
105
93
|
const columns = core.matrix.columns;
|
|
@@ -115,23 +103,20 @@ class CostsSimplex {
|
|
|
115
103
|
core.heading[core.nbasis[index]] = -index - 1;
|
|
116
104
|
}
|
|
117
105
|
|
|
118
|
-
|
|
119
|
-
private getNumberToTry() {
|
|
106
|
+
private getNumberOfNonBasicColumnToTryForEnter() {
|
|
120
107
|
const count = this.core.nbasis.length;
|
|
121
108
|
const scaled = count > 300 ? Math.floor((count * PERCENT_OF_ENTERING_TO_CHECK) / 100) : count;
|
|
122
109
|
if (scaled === 0) return 0;
|
|
123
110
|
return Math.max(this.core.settings.getRandomNext() % scaled, 1);
|
|
124
111
|
}
|
|
125
112
|
|
|
126
|
-
|
|
127
|
-
// cells, and a random one among ties. It moves to the end of the list.
|
|
128
|
-
private chooseEntering() {
|
|
113
|
+
private chooseEnteringColumnTableau() {
|
|
129
114
|
const core = this.core;
|
|
130
115
|
if (this.sortCounter === 0) {
|
|
131
116
|
this.sortNonBasis();
|
|
132
117
|
this.sortCounter = NBASIS_SORT_PERIOD;
|
|
133
118
|
} else this.sortCounter--;
|
|
134
|
-
let numToGoOver = this.
|
|
119
|
+
let numToGoOver = this.getNumberOfNonBasicColumnToTryForEnter();
|
|
135
120
|
if (numToGoOver === 0) return -1;
|
|
136
121
|
let minCells = core.matrix.getRowCount() + 1;
|
|
137
122
|
let enteringIndex = -1;
|
|
@@ -139,7 +124,7 @@ class CostsSimplex {
|
|
|
139
124
|
const list = this.nonBasisList;
|
|
140
125
|
for (let index = 0; numToGoOver > 0 && index < list.length; index++) {
|
|
141
126
|
const column = list[index];
|
|
142
|
-
if (!this.
|
|
127
|
+
if (!this.isColumnBeneficialForEnteringBasis(column)) continue;
|
|
143
128
|
const cells = core.matrix.columns[column].length;
|
|
144
129
|
if (cells < minCells) {
|
|
145
130
|
minCells = cells;
|
|
@@ -157,8 +142,7 @@ class CostsSimplex {
|
|
|
157
142
|
return entering;
|
|
158
143
|
}
|
|
159
144
|
|
|
160
|
-
|
|
161
|
-
private isBeneficial(column: number) {
|
|
145
|
+
private isColumnBeneficialForEnteringBasis(column: number) {
|
|
162
146
|
const core = this.core;
|
|
163
147
|
const reducedCost = this.reducedCosts[column];
|
|
164
148
|
if (reducedCost.isZero()) return false;
|
|
@@ -178,10 +162,7 @@ class CostsSimplex {
|
|
|
178
162
|
}
|
|
179
163
|
}
|
|
180
164
|
|
|
181
|
-
|
|
182
|
-
// broken by the shortest row and then at random, or the entering column itself when it reaches
|
|
183
|
-
// its other bound first.
|
|
184
|
-
private findLeaving(entering: number, limit: ThetaLimit) {
|
|
165
|
+
private findLeavingAndTTableau(entering: number, limit: ThetaLimit) {
|
|
185
166
|
const core = this.core;
|
|
186
167
|
const matrix = core.matrix;
|
|
187
168
|
const column = matrix.columns[entering];
|
|
@@ -233,8 +214,6 @@ class CostsSimplex {
|
|
|
233
214
|
return candidates[core.settings.getRandomNext() % candidates.length];
|
|
234
215
|
}
|
|
235
216
|
|
|
236
|
-
// limit_theta_on_basis_column: x[basic] + theta * m stays within the bounds of the column, or
|
|
237
|
-
// moves toward them when it is outside.
|
|
238
217
|
private limitThetaOnBasisColumn(basic: number, m: Rational, limit: ThetaLimit) {
|
|
239
218
|
const core = this.core;
|
|
240
219
|
const x = core.x[basic];
|
|
@@ -280,21 +259,19 @@ class CostsSimplex {
|
|
|
280
259
|
if (!limit.isUnlimited) clampTheta(limit);
|
|
281
260
|
}
|
|
282
261
|
|
|
283
|
-
|
|
284
|
-
private advance(entering: number, leaving: number, theta: Impq) {
|
|
262
|
+
private advanceOnEnteringAndLeavingTableau(entering: number, leaving: number, theta: Impq) {
|
|
285
263
|
const core = this.core;
|
|
286
264
|
const sign = Rational.fromNumber(this.signOfEnteringDelta);
|
|
287
265
|
if (entering === leaving) {
|
|
288
|
-
this.
|
|
266
|
+
this.updateXTableau(entering, theta.mul(sign));
|
|
289
267
|
return;
|
|
290
268
|
}
|
|
291
|
-
if (!theta.isZero()) this.
|
|
269
|
+
if (!theta.isZero()) this.updateXTableau(entering, core.isFeasible() ? theta.mul(sign) : theta);
|
|
292
270
|
core.pivot(entering, leaving);
|
|
293
271
|
this.nonBasisList[this.nonBasisList.length - 1] = leaving;
|
|
294
272
|
}
|
|
295
273
|
|
|
296
|
-
|
|
297
|
-
private updateX(entering: number, delta: Impq) {
|
|
274
|
+
private updateXTableau(entering: number, delta: Impq) {
|
|
298
275
|
const core = this.core;
|
|
299
276
|
core.x[entering] = core.x[entering].add(delta);
|
|
300
277
|
for (const cell of core.matrix.columns[entering])
|
|
@@ -305,9 +282,7 @@ class CostsSimplex {
|
|
|
305
282
|
}
|
|
306
283
|
}
|
|
307
284
|
|
|
308
|
-
|
|
309
|
-
// and the term's value at the optimum, or undefined when it is unbounded or cancelled.
|
|
310
|
-
const maximizeOnFeasibleSolver = (solver: LarSolver, term: LarTerm) => {
|
|
285
|
+
const maximizeTermOnFeasibleRSolver = (solver: LarSolver, term: LarTerm) => {
|
|
311
286
|
const core = solver.core;
|
|
312
287
|
solver.moveNonBasicColumnsToBounds();
|
|
313
288
|
const reducedCosts = core.x.map(() => Rational.zero);
|
|
@@ -327,21 +302,70 @@ const maximizeOnFeasibleSolver = (solver: LarSolver, term: LarTerm) => {
|
|
|
327
302
|
core.reducedCosts = undefined;
|
|
328
303
|
const status = core.status;
|
|
329
304
|
core.status = LP_OPTIMAL;
|
|
330
|
-
return status === LP_UNBOUNDED || status === LP_CANCELLED
|
|
305
|
+
return status === LP_UNBOUNDED || status === LP_CANCELLED
|
|
306
|
+
? undefined
|
|
307
|
+
: { value: term.apply(core.x), reducedCosts };
|
|
331
308
|
};
|
|
332
309
|
|
|
333
|
-
//
|
|
334
|
-
//
|
|
335
|
-
|
|
310
|
+
// Every column with a positive reduced cost sits at its upper bound, and every column with a
|
|
311
|
+
// negative one at its lower bound, so those bounds prove the maximum.
|
|
312
|
+
const getDependenciesOfMaximum = (solver: LarSolver, reducedCosts: readonly Rational[]) => {
|
|
313
|
+
let dependency: Dependency = null;
|
|
314
|
+
for (const [column, reducedCost] of reducedCosts.entries()) {
|
|
315
|
+
if (reducedCost.isZero()) continue;
|
|
316
|
+
dependency = mkJoin(
|
|
317
|
+
dependency,
|
|
318
|
+
reducedCost.isPositive() ? solver.getUpperWitness(column) : solver.getLowerWitness(column),
|
|
319
|
+
);
|
|
320
|
+
}
|
|
321
|
+
return dependency;
|
|
322
|
+
};
|
|
323
|
+
|
|
324
|
+
// Integer columns that maximization left fractional move out of the basis, if they can.
|
|
325
|
+
const adjustIntegerColumns = (solver: LarSolver, term: LarTerm, previous: Impq, maximum: Impq) => {
|
|
326
|
+
const core = solver.core;
|
|
327
|
+
const restore = () => {
|
|
328
|
+
core.restoreX();
|
|
329
|
+
return { status: LP_FEASIBLE, value: previous };
|
|
330
|
+
};
|
|
331
|
+
let isChanged = false;
|
|
332
|
+
for (let column = 0; column < core.x.length; column++) {
|
|
333
|
+
if (!solver.isInt(column) || core.x[column].isInt()) continue;
|
|
334
|
+
if (solver.isBase(column) && !solver.removeFromBasis(column)) return restore();
|
|
335
|
+
if (!core.x[column].isInt()) return restore();
|
|
336
|
+
isChanged = true;
|
|
337
|
+
}
|
|
338
|
+
const changed = isChanged ? term.apply(core.x) : maximum;
|
|
339
|
+
const isWorse = changed.compare(previous) < 0;
|
|
340
|
+
if (isWorse) core.restoreX();
|
|
341
|
+
const value = isWorse ? previous : changed;
|
|
342
|
+
if (!value.equals(maximum)) return { status: LP_FEASIBLE, value };
|
|
343
|
+
solver.status = LP_OPTIMAL;
|
|
344
|
+
return { status: LP_OPTIMAL, value };
|
|
345
|
+
};
|
|
346
|
+
|
|
347
|
+
export const maximizeTerm = (
|
|
348
|
+
solver: LarSolver,
|
|
349
|
+
column: number,
|
|
350
|
+
isFixingIntCols = false,
|
|
351
|
+
isComputingDependencies = false,
|
|
352
|
+
) => {
|
|
336
353
|
const term = solver.hasTerm(column)
|
|
337
354
|
? solver.getTerm(column)
|
|
338
355
|
: new LarTerm([[column, Rational.one]]);
|
|
339
|
-
|
|
340
|
-
const
|
|
356
|
+
solver.core.backupX();
|
|
357
|
+
const previous = term.apply(solver.core.x);
|
|
358
|
+
const maximum = maximizeTermOnFeasibleRSolver(solver, term);
|
|
341
359
|
if (maximum === undefined) {
|
|
342
|
-
solver.core.
|
|
343
|
-
return
|
|
360
|
+
solver.core.restoreX();
|
|
361
|
+
return { status: LP_UNBOUNDED, value: Impq.zero, dependency: null };
|
|
344
362
|
}
|
|
345
|
-
|
|
346
|
-
|
|
363
|
+
const dependency = isComputingDependencies
|
|
364
|
+
? getDependenciesOfMaximum(solver, maximum.reducedCosts)
|
|
365
|
+
: null;
|
|
366
|
+
if (!isFixingIntCols) {
|
|
367
|
+
solver.status = LP_OPTIMAL;
|
|
368
|
+
return { status: LP_OPTIMAL, value: maximum.value, dependency };
|
|
369
|
+
}
|
|
370
|
+
return { ...adjustIntegerColumns(solver, term, previous, maximum.value), dependency };
|
|
347
371
|
};
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. Builds, orders, and simplifies nex expressions. The order compares variables by
|
|
3
|
-
// weight, then by index, and simplification sorts products and sums by it and merges like terms.
|
|
4
|
-
// Z3 keeps every expression it allocates so that it can free them; here the collector does.
|
|
5
1
|
import { Rational } from "../rational";
|
|
2
|
+
import { UnorderedUintMap } from "./containers";
|
|
6
3
|
import {
|
|
7
4
|
type Nex,
|
|
8
5
|
type NexMul,
|
|
@@ -17,7 +14,6 @@ import {
|
|
|
17
14
|
isZeroScalar,
|
|
18
15
|
} from "./nex";
|
|
19
16
|
|
|
20
|
-
// occ: how many summands a variable divides, and its smallest power among them.
|
|
21
17
|
interface Occ {
|
|
22
18
|
occs: number;
|
|
23
19
|
power: number;
|
|
@@ -29,11 +25,10 @@ interface MapEntry<Value> {
|
|
|
29
25
|
}
|
|
30
26
|
|
|
31
27
|
export class NexCreator {
|
|
32
|
-
readonly occurencesMap = new
|
|
33
|
-
readonly powers = new
|
|
28
|
+
readonly occurencesMap = new UnorderedUintMap<Occ>();
|
|
29
|
+
readonly powers = new UnorderedUintMap<number>();
|
|
34
30
|
private activeVarsWeights: number[] = [];
|
|
35
31
|
|
|
36
|
-
// Assumes every variable is below k. Growing keeps the weights already set.
|
|
37
32
|
setNumberOfVars(count: number) {
|
|
38
33
|
const previousCount = this.activeVarsWeights.length;
|
|
39
34
|
this.activeVarsWeights.length = count;
|
|
@@ -56,7 +51,6 @@ export class NexCreator {
|
|
|
56
51
|
return { kind: "sum", children: [...children] };
|
|
57
52
|
}
|
|
58
53
|
|
|
59
|
-
// mk_mul(e, es...): a rational multiplies the coefficient, an expression is a factor.
|
|
60
54
|
mkMul(...factors: (Nex | Rational)[]): NexMul {
|
|
61
55
|
const children: NexPow[] = [];
|
|
62
56
|
let coeff = Rational.one;
|
|
@@ -71,7 +65,6 @@ export class NexCreator {
|
|
|
71
65
|
return { kind: "mul", coeff, children: [...children] };
|
|
72
66
|
}
|
|
73
67
|
|
|
74
|
-
// mul_factory::mk_reduced.
|
|
75
68
|
private mkReducedMul(coeff: Rational, children: NexPow[]) {
|
|
76
69
|
if (children.length === 0) return this.mkScalar(coeff);
|
|
77
70
|
if (coeff.equals(Rational.one) && children.length === 1 && children[0].power === 1)
|
|
@@ -79,14 +72,12 @@ export class NexCreator {
|
|
|
79
72
|
return this.mkMulWithPowers(coeff, children);
|
|
80
73
|
}
|
|
81
74
|
|
|
82
|
-
gtVar(first: number, second: number) {
|
|
75
|
+
private gtVar(first: number, second: number) {
|
|
83
76
|
const firstWeight = this.activeVarsWeights[first];
|
|
84
77
|
const secondWeight = this.activeVarsWeights[second];
|
|
85
78
|
return firstWeight !== secondWeight ? firstWeight > secondWeight : first > second;
|
|
86
79
|
}
|
|
87
80
|
|
|
88
|
-
// Scalars are the smallest, and the coefficient of a product does not count. Z3's
|
|
89
|
-
// gt_for_sort_join_sum is the same order.
|
|
90
81
|
gt(first: Nex, second: Nex): boolean {
|
|
91
82
|
if (first === second) return false;
|
|
92
83
|
if (first.kind === "var") return this.gtOnVarNex(first, second);
|
|
@@ -149,7 +140,6 @@ export class NexCreator {
|
|
|
149
140
|
return first.children.length > size;
|
|
150
141
|
}
|
|
151
142
|
|
|
152
|
-
// A std::map ordered by gt, greatest first: the index of the key, inserting it when absent.
|
|
153
143
|
private findOrInsert<Value>(entries: MapEntry<Value>[], key: Nex, value: Value) {
|
|
154
144
|
let low = 0;
|
|
155
145
|
let high = entries.length;
|
|
@@ -170,8 +160,6 @@ export class NexCreator {
|
|
|
170
160
|
return expr;
|
|
171
161
|
}
|
|
172
162
|
|
|
173
|
-
// eat_scalar_pow: the coefficient times the factor raised to power when the factor is a
|
|
174
|
-
// constant, else null.
|
|
175
163
|
private eatScalarPow(coeff: Rational, child: NexPow, power: number) {
|
|
176
164
|
if (child.expr.kind === "mul" && child.expr.children.length === 0)
|
|
177
165
|
return child.expr.coeff.equals(Rational.one)
|
|
@@ -183,9 +171,7 @@ export class NexCreator {
|
|
|
183
171
|
: coeff.mul(child.expr.value.pow(child.power * power));
|
|
184
172
|
}
|
|
185
173
|
|
|
186
|
-
|
|
187
|
-
// flattens the product factors, and merges equal factors into powers.
|
|
188
|
-
simplifyMul(mul: NexMul): Nex {
|
|
174
|
+
private simplifyMul(mul: NexMul): Nex {
|
|
189
175
|
const children: NexPow[] = [];
|
|
190
176
|
const toPromote: NexPow[] = [];
|
|
191
177
|
for (const child of mul.children) {
|
|
@@ -214,7 +200,6 @@ export class NexCreator {
|
|
|
214
200
|
return mul;
|
|
215
201
|
}
|
|
216
202
|
|
|
217
|
-
// The map already orders the factors by gt, so Z3's sort that follows changes nothing.
|
|
218
203
|
private mulToPowers(children: NexPow[]): NexPow[] {
|
|
219
204
|
const entries: MapEntry<number>[] = [];
|
|
220
205
|
for (const child of children) {
|
|
@@ -248,9 +233,6 @@ export class NexCreator {
|
|
|
248
233
|
this.sortJoinSum(sum);
|
|
249
234
|
}
|
|
250
235
|
|
|
251
|
-
// sort_join_sum: merges the summands that differ only in their coefficient, a + 3bc + 2bc into
|
|
252
|
-
// a + 5bc, sorts them by gt, and puts the sum of the scalars last. Like Z3, a merged product
|
|
253
|
-
// takes the new coefficient in place.
|
|
254
236
|
private sortJoinSum(sum: NexSum) {
|
|
255
237
|
const entries: MapEntry<Rational>[] = [];
|
|
256
238
|
let commonScalar = Rational.zero;
|
|
@@ -267,6 +249,7 @@ export class NexCreator {
|
|
|
267
249
|
for (const entry of entries) {
|
|
268
250
|
if (entry.value.isZero()) continue;
|
|
269
251
|
if (entry.key.kind === "mul") {
|
|
252
|
+
// Like Z3, a merged product takes the new coefficient in place.
|
|
270
253
|
entry.key.coeff = entry.value;
|
|
271
254
|
sum.children.push(this.simplify(entry.key));
|
|
272
255
|
} else if (entry.value.equals(Rational.one)) sum.children.push(entry.key);
|
|
@@ -286,7 +269,6 @@ export class NexCreator {
|
|
|
286
269
|
return this.mkSum(expr.children.map((child) => this.clone(child)));
|
|
287
270
|
}
|
|
288
271
|
|
|
289
|
-
// mk_div(a, j): a, a product or the variable itself, divided by the variable once.
|
|
290
272
|
mkDivByVar(expr: Nex, variable: number): Nex {
|
|
291
273
|
if (expr.kind !== "mul") return this.mkScalar(Rational.one);
|
|
292
274
|
const children: NexPow[] = [];
|
|
@@ -305,7 +287,6 @@ export class NexCreator {
|
|
|
305
287
|
return this.mkReducedMul(expr.coeff, children);
|
|
306
288
|
}
|
|
307
289
|
|
|
308
|
-
// mk_div_by_mul: each summand, a product or a variable, divided by the product of powers.
|
|
309
290
|
mkDiv(expr: Nex, divisor: NexMul): Nex {
|
|
310
291
|
if (expr.kind === "sum")
|
|
311
292
|
return this.mkSum(expr.children.map((child) => this.mkDiv(child, divisor)));
|
|
@@ -327,15 +308,12 @@ export class NexCreator {
|
|
|
327
308
|
children.push({ expr: this.mkVar(variable), power: child.power - divisorPower });
|
|
328
309
|
this.powers.delete(variable);
|
|
329
310
|
} else if (child.power === divisorPower) this.powers.delete(variable);
|
|
330
|
-
// The factor is eaten by the divisor, whose variable keeps the rest of its power.
|
|
331
311
|
else this.powers.set(variable, divisorPower - child.power);
|
|
332
312
|
}
|
|
333
313
|
return this.mkReducedMul(expr.coeff.div(divisor.coeff), children);
|
|
334
314
|
}
|
|
335
315
|
|
|
336
|
-
|
|
337
|
-
// the coefficient of the product; here the summands keep it.
|
|
338
|
-
canonize(expr: Nex): Nex {
|
|
316
|
+
private canonize(expr: Nex): Nex {
|
|
339
317
|
if (isElementary(expr)) return this.clone(expr);
|
|
340
318
|
const simplified = this.simplify(this.clone(expr));
|
|
341
319
|
if (simplified.kind === "sum") {
|
|
@@ -363,7 +341,6 @@ export class NexCreator {
|
|
|
363
341
|
return this.canonize(this.mkSum(summands));
|
|
364
342
|
}
|
|
365
343
|
|
|
366
|
-
// equal: whether the canonical forms agree when each variable weighs its index.
|
|
367
344
|
static equal(first: Nex, second: Nex) {
|
|
368
345
|
const creator = new NexCreator();
|
|
369
346
|
const count = Math.max(
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt. The nonlinear expressions
|
|
2
|
-
// that horner splits into cross-nested forms: scalars, variables, products of powers with a
|
|
3
|
-
// coefficient, and sums. Products and sums are mutable, since nex_creator simplifies them in place
|
|
4
|
-
// and cross_nested rewrites their children.
|
|
5
1
|
import { Rational } from "../rational";
|
|
2
|
+
import type { UnorderedUintMap } from "./containers";
|
|
6
3
|
|
|
7
4
|
interface NexScalar {
|
|
8
5
|
readonly kind: "scalar";
|
|
@@ -56,7 +53,6 @@ export const isLinear = (expr: Nex): boolean => {
|
|
|
56
53
|
return true;
|
|
57
54
|
};
|
|
58
55
|
|
|
59
|
-
// is_a_linear_term: a linear combination of at least two variables.
|
|
60
56
|
export const isALinearTerm = (sum: NexSum) => {
|
|
61
57
|
let numberOfNonScalars = 0;
|
|
62
58
|
for (const child of sum.children) {
|
|
@@ -68,8 +64,7 @@ export const isALinearTerm = (sum: NexSum) => {
|
|
|
68
64
|
return numberOfNonScalars > 1;
|
|
69
65
|
};
|
|
70
66
|
|
|
71
|
-
|
|
72
|
-
export const getPowersFromMul = (mul: NexMul, powers: Map<number, number>) => {
|
|
67
|
+
export const getPowersFromMul = (mul: NexMul, powers: UnorderedUintMap<number>) => {
|
|
73
68
|
powers.clear();
|
|
74
69
|
for (const child of mul.children)
|
|
75
70
|
if (child.expr.kind === "var") powers.set(child.expr.variable, child.power);
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_backoff.h), MIT license, see z3-license.txt. When the core runs
|
|
2
|
-
// its expensive engines.
|
|
3
|
-
|
|
4
|
-
// backoff: how many calls to skip before the next run of an expensive engine.
|
|
5
1
|
export class Backoff {
|
|
6
2
|
private delay = 0;
|
|
7
3
|
|
|
@@ -19,7 +15,6 @@ export class Backoff {
|
|
|
19
15
|
}
|
|
20
16
|
}
|
|
21
17
|
|
|
22
|
-
// squeeze_schedule: when to run the bounds optimization of the monomials.
|
|
23
18
|
export class SqueezeSchedule {
|
|
24
19
|
private failStreak = 0;
|
|
25
20
|
private squeezesSinceSatCheck = 0;
|
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_basics_lemmas.h, src/math/lp/nla_basics_lemmas.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. The basic lemmas of nla on monomials whose values are wrong: signs
|
|
3
|
-
// (-ab = (-a)b), zeros (xy = 0 iff x = 0 or y = 0), neutral factors (|xa| = |x| and x != 0 imply
|
|
4
|
-
// |a| = 1) and proportions (|xy| >= |y| when x != 0). Only the model-based lemmas are ported: with
|
|
5
|
-
// derived = true, basic_lemma returns after the sign lemma, so Z3 never reaches its derived
|
|
6
|
-
// zero and neutral lemmas.
|
|
7
1
|
import { Rational } from "../rational";
|
|
8
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
3
|
+
import { NULL_LPVAR } from "./lar-solver";
|
|
9
4
|
import { LarTerm } from "./lar-term";
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
5
|
+
import type { NlaCore } from "./nla-core";
|
|
6
|
+
import type { Factorization } from "./nla-factorization";
|
|
12
7
|
import { getRatSign, LemmaBuilder, mkIneq, signToRat } from "./nla-types";
|
|
13
8
|
import type { Monic } from "./nla-emonics";
|
|
14
9
|
|
|
@@ -33,8 +28,6 @@ export class Basics {
|
|
|
33
28
|
);
|
|
34
29
|
}
|
|
35
30
|
|
|
36
|
-
// Signs.
|
|
37
|
-
|
|
38
31
|
private basicSignLemmaOnTwoMonics(first: Monic, second: Monic) {
|
|
39
32
|
const sign = signToRat(first.rsign !== second.rsign);
|
|
40
33
|
if (this.core.varVal(first).equals(this.core.varVal(second).mul(sign))) return false;
|
|
@@ -61,8 +54,6 @@ export class Basics {
|
|
|
61
54
|
for (const lpVar of fixedZeros) this.addFixedZeroLemma(monic, lpVar);
|
|
62
55
|
}
|
|
63
56
|
|
|
64
|
-
// try_get_non_strict_sign_from_bounds and get_non_strict_sign: the sign times the sign of the
|
|
65
|
-
// variable, from its value or else its bounds, or 0.
|
|
66
57
|
private getNonStrictSign(lpVar: number, sign: number) {
|
|
67
58
|
const core = this.core;
|
|
68
59
|
const value = core.val(lpVar);
|
|
@@ -135,10 +126,6 @@ export class Basics {
|
|
|
135
126
|
lemma.explainMonic(second);
|
|
136
127
|
}
|
|
137
128
|
|
|
138
|
-
// Zeros.
|
|
139
|
-
|
|
140
|
-
// find_best_zero: a variable of value 0, preferably with 0 inside its bounds, and the variables
|
|
141
|
-
// fixed to 0.
|
|
142
129
|
private findBestZero(monic: Monic, fixedZeros: number[]) {
|
|
143
130
|
const core = this.core;
|
|
144
131
|
let zeroVar = -1;
|
|
@@ -185,8 +172,6 @@ export class Basics {
|
|
|
185
172
|
lemma.addIneq(mkIneq(lpVar, KIND_LT, 0));
|
|
186
173
|
}
|
|
187
174
|
|
|
188
|
-
// Model-based lemmas on the factorizations of a monic.
|
|
189
|
-
|
|
190
175
|
private basicLemmaForMonModelBased(rooted: Monic) {
|
|
191
176
|
const core = this.core;
|
|
192
177
|
const isZero = core.varVal(rooted).isZero();
|
|
@@ -203,7 +188,6 @@ export class Basics {
|
|
|
203
188
|
}
|
|
204
189
|
}
|
|
205
190
|
|
|
206
|
-
// x != 0 or y = 0 => |xy| >= |y|
|
|
207
191
|
private proportionLemmaModelBased(rooted: Monic, factorization: Factorization) {
|
|
208
192
|
const core = this.core;
|
|
209
193
|
if (core.hasRealFactorization(factorization)) return;
|
|
@@ -215,7 +199,6 @@ export class Basics {
|
|
|
215
199
|
if (factorIndex !== -1) this.generatePl(rooted, factorization, factorIndex);
|
|
216
200
|
}
|
|
217
201
|
|
|
218
|
-
// sign_m*m < 0 or \/_{i != k} f_i = 0 or sign_m*m >= sign_k*f_k
|
|
219
202
|
private generatePlOnMon(monic: Monic, factorIndex: number) {
|
|
220
203
|
const core = this.core;
|
|
221
204
|
const lemma = new LemmaBuilder(core);
|
|
@@ -281,7 +264,6 @@ export class Basics {
|
|
|
281
264
|
);
|
|
282
265
|
}
|
|
283
266
|
|
|
284
|
-
// xy = 0 -> x = 0 or y = 0
|
|
285
267
|
private basicLemmaForMonZeroModelBased(rooted: Monic, factorization: Factorization) {
|
|
286
268
|
const lemma = new LemmaBuilder(this.core);
|
|
287
269
|
lemma.addIneq(mkIneq(rooted.variable, KIND_NE, 0));
|
|
@@ -294,8 +276,6 @@ export class Basics {
|
|
|
294
276
|
lemma.explainFactorization(factorization);
|
|
295
277
|
}
|
|
296
278
|
|
|
297
|
-
// /\_{j != i} f_j = val(f_j) => m = sign * f_i, or /\_j f_j = val(f_j) => m = sign, over the
|
|
298
|
-
// variables of a monic.
|
|
299
279
|
private basicLemmaForMonNeutralFromFactorsToMonicModelBasedFm(monic: Monic) {
|
|
300
280
|
const core = this.core;
|
|
301
281
|
const neutral = this.getNeutralNotOne(
|
|
@@ -326,18 +306,57 @@ export class Basics {
|
|
|
326
306
|
);
|
|
327
307
|
}
|
|
328
308
|
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
309
|
+
private basicLemmaForMonNeutralMonicToFactorModelBased(
|
|
310
|
+
rooted: Monic,
|
|
311
|
+
factorization: Factorization,
|
|
312
|
+
) {
|
|
313
|
+
const core = this.core;
|
|
314
|
+
const monicVar = core.emons.get(rooted.variable).variable;
|
|
315
|
+
const absMonicValue = core.val(monicVar).abs();
|
|
316
|
+
if (absMonicValue.isZero()) return;
|
|
317
|
+
let sameAbsVar = NULL_LPVAR;
|
|
318
|
+
let nonUnitVar = NULL_LPVAR;
|
|
319
|
+
let isAllInt = true;
|
|
320
|
+
for (const factor of factorization.factors) {
|
|
321
|
+
const lpVar = factor.variable;
|
|
322
|
+
isAllInt &&= core.varIsInt(lpVar);
|
|
323
|
+
// Z3 tests the factor's variable against null_lpvar, which never holds, so the lemma never fires.
|
|
324
|
+
if (lpVar === NULL_LPVAR && core.valFactor(factor).abs().equals(absMonicValue))
|
|
325
|
+
sameAbsVar = lpVar;
|
|
326
|
+
else if (!core.valFactor(factor).abs().equals(Rational.one)) nonUnitVar = lpVar;
|
|
327
|
+
}
|
|
328
|
+
if (sameAbsVar === NULL_LPVAR || nonUnitVar === NULL_LPVAR) return;
|
|
329
|
+
if (!isAllInt && factorization.factors.length > 2) return;
|
|
330
|
+
const lemma = new LemmaBuilder(core);
|
|
331
|
+
lemma.addIneq(mkIneq(monicVar, KIND_EQ, 0));
|
|
332
|
+
lemma.addIneq(
|
|
333
|
+
mkIneq(
|
|
334
|
+
new LarTerm([
|
|
335
|
+
[sameAbsVar, Rational.one],
|
|
336
|
+
[
|
|
337
|
+
monicVar,
|
|
338
|
+
core.val(sameAbsVar).equals(core.val(monicVar).neg())
|
|
339
|
+
? Rational.one
|
|
340
|
+
: Rational.minusOne,
|
|
341
|
+
],
|
|
342
|
+
]),
|
|
343
|
+
KIND_NE,
|
|
344
|
+
0,
|
|
345
|
+
),
|
|
346
|
+
);
|
|
347
|
+
lemma.addIneq(mkIneq(nonUnitVar, KIND_EQ, 1));
|
|
348
|
+
lemma.addIneq(mkIneq(nonUnitVar, KIND_EQ, -1));
|
|
349
|
+
lemma.explainMonic(rooted);
|
|
350
|
+
lemma.explainFactorization(factorization);
|
|
351
|
+
}
|
|
352
|
+
|
|
332
353
|
private basicLemmaForMonNeutralModelBased(rooted: Monic, factorization: Factorization) {
|
|
354
|
+
this.basicLemmaForMonNeutralMonicToFactorModelBased(rooted, factorization);
|
|
333
355
|
if (factorization.mon !== null)
|
|
334
356
|
this.basicLemmaForMonNeutralFromFactorsToMonicModelBasedFm(factorization.mon);
|
|
335
357
|
else this.basicLemmaForMonNeutralFromFactorsToMonicModelBased(rooted, factorization);
|
|
336
358
|
}
|
|
337
359
|
|
|
338
|
-
// can_create_lemma_for_mon_neutral_from_factors_to_monic_model_based: the one factor whose
|
|
339
|
-
// value is not +-1, or -1 when there is none, and the product of the other values, when the
|
|
340
|
-
// monic's value disagrees with them.
|
|
341
360
|
private getNeutralNotOne(monic: Monic, factors: FactorValue[]) {
|
|
342
361
|
let sign = Rational.one;
|
|
343
362
|
let notOne = -1;
|
|
@@ -383,7 +402,6 @@ export class Basics {
|
|
|
383
402
|
lemma.explainFactorization(factorization);
|
|
384
403
|
}
|
|
385
404
|
|
|
386
|
-
// x = 0 or y = 0 -> xy = 0
|
|
387
405
|
private basicLemmaForMonNonZeroModelBased(factorization: Factorization) {
|
|
388
406
|
const monic = factorization.mon;
|
|
389
407
|
if (monic === null) return;
|