tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- 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 +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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,15 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_divisions.h, src/math/lp/nla_divisions.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. The lemmas of nla on div, mod and /: monotonicity in the dividend and the
|
|
3
|
-
// divisor, bounded divisions by numerals, and divisibility closures over a shared divisor. The
|
|
4
|
-
// check is skipped while nla uses nlsat's model.
|
|
5
1
|
import { getEuclideanDiv, Rational } from "../rational";
|
|
6
2
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
7
3
|
import { NULL_LPVAR } from "./lar-solver";
|
|
8
4
|
import { LarTerm } from "./lar-term";
|
|
9
|
-
import {
|
|
5
|
+
import type { NlaCore } from "./nla-core";
|
|
10
6
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
11
7
|
|
|
12
|
-
// A division q = x / y with r its remainder, or a divisibility fact r = mod(x, y), q = div(x, y).
|
|
13
8
|
export interface Division {
|
|
14
9
|
readonly quotient: number;
|
|
15
10
|
readonly dividend: number;
|
|
@@ -26,7 +21,6 @@ interface DivisionValues {
|
|
|
26
21
|
readonly quotientValue: Rational;
|
|
27
22
|
}
|
|
28
23
|
|
|
29
|
-
// div on integers: Euclidean division, as mpz_manager::div.
|
|
30
24
|
const getIntDiv = (dividend: Rational, divisor: Rational) =>
|
|
31
25
|
Rational.of(getEuclideanDiv(dividend.num, divisor.num));
|
|
32
26
|
|
|
@@ -45,7 +39,6 @@ const mkDifference = (first: number, second: number) =>
|
|
|
45
39
|
export class Divisions {
|
|
46
40
|
private idivisions: Division[] = [];
|
|
47
41
|
private boundedDivisions: Division[] = [];
|
|
48
|
-
// Divisibility facts, whose quotient is div(x, y) and remainder mod(x, y).
|
|
49
42
|
private divisibility: Division[] = [];
|
|
50
43
|
|
|
51
44
|
constructor(private core: NlaCore) {}
|
|
@@ -73,7 +66,6 @@ export class Divisions {
|
|
|
73
66
|
this.pushDivision(this.divisibility, division);
|
|
74
67
|
}
|
|
75
68
|
|
|
76
|
-
// y1 >= y2 > 0 & 0 <= x1 <= x2 => x1/y1 <= x2/y2
|
|
77
69
|
private monotonicity1(first: DivisionValues, second: DivisionValues) {
|
|
78
70
|
if (
|
|
79
71
|
!(
|
|
@@ -94,7 +86,6 @@ export class Divisions {
|
|
|
94
86
|
return true;
|
|
95
87
|
}
|
|
96
88
|
|
|
97
|
-
// y2 <= y1 < 0 & x1 >= x2 >= 0 => x1/y1 <= x2/y2
|
|
98
89
|
private monotonicity2(first: DivisionValues, second: DivisionValues) {
|
|
99
90
|
if (
|
|
100
91
|
!(
|
|
@@ -115,7 +106,6 @@ export class Divisions {
|
|
|
115
106
|
return true;
|
|
116
107
|
}
|
|
117
108
|
|
|
118
|
-
// y2 <= y1 < 0 & x1 <= x2 <= 0 => x1/y1 >= x2/y2
|
|
119
109
|
private monotonicity3(first: DivisionValues, second: DivisionValues) {
|
|
120
110
|
if (
|
|
121
111
|
!(
|
|
@@ -159,8 +149,6 @@ export class Divisions {
|
|
|
159
149
|
};
|
|
160
150
|
}
|
|
161
151
|
|
|
162
|
-
// The monotonicity lemmas of the integer divisions whose quotients are wrong, against the others.
|
|
163
|
-
// Z3's theory_lra registers no real divisions, so the rdivisions it would also check stay empty.
|
|
164
152
|
private checkMonotonicity(divisions: Division[]) {
|
|
165
153
|
const core = this.core;
|
|
166
154
|
for (const division of divisions) {
|
|
@@ -187,8 +175,6 @@ export class Divisions {
|
|
|
187
175
|
this.checkModCongruence();
|
|
188
176
|
}
|
|
189
177
|
|
|
190
|
-
// p <= q * div(r, q) + q - 1 => div(p, q) <= div(r, q), and p >= q * div(r, q) =>
|
|
191
|
-
// div(r, q) <= div(p, q), for a bounded p, a value q and r = eval(p).
|
|
192
178
|
checkBoundedDivisions() {
|
|
193
179
|
const core = this.core;
|
|
194
180
|
const offset = core.random();
|
|
@@ -222,7 +208,6 @@ export class Divisions {
|
|
|
222
208
|
}
|
|
223
209
|
}
|
|
224
210
|
|
|
225
|
-
// mod(factor, p) = 0 => mod(factor * k, p) = 0
|
|
226
211
|
private checkModMult() {
|
|
227
212
|
const core = this.core;
|
|
228
213
|
const offset = core.random();
|
|
@@ -249,40 +234,40 @@ export class Divisions {
|
|
|
249
234
|
}
|
|
250
235
|
}
|
|
251
236
|
|
|
252
|
-
// y != 0 & mod(a, y) = 0 & x = c * a, for an integer constant c, => mod(x, y) = 0
|
|
253
237
|
private checkLinearDivisibility() {
|
|
254
238
|
const core = this.core;
|
|
255
239
|
const size = this.divisibility.length;
|
|
256
240
|
for (let index = 0; index < size; index++) {
|
|
257
241
|
const fact = this.divisibility[index];
|
|
258
|
-
const
|
|
259
|
-
const
|
|
242
|
+
const dividend = fact.dividend;
|
|
243
|
+
const divisor = fact.divisor;
|
|
260
244
|
if (!core.isRelevant(fact.remainder)) continue;
|
|
261
245
|
if (core.val(fact.remainder).isZero()) continue;
|
|
262
|
-
const
|
|
263
|
-
const
|
|
264
|
-
if (
|
|
246
|
+
const dividendValue = core.val(dividend);
|
|
247
|
+
const divisorValue = core.val(divisor);
|
|
248
|
+
if (divisorValue.isZero() || dividendValue.isZero()) continue;
|
|
265
249
|
for (let otherIndex = 0; otherIndex < size; otherIndex++) {
|
|
266
250
|
if (index === otherIndex) continue;
|
|
267
251
|
const other = this.divisibility[otherIndex];
|
|
268
|
-
const
|
|
269
|
-
const
|
|
270
|
-
if (
|
|
252
|
+
const otherDividend = other.dividend;
|
|
253
|
+
const otherDivisor = other.divisor;
|
|
254
|
+
if (otherDivisor !== divisor && !core.val(otherDivisor).equals(divisorValue)) continue;
|
|
271
255
|
if (!core.isRelevant(other.remainder)) continue;
|
|
272
256
|
if (!core.val(other.remainder).isZero()) continue;
|
|
273
|
-
const
|
|
274
|
-
if (
|
|
275
|
-
const coeff =
|
|
257
|
+
const otherDividendValue = core.val(otherDividend);
|
|
258
|
+
if (otherDividendValue.isZero()) continue;
|
|
259
|
+
const coeff = dividendValue.div(otherDividendValue);
|
|
276
260
|
if (!coeff.isInt() || coeff.isZero()) continue;
|
|
277
|
-
if (!
|
|
261
|
+
if (!dividendValue.equals(coeff.mul(otherDividendValue))) continue;
|
|
278
262
|
const lemma = new LemmaBuilder(core);
|
|
279
|
-
lemma.addIneq(mkIneq(
|
|
280
|
-
if (
|
|
263
|
+
lemma.addIneq(mkIneq(divisor, KIND_EQ, 0));
|
|
264
|
+
if (otherDivisor !== divisor)
|
|
265
|
+
lemma.addIneq(mkIneq(mkDifference(divisor, otherDivisor), KIND_NE, 0));
|
|
281
266
|
lemma.addIneq(
|
|
282
267
|
mkIneq(
|
|
283
268
|
new LarTerm([
|
|
284
|
-
[
|
|
285
|
-
[
|
|
269
|
+
[dividend, Rational.one],
|
|
270
|
+
[otherDividend, coeff.neg()],
|
|
286
271
|
]),
|
|
287
272
|
KIND_NE,
|
|
288
273
|
0,
|
|
@@ -295,35 +280,38 @@ export class Divisions {
|
|
|
295
280
|
}
|
|
296
281
|
}
|
|
297
282
|
|
|
298
|
-
// div(x,y) - div(s,y) = delta => mod(x,y) - mod(s,y) = (x - s) - delta*y, for y != 0
|
|
299
283
|
private checkModCongruence() {
|
|
300
284
|
const core = this.core;
|
|
301
285
|
const size = this.divisibility.length;
|
|
302
286
|
for (let index = 0; index < size; index++) {
|
|
303
287
|
const fact = this.divisibility[index];
|
|
304
|
-
const
|
|
288
|
+
const divisor = fact.divisor;
|
|
305
289
|
if (!core.isRelevant(fact.remainder)) continue;
|
|
306
|
-
const
|
|
307
|
-
if (
|
|
290
|
+
const divisorValue = core.val(divisor);
|
|
291
|
+
if (divisorValue.isZero()) continue;
|
|
308
292
|
for (let otherIndex = index + 1; otherIndex < size; otherIndex++) {
|
|
309
293
|
const other = this.divisibility[otherIndex];
|
|
310
|
-
const
|
|
294
|
+
const otherDivisor = other.divisor;
|
|
311
295
|
if (!core.isRelevant(other.remainder)) continue;
|
|
312
|
-
if (
|
|
296
|
+
if (otherDivisor !== divisor && !core.val(otherDivisor).equals(divisorValue)) continue;
|
|
313
297
|
const delta = core.val(fact.quotient).sub(core.val(other.quotient));
|
|
314
298
|
const left = core.val(fact.remainder).sub(core.val(other.remainder));
|
|
315
|
-
const right = core
|
|
299
|
+
const right = core
|
|
300
|
+
.val(fact.dividend)
|
|
301
|
+
.sub(core.val(other.dividend))
|
|
302
|
+
.sub(delta.mul(divisorValue));
|
|
316
303
|
if (left.equals(right)) continue;
|
|
317
304
|
const lemma = new LemmaBuilder(core);
|
|
318
|
-
lemma.addIneq(mkIneq(
|
|
319
|
-
if (
|
|
305
|
+
lemma.addIneq(mkIneq(divisor, KIND_EQ, 0));
|
|
306
|
+
if (otherDivisor !== divisor)
|
|
307
|
+
lemma.addIneq(mkIneq(mkDifference(divisor, otherDivisor), KIND_NE, 0));
|
|
320
308
|
lemma.addIneq(mkIneq(mkDifference(fact.quotient, other.quotient), KIND_NE, delta));
|
|
321
309
|
const term = new LarTerm();
|
|
322
310
|
term.addMonomial(Rational.one, fact.remainder);
|
|
323
311
|
term.addMonomial(Rational.minusOne, other.remainder);
|
|
324
312
|
term.addMonomial(Rational.minusOne, fact.dividend);
|
|
325
313
|
term.addMonomial(Rational.one, other.dividend);
|
|
326
|
-
term.addMonomial(delta,
|
|
314
|
+
term.addMonomial(delta, divisor);
|
|
327
315
|
lemma.addIneq(mkIneq(term, KIND_EQ, 0));
|
|
328
316
|
return;
|
|
329
317
|
}
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
// license, see z3-license.txt. The monomials v := v1 * ... * vn of nla, canonized over the
|
|
3
|
-
// variable equivalences, with the cyclic use lists of their variables and the congruence classes
|
|
4
|
-
// of monomials equal up to sign.
|
|
5
|
-
import { getSignedVarVar, isSignedVarNegated, negateSignedVar, VarEqs } from "./nla-var-eqs";
|
|
1
|
+
import { getSignedVarVar, isSignedVarNegated, negateSignedVar, type VarEqs } from "./nla-var-eqs";
|
|
6
2
|
import { TrailStack, UnionFind } from "./union-find";
|
|
7
3
|
|
|
8
4
|
const compareNumbers = (first: number, second: number) => first - second;
|
|
9
5
|
|
|
10
6
|
export class Monic {
|
|
11
7
|
readonly vars: number[];
|
|
12
|
-
// The roots of the variables, sorted, and the parity of their signs.
|
|
13
8
|
rvars: number[] = [];
|
|
14
9
|
rsign = false;
|
|
15
10
|
visited = 0;
|
|
@@ -32,7 +27,6 @@ export class Monic {
|
|
|
32
27
|
}
|
|
33
28
|
}
|
|
34
29
|
|
|
35
|
-
// A cell of a cyclic use list: the index of a monic, and the next cell.
|
|
36
30
|
class Cell {
|
|
37
31
|
next: Cell = this;
|
|
38
32
|
|
|
@@ -53,15 +47,13 @@ export class Emonics {
|
|
|
53
47
|
private var2index: number[] = [];
|
|
54
48
|
private visitedStamp = 0;
|
|
55
49
|
private useLists: HeadTail[] = [];
|
|
56
|
-
// The congruence table: the monics of each rooted variable list, the first its representative.
|
|
57
50
|
private cgTable = new Map<string, number[]>();
|
|
58
51
|
|
|
59
52
|
constructor(private varEqs: VarEqs) {
|
|
60
53
|
varEqs.setMergeHandler(this.varEqsHandler);
|
|
61
54
|
}
|
|
62
55
|
|
|
63
|
-
|
|
64
|
-
readonly varEqsHandler = {
|
|
56
|
+
private readonly varEqsHandler = {
|
|
65
57
|
afterMergeEh: (r2: number, r1: number) => {
|
|
66
58
|
if (
|
|
67
59
|
getSignedVarVar(r1) !== getSignedVarVar(r2) &&
|
|
@@ -230,7 +222,6 @@ export class Emonics {
|
|
|
230
222
|
return this.useLists[root].head;
|
|
231
223
|
}
|
|
232
224
|
|
|
233
|
-
// The monics in the use list of a variable's root, around the cycle from its head.
|
|
234
225
|
*getUseList(lpVar: number) {
|
|
235
226
|
const head = this.getHead(lpVar);
|
|
236
227
|
if (head === null) return;
|
|
@@ -246,11 +237,6 @@ export class Emonics {
|
|
|
246
237
|
return table === undefined || table.length === 0 ? undefined : this.get(table[0]);
|
|
247
238
|
}
|
|
248
239
|
|
|
249
|
-
isCanonicalMonic(lpVar: number) {
|
|
250
|
-
const index = this.var2index[lpVar];
|
|
251
|
-
return index >= this.unionFind.numVars || this.unionFind.find(index) === index;
|
|
252
|
-
}
|
|
253
|
-
|
|
254
240
|
private removeCg(lpVar: number) {
|
|
255
241
|
const first = this.useLists[lpVar].head;
|
|
256
242
|
if (first === null) return;
|
|
@@ -328,8 +314,7 @@ export class Emonics {
|
|
|
328
314
|
for (const monic of this.monics) this.doCanonize(monic);
|
|
329
315
|
}
|
|
330
316
|
|
|
331
|
-
|
|
332
|
-
canonizeDivides(divisor: Monic, product: Monic) {
|
|
317
|
+
private canonizeDivides(divisor: Monic, product: Monic) {
|
|
333
318
|
if (divisor.size > product.size) return false;
|
|
334
319
|
let divisorIndex = 0;
|
|
335
320
|
let productIndex = 0;
|
|
@@ -346,8 +331,6 @@ export class Emonics {
|
|
|
346
331
|
}
|
|
347
332
|
}
|
|
348
333
|
|
|
349
|
-
// get_products_of: the monics, other than the given one, that it divides, or every monic using
|
|
350
|
-
// the variable, each once.
|
|
351
334
|
*getProductsOf(factor: Monic | number) {
|
|
352
335
|
this.incVisited();
|
|
353
336
|
const isMonic = factor instanceof Monic;
|
|
@@ -360,7 +343,6 @@ export class Emonics {
|
|
|
360
343
|
}
|
|
361
344
|
}
|
|
362
345
|
|
|
363
|
-
// enum_sign_equiv_monics: the monics equal to this one up to sign, around its class's cycle.
|
|
364
346
|
*getSignEquivMonics(monic: Monic) {
|
|
365
347
|
const start = this.var2index[monic.variable];
|
|
366
348
|
let index = start;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/factorization.h), MIT license, see z3-license.txt. A factor of a
|
|
2
|
-
// monic is a variable or a monic, with a sign. The core makes the factorizations, see
|
|
3
|
-
// getFactorizations in nla-core.ts.
|
|
4
1
|
import type { Monic } from "./nla-emonics";
|
|
5
2
|
import { signToRat } from "./nla-types";
|
|
6
3
|
|
|
@@ -18,7 +15,6 @@ export const mkFactor = (variable: number, isMon: boolean): Factor => ({
|
|
|
18
15
|
|
|
19
16
|
export const getFactorSign = (factor: Factor) => signToRat(factor.isNegated);
|
|
20
17
|
|
|
21
|
-
// A factorization: the factors of a monic, which is set for the factorization into its variables.
|
|
22
18
|
export interface Factorization {
|
|
23
19
|
readonly factors: Factor[];
|
|
24
20
|
mon: Monic | null;
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/nla_grobner.h, src/math/lp/nla_grobner.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. nla's Grobner pass: the rows around the monomials to refine become polynomial
|
|
3
|
-
// equations, which dd::solver saturates, and the equations then yield lemmas: interval conflicts,
|
|
4
|
-
// quotient and residue bounds, failed gcd tests, fixed variables, factorizations, and new linear
|
|
5
|
-
// rows. Z3's nlsat conflict check (is_nla_conflict) is not ported, nor are the statistics.
|
|
6
1
|
import { PddMemoryOutError } from "../../../../errors";
|
|
7
2
|
import { getEuclideanMod, getGcd, getLcm, Rational } from "../rational";
|
|
8
3
|
import { KIND_EQ, KIND_GE, KIND_LE, KIND_LT, KIND_NE } from "./constraints";
|
|
@@ -40,7 +35,6 @@ const ADAPTIVE_MAX = 4 * 16;
|
|
|
40
35
|
const ADAPTIVE_BUMP_AFTER = 2;
|
|
41
36
|
const DELAY_CAP = 1000000;
|
|
42
37
|
|
|
43
|
-
// A dependency that pdd_expr and val_of_fixed_var_with_deps extend, where Z3 passes a reference.
|
|
44
38
|
interface DepRef {
|
|
45
39
|
dep: Dependency;
|
|
46
40
|
}
|
|
@@ -63,11 +57,9 @@ const getRationalLcm = (first: Rational, second: Rational) =>
|
|
|
63
57
|
|
|
64
58
|
const getDenominator = (value: Rational) => Rational.of(value.den);
|
|
65
59
|
|
|
66
|
-
// divides: whether the integer a divides the integer b, where 0 divides only 0.
|
|
67
60
|
const divides = (divisor: Rational, value: Rational) =>
|
|
68
61
|
divisor.isZero() ? value.isZero() : value.num % divisor.num === 0n;
|
|
69
62
|
|
|
70
|
-
// ps_root: the root a of a^2 * M^2, a perfect square with every variable of even multiplicity.
|
|
71
63
|
const getPerfectSquareRoot = (coeff: Rational, vars: number[]) => {
|
|
72
64
|
if (vars.length % 2 === 1) return undefined;
|
|
73
65
|
const root = coeff.root(2);
|
|
@@ -80,8 +72,6 @@ const getPerfectSquareRoot = (coeff: Rational, vars: number[]) => {
|
|
|
80
72
|
return root;
|
|
81
73
|
};
|
|
82
74
|
|
|
83
|
-
// ps_cross: whether (c12, v12) is the cross term -2ab*M1*M2 of the perfect squares a^2*M1^2 and
|
|
84
|
-
// b^2*M2^2.
|
|
85
75
|
const isPerfectSquareCross = (
|
|
86
76
|
first: Rational,
|
|
87
77
|
firstVars: number[],
|
|
@@ -105,19 +95,18 @@ const isPerfectSquareCross = (
|
|
|
105
95
|
};
|
|
106
96
|
|
|
107
97
|
export class Grobner {
|
|
108
|
-
private
|
|
109
|
-
private
|
|
110
|
-
private
|
|
98
|
+
private propagatesQuotients = false;
|
|
99
|
+
private hasGcdTest = false;
|
|
100
|
+
private expandsTerms = false;
|
|
111
101
|
private readonly manager: PddManager;
|
|
112
102
|
private readonly solver: PddSolver;
|
|
113
103
|
private readonly nexCreator = new NexCreator();
|
|
114
104
|
private readonly rows = new IndexedUintSet();
|
|
115
|
-
private quota
|
|
105
|
+
private quota = NLA_PARAMS.grQ;
|
|
116
106
|
private delayBase = 0;
|
|
117
107
|
private delay = 0;
|
|
118
108
|
private growthBoost = ADAPTIVE_UNIT;
|
|
119
109
|
private hitStreak = 0;
|
|
120
|
-
private readonly isAddingAllEqs = false;
|
|
121
110
|
private mon2var = new Map<string, number>();
|
|
122
111
|
|
|
123
112
|
constructor(private core: NlaCore) {
|
|
@@ -125,7 +114,12 @@ export class Grobner {
|
|
|
125
114
|
this.solver = new PddSolver(this.manager, () => core.isCanceled());
|
|
126
115
|
}
|
|
127
116
|
|
|
128
|
-
|
|
117
|
+
updateParams() {
|
|
118
|
+
this.propagatesQuotients = NLA_PARAMS.grobnerPropagateQuotients;
|
|
119
|
+
this.hasGcdTest = NLA_PARAMS.grobnerGcdTest;
|
|
120
|
+
this.expandsTerms = NLA_PARAMS.grobnerExpandTerms;
|
|
121
|
+
}
|
|
122
|
+
|
|
129
123
|
run() {
|
|
130
124
|
if (this.core.lra.getColumnCount() > 5000) return;
|
|
131
125
|
if (this.quota === 0) this.quota = NLA_PARAMS.grQ;
|
|
@@ -166,7 +160,6 @@ export class Grobner {
|
|
|
166
160
|
if (this.quota > 0) this.quota--;
|
|
167
161
|
}
|
|
168
162
|
|
|
169
|
-
// Z3 catches every exception here, of which a failed pdd allocation is the one that can occur.
|
|
170
163
|
private catchMemoryOut(propagate: () => boolean) {
|
|
171
164
|
try {
|
|
172
165
|
return propagate();
|
|
@@ -176,8 +169,6 @@ export class Grobner {
|
|
|
176
169
|
}
|
|
177
170
|
}
|
|
178
171
|
|
|
179
|
-
// update_growth_boost: two productive runs in a row raise the boost by half, up to the cap, and a
|
|
180
|
-
// miss takes back a quarter of the excess over the unit.
|
|
181
172
|
private updateGrowthBoost(isProductive: boolean) {
|
|
182
173
|
if (isProductive) {
|
|
183
174
|
if (++this.hitStreak < ADAPTIVE_BUMP_AFTER) return;
|
|
@@ -222,7 +213,6 @@ export class Grobner {
|
|
|
222
213
|
return this.countPropagations((equation) => this.propagateQuotientsOf(equation));
|
|
223
214
|
}
|
|
224
215
|
|
|
225
|
-
// propagate_fixed: k*x = 0 gives x = 0, and x + b = 0 gives x = -b.
|
|
226
216
|
private propagateFixed(equation: Equation) {
|
|
227
217
|
const poly = equation.poly;
|
|
228
218
|
if (poly.isUnary()) {
|
|
@@ -246,7 +236,6 @@ export class Grobner {
|
|
|
246
236
|
return true;
|
|
247
237
|
}
|
|
248
238
|
|
|
249
|
-
// propagate_factorization: x*q = 0 gives x = 0 or q = 0, for a linear q.
|
|
250
239
|
private propagateFactorizationOf(equation: Equation) {
|
|
251
240
|
const factors = equation.poly.varFactors();
|
|
252
241
|
if (factors.vars.length === 0 || !factors.poly.isLinear()) return false;
|
|
@@ -259,8 +248,6 @@ export class Grobner {
|
|
|
259
248
|
return true;
|
|
260
249
|
}
|
|
261
250
|
|
|
262
|
-
// linear_to_term: the linear polynomial times the lcm of its denominators, as a term and an
|
|
263
|
-
// offset.
|
|
264
251
|
private linearToTerm(poly: Pdd): LinearTerm {
|
|
265
252
|
let lcm = Rational.one;
|
|
266
253
|
let current = poly;
|
|
@@ -289,8 +276,6 @@ export class Grobner {
|
|
|
289
276
|
);
|
|
290
277
|
}
|
|
291
278
|
|
|
292
|
-
// propagate_gcd_test: x^k - y = 0 limits y modulo k^2. For each residue r of x modulo k, the
|
|
293
|
-
// gcd of the coefficients of p with k*x + r for x must divide its constant term.
|
|
294
279
|
private propagateGcdTestOf(equation: Equation) {
|
|
295
280
|
let poly = equation.poly;
|
|
296
281
|
if (poly.isLinear() || poly.isVal() || !this.isIntPoly(poly)) return false;
|
|
@@ -330,8 +315,6 @@ export class Grobner {
|
|
|
330
315
|
return false;
|
|
331
316
|
}
|
|
332
317
|
|
|
333
|
-
// propagate_quotients: for x*y + z = 0 over the integers, the residue of a linear variable and
|
|
334
|
-
// bounds that relate a factor to the rest.
|
|
335
318
|
private propagateQuotientsOf(equation: Equation) {
|
|
336
319
|
const poly = equation.poly;
|
|
337
320
|
if (poly.isLinear() || poly.isVal() || !this.isIntPoly(poly)) return false;
|
|
@@ -355,8 +338,6 @@ export class Grobner {
|
|
|
355
338
|
return isLemmaFound;
|
|
356
339
|
}
|
|
357
340
|
|
|
358
|
-
// mod_residue: when every monomial but c_v*v is a multiple of M*c_v and the constant term is
|
|
359
|
-
// K*c_v, then v = -K modulo M, so 0 <= v < M forces v to the residue.
|
|
360
341
|
private propagateModResidue(equation: Equation) {
|
|
361
342
|
const poly = equation.poly;
|
|
362
343
|
for (const linear of poly) {
|
|
@@ -399,14 +380,12 @@ export class Grobner {
|
|
|
399
380
|
return false;
|
|
400
381
|
}
|
|
401
382
|
|
|
402
|
-
// The lemmas of p = v*lc + r for a linear r, by the values of v, lc and r.
|
|
403
383
|
private addQuotientLemma(equation: Equation, variable: number, lc: Pdd, rest: Pdd) {
|
|
404
384
|
const variableValue = this.core.val(variable);
|
|
405
385
|
const restValue = this.getValue(rest);
|
|
406
386
|
const lcValue = this.getValue(lc);
|
|
407
387
|
if (restValue.isZero()) {
|
|
408
388
|
if (variableValue.isZero() || lcValue.isZero() || !lc.isLinear()) return false;
|
|
409
|
-
// v = 0 or lc = 0 or r != 0
|
|
410
389
|
const lcTerm = this.linearToTerm(lc);
|
|
411
390
|
const restTerm = this.linearToTerm(rest);
|
|
412
391
|
this.addDependencies(new LemmaBuilder(this.core), equation)
|
|
@@ -416,7 +395,6 @@ export class Grobner {
|
|
|
416
395
|
return true;
|
|
417
396
|
}
|
|
418
397
|
if (variableValue.isZero()) {
|
|
419
|
-
// v = 0 => r = 0
|
|
420
398
|
const lemma = this.addDependencies(new LemmaBuilder(this.core), equation);
|
|
421
399
|
const restTerm = this.linearToTerm(rest);
|
|
422
400
|
lemma
|
|
@@ -426,7 +404,6 @@ export class Grobner {
|
|
|
426
404
|
}
|
|
427
405
|
if (lcValue.isZero()) {
|
|
428
406
|
if (!lc.isLinear()) return false;
|
|
429
|
-
// lc = 0 => r = 0
|
|
430
407
|
const lemma = this.addDependencies(new LemmaBuilder(this.core), equation);
|
|
431
408
|
const lcTerm = this.linearToTerm(lc);
|
|
432
409
|
const restTerm = this.linearToTerm(rest);
|
|
@@ -439,7 +416,6 @@ export class Grobner {
|
|
|
439
416
|
const isVariablePositive = variableValue.isPositive();
|
|
440
417
|
const isRestPositive = restValue.isPositive();
|
|
441
418
|
if (variableValue.abs().compare(restValue.abs()) > 0) {
|
|
442
|
-
// v*c + t = 0 with |v| > |t| != 0: v changes sign, t changes sign, or |v| <= |t|
|
|
443
419
|
const lemma = new LemmaBuilder(this.core);
|
|
444
420
|
const restTerm = this.linearToTerm(rest);
|
|
445
421
|
this.addDependencies(lemma, equation);
|
|
@@ -460,7 +436,6 @@ export class Grobner {
|
|
|
460
436
|
variableValue.abs().compare(one) > 0 &&
|
|
461
437
|
variableValue.abs().compare(restValue.abs()) >= 0
|
|
462
438
|
) {
|
|
463
|
-
// v*c + t = 0 & |c| > 1, |v| > 1 => |v| < |t|
|
|
464
439
|
const lemma = new LemmaBuilder(this.core);
|
|
465
440
|
const restTerm = this.linearToTerm(rest);
|
|
466
441
|
const lcTerm = this.linearToTerm(lc);
|
|
@@ -497,7 +472,7 @@ export class Grobner {
|
|
|
497
472
|
|
|
498
473
|
private configure() {
|
|
499
474
|
this.solver.reset();
|
|
500
|
-
|
|
475
|
+
const isLoaded = this.catchMemoryOut(() => {
|
|
501
476
|
this.setLevel2var();
|
|
502
477
|
for (const lpVar of this.core.activeVarSet.elems) {
|
|
503
478
|
if (this.core.lra.isBase(lpVar)) {
|
|
@@ -505,10 +480,9 @@ export class Grobner {
|
|
|
505
480
|
}
|
|
506
481
|
if (this.core.isMonicVar(lpVar) && this.core.varIsFixed(lpVar)) this.addFixedMonic(lpVar);
|
|
507
482
|
}
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
}
|
|
483
|
+
return true;
|
|
484
|
+
});
|
|
485
|
+
if (!isLoaded) return false;
|
|
512
486
|
const config = getDefaultPddSolverConfig();
|
|
513
487
|
config.maxSteps = this.solver.equations().length;
|
|
514
488
|
config.maxSimplified = NLA_PARAMS.grobnerMaxSimplified;
|
|
@@ -530,7 +504,6 @@ export class Grobner {
|
|
|
530
504
|
return true;
|
|
531
505
|
}
|
|
532
506
|
|
|
533
|
-
// equation_is_true: the equation holds at the values, or a free column can make it hold.
|
|
534
507
|
private isEquationTrue(equation: Equation) {
|
|
535
508
|
if (equation.poly.freeVars().some((variable) => this.core.lra.isFree(variable))) return true;
|
|
536
509
|
return this.getValue(equation.poly).isZero();
|
|
@@ -542,8 +515,6 @@ export class Grobner {
|
|
|
542
515
|
return interval;
|
|
543
516
|
};
|
|
544
517
|
|
|
545
|
-
// is_conflicting: the interval of the polynomial excludes 0, or a cross-nested form or a
|
|
546
|
-
// perfect square shows that it does.
|
|
547
518
|
private isEquationConflicting(equation: Equation) {
|
|
548
519
|
if (this.isEquationTrue(equation)) return false;
|
|
549
520
|
const interval = getPddInterval(equation.poly, "without-deps", this.getVarInterval);
|
|
@@ -563,7 +534,6 @@ export class Grobner {
|
|
|
563
534
|
new LemmaBuilder(this.core).addExplanation(explanation);
|
|
564
535
|
}
|
|
565
536
|
|
|
566
|
-
// monomial_interval: coeff times the product of the variables' intervals.
|
|
567
537
|
private getMonomialInterval(coeff: Rational, vars: number[], mode: DepsMode) {
|
|
568
538
|
const result = mkDepInterval();
|
|
569
539
|
setValue(result, coeff);
|
|
@@ -580,8 +550,6 @@ export class Grobner {
|
|
|
580
550
|
return result;
|
|
581
551
|
}
|
|
582
552
|
|
|
583
|
-
// add_perfect_square_conflict: a triple of monomials a^2*M1^2, b^2*M2^2 and -2ab*M1*M2 is
|
|
584
|
-
// (a*M1 - b*M2)^2, at least 0, which replaces their interval when its lower bound is negative.
|
|
585
553
|
private addPerfectSquareConflict(equation: Equation) {
|
|
586
554
|
const monomials: SortedMonomial[] = [...equation.poly].map((monomial) => ({
|
|
587
555
|
coeff: monomial.coeff,
|
|
@@ -632,7 +600,6 @@ export class Grobner {
|
|
|
632
600
|
}
|
|
633
601
|
}
|
|
634
602
|
if (!isFound) return false;
|
|
635
|
-
// [0, oo) for the perfect squares is an unconditional bound, without a dependency.
|
|
636
603
|
const sum = mkDepInterval();
|
|
637
604
|
sum.isLowerInf = false;
|
|
638
605
|
sum.lower = Rational.zero;
|
|
@@ -658,7 +625,6 @@ export class Grobner {
|
|
|
658
625
|
return this.getMonomialInterval(monomial.coeff, monomial.vars, "without-deps");
|
|
659
626
|
}
|
|
660
627
|
|
|
661
|
-
// add_horner_conflict: the cross-nested forms of the polynomial, whose intervals may exclude 0.
|
|
662
628
|
private addHornerConflict(equation: Equation) {
|
|
663
629
|
const nexCreator = this.nexCreator;
|
|
664
630
|
const freeVars = equation.poly.freeVars();
|
|
@@ -688,8 +654,6 @@ export class Grobner {
|
|
|
688
654
|
return crossNested.done();
|
|
689
655
|
}
|
|
690
656
|
|
|
691
|
-
// propagate_linear_equations: an equation whose monomials all have columns and that the values
|
|
692
|
-
// violate becomes a new row fixed to its constant.
|
|
693
657
|
private propagateLinearEquations() {
|
|
694
658
|
this.mon2var.clear();
|
|
695
659
|
for (const monic of this.core.emons.monics)
|
|
@@ -701,8 +665,7 @@ export class Grobner {
|
|
|
701
665
|
return changed > 0;
|
|
702
666
|
}
|
|
703
667
|
|
|
704
|
-
//
|
|
705
|
-
// the monics.
|
|
668
|
+
// Like Z3, the variables are looked up in the pdd's order among the monics' sorted variables.
|
|
706
669
|
private getMonomialColumn(vars: number[]) {
|
|
707
670
|
return this.mon2var.get(vars.join(","));
|
|
708
671
|
}
|
|
@@ -739,7 +702,6 @@ export class Grobner {
|
|
|
739
702
|
return true;
|
|
740
703
|
}
|
|
741
704
|
|
|
742
|
-
// find_nl_cluster: the variables and rows reachable from the monomials to refine.
|
|
743
705
|
private findNlCluster() {
|
|
744
706
|
this.rows.clear();
|
|
745
707
|
this.core.activeVarSet.clear();
|
|
@@ -749,7 +711,6 @@ export class Grobner {
|
|
|
749
711
|
}
|
|
750
712
|
}
|
|
751
713
|
|
|
752
|
-
// add_var_and_its_factors_to_q_and_collect_new_rows.
|
|
753
714
|
private addVarAndItsFactorsToQueue(lpVar: number, queue: number[]) {
|
|
754
715
|
const core = this.core;
|
|
755
716
|
const lra = core.lra;
|
|
@@ -769,17 +730,12 @@ export class Grobner {
|
|
|
769
730
|
if (this.rows.has(row)) continue;
|
|
770
731
|
this.rows.add(row);
|
|
771
732
|
const basic = lra.core.basis[row];
|
|
772
|
-
// A free column over the reals can be assigned.
|
|
773
733
|
if (lra.isFree(basic) && basic !== lpVar) {
|
|
774
734
|
if (!lra.isInt(basic)) continue;
|
|
775
|
-
|
|
776
|
-
if (
|
|
777
|
-
// A free integer column with integer coefficients can be assigned.
|
|
778
|
-
if (!this.isAddingAllEqs && lra.getRow(row).every((rowCell) => rowCell.coeff.isInt()))
|
|
779
|
-
continue;
|
|
735
|
+
if (!this.hasGcdTest && !this.propagatesQuotients) continue;
|
|
736
|
+
if (lra.getRow(row).every((rowCell) => rowCell.coeff.isInt())) continue;
|
|
780
737
|
}
|
|
781
|
-
if (
|
|
782
|
-
continue;
|
|
738
|
+
if (lra.getRow(row).length > NLA_PARAMS.hornerRowLengthLimit) continue;
|
|
783
739
|
for (const rowCell of lra.getRow(row)) this.addVarAndItsFactorsToQueue(rowCell.column, queue);
|
|
784
740
|
}
|
|
785
741
|
}
|
|
@@ -792,13 +748,11 @@ export class Grobner {
|
|
|
792
748
|
|
|
793
749
|
private getTermPdd(term: LarTerm, ref: DepRef) {
|
|
794
750
|
let result = this.manager.mkVal(Rational.zero);
|
|
795
|
-
for (const entry of term.coeffs) result = result.add(this.
|
|
751
|
+
for (const entry of term.coeffs) result = result.add(this.getPddExpr(entry[1], entry[0], ref));
|
|
796
752
|
return result;
|
|
797
753
|
}
|
|
798
754
|
|
|
799
|
-
|
|
800
|
-
// the products of their variables.
|
|
801
|
-
private getPdd(coeff: Rational, lpVar: number, ref: DepRef) {
|
|
755
|
+
private getPddExpr(coeff: Rational, lpVar: number, ref: DepRef) {
|
|
802
756
|
const core = this.core;
|
|
803
757
|
let result = this.manager.mkVal(coeff);
|
|
804
758
|
const vars = [lpVar];
|
|
@@ -822,8 +776,6 @@ export class Grobner {
|
|
|
822
776
|
return result;
|
|
823
777
|
}
|
|
824
778
|
|
|
825
|
-
// is_solved: p = 0 as v = r, for a linear p where v is the only variable bounded on one side
|
|
826
|
-
// while several are bounded on the other, so that r has no bound on that side.
|
|
827
779
|
private getSolvedForm(poly: Pdd) {
|
|
828
780
|
if (!poly.isLinear()) return null;
|
|
829
781
|
let numLo = 0;
|
|
@@ -862,7 +814,6 @@ export class Grobner {
|
|
|
862
814
|
};
|
|
863
815
|
}
|
|
864
816
|
|
|
865
|
-
// add_eq: adds the equation in solved form when it has one.
|
|
866
817
|
private addEq(poly: Pdd, dep: Dependency) {
|
|
867
818
|
const simplified = this.solver.simplify(poly, dep);
|
|
868
819
|
const solved = this.getSolvedForm(simplified.poly);
|
|
@@ -874,7 +825,7 @@ export class Grobner {
|
|
|
874
825
|
const ref: DepRef = { dep: null };
|
|
875
826
|
let product = this.manager.mkVal(Rational.one);
|
|
876
827
|
for (const factor of this.core.emons.get(lpVar).vars) {
|
|
877
|
-
product = product.mul(this.
|
|
828
|
+
product = product.mul(this.getPddExpr(Rational.one, factor, ref));
|
|
878
829
|
}
|
|
879
830
|
product = product.sub(this.getValOfFixedVarWithDeps(lpVar, ref));
|
|
880
831
|
this.addEq(product, ref.dep);
|
|
@@ -883,11 +834,10 @@ export class Grobner {
|
|
|
883
834
|
private addRow(row: RowCell[]) {
|
|
884
835
|
const ref: DepRef = { dep: null };
|
|
885
836
|
let sum = this.manager.mkVal(Rational.zero);
|
|
886
|
-
for (const cell of row) sum = sum.add(this.
|
|
837
|
+
for (const cell of row) sum = sum.add(this.getPddExpr(cell.coeff, cell.column, ref));
|
|
887
838
|
this.addEq(sum, ref.dep);
|
|
888
839
|
}
|
|
889
840
|
|
|
890
|
-
// set_level2var: the columns by weight, then index, from the lowest level.
|
|
891
841
|
private setLevel2var() {
|
|
892
842
|
const core = this.core;
|
|
893
843
|
const count = core.lra.getColumnCount();
|