tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see
|
|
2
|
-
// z3-license.txt. The rewrites of sums and products of monomials, which arith_rewriter extends.
|
|
3
|
-
// Powers are not ported, as tlapm's encoding does not produce them.
|
|
4
1
|
import {
|
|
5
|
-
AstManager,
|
|
2
|
+
type AstManager,
|
|
6
3
|
KIND_APP,
|
|
7
4
|
OP_ABS,
|
|
8
5
|
OP_ADD,
|
|
@@ -10,30 +7,59 @@ import {
|
|
|
10
7
|
OP_GE,
|
|
11
8
|
OP_GT,
|
|
12
9
|
OP_IDIV,
|
|
10
|
+
OP_ITE,
|
|
13
11
|
OP_IS_INT,
|
|
14
12
|
OP_LE,
|
|
15
13
|
OP_LT,
|
|
16
14
|
OP_MOD,
|
|
15
|
+
OP_REM,
|
|
17
16
|
OP_MUL,
|
|
18
17
|
OP_NUM,
|
|
19
18
|
OP_SUB,
|
|
20
19
|
OP_TO_INT,
|
|
21
20
|
OP_TO_REAL,
|
|
22
21
|
OP_UMINUS,
|
|
22
|
+
OP_POWER,
|
|
23
|
+
OP_POWER0,
|
|
24
|
+
OP_SIN,
|
|
25
|
+
OP_COS,
|
|
26
|
+
OP_TAN,
|
|
27
|
+
OP_ASIN,
|
|
28
|
+
OP_ACOS,
|
|
29
|
+
OP_ATAN,
|
|
30
|
+
OP_SINH,
|
|
31
|
+
OP_COSH,
|
|
32
|
+
OP_TANH,
|
|
33
|
+
OP_ASINH,
|
|
34
|
+
OP_ACOSH,
|
|
35
|
+
OP_ATANH,
|
|
36
|
+
OP_EXP,
|
|
37
|
+
OP_ATAN2,
|
|
38
|
+
OP_LOG,
|
|
39
|
+
OP_PI,
|
|
40
|
+
OP_E,
|
|
41
|
+
OP_ALGEBRAIC_NUM,
|
|
23
42
|
SORT_INT,
|
|
24
43
|
} from "./ast";
|
|
44
|
+
import { isAstLess } from "./ast-lt";
|
|
45
|
+
import { ObjHashtable } from "./hashtable";
|
|
25
46
|
import { Rational } from "./rational";
|
|
26
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
27
48
|
|
|
28
49
|
export interface ArithRewriterOptions {
|
|
29
|
-
// poly_rewriter's som: distributes products over sums.
|
|
30
50
|
readonly isSom: boolean;
|
|
31
|
-
// arith_rewriter's sort_sums: orders the monomials of a sum.
|
|
32
51
|
readonly isSortSums: boolean;
|
|
33
|
-
|
|
52
|
+
readonly isArithLhs: boolean;
|
|
34
53
|
readonly isArithIneqLhs: boolean;
|
|
35
|
-
// arith_rewriter's gcd_rounding: divides integer atoms by the gcd of their coefficients.
|
|
36
54
|
readonly isGcdRounding: boolean;
|
|
55
|
+
readonly isAnumSimp: boolean;
|
|
56
|
+
readonly isExpandPower: boolean;
|
|
57
|
+
readonly isExpandTan: boolean;
|
|
58
|
+
readonly maxDegree: number;
|
|
59
|
+
readonly isHoistIte?: boolean;
|
|
60
|
+
readonly isHoistMul?: boolean;
|
|
61
|
+
readonly isFlat?: boolean;
|
|
62
|
+
readonly isElimRem?: boolean;
|
|
37
63
|
}
|
|
38
64
|
|
|
39
65
|
const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
@@ -44,6 +70,7 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
44
70
|
OP_MUL,
|
|
45
71
|
OP_IDIV,
|
|
46
72
|
OP_MOD,
|
|
73
|
+
OP_REM,
|
|
47
74
|
OP_ABS,
|
|
48
75
|
OP_LE,
|
|
49
76
|
OP_GE,
|
|
@@ -53,13 +80,30 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
53
80
|
OP_TO_REAL,
|
|
54
81
|
OP_TO_INT,
|
|
55
82
|
OP_IS_INT,
|
|
83
|
+
OP_POWER,
|
|
84
|
+
OP_POWER0,
|
|
85
|
+
OP_SIN,
|
|
86
|
+
OP_COS,
|
|
87
|
+
OP_TAN,
|
|
88
|
+
OP_ASIN,
|
|
89
|
+
OP_ACOS,
|
|
90
|
+
OP_ATAN,
|
|
91
|
+
OP_SINH,
|
|
92
|
+
OP_COSH,
|
|
93
|
+
OP_TANH,
|
|
94
|
+
OP_ASINH,
|
|
95
|
+
OP_ACOSH,
|
|
96
|
+
OP_ATANH,
|
|
97
|
+
OP_EXP,
|
|
98
|
+
OP_ATAN2,
|
|
99
|
+
OP_LOG,
|
|
100
|
+
OP_PI,
|
|
101
|
+
OP_E,
|
|
102
|
+
OP_ALGEBRAIC_NUM,
|
|
56
103
|
]);
|
|
57
104
|
|
|
58
105
|
export class PolyRewriter {
|
|
59
|
-
// m_curr_sort: the sort of the numerals and terms that the current rewrite makes.
|
|
60
106
|
protected currSort = SORT_INT;
|
|
61
|
-
// The expr_fast_mark1 and expr_fast_mark2 of mk_nflat_add_core: Z3 marks the power products in
|
|
62
|
-
// their nodes, and a stamp per expression marks them here for one call.
|
|
63
107
|
private visitedStamps = new Int32Array(0);
|
|
64
108
|
private multipleStamps = new Int32Array(0);
|
|
65
109
|
private stamp = 0;
|
|
@@ -73,15 +117,22 @@ export class PolyRewriter {
|
|
|
73
117
|
return { expr, depth };
|
|
74
118
|
}
|
|
75
119
|
|
|
120
|
+
protected isNumeral(expr: number) {
|
|
121
|
+
return this.manager.isNumeral(expr);
|
|
122
|
+
}
|
|
123
|
+
|
|
76
124
|
protected isZero(expr: number) {
|
|
77
|
-
return this.
|
|
125
|
+
return this.isNumeral(expr) && this.getValue(expr).isZero();
|
|
78
126
|
}
|
|
79
127
|
|
|
80
|
-
// The value of a numeral of either sort.
|
|
81
128
|
protected getValue(expr: number) {
|
|
82
129
|
return this.manager.getRationalValue(expr);
|
|
83
130
|
}
|
|
84
131
|
|
|
132
|
+
protected normalize(value: Rational) {
|
|
133
|
+
return value;
|
|
134
|
+
}
|
|
135
|
+
|
|
85
136
|
protected mkNumeral(value: Rational) {
|
|
86
137
|
return this.manager.mkNumeralOfSort(value, this.currSort);
|
|
87
138
|
}
|
|
@@ -98,7 +149,14 @@ export class PolyRewriter {
|
|
|
98
149
|
return this.manager.kinds[expr] === KIND_APP && ARITH_OPS.has(this.manager.getOp(expr));
|
|
99
150
|
}
|
|
100
151
|
|
|
101
|
-
|
|
152
|
+
protected mkAddTerm(args: number[]) {
|
|
153
|
+
return this.manager.mkApp(OP_ADD, args, this.currSort);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
protected mkMulTerm(args: number[]) {
|
|
157
|
+
return this.manager.mkApp(OP_MUL, args, this.currSort);
|
|
158
|
+
}
|
|
159
|
+
|
|
102
160
|
protected getNumMonomials(expr: number) {
|
|
103
161
|
return this.isAdd(expr) ? this.manager.getNumArgs(expr) : 1;
|
|
104
162
|
}
|
|
@@ -107,11 +165,10 @@ export class PolyRewriter {
|
|
|
107
165
|
return this.isAdd(expr) ? this.manager.getArg(expr, index) : expr;
|
|
108
166
|
}
|
|
109
167
|
|
|
110
|
-
// get_power_product: the monomial without its coefficient.
|
|
111
168
|
protected getPowerProduct(expr: number) {
|
|
112
169
|
return this.isMul(expr) &&
|
|
113
170
|
this.manager.getNumArgs(expr) === 2 &&
|
|
114
|
-
this.
|
|
171
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
115
172
|
? this.manager.getArg(expr, 1)
|
|
116
173
|
: expr;
|
|
117
174
|
}
|
|
@@ -119,32 +176,31 @@ export class PolyRewriter {
|
|
|
119
176
|
protected getCoefficient(expr: number) {
|
|
120
177
|
return this.isMul(expr) &&
|
|
121
178
|
this.manager.getNumArgs(expr) === 2 &&
|
|
122
|
-
this.
|
|
179
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
123
180
|
? this.getValue(this.manager.getArg(expr, 0))
|
|
124
181
|
: Rational.one;
|
|
125
182
|
}
|
|
126
183
|
|
|
127
|
-
// mon_lt::ordinal, without powers.
|
|
128
184
|
protected getOrdinal(expr: number) {
|
|
129
185
|
const manager = this.manager;
|
|
130
|
-
if (
|
|
131
|
-
return manager.ids[expr];
|
|
186
|
+
if (!this.isArithTerm(expr)) return manager.ids[expr];
|
|
132
187
|
if (this.isMul(expr)) {
|
|
133
|
-
return manager.ids[
|
|
134
|
-
manager.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr
|
|
135
|
-
];
|
|
188
|
+
return manager.ids[this.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr];
|
|
136
189
|
}
|
|
137
|
-
return
|
|
190
|
+
return this.isNumeral(expr) ? -1 : manager.ids[expr];
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
private isMonomialLess(first: number, second: number) {
|
|
194
|
+
return this.options.isArithIneqLhs
|
|
195
|
+
? this.getOrdinal(first) < this.getOrdinal(second)
|
|
196
|
+
: isAstLess(this.manager, first, second);
|
|
138
197
|
}
|
|
139
198
|
|
|
140
|
-
// std::sort with mon_lt, of the monomials from start, in place. Insertion sort is stable, as
|
|
141
|
-
// Array.prototype.sort is, and allocates nothing for the short sums that are the common case.
|
|
142
199
|
protected sortMonomials(monomials: number[], start: number) {
|
|
143
200
|
for (let index = start + 1; index < monomials.length; index++) {
|
|
144
201
|
const monomial = monomials[index];
|
|
145
|
-
const ordinal = this.getOrdinal(monomial);
|
|
146
202
|
let position = index;
|
|
147
|
-
for (; position > start && this.
|
|
203
|
+
for (; position > start && this.isMonomialLess(monomial, monomials[position - 1]); position--)
|
|
148
204
|
monomials[position] = monomials[position - 1];
|
|
149
205
|
monomials[position] = monomial;
|
|
150
206
|
}
|
|
@@ -154,15 +210,15 @@ export class PolyRewriter {
|
|
|
154
210
|
mkAddApp(args: number[]) {
|
|
155
211
|
if (args.length === 0) return this.mkNumeral(Rational.zero);
|
|
156
212
|
if (args.length === 1) return args[0];
|
|
157
|
-
return this.
|
|
213
|
+
return this.mkAddTerm(args);
|
|
158
214
|
}
|
|
159
215
|
|
|
160
216
|
mkMulApp(args: number[]): number {
|
|
161
217
|
if (args.length === 0) return this.mkNumeral(Rational.one);
|
|
162
218
|
if (args.length === 1) return args[0];
|
|
163
|
-
if (args.length > 2 && this.
|
|
219
|
+
if (args.length > 2 && this.isNumeral(args[0]))
|
|
164
220
|
return this.mkMulAppWith(this.getValue(args[0]), this.mkMulApp(args.slice(1)));
|
|
165
|
-
return this.
|
|
221
|
+
return this.mkMulTerm(args);
|
|
166
222
|
}
|
|
167
223
|
|
|
168
224
|
protected mkMulAppWith(coefficient: Rational, arg: number) {
|
|
@@ -170,11 +226,16 @@ export class PolyRewriter {
|
|
|
170
226
|
return this.mkMulApp([this.mkNumeral(coefficient), arg]);
|
|
171
227
|
}
|
|
172
228
|
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
229
|
+
mkAdd(args: number[]) {
|
|
230
|
+
const result = this.mkAddCore(args);
|
|
231
|
+
return typeof result === "object" ? result.expr : result;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
235
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
176
236
|
this.currSort = this.manager.sorts[args[0]];
|
|
177
|
-
if (!args.some((arg) => this.isAdd(arg)))
|
|
237
|
+
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
238
|
+
return this.mkNflatAdd(args);
|
|
178
239
|
const flat: number[] = [];
|
|
179
240
|
for (const arg of args) {
|
|
180
241
|
if (this.isAdd(arg)) this.manager.pushArgs(arg, flat);
|
|
@@ -184,7 +245,6 @@ export class PolyRewriter {
|
|
|
184
245
|
}
|
|
185
246
|
|
|
186
247
|
private mkNflatAdd(args: number[]) {
|
|
187
|
-
const manager = this.manager;
|
|
188
248
|
const isSortSums = this.options.isSortSums;
|
|
189
249
|
let constant = Rational.zero;
|
|
190
250
|
let numCoeffs = 0;
|
|
@@ -194,12 +254,12 @@ export class PolyRewriter {
|
|
|
194
254
|
const stamp = ++this.stamp;
|
|
195
255
|
for (let index = 0; index < args.length; index++) {
|
|
196
256
|
const arg = args[index];
|
|
197
|
-
if (
|
|
257
|
+
if (this.isNumeral(arg)) {
|
|
198
258
|
numCoeffs++;
|
|
199
259
|
constant = constant.add(this.getValue(arg));
|
|
200
260
|
isOrdered = !isSortSums || index === 0;
|
|
201
261
|
} else if (isSortSums && isOrdered) {
|
|
202
|
-
if (previous !== -1 && this.
|
|
262
|
+
if (previous !== -1 && this.isMonomialLess(arg, previous)) isOrdered = false;
|
|
203
263
|
previous = arg;
|
|
204
264
|
}
|
|
205
265
|
const product = this.getPowerProduct(arg);
|
|
@@ -209,43 +269,169 @@ export class PolyRewriter {
|
|
|
209
269
|
isMultiple = true;
|
|
210
270
|
} else this.visitedStamps[product] = stamp;
|
|
211
271
|
}
|
|
272
|
+
constant = this.normalize(constant);
|
|
212
273
|
if (isMultiple) {
|
|
213
274
|
const coeffs = new Map<number, Rational>();
|
|
214
275
|
for (const arg of args) {
|
|
215
|
-
if (
|
|
276
|
+
if (this.isNumeral(arg)) continue;
|
|
216
277
|
const product = this.getPowerProduct(arg);
|
|
217
278
|
if (this.multipleStamps[product] === stamp)
|
|
218
279
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
219
280
|
}
|
|
220
281
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
221
|
-
// visited.reset(): a new stamp marks the power products already copied.
|
|
222
282
|
const copiedStamp = ++this.stamp;
|
|
223
283
|
for (const arg of args) {
|
|
224
|
-
if (
|
|
284
|
+
if (this.isNumeral(arg)) continue;
|
|
225
285
|
const product = this.getPowerProduct(arg);
|
|
226
286
|
if (this.multipleStamps[product] !== stamp) newArgs.push(arg);
|
|
227
287
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
228
288
|
this.visitedStamps[product] = copiedStamp;
|
|
229
|
-
const coefficient = coeffs.get(product) ?? Rational.zero;
|
|
289
|
+
const coefficient = this.normalize(coeffs.get(product) ?? Rational.zero);
|
|
230
290
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
231
291
|
}
|
|
232
292
|
}
|
|
233
|
-
return this.
|
|
234
|
-
|
|
293
|
+
return this.hoist(
|
|
294
|
+
this.mkAddApp(
|
|
295
|
+
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
296
|
+
),
|
|
235
297
|
);
|
|
236
298
|
}
|
|
237
|
-
if (isOrdered) {
|
|
299
|
+
if (isOrdered && this.options.isHoistMul !== true && this.options.isHoistIte !== true) {
|
|
238
300
|
if (numCoeffs === 0) return undefined;
|
|
239
|
-
if (numCoeffs === 1 &&
|
|
301
|
+
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
240
302
|
return undefined;
|
|
241
303
|
}
|
|
242
304
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
243
|
-
for (const arg of args) if (!
|
|
244
|
-
return this.
|
|
245
|
-
isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1),
|
|
305
|
+
for (const arg of args) if (!this.isNumeral(arg)) newArgs.push(arg);
|
|
306
|
+
return this.hoist(
|
|
307
|
+
this.mkAddApp(isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1)),
|
|
246
308
|
);
|
|
247
309
|
}
|
|
248
310
|
|
|
311
|
+
private hoist(sum: number): number | Rewrite {
|
|
312
|
+
const hoisted = this.hoistMultiplication(sum) ?? this.hoistIte(sum);
|
|
313
|
+
return hoisted === undefined ? sum : this.reduce(hoisted, Infinity);
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// TO_BUFFER: the first argument takes the place of the term, and the others go at the end.
|
|
317
|
+
private getFlatArgs(expr: number, isSplit: (expr: number) => boolean) {
|
|
318
|
+
const manager = this.manager;
|
|
319
|
+
const buffer = [expr];
|
|
320
|
+
for (let index = 0; index < buffer.length;) {
|
|
321
|
+
const item = buffer[index];
|
|
322
|
+
if (!isSplit(item)) {
|
|
323
|
+
index++;
|
|
324
|
+
continue;
|
|
325
|
+
}
|
|
326
|
+
buffer[index] = manager.getArg(item, 0);
|
|
327
|
+
for (let arg = 1; arg < manager.getNumArgs(item); arg++)
|
|
328
|
+
buffer.push(manager.getArg(item, arg));
|
|
329
|
+
}
|
|
330
|
+
return buffer;
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
private hoistMultiplication(sum: number) {
|
|
334
|
+
if (this.options.isHoistMul !== true) return undefined;
|
|
335
|
+
const isMul = (expr: number) => this.isMul(expr);
|
|
336
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
337
|
+
const isValid = adds.map(() => true);
|
|
338
|
+
const positions = new Map<number, number>();
|
|
339
|
+
let isChanged = false;
|
|
340
|
+
for (let index = 0; index < adds.length; index++)
|
|
341
|
+
for (const factor of this.getFlatArgs(adds[index], isMul)) {
|
|
342
|
+
if (this.isNumeral(factor)) continue;
|
|
343
|
+
const position = positions.get(factor);
|
|
344
|
+
if (position === undefined || !isValid[position] || position === index) {
|
|
345
|
+
positions.set(factor, index);
|
|
346
|
+
continue;
|
|
347
|
+
}
|
|
348
|
+
this.currSort = this.manager.sorts[adds[index]];
|
|
349
|
+
const first = this.getFlatArgs(adds[position], isMul);
|
|
350
|
+
const second = this.getFlatArgs(adds[index], isMul);
|
|
351
|
+
let shared = 0;
|
|
352
|
+
for (let firstIndex = 0; firstIndex < first.length; firstIndex++) {
|
|
353
|
+
const match = second.indexOf(first[firstIndex], shared);
|
|
354
|
+
if (match === -1) continue;
|
|
355
|
+
[first[firstIndex], first[shared]] = [first[shared], first[firstIndex]];
|
|
356
|
+
[second[match], second[shared]] = [second[shared], second[match]];
|
|
357
|
+
shared++;
|
|
358
|
+
}
|
|
359
|
+
first[shared] = this.mkAddApp([
|
|
360
|
+
this.mkMulApp(first.slice(shared)),
|
|
361
|
+
this.mkMulApp(second.slice(shared)),
|
|
362
|
+
]);
|
|
363
|
+
adds[position] = this.mkMulApp(first.slice(0, shared + 1));
|
|
364
|
+
adds[index] = this.mkNumeral(Rational.zero);
|
|
365
|
+
isValid[position] = false;
|
|
366
|
+
isValid[index] = false;
|
|
367
|
+
isChanged = true;
|
|
368
|
+
break;
|
|
369
|
+
}
|
|
370
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
private hoistIte(sum: number) {
|
|
374
|
+
if (this.options.isHoistIte !== true) return undefined;
|
|
375
|
+
const manager = this.manager;
|
|
376
|
+
const shared = new ObjHashtable((expr) => manager.hashes[expr]);
|
|
377
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
378
|
+
let isChanged = false;
|
|
379
|
+
for (let index = 0; index < adds.length; index++) {
|
|
380
|
+
const add = adds[index];
|
|
381
|
+
if (manager.getOp(add) !== OP_ITE) continue;
|
|
382
|
+
shared.clear();
|
|
383
|
+
if (!this.collectSharedSummands(add, shared)) continue;
|
|
384
|
+
const summands = [this.applyHoist(add, shared)];
|
|
385
|
+
for (const summand of shared) summands.push(summand);
|
|
386
|
+
const hoisted = this.mkAddApp(summands);
|
|
387
|
+
if (hoisted === add) continue;
|
|
388
|
+
adds[index] = hoisted;
|
|
389
|
+
isChanged = true;
|
|
390
|
+
}
|
|
391
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private collectSharedSummands(expr: number, shared: ObjHashtable): boolean {
|
|
395
|
+
const manager = this.manager;
|
|
396
|
+
if (manager.getOp(expr) === OP_ITE)
|
|
397
|
+
return (
|
|
398
|
+
this.collectSharedSummands(manager.getArg(expr, 1), shared) &&
|
|
399
|
+
this.collectSharedSummands(manager.getArg(expr, 2), shared)
|
|
400
|
+
);
|
|
401
|
+
if (this.isNumeral(expr) && this.getValue(expr).isInt()) return false;
|
|
402
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
403
|
+
if (shared.size === 0)
|
|
404
|
+
for (let index = 0; index < summands.length; index++) shared.add(summands[index]);
|
|
405
|
+
else {
|
|
406
|
+
const removed: number[] = [];
|
|
407
|
+
for (const summand of shared) if (!summands.includes(summand)) removed.push(summand);
|
|
408
|
+
for (let index = removed.length - 1; index >= 0; index--) shared.delete(removed[index]);
|
|
409
|
+
}
|
|
410
|
+
if (shared.size === 0) return false;
|
|
411
|
+
for (let index = 1; index < summands.length; index++)
|
|
412
|
+
if (summands.lastIndexOf(summands[index], index - 1) !== -1) return false;
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private applyHoist(expr: number, shared: ObjHashtable): number {
|
|
417
|
+
const manager = this.manager;
|
|
418
|
+
if (manager.getOp(expr) === OP_ITE) {
|
|
419
|
+
const thenExpr = this.applyHoist(manager.getArg(expr, 1), shared);
|
|
420
|
+
const elseExpr = this.applyHoist(manager.getArg(expr, 2), shared);
|
|
421
|
+
return manager.mkApp(
|
|
422
|
+
OP_ITE,
|
|
423
|
+
[manager.getArg(expr, 0), thenExpr, elseExpr],
|
|
424
|
+
manager.sorts[expr],
|
|
425
|
+
);
|
|
426
|
+
}
|
|
427
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
428
|
+
let size = 0;
|
|
429
|
+
for (let index = 0; index < summands.length; index++)
|
|
430
|
+
if (!shared.has(summands[index])) summands[size++] = summands[index];
|
|
431
|
+
summands.length = size;
|
|
432
|
+
return this.mkAddApp(summands);
|
|
433
|
+
}
|
|
434
|
+
|
|
249
435
|
private growStamps(expr: number) {
|
|
250
436
|
const size = Math.max(2 * this.visitedStamps.length, expr + 1, 1024);
|
|
251
437
|
const visitedStamps = new Int32Array(size);
|
|
@@ -257,13 +443,14 @@ export class PolyRewriter {
|
|
|
257
443
|
}
|
|
258
444
|
|
|
259
445
|
mkMul(args: number[]): number | Rewrite | undefined {
|
|
260
|
-
if (args.length < 2) return undefined;
|
|
446
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
261
447
|
this.currSort = this.manager.sorts[args[0]];
|
|
262
448
|
const isFlatMonomial =
|
|
263
449
|
args.length === 2 &&
|
|
264
|
-
this.
|
|
265
|
-
!(this.isMul(args[1]) && this.
|
|
266
|
-
if (isFlatMonomial || !args.some((arg) => this.isMul(arg)))
|
|
450
|
+
this.isNumeral(args[0]) &&
|
|
451
|
+
!(this.isMul(args[1]) && this.isNumeral(this.manager.getArg(args[1], 0)));
|
|
452
|
+
if (this.options.isFlat === false || isFlatMonomial || !args.some((arg) => this.isMul(arg)))
|
|
453
|
+
return this.mkNflatMul(args);
|
|
267
454
|
const flat: number[] = [];
|
|
268
455
|
const collect = (arg: number) => {
|
|
269
456
|
if (this.isMul(arg))
|
|
@@ -279,7 +466,7 @@ export class PolyRewriter {
|
|
|
279
466
|
const manager = this.manager;
|
|
280
467
|
if (
|
|
281
468
|
args.length === 2 &&
|
|
282
|
-
this.
|
|
469
|
+
this.isNumeral(args[0]) &&
|
|
283
470
|
!this.getValue(args[0]).equals(Rational.one) &&
|
|
284
471
|
!this.getValue(args[0]).isZero() &&
|
|
285
472
|
!this.isArithTerm(args[1])
|
|
@@ -290,7 +477,7 @@ export class PolyRewriter {
|
|
|
290
477
|
let numAdd = 0;
|
|
291
478
|
let factor = -1;
|
|
292
479
|
for (const arg of args) {
|
|
293
|
-
if (this.
|
|
480
|
+
if (this.isNumeral(arg)) {
|
|
294
481
|
numCoeffs++;
|
|
295
482
|
coefficient = coefficient.mul(this.getValue(arg));
|
|
296
483
|
} else {
|
|
@@ -298,15 +485,16 @@ export class PolyRewriter {
|
|
|
298
485
|
if (this.isAdd(arg)) numAdd++;
|
|
299
486
|
}
|
|
300
487
|
}
|
|
488
|
+
coefficient = this.normalize(coefficient);
|
|
301
489
|
if (numCoeffs === args.length || coefficient.isZero()) return this.mkNumeral(coefficient);
|
|
302
490
|
if (numCoeffs === args.length - 1) {
|
|
303
491
|
if (coefficient.equals(Rational.one)) return factor;
|
|
304
492
|
if (this.isMul(factor)) {
|
|
305
|
-
if (manager.getNumArgs(factor) !== 2 || !this.
|
|
493
|
+
if (manager.getNumArgs(factor) !== 2 || !this.isNumeral(manager.getArg(factor, 0)))
|
|
306
494
|
return undefined;
|
|
307
495
|
return this.reduce(
|
|
308
496
|
this.mkMulAppWith(
|
|
309
|
-
coefficient.mul(this.getValue(manager.getArg(factor, 0))),
|
|
497
|
+
this.normalize(coefficient.mul(this.getValue(manager.getArg(factor, 0)))),
|
|
310
498
|
manager.getArg(factor, 1),
|
|
311
499
|
),
|
|
312
500
|
1,
|
|
@@ -323,18 +511,15 @@ export class PolyRewriter {
|
|
|
323
511
|
2,
|
|
324
512
|
);
|
|
325
513
|
}
|
|
326
|
-
if (numCoeffs > 1 || (numCoeffs === 1 && !this.
|
|
514
|
+
if (numCoeffs > 1 || (numCoeffs === 1 && !this.isNumeral(args[0])))
|
|
327
515
|
return this.reduce(
|
|
328
|
-
this.mkMulAppWith(
|
|
329
|
-
coefficient,
|
|
330
|
-
this.mkMulApp(args.filter((arg) => !this.manager.isNumeral(arg))),
|
|
331
|
-
),
|
|
516
|
+
this.mkMulAppWith(coefficient, this.mkMulApp(args.filter((arg) => !this.isNumeral(arg)))),
|
|
332
517
|
2,
|
|
333
518
|
);
|
|
334
519
|
if (!this.options.isSom || numAdd === 0) {
|
|
335
|
-
const factors = args.filter((arg) => !this.
|
|
520
|
+
const factors = args.filter((arg) => !this.isNumeral(arg));
|
|
336
521
|
const isOrdered = factors.every(
|
|
337
|
-
(arg, index) => index === 0 || this.
|
|
522
|
+
(arg, index) => index === 0 || !this.isMonomialLess(arg, factors[index - 1]),
|
|
338
523
|
);
|
|
339
524
|
if (isOrdered && numCoeffs === 0) return undefined;
|
|
340
525
|
const ordered = isOrdered ? factors : this.sortMonomials(factors, 0);
|
|
@@ -342,7 +527,6 @@ export class PolyRewriter {
|
|
|
342
527
|
}
|
|
343
528
|
const sums = args.map((arg) => (this.isAdd(arg) ? manager.getArgs(arg) : [arg]));
|
|
344
529
|
const positions = sums.map(() => 0);
|
|
345
|
-
// Like som's expr_ref_buffer, the products are released in order when it returns.
|
|
346
530
|
const products: number[] = [];
|
|
347
531
|
const isBlownUp = manager.withTemporaries(
|
|
348
532
|
() => {
|
|
@@ -377,11 +561,10 @@ export class PolyRewriter {
|
|
|
377
561
|
|
|
378
562
|
mkUminus(arg: number) {
|
|
379
563
|
this.currSort = this.manager.sorts[arg];
|
|
380
|
-
if (this.
|
|
564
|
+
if (this.isNumeral(arg)) return this.mkNumeral(this.getValue(arg).neg());
|
|
381
565
|
return this.reduce(this.mkMulAppWith(Rational.minusOne, arg), 1);
|
|
382
566
|
}
|
|
383
567
|
|
|
384
|
-
// poly_rewriter::cancel_monomials. The stamps stand for its visited, multiple and copied marks.
|
|
385
568
|
protected cancelMonomials(lhs: number, rhs: number, isMoving: boolean) {
|
|
386
569
|
const manager = this.manager;
|
|
387
570
|
this.currSort = manager.sorts[lhs];
|
|
@@ -390,7 +573,7 @@ export class PolyRewriter {
|
|
|
390
573
|
let numCoeffs = 0;
|
|
391
574
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
392
575
|
const arg = this.getMonomial(lhs, index);
|
|
393
|
-
if (
|
|
576
|
+
if (this.isNumeral(arg)) {
|
|
394
577
|
constant = constant.add(this.getValue(arg));
|
|
395
578
|
numCoeffs++;
|
|
396
579
|
continue;
|
|
@@ -399,11 +582,11 @@ export class PolyRewriter {
|
|
|
399
582
|
if (product >= this.visitedStamps.length) this.growStamps(product);
|
|
400
583
|
this.visitedStamps[product] = stamp;
|
|
401
584
|
}
|
|
402
|
-
if (isMoving && numCoeffs === 0 &&
|
|
585
|
+
if (isMoving && numCoeffs === 0 && this.isNumeral(rhs)) return undefined;
|
|
403
586
|
let isMultiple = false;
|
|
404
587
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
405
588
|
const arg = this.getMonomial(rhs, index);
|
|
406
|
-
if (
|
|
589
|
+
if (this.isNumeral(arg)) {
|
|
407
590
|
constant = constant.sub(this.getValue(arg));
|
|
408
591
|
numCoeffs++;
|
|
409
592
|
continue;
|
|
@@ -414,9 +597,9 @@ export class PolyRewriter {
|
|
|
414
597
|
isMultiple = true;
|
|
415
598
|
}
|
|
416
599
|
}
|
|
600
|
+
constant = this.normalize(constant);
|
|
417
601
|
if (!isMultiple && numCoeffs <= 1) {
|
|
418
|
-
if (isMoving ?
|
|
419
|
-
return undefined;
|
|
602
|
+
if (isMoving ? this.isNumeral(rhs) : numCoeffs === 0 || this.isNumeral(rhs)) return undefined;
|
|
420
603
|
}
|
|
421
604
|
const isMultipleProduct = (product: number) =>
|
|
422
605
|
product < this.multipleStamps.length && this.multipleStamps[product] === stamp;
|
|
@@ -424,14 +607,14 @@ export class PolyRewriter {
|
|
|
424
607
|
if (isMultiple) {
|
|
425
608
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
426
609
|
const arg = this.getMonomial(lhs, index);
|
|
427
|
-
if (
|
|
610
|
+
if (this.isNumeral(arg)) continue;
|
|
428
611
|
const product = this.getPowerProduct(arg);
|
|
429
612
|
if (isMultipleProduct(product))
|
|
430
613
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
431
614
|
}
|
|
432
615
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
433
616
|
const arg = this.getMonomial(rhs, index);
|
|
434
|
-
if (
|
|
617
|
+
if (this.isNumeral(arg)) continue;
|
|
435
618
|
const product = this.getPowerProduct(arg);
|
|
436
619
|
if (isMultipleProduct(product))
|
|
437
620
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).sub(this.getCoefficient(arg)));
|
|
@@ -441,7 +624,7 @@ export class PolyRewriter {
|
|
|
441
624
|
const copiedStamp = ++this.stamp;
|
|
442
625
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
443
626
|
const arg = this.getMonomial(lhs, index);
|
|
444
|
-
if (
|
|
627
|
+
if (this.isNumeral(arg)) continue;
|
|
445
628
|
const product = this.getPowerProduct(arg);
|
|
446
629
|
if (!isMultipleProduct(product)) newLhs.push(arg);
|
|
447
630
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
@@ -453,7 +636,7 @@ export class PolyRewriter {
|
|
|
453
636
|
const newRhs: number[] = [];
|
|
454
637
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
455
638
|
const arg = this.getMonomial(rhs, index);
|
|
456
|
-
if (
|
|
639
|
+
if (this.isNumeral(arg)) continue;
|
|
457
640
|
const product = this.getPowerProduct(arg);
|
|
458
641
|
if (isMultipleProduct(product)) continue;
|
|
459
642
|
if (!isMoving) newRhs.push(arg);
|
|
@@ -466,12 +649,11 @@ export class PolyRewriter {
|
|
|
466
649
|
}
|
|
467
650
|
const sortedLhs = isMoving && this.options.isSortSums ? this.sortMonomials(newLhs, 0) : newLhs;
|
|
468
651
|
const isConstantAtRhs = isMoving || newRhs.length === 0 || newLhs.length > 0;
|
|
469
|
-
const value = isConstantAtRhs ? constant.neg() : constant;
|
|
652
|
+
const value = isConstantAtRhs ? this.normalize(constant.neg()) : constant;
|
|
470
653
|
const isLhsConstant = !isConstantAtRhs && (sortedLhs.length === 0 || !value.isZero());
|
|
471
654
|
const isRhsConstant = isConstantAtRhs && (newRhs.length === 0 || !value.isZero());
|
|
472
655
|
if (isLhsConstant) sortedLhs.unshift(this.mkNumeral(value));
|
|
473
656
|
if (isRhsConstant) newRhs.unshift(this.mkNumeral(value));
|
|
474
|
-
|
|
475
|
-
return { lhs: lhsResult, rhs: this.mkAddApp(newRhs) };
|
|
657
|
+
return { lhs: this.mkAddApp(sortedLhs), rhs: this.mkAddApp(newRhs) };
|
|
476
658
|
}
|
|
477
659
|
}
|