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,24 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// z3-license.txt. nla's bridge to nlsat. The constraints in the cone of influence of the monomials
|
|
3
|
-
// to refine go to nlsat, with every monomial and term column replaced by its polynomial. check runs
|
|
4
|
-
// nlsat's search on them: a model becomes nla's, and a refutation a lemma over the constraints of
|
|
5
|
-
// its core. check_assignment instead hands nlsat the current values, and when they violate a
|
|
6
|
-
// constraint, nlsat's linear cell around them becomes a lemma.
|
|
7
|
-
// Deviations from Z3:
|
|
8
|
-
// - nlsat input it does not implement (NlsatUnsupportedError) answers unknown. That is a linear
|
|
9
|
-
// cell around an irrational section, where Z3 exits the process (levelwise.cpp,
|
|
10
|
-
// add_linear_approximations).
|
|
11
|
-
// - nlsat's check(rvalues) never answers satisfied, because its solver starts with the clause
|
|
12
|
-
// [true], whose literal is unassigned outside search. So the satisfied branch of
|
|
13
|
-
// check_assignment, which switches nla to nlsat's model, is left out.
|
|
14
|
-
// - A lemma literal of check_assignment is always linear, because the cell bounds are, so
|
|
15
|
-
// add_mul_def, which defines a fresh monomial column, is left out. A nonlinear literal would
|
|
16
|
-
// answer unknown.
|
|
17
|
-
// - nlsat counts against the budget of a check only its own steps, not those of the polynomial and
|
|
18
|
-
// algebraic number managers, so a long search stops at a different point than Z3's. Like Z3's,
|
|
19
|
-
// it then throws, which ends the whole check as unknown.
|
|
20
|
-
// - Transcendental functions are not supported, so none are registered with nlsat.
|
|
21
|
-
import { NlsatUnsupportedError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { NlsatUnsupportedError, SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
22
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
23
3
|
import { Rational, getLcm } from "../rational";
|
|
24
4
|
import { Anum } from "../nlsat/algebraic";
|
|
@@ -35,9 +15,9 @@ import {
|
|
|
35
15
|
type LarConstraint,
|
|
36
16
|
} from "./constraints";
|
|
37
17
|
import { Explanation } from "./explanation";
|
|
38
|
-
import type
|
|
18
|
+
import { type LarSolver, NULL_LPVAR } from "./lar-solver";
|
|
39
19
|
import { LarTerm } from "./lar-term";
|
|
40
|
-
import {
|
|
20
|
+
import type { NlaCore } from "./nla-core";
|
|
41
21
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
42
22
|
|
|
43
23
|
interface Occurrences {
|
|
@@ -46,14 +26,11 @@ interface Occurrences {
|
|
|
46
26
|
terms: number[];
|
|
47
27
|
}
|
|
48
28
|
|
|
49
|
-
// lar_base_constraint::coeffs: the term of a term column, else the column itself.
|
|
50
29
|
const getConstraintCoeffs = (lra: LarSolver, constraint: LarConstraint): [number, Rational][] =>
|
|
51
30
|
lra.hasTerm(constraint.column)
|
|
52
31
|
? [...lra.getTerm(constraint.column).coeffs]
|
|
53
32
|
: [[constraint.column, Rational.one]];
|
|
54
33
|
|
|
55
|
-
// coi::init: the constraints reachable from the monomials to refine through shared variables,
|
|
56
|
-
// monomials and terms, in the order the search reaches them.
|
|
57
34
|
const getConeOfInfluence = (core: NlaCore) => {
|
|
58
35
|
const lra = core.lra;
|
|
59
36
|
const occurrences: Occurrences[] = [];
|
|
@@ -68,7 +45,12 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
68
45
|
for (const lpVar of monic.vars) getOccurrences(lpVar).monics.push(monic.variable);
|
|
69
46
|
for (const term of lra.terms)
|
|
70
47
|
for (const entry of term.coeffs) getOccurrences(entry[0]).terms.push(term.column);
|
|
71
|
-
|
|
48
|
+
// The applications of transcendental functions are neither monomials nor terms.
|
|
49
|
+
const todo = [
|
|
50
|
+
...core.transcendentals.apps.flatMap((app) => [app.arg, app.val]),
|
|
51
|
+
...core.transcendentals.atan2Apps.flatMap((app) => [app.y, app.x, app.val]),
|
|
52
|
+
...core.toRefine.elems,
|
|
53
|
+
];
|
|
72
54
|
const vars = new Set<number>();
|
|
73
55
|
const constraints = new Set<number>();
|
|
74
56
|
const monics = new Set<number>();
|
|
@@ -96,26 +78,25 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
96
78
|
return { vars, constraints, monics };
|
|
97
79
|
};
|
|
98
80
|
|
|
99
|
-
// has_large_dyadic_denominator: a denominator 2^k with k >= 24.
|
|
100
81
|
const hasLargeDyadicDenominator = (value: Rational) => {
|
|
101
82
|
const den = value.den;
|
|
102
83
|
return den >= 1n << 24n && (den & (den - 1n)) === 0n;
|
|
103
84
|
};
|
|
104
85
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
86
|
+
const getSortedVars = (vars: readonly number[]) =>
|
|
87
|
+
[...vars].sort((first, second) => first - second);
|
|
88
|
+
|
|
108
89
|
const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
|
|
109
90
|
constraint.isAuxiliary &&
|
|
110
91
|
(hasLargeDyadicDenominator(constraint.rhs.x) ||
|
|
111
92
|
getConstraintCoeffs(lra, constraint).some((entry) => hasLargeDyadicDenominator(entry[1])));
|
|
112
93
|
|
|
113
94
|
export class NraSolver {
|
|
114
|
-
// m_nlsat and m_values: the solver of the last check, and the values of its model.
|
|
115
95
|
private solver = new NlsatSolver();
|
|
116
96
|
private values: Anum[] = [];
|
|
117
|
-
// m_lp2nl: the nlsat variable of each column the solver has.
|
|
118
97
|
private lp2nl = new Map<number, number>();
|
|
98
|
+
private literal2constraint = new Map<number, number>();
|
|
99
|
+
private vars2mon = new Map<string, number>();
|
|
119
100
|
|
|
120
101
|
constructor(private core: NlaCore) {}
|
|
121
102
|
|
|
@@ -123,14 +104,12 @@ export class NraSolver {
|
|
|
123
104
|
return this.solver.am;
|
|
124
105
|
}
|
|
125
106
|
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
107
|
+
private reset() {
|
|
108
|
+
this.solver = new NlsatSolver(this.core.nraLimit);
|
|
109
|
+
this.values = [];
|
|
110
|
+
this.lp2nl.clear();
|
|
129
111
|
}
|
|
130
112
|
|
|
131
|
-
// mk_definition: each included column as a polynomial in the included columns that are neither
|
|
132
|
-
// monomials nor terms, scaled by an integer denominator to keep the coefficients integral.
|
|
133
|
-
// Excluded columns have no definition.
|
|
134
113
|
private mkDefinitions(isIncluded: (lpVar: number) => boolean) {
|
|
135
114
|
const core = this.core;
|
|
136
115
|
const lra = core.lra;
|
|
@@ -180,8 +159,6 @@ export class NraSolver {
|
|
|
180
159
|
return { definitions, denominators };
|
|
181
160
|
}
|
|
182
161
|
|
|
183
|
-
// add_constraint: the constraint sum(coeff * v) kind rhs as den * (sum(coeff / den[v] * def[v]) -
|
|
184
|
-
// rhs) kind 0, where den clears every denominator, in a unit clause that assumes the constraint.
|
|
185
162
|
private addConstraint(
|
|
186
163
|
constraintIndex: number,
|
|
187
164
|
definitions: readonly (Polynomial | null)[],
|
|
@@ -217,17 +194,36 @@ export class NraSolver {
|
|
|
217
194
|
return literal;
|
|
218
195
|
}
|
|
219
196
|
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
197
|
+
private getNlVar(lpVar: number) {
|
|
198
|
+
const variable = this.lp2nl.get(lpVar) ?? this.solver.mkVar(this.core.lra.isInt(lpVar));
|
|
199
|
+
this.lp2nl.set(lpVar, variable);
|
|
200
|
+
return variable;
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
private registerTranscendentals() {
|
|
204
|
+
const transcendentals = this.core.transcendentals;
|
|
205
|
+
const solver = this.solver.transcendentals;
|
|
206
|
+
for (const app of transcendentals.apps)
|
|
207
|
+
solver.add(app.op, this.getNlVar(app.arg), this.getNlVar(app.val));
|
|
208
|
+
for (const app of transcendentals.atan2Apps)
|
|
209
|
+
solver.addAtan2(this.getNlVar(app.y), this.getNlVar(app.x), this.getNlVar(app.val));
|
|
210
|
+
if (transcendentals.piVar !== NULL_LPVAR) solver.addPi(this.getNlVar(transcendentals.piVar));
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
check(maxConflicts: number) {
|
|
214
|
+
try {
|
|
215
|
+
return this.checkCore(maxConflicts);
|
|
216
|
+
} catch (error) {
|
|
217
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
218
|
+
throw error;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
private checkCore(maxConflicts: number) {
|
|
225
223
|
const core = this.core;
|
|
226
224
|
const lra = core.lra;
|
|
227
|
-
this.
|
|
225
|
+
this.reset();
|
|
228
226
|
this.solver.maxConflicts = maxConflicts;
|
|
229
|
-
this.values = [];
|
|
230
|
-
this.lp2nl.clear();
|
|
231
227
|
const cone = getConeOfInfluence(core);
|
|
232
228
|
const definitions = this.mkDefinitions((lpVar) => cone.vars.has(lpVar));
|
|
233
229
|
const skipped = new Set<number>();
|
|
@@ -238,19 +234,12 @@ export class NraSolver {
|
|
|
238
234
|
}
|
|
239
235
|
this.addConstraint(constraintIndex, definitions.definitions, definitions.denominators);
|
|
240
236
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
return this.solver.check();
|
|
244
|
-
} catch (error) {
|
|
245
|
-
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
246
|
-
throw error;
|
|
247
|
-
}
|
|
248
|
-
})();
|
|
237
|
+
this.registerTranscendentals();
|
|
238
|
+
const result = this.solver.check();
|
|
249
239
|
if (result === L_TRUE) {
|
|
250
240
|
this.solver.restoreOrder();
|
|
251
241
|
core.setUseNraModel(true);
|
|
252
242
|
lra.initModel();
|
|
253
|
-
// A violated constraint or monomial that nlsat saw would be a bug.
|
|
254
243
|
for (const [constraintIndex, constraint] of lra.constraints.constraints.entries()) {
|
|
255
244
|
if (!constraint.isActive || this.isConstraintSatisfied(constraint)) continue;
|
|
256
245
|
if (cone.constraints.has(constraintIndex) && !skipped.has(constraintIndex))
|
|
@@ -273,8 +262,6 @@ export class NraSolver {
|
|
|
273
262
|
return result;
|
|
274
263
|
}
|
|
275
264
|
|
|
276
|
-
// value: the model's value of a column. A monomial or term gets the value of its definition, a
|
|
277
|
-
// column outside the cone of influence its value in lar_solver.
|
|
278
265
|
value(lpVar: number) {
|
|
279
266
|
const core = this.core;
|
|
280
267
|
const lra = core.lra;
|
|
@@ -308,7 +295,6 @@ export class NraSolver {
|
|
|
308
295
|
return this.values[lpVar];
|
|
309
296
|
}
|
|
310
297
|
|
|
311
|
-
// check_monic
|
|
312
298
|
private isMonicSatisfied(lpVar: number, vars: readonly number[]) {
|
|
313
299
|
const am = this.solver.am;
|
|
314
300
|
const product = vars.reduce(
|
|
@@ -318,7 +304,6 @@ export class NraSolver {
|
|
|
318
304
|
return am.compare(this.value(lpVar), product) === 0;
|
|
319
305
|
}
|
|
320
306
|
|
|
321
|
-
// check_constraint: the value of the left side against the right side, without δ.
|
|
322
307
|
private isConstraintSatisfied(constraint: LarConstraint) {
|
|
323
308
|
const am = this.solver.am;
|
|
324
309
|
const sum = getConstraintCoeffs(this.core.lra, constraint).reduce(
|
|
@@ -338,55 +323,93 @@ export class NraSolver {
|
|
|
338
323
|
: sign === 0;
|
|
339
324
|
}
|
|
340
325
|
|
|
341
|
-
|
|
342
|
-
// constraint each literal came from, or null when nlsat finds no violated constraint.
|
|
343
|
-
private getClause() {
|
|
326
|
+
private setupAssignmentSolver() {
|
|
344
327
|
const core = this.core;
|
|
345
328
|
const lra = core.lra;
|
|
346
|
-
this.
|
|
347
|
-
this.
|
|
329
|
+
this.reset();
|
|
330
|
+
this.literal2constraint.clear();
|
|
331
|
+
this.vars2mon.clear();
|
|
348
332
|
const cone = getConeOfInfluence(core);
|
|
349
333
|
const definitions = this.mkDefinitions(() => true);
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
334
|
+
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
335
|
+
this.values.push(new Anum(core.val(lpVar)));
|
|
336
|
+
if (core.emons.isMonicVar(lpVar))
|
|
337
|
+
this.vars2mon.set(getSortedVars(core.emons.get(lpVar).vars).join(","), lpVar);
|
|
338
|
+
}
|
|
353
339
|
for (const constraintIndex of cone.constraints) {
|
|
354
340
|
const literal = this.addConstraint(
|
|
355
341
|
constraintIndex,
|
|
356
342
|
definitions.definitions,
|
|
357
343
|
definitions.denominators,
|
|
358
344
|
);
|
|
359
|
-
|
|
345
|
+
this.literal2constraint.set(literal, constraintIndex);
|
|
360
346
|
}
|
|
361
|
-
|
|
362
|
-
if (result.result !== L_FALSE) return null;
|
|
363
|
-
return { clause: result.clause, literalConstraints };
|
|
347
|
+
this.registerTranscendentals();
|
|
364
348
|
}
|
|
365
349
|
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
350
|
+
private processPolynomialCheckAssignment(
|
|
351
|
+
polynomial: Polynomial,
|
|
352
|
+
nl2lp: readonly number[],
|
|
353
|
+
term: LarTerm,
|
|
354
|
+
) {
|
|
355
|
+
let bound = Rational.zero;
|
|
356
|
+
for (let index = 0; index < polynomial.size; index++) {
|
|
357
|
+
const monomial = polynomial.ms[index];
|
|
358
|
+
const coeff = Rational.of(polynomial.as[index]);
|
|
359
|
+
// A linear cell leaves every new lemma polynomial linear, so like Z3 this ignores degrees.
|
|
360
|
+
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
361
|
+
else if (monomial.size === 1) term.addMonomial(coeff, nl2lp[monomial.vars[0]]);
|
|
362
|
+
else {
|
|
363
|
+
const vars = getSortedVars(monomial.vars.map((variable) => nl2lp[variable]));
|
|
364
|
+
term.addMonomial(coeff, this.vars2mon.get(vars.join(",")) ?? this.core.addMulDef(vars));
|
|
374
365
|
}
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
return this.addLemma(clause.clause, clause.literalConstraints);
|
|
366
|
+
}
|
|
367
|
+
return bound;
|
|
378
368
|
}
|
|
379
369
|
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
370
|
+
private reverseLp2nl() {
|
|
371
|
+
const nl2lp: number[] = [];
|
|
372
|
+
for (const entry of this.lp2nl) nl2lp[entry[1]] = entry[0];
|
|
373
|
+
return nl2lp;
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
checkAssignment() {
|
|
377
|
+
try {
|
|
378
|
+
return this.checkAssignmentCore();
|
|
379
|
+
} catch (error) {
|
|
380
|
+
// Deviation from Z3: a linear cell around an irrational section answers unknown, where Z3 exits.
|
|
381
|
+
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
382
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
383
|
+
throw error;
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
|
|
387
|
+
private checkAssignmentCore() {
|
|
388
|
+
const core = this.core;
|
|
389
|
+
const lra = core.lra;
|
|
390
|
+
this.setupAssignmentSolver();
|
|
391
|
+
const result = this.solver.checkAssignment(this.values);
|
|
392
|
+
if (result.result === L_TRUE) {
|
|
393
|
+
core.setUseNraModel(true);
|
|
394
|
+
lra.initModel();
|
|
395
|
+
for (const constraint of lra.constraints.constraints)
|
|
396
|
+
if (constraint.isActive && !this.isConstraintSatisfied(constraint)) return L_UNDEF;
|
|
397
|
+
for (const monic of core.emons.monics)
|
|
398
|
+
if (!this.isMonicSatisfied(monic.variable, monic.vars)) return L_UNDEF;
|
|
399
|
+
core.setUseNraModel(true);
|
|
400
|
+
}
|
|
401
|
+
if (result.result === L_FALSE) return this.addLemma(result.clause);
|
|
402
|
+
return result.result;
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
private addLemma(clause: readonly number[]) {
|
|
384
406
|
const core = this.core;
|
|
385
407
|
const solver = this.solver;
|
|
386
|
-
const
|
|
408
|
+
const nl2lp = this.reverseLp2nl();
|
|
409
|
+
let result = L_FALSE;
|
|
387
410
|
const lemma = new LemmaBuilder(core);
|
|
388
411
|
for (const literal of clause) {
|
|
389
|
-
const constraintIndex =
|
|
412
|
+
const constraintIndex = this.literal2constraint.get(literal ^ 1);
|
|
390
413
|
if (constraintIndex !== undefined) {
|
|
391
414
|
const explanation = new Explanation();
|
|
392
415
|
explanation.push(constraintIndex);
|
|
@@ -395,25 +418,12 @@ export class NraSolver {
|
|
|
395
418
|
}
|
|
396
419
|
const atom = solver.getAtom(literal);
|
|
397
420
|
if (atom === null) throw new SmtInvariantError(`nlsat literal ${literal} has no atom`);
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
atom.polynomials.length !== 1 ||
|
|
402
|
-
pm.totalDegree(atom.polynomials[0]) > 1
|
|
403
|
-
) {
|
|
404
|
-
core.lemmas.pop();
|
|
405
|
-
return L_UNDEF;
|
|
421
|
+
if (!isIneqAtom(atom) || atom.polynomials.length !== 1) {
|
|
422
|
+
result = L_UNDEF;
|
|
423
|
+
break;
|
|
406
424
|
}
|
|
407
|
-
// process_polynomial_check_assignment, for a linear polynomial.
|
|
408
|
-
const polynomial = atom.polynomials[0];
|
|
409
425
|
const term = new LarTerm();
|
|
410
|
-
|
|
411
|
-
for (let index = 0; index < polynomial.size; index++) {
|
|
412
|
-
const monomial = polynomial.ms[index];
|
|
413
|
-
const coeff = Rational.of(polynomial.as[index]);
|
|
414
|
-
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
415
|
-
else term.addMonomial(coeff, monomial.vars[0]);
|
|
416
|
-
}
|
|
426
|
+
const bound = this.processPolynomialCheckAssignment(atom.polynomials[0], nl2lp, term);
|
|
417
427
|
const isNegated = (literal & 1) === 1;
|
|
418
428
|
const kind =
|
|
419
429
|
atom.kind === "EQ"
|
|
@@ -429,12 +439,13 @@ export class NraSolver {
|
|
|
429
439
|
: KIND_GT;
|
|
430
440
|
const ineq = mkIneq(term, kind, bound);
|
|
431
441
|
if (core.ineqHolds(ineq)) {
|
|
432
|
-
|
|
433
|
-
|
|
442
|
+
result = L_UNDEF;
|
|
443
|
+
break;
|
|
434
444
|
}
|
|
435
445
|
lemma.addIneq(ineq);
|
|
436
446
|
}
|
|
437
|
-
core.isCheckFeasible = true;
|
|
438
|
-
|
|
447
|
+
if (result === L_FALSE) core.isCheckFeasible = true;
|
|
448
|
+
if (result === L_UNDEF) core.lemmas.pop();
|
|
449
|
+
return result;
|
|
439
450
|
}
|
|
440
451
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/numeric_pair.h), MIT license, see z3-license.txt. The value x + δy
|
|
2
|
-
// of a column, where δ is a positive infinitesimal that encodes strict bounds.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
|
|
5
3
|
export class Impq {
|
|
@@ -30,7 +28,6 @@ export class Impq {
|
|
|
30
28
|
return new Impq(this.x.neg(), this.y.neg());
|
|
31
29
|
}
|
|
32
30
|
|
|
33
|
-
// Lexicographic, as δ is smaller than any positive rational.
|
|
34
31
|
compare(other: Impq) {
|
|
35
32
|
const byX = this.x.compare(other.x);
|
|
36
33
|
return byX !== 0 ? byX : this.y.compare(other.y);
|
|
@@ -48,7 +45,6 @@ export class Impq {
|
|
|
48
45
|
return this.y.isZero() && this.x.isInt();
|
|
49
46
|
}
|
|
50
47
|
|
|
51
|
-
// floor and ceil of numeric_pair: x + δy rounded, for a positive δ smaller than any gap.
|
|
52
48
|
floor() {
|
|
53
49
|
if (!this.x.isInt()) return this.x.floor();
|
|
54
50
|
return this.y.isNegative() ? this.x.sub(Rational.one) : this.x;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/dd/pdd_interval.h), MIT license, see z3-license.txt. The interval of a
|
|
2
|
-
// pdd under the intervals of its variables, as x*hi + lo by interval arithmetic. The distributed
|
|
3
|
-
// variant, which nla does not call, is not ported.
|
|
4
1
|
import {
|
|
5
2
|
add,
|
|
6
3
|
type DepInterval,
|
|
@@ -1,11 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_simplifier.h, src/math/grobner/pdd_simplifier.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt. The passes that dd::solver::simplify runs before saturation: solve
|
|
3
|
-
// linear equations for their top variable, retire equations whose top variable occurs nowhere
|
|
4
|
-
// else, subtract equations that share a lo part, and eliminate variables that occur as leaves.
|
|
5
|
-
// The extended linear pass works only modulo 2 and the dual elimination is disabled in Z3, so
|
|
6
|
-
// neither is ported. No pass makes a value outside an operation, so none can run out of nodes.
|
|
7
1
|
import { mkJoin } from "./dependency";
|
|
8
|
-
import { Equation, PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
2
|
+
import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
9
3
|
import { shrink } from "../array";
|
|
10
4
|
|
|
11
5
|
export class PddSimplifier {
|
|
@@ -30,8 +24,6 @@ export class PddSimplifier {
|
|
|
30
24
|
return this.simplifyLinear(linear);
|
|
31
25
|
}
|
|
32
26
|
|
|
33
|
-
// simplify_linear_step: solves each linear equation for its top variable, which it eliminates
|
|
34
|
-
// from the others, and moves it to the solved equations.
|
|
35
27
|
private simplifyLinear(linear: Equation[]) {
|
|
36
28
|
const solver = this.solver;
|
|
37
29
|
const useList = this.getUseList();
|
|
@@ -45,7 +37,6 @@ export class PddSimplifier {
|
|
|
45
37
|
const variable = source.poly.var();
|
|
46
38
|
const uses = useList[variable];
|
|
47
39
|
let isAllReduced = true;
|
|
48
|
-
// Equations added to the uses of the variable during the walk are not walked.
|
|
49
40
|
for (let index = 0, length = uses.length; index < length; index++) {
|
|
50
41
|
const target = uses[index];
|
|
51
42
|
if (source === target || solver.isTrivial(target)) continue;
|
|
@@ -80,7 +71,6 @@ export class PddSimplifier {
|
|
|
80
71
|
return kept > 0 || hasConflict;
|
|
81
72
|
}
|
|
82
73
|
|
|
83
|
-
// simplify_cc_step: replaces p*x + q and r*y + q by p*x + q and p*x - r*y, when p or r is a value.
|
|
84
74
|
private simplifyCcStep() {
|
|
85
75
|
const solver = this.solver;
|
|
86
76
|
const los = new Map<number, Equation>();
|
|
@@ -107,7 +97,6 @@ export class PddSimplifier {
|
|
|
107
97
|
return isReduced;
|
|
108
98
|
}
|
|
109
99
|
|
|
110
|
-
// simplify_leaf_step: removes a*x + b from the equations where x occurs as a leaf, for a value a.
|
|
111
100
|
private simplifyLeafStep() {
|
|
112
101
|
const solver = this.solver;
|
|
113
102
|
const useList = this.getUseList();
|
|
@@ -137,8 +126,6 @@ export class PddSimplifier {
|
|
|
137
126
|
return false;
|
|
138
127
|
}
|
|
139
128
|
|
|
140
|
-
// simplify_elim_pure_step: an equation linear in its top variable, which occurs nowhere else, is
|
|
141
|
-
// solved.
|
|
142
129
|
private simplifyElimPureStep() {
|
|
143
130
|
const solver = this.solver;
|
|
144
131
|
const useList = this.getUseList();
|
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/grobner/pdd_solver.h, src/math/grobner/pdd_solver.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt. dd::solver, the Grobner basis completion that nla runs on polynomials as
|
|
3
|
-
// pdds. Each step picks the simplest equation whose leading variable is highest, simplifies it by
|
|
4
|
-
// the processed equations and them by it, and adds its S-polynomials with them to be simplified.
|
|
5
|
-
// Equations move between the solved, processed and to-simplify sets, each in an array where an
|
|
6
|
-
// equation knows its index. Z3's solver::simplify runs the simplifier, which here is PddSimplifier
|
|
7
|
-
// in pdd-simplifier, run by its caller.
|
|
8
1
|
import { PddMemoryOutError } from "../../../../errors";
|
|
9
|
-
import { Dependency, mkJoin } from "./dependency";
|
|
10
|
-
import { Pdd, PddManager } from "./pdd";
|
|
2
|
+
import { type Dependency, mkJoin } from "./dependency";
|
|
3
|
+
import type { Pdd, PddManager } from "./pdd";
|
|
11
4
|
import { shrink } from "../array";
|
|
12
5
|
|
|
13
6
|
export const SOLVED = 0;
|
|
@@ -48,9 +41,6 @@ interface Subst {
|
|
|
48
41
|
|
|
49
42
|
class PddSolverStats {
|
|
50
43
|
simplified = 0;
|
|
51
|
-
maxExprSize = 0;
|
|
52
|
-
maxExprDegree = 0;
|
|
53
|
-
superposed = 0;
|
|
54
44
|
computeSteps = 0;
|
|
55
45
|
}
|
|
56
46
|
|
|
@@ -64,8 +54,6 @@ export class Equation {
|
|
|
64
54
|
) {}
|
|
65
55
|
}
|
|
66
56
|
|
|
67
|
-
// scoped_update: walks a set with i and keeps the equations that nextj moves to j. finish keeps
|
|
68
|
-
// those not walked and drops the rest, as Z3's destructor does.
|
|
69
57
|
export class SetUpdate {
|
|
70
58
|
i = 0;
|
|
71
59
|
private j = 0;
|
|
@@ -141,10 +129,8 @@ export class PddSolver {
|
|
|
141
129
|
if (this.var2level.length > 0) {
|
|
142
130
|
this.levelp1 = Math.max(this.var2level[poly.var()] + 1, this.levelp1);
|
|
143
131
|
}
|
|
144
|
-
this.updateStats(equation);
|
|
145
132
|
}
|
|
146
133
|
|
|
147
|
-
// simplify: applies the substitutions to p, and returns it with its dependency.
|
|
148
134
|
simplify(poly: Pdd, dep: Dependency) {
|
|
149
135
|
let result = poly;
|
|
150
136
|
let resultDep = dep;
|
|
@@ -175,7 +161,6 @@ export class PddSolver {
|
|
|
175
161
|
const isLeadingTermChanged = substituted.differentLeadingTerm(target.poly);
|
|
176
162
|
target.poly = substituted;
|
|
177
163
|
target.dep = mkJoin(target.dep, dep);
|
|
178
|
-
this.updateStats(target);
|
|
179
164
|
return isLeadingTermChanged;
|
|
180
165
|
};
|
|
181
166
|
if (!this.isDone()) this.simplifySetUsing(this.processed, simplifier);
|
|
@@ -201,7 +186,6 @@ export class PddSolver {
|
|
|
201
186
|
this.stats.computeSteps++;
|
|
202
187
|
const equation = this.pickNext();
|
|
203
188
|
if (equation === null) return false;
|
|
204
|
-
// scoped_process: the equation goes back to processed unless the step settles it.
|
|
205
189
|
let pending: Equation | null = equation;
|
|
206
190
|
try {
|
|
207
191
|
this.simplifyUsingAll(equation, this.processed);
|
|
@@ -261,11 +245,9 @@ export class PddSolver {
|
|
|
261
245
|
this.isTooComplexFound = true;
|
|
262
246
|
return;
|
|
263
247
|
}
|
|
264
|
-
this.stats.superposed++;
|
|
265
248
|
this.add(poly, mkJoin(first.dep, second.dep));
|
|
266
249
|
}
|
|
267
250
|
|
|
268
|
-
// simplify_using(eq, eqs): reduces eq by the set until no reduction applies.
|
|
269
251
|
private simplifyUsingAll(equation: Equation, set: Equation[]) {
|
|
270
252
|
let isSimplified = false;
|
|
271
253
|
do {
|
|
@@ -284,8 +266,6 @@ export class PddSolver {
|
|
|
284
266
|
this.simplifySetUsing(set, (target) => this.trySimplifyUsing(target, source));
|
|
285
267
|
}
|
|
286
268
|
|
|
287
|
-
// simplify_using(set, simplifier): the simplifier returns null when it leaves the target, and
|
|
288
|
-
// otherwise whether the leading term changed.
|
|
289
269
|
private simplifySetUsing(set: Equation[], simplifier: (target: Equation) => boolean | null) {
|
|
290
270
|
const update = new SetUpdate(set);
|
|
291
271
|
for (; update.i < update.size; update.i++) {
|
|
@@ -306,8 +286,6 @@ export class PddSolver {
|
|
|
306
286
|
update.finish();
|
|
307
287
|
}
|
|
308
288
|
|
|
309
|
-
// try_simplify_using: null when the target stays, and otherwise whether its leading term changed
|
|
310
|
-
// while it was processed.
|
|
311
289
|
private trySimplifyUsing(target: Equation, source: Equation) {
|
|
312
290
|
if (source === target) return null;
|
|
313
291
|
this.stats.simplified++;
|
|
@@ -321,12 +299,9 @@ export class PddSolver {
|
|
|
321
299
|
target.state === PROCESSED && reduced.differentLeadingTerm(target.poly);
|
|
322
300
|
target.poly = reduced;
|
|
323
301
|
target.dep = mkJoin(target.dep, source.dep);
|
|
324
|
-
this.updateStats(target);
|
|
325
302
|
return isLeadingTermChanged;
|
|
326
303
|
}
|
|
327
304
|
|
|
328
|
-
// simplify_using(dst, src): reduces dst by src whatever the result, and returns whether its
|
|
329
|
-
// leading term changed while it was processed.
|
|
330
305
|
simplifyUsing(target: Equation, source: Equation) {
|
|
331
306
|
if (source === target) return false;
|
|
332
307
|
this.stats.simplified++;
|
|
@@ -336,7 +311,6 @@ export class PddSolver {
|
|
|
336
311
|
if (reduced.equals(target.poly)) return isLeadingTermChanged;
|
|
337
312
|
target.poly = reduced;
|
|
338
313
|
target.dep = mkJoin(target.dep, source.dep);
|
|
339
|
-
this.updateStats(target);
|
|
340
314
|
return isLeadingTermChanged;
|
|
341
315
|
}
|
|
342
316
|
|
|
@@ -400,9 +374,4 @@ export class PddSolver {
|
|
|
400
374
|
equation.idx = set.length;
|
|
401
375
|
set.push(equation);
|
|
402
376
|
}
|
|
403
|
-
|
|
404
|
-
private updateStats(equation: Equation) {
|
|
405
|
-
this.stats.maxExprSize = Math.max(this.stats.maxExprSize, equation.poly.treeSize());
|
|
406
|
-
this.stats.maxExprDegree = Math.max(this.stats.maxExprDegree, equation.poly.degree());
|
|
407
|
-
}
|
|
408
377
|
}
|