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