tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,11 +1,6 @@
|
|
|
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 {
|
|
2
|
+
import type { Pdd } from "./pdd";
|
|
3
|
+
import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
|
|
9
4
|
import { shrink } from "../array";
|
|
10
5
|
|
|
11
6
|
export class PddSimplifier {
|
|
@@ -23,15 +18,16 @@ export class PddSimplifier {
|
|
|
23
18
|
}
|
|
24
19
|
|
|
25
20
|
private simplifyLinearStep(isBinary: boolean) {
|
|
26
|
-
const linear =
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
const linear: Equation[] = [];
|
|
22
|
+
for (const equation of this.solver.toSimplify) {
|
|
23
|
+
const poly = equation.poly.copy();
|
|
24
|
+
if (isBinary ? poly.isBinary() : poly.isLinear()) linear.push(equation);
|
|
25
|
+
poly.release();
|
|
26
|
+
}
|
|
29
27
|
if (linear.length === 0) return false;
|
|
30
28
|
return this.simplifyLinear(linear);
|
|
31
29
|
}
|
|
32
30
|
|
|
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
31
|
private simplifyLinear(linear: Equation[]) {
|
|
36
32
|
const solver = this.solver;
|
|
37
33
|
const useList = this.getUseList();
|
|
@@ -45,12 +41,13 @@ export class PddSimplifier {
|
|
|
45
41
|
const variable = source.poly.var();
|
|
46
42
|
const uses = useList[variable];
|
|
47
43
|
let isAllReduced = true;
|
|
48
|
-
// Equations added to the uses of the variable during the walk are not walked.
|
|
49
44
|
for (let index = 0, length = uses.length; index < length; index++) {
|
|
50
45
|
const target = uses[index];
|
|
51
46
|
if (source === target || solver.isTrivial(target)) continue;
|
|
52
|
-
|
|
47
|
+
const targetPoly = target.poly.copy();
|
|
48
|
+
if (!source.poly.isBinary() && !targetPoly.isLinear()) {
|
|
53
49
|
isAllReduced = false;
|
|
50
|
+
targetPoly.release();
|
|
54
51
|
continue;
|
|
55
52
|
}
|
|
56
53
|
this.removeFromUse(target, useList, variable);
|
|
@@ -66,6 +63,7 @@ export class PddSimplifier {
|
|
|
66
63
|
solver.pushEquation(TO_SIMPLIFY, target);
|
|
67
64
|
}
|
|
68
65
|
this.addToUse(target, useList);
|
|
66
|
+
targetPoly.release();
|
|
69
67
|
}
|
|
70
68
|
if (isAllReduced) linear[kept++] = source;
|
|
71
69
|
}
|
|
@@ -76,11 +74,10 @@ export class PddSimplifier {
|
|
|
76
74
|
solver.pushEquation(SOLVED, source);
|
|
77
75
|
}
|
|
78
76
|
}
|
|
79
|
-
for (const equation of trivial) solver.
|
|
77
|
+
for (const equation of trivial) solver.delEquation(equation);
|
|
80
78
|
return kept > 0 || hasConflict;
|
|
81
79
|
}
|
|
82
80
|
|
|
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
81
|
private simplifyCcStep() {
|
|
85
82
|
const solver = this.solver;
|
|
86
83
|
const los = new Map<number, Equation>();
|
|
@@ -88,33 +85,55 @@ export class PddSimplifier {
|
|
|
88
85
|
const update = new SetUpdate(solver.toSimplify);
|
|
89
86
|
for (; update.i < update.size; update.i++) {
|
|
90
87
|
const first = update.get();
|
|
91
|
-
const poly = first.poly;
|
|
92
|
-
const
|
|
93
|
-
|
|
94
|
-
if (
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
first.poly
|
|
88
|
+
const poly = first.poly.copy();
|
|
89
|
+
const lo = poly.lo();
|
|
90
|
+
const second = los.get(lo.root) ?? first;
|
|
91
|
+
if (second === first) los.set(lo.root, first);
|
|
92
|
+
lo.release();
|
|
93
|
+
const secondPoly = second.poly.copy();
|
|
94
|
+
if (second !== first && this.isCcReducible(poly, secondPoly)) {
|
|
95
|
+
const difference = poly.sub(second.poly);
|
|
96
|
+
first.poly.assign(difference);
|
|
97
|
+
difference.release();
|
|
100
98
|
first.dep = mkJoin(first.dep, second.dep);
|
|
101
99
|
isReduced = true;
|
|
102
|
-
|
|
100
|
+
const isTrivial = solver.isTrivial(first);
|
|
101
|
+
if (isTrivial) solver.retire(first);
|
|
102
|
+
if (isTrivial || solver.checkConflict(first)) {
|
|
103
|
+
secondPoly.release();
|
|
104
|
+
poly.release();
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
103
107
|
}
|
|
104
108
|
update.nextj();
|
|
109
|
+
secondPoly.release();
|
|
110
|
+
poly.release();
|
|
105
111
|
}
|
|
106
112
|
update.finish();
|
|
107
113
|
return isReduced;
|
|
108
114
|
}
|
|
109
115
|
|
|
110
|
-
|
|
116
|
+
private isCcReducible(poly: Pdd, secondPoly: Pdd) {
|
|
117
|
+
const hi = poly.hi();
|
|
118
|
+
const secondHi = hi.isVal() ? null : secondPoly.hi();
|
|
119
|
+
const lo = secondHi === null || secondHi.isVal() ? poly.lo() : null;
|
|
120
|
+
const isReducible = lo !== null && !lo.isVal();
|
|
121
|
+
lo?.release();
|
|
122
|
+
secondHi?.release();
|
|
123
|
+
hi.release();
|
|
124
|
+
return isReducible;
|
|
125
|
+
}
|
|
126
|
+
|
|
111
127
|
private simplifyLeafStep() {
|
|
112
128
|
const solver = this.solver;
|
|
113
129
|
const useList = this.getUseList();
|
|
114
130
|
for (let index = 0; index < solver.toSimplify.length; index++) {
|
|
115
131
|
const source = solver.toSimplify[index];
|
|
116
|
-
const poly = source.poly;
|
|
117
|
-
if (poly.isVal() || !
|
|
132
|
+
const poly = source.poly.copy();
|
|
133
|
+
if (poly.isVal() || !this.isHiVal(poly)) {
|
|
134
|
+
poly.release();
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
118
137
|
const leaves = useList[poly.var()].filter(
|
|
119
138
|
(target) => target !== source && target.poly.varIsLeaf(poly.var()),
|
|
120
139
|
);
|
|
@@ -123,22 +142,22 @@ export class PddSimplifier {
|
|
|
123
142
|
const isLeadingTermChanged = solver.simplifyUsing(target, source);
|
|
124
143
|
this.addToUse(target, useList);
|
|
125
144
|
if (solver.isTrivial(target)) {
|
|
126
|
-
solver.
|
|
145
|
+
solver.delEquation(target);
|
|
127
146
|
} else if (target.poly.isVal()) {
|
|
128
147
|
solver.popEquation(target);
|
|
129
148
|
solver.setConflict(target);
|
|
149
|
+
poly.release();
|
|
130
150
|
return true;
|
|
131
151
|
} else if (isLeadingTermChanged) {
|
|
132
152
|
solver.popEquation(target);
|
|
133
153
|
solver.pushEquation(TO_SIMPLIFY, target);
|
|
134
154
|
}
|
|
135
155
|
}
|
|
156
|
+
poly.release();
|
|
136
157
|
}
|
|
137
158
|
return false;
|
|
138
159
|
}
|
|
139
160
|
|
|
140
|
-
// simplify_elim_pure_step: an equation linear in its top variable, which occurs nowhere else, is
|
|
141
|
-
// solved.
|
|
142
161
|
private simplifyElimPureStep() {
|
|
143
162
|
const solver = this.solver;
|
|
144
163
|
const useList = this.getUseList();
|
|
@@ -146,18 +165,26 @@ export class PddSimplifier {
|
|
|
146
165
|
let hasSolved = false;
|
|
147
166
|
for (; update.i < update.size; update.i++) {
|
|
148
167
|
const equation = update.get();
|
|
149
|
-
const poly = equation.poly;
|
|
150
|
-
if (!poly.isVal() &&
|
|
168
|
+
const poly = equation.poly.copy();
|
|
169
|
+
if (!poly.isVal() && this.isHiVal(poly) && useList[poly.var()].length === 1) {
|
|
151
170
|
solver.pushEquation(SOLVED, equation);
|
|
152
171
|
hasSolved = true;
|
|
153
172
|
} else {
|
|
154
173
|
update.nextj();
|
|
155
174
|
}
|
|
175
|
+
poly.release();
|
|
156
176
|
}
|
|
157
177
|
update.finish();
|
|
158
178
|
return hasSolved;
|
|
159
179
|
}
|
|
160
180
|
|
|
181
|
+
private isHiVal(poly: Pdd) {
|
|
182
|
+
const hi = poly.hi();
|
|
183
|
+
const isVal = hi.isVal();
|
|
184
|
+
hi.release();
|
|
185
|
+
return isVal;
|
|
186
|
+
}
|
|
187
|
+
|
|
161
188
|
private addToUse(equation: Equation, useList: Equation[][]) {
|
|
162
189
|
for (const variable of equation.poly.freeVars()) {
|
|
163
190
|
while (useList.length <= variable) useList.push([]);
|
|
@@ -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,24 +41,22 @@ 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
|
|
|
57
47
|
export class Equation {
|
|
58
48
|
state = TO_SIMPLIFY;
|
|
59
49
|
idx = 0;
|
|
50
|
+
readonly poly: Pdd;
|
|
60
51
|
|
|
61
52
|
constructor(
|
|
62
|
-
|
|
53
|
+
poly: Pdd,
|
|
63
54
|
public dep: Dependency,
|
|
64
|
-
) {
|
|
55
|
+
) {
|
|
56
|
+
this.poly = poly.copy();
|
|
57
|
+
}
|
|
65
58
|
}
|
|
66
59
|
|
|
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
60
|
export class SetUpdate {
|
|
70
61
|
i = 0;
|
|
71
62
|
private j = 0;
|
|
@@ -123,6 +114,10 @@ export class PddSolver {
|
|
|
123
114
|
}
|
|
124
115
|
|
|
125
116
|
reset() {
|
|
117
|
+
for (const equation of this.solved) equation.poly.release();
|
|
118
|
+
for (const equation of this.toSimplify) equation.poly.release();
|
|
119
|
+
for (const equation of this.processed) equation.poly.release();
|
|
120
|
+
for (const subst of this.substs) subst.poly.release();
|
|
126
121
|
this.substs = [];
|
|
127
122
|
this.solved = [];
|
|
128
123
|
this.processed = [];
|
|
@@ -141,24 +136,23 @@ export class PddSolver {
|
|
|
141
136
|
if (this.var2level.length > 0) {
|
|
142
137
|
this.levelp1 = Math.max(this.var2level[poly.var()] + 1, this.levelp1);
|
|
143
138
|
}
|
|
144
|
-
this.updateStats(equation);
|
|
145
139
|
}
|
|
146
140
|
|
|
147
|
-
// simplify: applies the substitutions to p, and returns it with its dependency.
|
|
148
141
|
simplify(poly: Pdd, dep: Dependency) {
|
|
149
|
-
let result = poly;
|
|
150
142
|
let resultDep = dep;
|
|
151
143
|
for (const subst of this.substs) {
|
|
152
|
-
const substituted =
|
|
153
|
-
if (substituted.equals(
|
|
154
|
-
|
|
155
|
-
|
|
144
|
+
const substituted = poly.substPdd(subst.variable, subst.poly);
|
|
145
|
+
if (!substituted.equals(poly)) {
|
|
146
|
+
poly.assign(substituted);
|
|
147
|
+
resultDep = mkJoin(resultDep, subst.dep);
|
|
148
|
+
}
|
|
149
|
+
substituted.release();
|
|
156
150
|
}
|
|
157
|
-
return
|
|
151
|
+
return resultDep;
|
|
158
152
|
}
|
|
159
153
|
|
|
160
154
|
addSubst(variable: number, poly: Pdd, dep: Dependency) {
|
|
161
|
-
this.substs.push({ variable, poly, dep });
|
|
155
|
+
this.substs.push({ variable, poly: poly.copy(), dep });
|
|
162
156
|
if (this.var2level.length > 0) {
|
|
163
157
|
this.levelp1 = Math.max(
|
|
164
158
|
this.var2level[variable] + 1,
|
|
@@ -167,15 +161,9 @@ export class PddSolver {
|
|
|
167
161
|
}
|
|
168
162
|
const simplifier = (target: Equation) => {
|
|
169
163
|
const substituted = target.poly.substPdd(variable, poly);
|
|
170
|
-
|
|
171
|
-
if (
|
|
172
|
-
|
|
173
|
-
return null;
|
|
174
|
-
}
|
|
175
|
-
const isLeadingTermChanged = substituted.differentLeadingTerm(target.poly);
|
|
176
|
-
target.poly = substituted;
|
|
177
|
-
target.dep = mkJoin(target.dep, dep);
|
|
178
|
-
this.updateStats(target);
|
|
164
|
+
const isLeadingTermChanged = this.simplifyTo(target, substituted, true);
|
|
165
|
+
if (isLeadingTermChanged !== null) target.dep = mkJoin(target.dep, dep);
|
|
166
|
+
substituted.release();
|
|
179
167
|
return isLeadingTermChanged;
|
|
180
168
|
};
|
|
181
169
|
if (!this.isDone()) this.simplifySetUsing(this.processed, simplifier);
|
|
@@ -201,12 +189,12 @@ export class PddSolver {
|
|
|
201
189
|
this.stats.computeSteps++;
|
|
202
190
|
const equation = this.pickNext();
|
|
203
191
|
if (equation === null) return false;
|
|
204
|
-
// scoped_process: the equation goes back to processed unless the step settles it.
|
|
205
192
|
let pending: Equation | null = equation;
|
|
206
193
|
try {
|
|
207
194
|
this.simplifyUsingAll(equation, this.processed);
|
|
208
195
|
if (this.isTrivial(equation)) {
|
|
209
196
|
pending = null;
|
|
197
|
+
this.retire(equation);
|
|
210
198
|
return true;
|
|
211
199
|
}
|
|
212
200
|
if (this.checkConflict(equation)) {
|
|
@@ -221,7 +209,9 @@ export class PddSolver {
|
|
|
221
209
|
if (this.isDone()) return false;
|
|
222
210
|
if (!this.isTooComplexFound) {
|
|
223
211
|
pending = null;
|
|
224
|
-
|
|
212
|
+
const poly = equation.poly.copy();
|
|
213
|
+
this.pushEquation(poly.degree() === 1 ? SOLVED : PROCESSED, equation);
|
|
214
|
+
poly.release();
|
|
225
215
|
}
|
|
226
216
|
return true;
|
|
227
217
|
} finally {
|
|
@@ -255,17 +245,14 @@ export class PddSolver {
|
|
|
255
245
|
}
|
|
256
246
|
|
|
257
247
|
private superpose(first: Equation, second: Equation) {
|
|
258
|
-
const poly = this.manager.
|
|
259
|
-
if (poly
|
|
260
|
-
|
|
261
|
-
this.
|
|
262
|
-
return;
|
|
248
|
+
const poly = this.manager.zero();
|
|
249
|
+
if (this.manager.trySpoly(first.poly, second.poly, poly) && !poly.isZero()) {
|
|
250
|
+
if (this.isTooComplex(poly)) this.isTooComplexFound = true;
|
|
251
|
+
else this.add(poly, mkJoin(first.dep, second.dep));
|
|
263
252
|
}
|
|
264
|
-
|
|
265
|
-
this.add(poly, mkJoin(first.dep, second.dep));
|
|
253
|
+
poly.release();
|
|
266
254
|
}
|
|
267
255
|
|
|
268
|
-
// simplify_using(eq, eqs): reduces eq by the set until no reduction applies.
|
|
269
256
|
private simplifyUsingAll(equation: Equation, set: Equation[]) {
|
|
270
257
|
let isSimplified = false;
|
|
271
258
|
do {
|
|
@@ -275,23 +262,29 @@ export class PddSolver {
|
|
|
275
262
|
if (this.isCanceled() || equation.poly.isVal()) break;
|
|
276
263
|
}
|
|
277
264
|
} while (isSimplified && !equation.poly.isVal());
|
|
278
|
-
if (equation.poly.isUnary()
|
|
279
|
-
|
|
280
|
-
|
|
265
|
+
if (!equation.poly.isUnary()) return;
|
|
266
|
+
const hi = equation.poly.hi();
|
|
267
|
+
const isNegative = hi.val().isNegative();
|
|
268
|
+
hi.release();
|
|
269
|
+
if (!isNegative) return;
|
|
270
|
+
const negated = equation.poly.neg();
|
|
271
|
+
equation.poly.assign(negated);
|
|
272
|
+
negated.release();
|
|
281
273
|
}
|
|
282
274
|
|
|
283
275
|
private simplifySetUsingEquation(set: Equation[], source: Equation) {
|
|
284
276
|
this.simplifySetUsing(set, (target) => this.trySimplifyUsing(target, source));
|
|
285
277
|
}
|
|
286
278
|
|
|
287
|
-
// simplify_using(set, simplifier): the simplifier returns null when it leaves the target, and
|
|
288
|
-
// otherwise whether the leading term changed.
|
|
289
279
|
private simplifySetUsing(set: Equation[], simplifier: (target: Equation) => boolean | null) {
|
|
290
280
|
const update = new SetUpdate(set);
|
|
291
281
|
for (; update.i < update.size; update.i++) {
|
|
292
282
|
const target = set[update.i];
|
|
293
283
|
const isLeadingTermChanged = this.isDone() ? null : simplifier(target);
|
|
294
|
-
if (isLeadingTermChanged !== null && this.isTrivial(target))
|
|
284
|
+
if (isLeadingTermChanged !== null && this.isTrivial(target)) {
|
|
285
|
+
this.retire(target);
|
|
286
|
+
continue;
|
|
287
|
+
}
|
|
295
288
|
if (isLeadingTermChanged !== null && this.checkConflict(target)) continue;
|
|
296
289
|
if (isLeadingTermChanged === true) {
|
|
297
290
|
if (set === this.toSimplify) update.nextj();
|
|
@@ -306,37 +299,42 @@ export class PddSolver {
|
|
|
306
299
|
update.finish();
|
|
307
300
|
}
|
|
308
301
|
|
|
309
|
-
// try_simplify_using: null when the target stays, and otherwise whether its leading term changed
|
|
310
|
-
// while it was processed.
|
|
311
302
|
private trySimplifyUsing(target: Equation, source: Equation) {
|
|
312
303
|
if (source === target) return null;
|
|
313
304
|
this.stats.simplified++;
|
|
314
|
-
const
|
|
315
|
-
|
|
316
|
-
|
|
305
|
+
const sourcePoly = source.poly.copy();
|
|
306
|
+
const reduced = target.poly.reduce(sourcePoly);
|
|
307
|
+
const isLeadingTermChanged = this.simplifyTo(target, reduced, target.state === PROCESSED);
|
|
308
|
+
if (isLeadingTermChanged !== null) target.dep = mkJoin(target.dep, source.dep);
|
|
309
|
+
reduced.release();
|
|
310
|
+
sourcePoly.release();
|
|
311
|
+
return isLeadingTermChanged;
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
private simplifyTo(target: Equation, poly: Pdd, isLeadingTermTracked: boolean) {
|
|
315
|
+
if (poly.equals(target.poly)) return null;
|
|
316
|
+
if (this.isTooComplex(poly)) {
|
|
317
317
|
this.isTooComplexFound = true;
|
|
318
318
|
return null;
|
|
319
319
|
}
|
|
320
|
-
const isLeadingTermChanged =
|
|
321
|
-
|
|
322
|
-
target.poly = reduced;
|
|
323
|
-
target.dep = mkJoin(target.dep, source.dep);
|
|
324
|
-
this.updateStats(target);
|
|
320
|
+
const isLeadingTermChanged = isLeadingTermTracked && poly.differentLeadingTerm(target.poly);
|
|
321
|
+
target.poly.assign(poly);
|
|
325
322
|
return isLeadingTermChanged;
|
|
326
323
|
}
|
|
327
324
|
|
|
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
325
|
simplifyUsing(target: Equation, source: Equation) {
|
|
331
326
|
if (source === target) return false;
|
|
332
327
|
this.stats.simplified++;
|
|
333
|
-
const
|
|
328
|
+
const sourcePoly = source.poly.copy();
|
|
329
|
+
const reduced = target.poly.reduce(sourcePoly);
|
|
334
330
|
const isLeadingTermChanged =
|
|
335
331
|
target.state === PROCESSED && reduced.differentLeadingTerm(target.poly);
|
|
336
|
-
if (reduced.equals(target.poly))
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
332
|
+
if (!reduced.equals(target.poly)) {
|
|
333
|
+
target.poly.assign(reduced);
|
|
334
|
+
target.dep = mkJoin(target.dep, source.dep);
|
|
335
|
+
}
|
|
336
|
+
reduced.release();
|
|
337
|
+
sourcePoly.release();
|
|
340
338
|
return isLeadingTermChanged;
|
|
341
339
|
}
|
|
342
340
|
|
|
@@ -384,6 +382,15 @@ export class PddSolver {
|
|
|
384
382
|
return state === TO_SIMPLIFY ? this.toSimplify : this.solved;
|
|
385
383
|
}
|
|
386
384
|
|
|
385
|
+
delEquation(equation: Equation) {
|
|
386
|
+
this.popEquation(equation);
|
|
387
|
+
this.retire(equation);
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
retire(equation: Equation) {
|
|
391
|
+
equation.poly.release();
|
|
392
|
+
}
|
|
393
|
+
|
|
387
394
|
popEquation(equation: Equation) {
|
|
388
395
|
const set = this.getQueue(equation.state);
|
|
389
396
|
const last = set[set.length - 1];
|
|
@@ -400,9 +407,4 @@ export class PddSolver {
|
|
|
400
407
|
equation.idx = set.length;
|
|
401
408
|
set.push(equation);
|
|
402
409
|
}
|
|
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
410
|
}
|