tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
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 +2 -1
- 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 +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- 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 +38 -10
- 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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- 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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 -6
- 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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- 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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- 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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- 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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- 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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- 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 +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { SmtUnsupportedError } from "../../../errors";
|
|
2
2
|
import {
|
|
3
3
|
type AstManager,
|
|
4
4
|
KIND_APP,
|
|
@@ -8,18 +8,41 @@ import {
|
|
|
8
8
|
OP_GE,
|
|
9
9
|
OP_GT,
|
|
10
10
|
OP_IDIV,
|
|
11
|
+
OP_ITE,
|
|
11
12
|
OP_IS_INT,
|
|
12
13
|
OP_LE,
|
|
13
14
|
OP_LT,
|
|
14
15
|
OP_MOD,
|
|
16
|
+
OP_REM,
|
|
15
17
|
OP_MUL,
|
|
16
18
|
OP_NUM,
|
|
17
19
|
OP_SUB,
|
|
18
20
|
OP_TO_INT,
|
|
19
21
|
OP_TO_REAL,
|
|
20
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,
|
|
21
43
|
SORT_INT,
|
|
22
44
|
} from "./ast";
|
|
45
|
+
import { isAstLess } from "./ast-lt";
|
|
23
46
|
import { Rational } from "./rational";
|
|
24
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
25
48
|
|
|
@@ -28,6 +51,14 @@ export interface ArithRewriterOptions {
|
|
|
28
51
|
readonly isSortSums: boolean;
|
|
29
52
|
readonly isArithIneqLhs: boolean;
|
|
30
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;
|
|
31
62
|
}
|
|
32
63
|
|
|
33
64
|
const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
@@ -38,6 +69,7 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
38
69
|
OP_MUL,
|
|
39
70
|
OP_IDIV,
|
|
40
71
|
OP_MOD,
|
|
72
|
+
OP_REM,
|
|
41
73
|
OP_ABS,
|
|
42
74
|
OP_LE,
|
|
43
75
|
OP_GE,
|
|
@@ -47,6 +79,26 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
47
79
|
OP_TO_REAL,
|
|
48
80
|
OP_TO_INT,
|
|
49
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,
|
|
50
102
|
]);
|
|
51
103
|
|
|
52
104
|
export class PolyRewriter {
|
|
@@ -64,14 +116,22 @@ export class PolyRewriter {
|
|
|
64
116
|
return { expr, depth };
|
|
65
117
|
}
|
|
66
118
|
|
|
119
|
+
protected isNumeral(expr: number) {
|
|
120
|
+
return this.manager.isNumeral(expr);
|
|
121
|
+
}
|
|
122
|
+
|
|
67
123
|
protected isZero(expr: number) {
|
|
68
|
-
return this.
|
|
124
|
+
return this.isNumeral(expr) && this.getValue(expr).isZero();
|
|
69
125
|
}
|
|
70
126
|
|
|
71
127
|
protected getValue(expr: number) {
|
|
72
128
|
return this.manager.getRationalValue(expr);
|
|
73
129
|
}
|
|
74
130
|
|
|
131
|
+
protected normalize(value: Rational) {
|
|
132
|
+
return value;
|
|
133
|
+
}
|
|
134
|
+
|
|
75
135
|
protected mkNumeral(value: Rational) {
|
|
76
136
|
return this.manager.mkNumeralOfSort(value, this.currSort);
|
|
77
137
|
}
|
|
@@ -88,6 +148,14 @@ export class PolyRewriter {
|
|
|
88
148
|
return this.manager.kinds[expr] === KIND_APP && ARITH_OPS.has(this.manager.getOp(expr));
|
|
89
149
|
}
|
|
90
150
|
|
|
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
|
+
|
|
91
159
|
protected getNumMonomials(expr: number) {
|
|
92
160
|
return this.isAdd(expr) ? this.manager.getNumArgs(expr) : 1;
|
|
93
161
|
}
|
|
@@ -99,7 +167,7 @@ export class PolyRewriter {
|
|
|
99
167
|
protected getPowerProduct(expr: number) {
|
|
100
168
|
return this.isMul(expr) &&
|
|
101
169
|
this.manager.getNumArgs(expr) === 2 &&
|
|
102
|
-
this.
|
|
170
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
103
171
|
? this.manager.getArg(expr, 1)
|
|
104
172
|
: expr;
|
|
105
173
|
}
|
|
@@ -107,29 +175,31 @@ export class PolyRewriter {
|
|
|
107
175
|
protected getCoefficient(expr: number) {
|
|
108
176
|
return this.isMul(expr) &&
|
|
109
177
|
this.manager.getNumArgs(expr) === 2 &&
|
|
110
|
-
this.
|
|
178
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
111
179
|
? this.getValue(this.manager.getArg(expr, 0))
|
|
112
180
|
: Rational.one;
|
|
113
181
|
}
|
|
114
182
|
|
|
115
183
|
protected getOrdinal(expr: number) {
|
|
116
184
|
const manager = this.manager;
|
|
117
|
-
if (
|
|
118
|
-
return manager.ids[expr];
|
|
185
|
+
if (!this.isArithTerm(expr)) return manager.ids[expr];
|
|
119
186
|
if (this.isMul(expr)) {
|
|
120
|
-
return manager.ids[
|
|
121
|
-
manager.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr
|
|
122
|
-
];
|
|
187
|
+
return manager.ids[this.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr];
|
|
123
188
|
}
|
|
124
|
-
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);
|
|
125
196
|
}
|
|
126
197
|
|
|
127
198
|
protected sortMonomials(monomials: number[], start: number) {
|
|
128
199
|
for (let index = start + 1; index < monomials.length; index++) {
|
|
129
200
|
const monomial = monomials[index];
|
|
130
|
-
const ordinal = this.getOrdinal(monomial);
|
|
131
201
|
let position = index;
|
|
132
|
-
for (; position > start && this.
|
|
202
|
+
for (; position > start && this.isMonomialLess(monomial, monomials[position - 1]); position--)
|
|
133
203
|
monomials[position] = monomials[position - 1];
|
|
134
204
|
monomials[position] = monomial;
|
|
135
205
|
}
|
|
@@ -139,15 +209,15 @@ export class PolyRewriter {
|
|
|
139
209
|
mkAddApp(args: number[]) {
|
|
140
210
|
if (args.length === 0) return this.mkNumeral(Rational.zero);
|
|
141
211
|
if (args.length === 1) return args[0];
|
|
142
|
-
return this.
|
|
212
|
+
return this.mkAddTerm(args);
|
|
143
213
|
}
|
|
144
214
|
|
|
145
215
|
mkMulApp(args: number[]): number {
|
|
146
216
|
if (args.length === 0) return this.mkNumeral(Rational.one);
|
|
147
217
|
if (args.length === 1) return args[0];
|
|
148
|
-
if (args.length > 2 && this.
|
|
218
|
+
if (args.length > 2 && this.isNumeral(args[0]))
|
|
149
219
|
return this.mkMulAppWith(this.getValue(args[0]), this.mkMulApp(args.slice(1)));
|
|
150
|
-
return this.
|
|
220
|
+
return this.mkMulTerm(args);
|
|
151
221
|
}
|
|
152
222
|
|
|
153
223
|
protected mkMulAppWith(coefficient: Rational, arg: number) {
|
|
@@ -155,10 +225,27 @@ export class PolyRewriter {
|
|
|
155
225
|
return this.mkMulApp([this.mkNumeral(coefficient), arg]);
|
|
156
226
|
}
|
|
157
227
|
|
|
158
|
-
mkAdd(args: number[])
|
|
159
|
-
|
|
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");
|
|
160
246
|
this.currSort = this.manager.sorts[args[0]];
|
|
161
|
-
if (!args.some((arg) => this.isAdd(arg)))
|
|
247
|
+
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
248
|
+
return this.mkNflatAdd(args);
|
|
162
249
|
const flat: number[] = [];
|
|
163
250
|
for (const arg of args) {
|
|
164
251
|
if (this.isAdd(arg)) this.manager.pushArgs(arg, flat);
|
|
@@ -168,7 +255,6 @@ export class PolyRewriter {
|
|
|
168
255
|
}
|
|
169
256
|
|
|
170
257
|
private mkNflatAdd(args: number[]) {
|
|
171
|
-
const manager = this.manager;
|
|
172
258
|
const isSortSums = this.options.isSortSums;
|
|
173
259
|
let constant = Rational.zero;
|
|
174
260
|
let numCoeffs = 0;
|
|
@@ -178,12 +264,12 @@ export class PolyRewriter {
|
|
|
178
264
|
const stamp = ++this.stamp;
|
|
179
265
|
for (let index = 0; index < args.length; index++) {
|
|
180
266
|
const arg = args[index];
|
|
181
|
-
if (
|
|
267
|
+
if (this.isNumeral(arg)) {
|
|
182
268
|
numCoeffs++;
|
|
183
269
|
constant = constant.add(this.getValue(arg));
|
|
184
270
|
isOrdered = !isSortSums || index === 0;
|
|
185
271
|
} else if (isSortSums && isOrdered) {
|
|
186
|
-
if (previous !== -1 && this.
|
|
272
|
+
if (previous !== -1 && this.isMonomialLess(arg, previous)) isOrdered = false;
|
|
187
273
|
previous = arg;
|
|
188
274
|
}
|
|
189
275
|
const product = this.getPowerProduct(arg);
|
|
@@ -193,10 +279,11 @@ export class PolyRewriter {
|
|
|
193
279
|
isMultiple = true;
|
|
194
280
|
} else this.visitedStamps[product] = stamp;
|
|
195
281
|
}
|
|
282
|
+
constant = this.normalize(constant);
|
|
196
283
|
if (isMultiple) {
|
|
197
284
|
const coeffs = new Map<number, Rational>();
|
|
198
285
|
for (const arg of args) {
|
|
199
|
-
if (
|
|
286
|
+
if (this.isNumeral(arg)) continue;
|
|
200
287
|
const product = this.getPowerProduct(arg);
|
|
201
288
|
if (this.multipleStamps[product] === stamp)
|
|
202
289
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
@@ -204,31 +291,90 @@ export class PolyRewriter {
|
|
|
204
291
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
205
292
|
const copiedStamp = ++this.stamp;
|
|
206
293
|
for (const arg of args) {
|
|
207
|
-
if (
|
|
294
|
+
if (this.isNumeral(arg)) continue;
|
|
208
295
|
const product = this.getPowerProduct(arg);
|
|
209
296
|
if (this.multipleStamps[product] !== stamp) newArgs.push(arg);
|
|
210
297
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
211
298
|
this.visitedStamps[product] = copiedStamp;
|
|
212
|
-
const coefficient = coeffs.get(product) ?? Rational.zero;
|
|
299
|
+
const coefficient = this.normalize(coeffs.get(product) ?? Rational.zero);
|
|
213
300
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
214
301
|
}
|
|
215
302
|
}
|
|
216
|
-
return this.
|
|
217
|
-
|
|
303
|
+
return this.hoistMultiplication(
|
|
304
|
+
this.mkAddApp(
|
|
305
|
+
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
306
|
+
),
|
|
218
307
|
);
|
|
219
308
|
}
|
|
220
|
-
if (isOrdered) {
|
|
309
|
+
if (isOrdered && this.options.isHoistMul !== true) {
|
|
221
310
|
if (numCoeffs === 0) return undefined;
|
|
222
|
-
if (numCoeffs === 1 &&
|
|
311
|
+
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
223
312
|
return undefined;
|
|
224
313
|
}
|
|
225
314
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
226
|
-
for (const arg of args) if (!
|
|
227
|
-
return this.
|
|
228
|
-
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)),
|
|
229
318
|
);
|
|
230
319
|
}
|
|
231
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
|
+
|
|
232
378
|
private growStamps(expr: number) {
|
|
233
379
|
const size = Math.max(2 * this.visitedStamps.length, expr + 1, 1024);
|
|
234
380
|
const visitedStamps = new Int32Array(size);
|
|
@@ -240,13 +386,14 @@ export class PolyRewriter {
|
|
|
240
386
|
}
|
|
241
387
|
|
|
242
388
|
mkMul(args: number[]): number | Rewrite | undefined {
|
|
243
|
-
if (args.length < 2) return undefined;
|
|
389
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
244
390
|
this.currSort = this.manager.sorts[args[0]];
|
|
245
391
|
const isFlatMonomial =
|
|
246
392
|
args.length === 2 &&
|
|
247
|
-
this.
|
|
248
|
-
!(this.isMul(args[1]) && this.
|
|
249
|
-
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);
|
|
250
397
|
const flat: number[] = [];
|
|
251
398
|
const collect = (arg: number) => {
|
|
252
399
|
if (this.isMul(arg))
|
|
@@ -262,7 +409,7 @@ export class PolyRewriter {
|
|
|
262
409
|
const manager = this.manager;
|
|
263
410
|
if (
|
|
264
411
|
args.length === 2 &&
|
|
265
|
-
this.
|
|
412
|
+
this.isNumeral(args[0]) &&
|
|
266
413
|
!this.getValue(args[0]).equals(Rational.one) &&
|
|
267
414
|
!this.getValue(args[0]).isZero() &&
|
|
268
415
|
!this.isArithTerm(args[1])
|
|
@@ -273,7 +420,7 @@ export class PolyRewriter {
|
|
|
273
420
|
let numAdd = 0;
|
|
274
421
|
let factor = -1;
|
|
275
422
|
for (const arg of args) {
|
|
276
|
-
if (this.
|
|
423
|
+
if (this.isNumeral(arg)) {
|
|
277
424
|
numCoeffs++;
|
|
278
425
|
coefficient = coefficient.mul(this.getValue(arg));
|
|
279
426
|
} else {
|
|
@@ -281,15 +428,16 @@ export class PolyRewriter {
|
|
|
281
428
|
if (this.isAdd(arg)) numAdd++;
|
|
282
429
|
}
|
|
283
430
|
}
|
|
431
|
+
coefficient = this.normalize(coefficient);
|
|
284
432
|
if (numCoeffs === args.length || coefficient.isZero()) return this.mkNumeral(coefficient);
|
|
285
433
|
if (numCoeffs === args.length - 1) {
|
|
286
434
|
if (coefficient.equals(Rational.one)) return factor;
|
|
287
435
|
if (this.isMul(factor)) {
|
|
288
|
-
if (manager.getNumArgs(factor) !== 2 || !this.
|
|
436
|
+
if (manager.getNumArgs(factor) !== 2 || !this.isNumeral(manager.getArg(factor, 0)))
|
|
289
437
|
return undefined;
|
|
290
438
|
return this.reduce(
|
|
291
439
|
this.mkMulAppWith(
|
|
292
|
-
coefficient.mul(this.getValue(manager.getArg(factor, 0))),
|
|
440
|
+
this.normalize(coefficient.mul(this.getValue(manager.getArg(factor, 0)))),
|
|
293
441
|
manager.getArg(factor, 1),
|
|
294
442
|
),
|
|
295
443
|
1,
|
|
@@ -306,18 +454,15 @@ export class PolyRewriter {
|
|
|
306
454
|
2,
|
|
307
455
|
);
|
|
308
456
|
}
|
|
309
|
-
if (numCoeffs > 1 || (numCoeffs === 1 && !this.
|
|
457
|
+
if (numCoeffs > 1 || (numCoeffs === 1 && !this.isNumeral(args[0])))
|
|
310
458
|
return this.reduce(
|
|
311
|
-
this.mkMulAppWith(
|
|
312
|
-
coefficient,
|
|
313
|
-
this.mkMulApp(args.filter((arg) => !this.manager.isNumeral(arg))),
|
|
314
|
-
),
|
|
459
|
+
this.mkMulAppWith(coefficient, this.mkMulApp(args.filter((arg) => !this.isNumeral(arg)))),
|
|
315
460
|
2,
|
|
316
461
|
);
|
|
317
462
|
if (!this.options.isSom || numAdd === 0) {
|
|
318
|
-
const factors = args.filter((arg) => !this.
|
|
463
|
+
const factors = args.filter((arg) => !this.isNumeral(arg));
|
|
319
464
|
const isOrdered = factors.every(
|
|
320
|
-
(arg, index) => index === 0 || this.
|
|
465
|
+
(arg, index) => index === 0 || !this.isMonomialLess(arg, factors[index - 1]),
|
|
321
466
|
);
|
|
322
467
|
if (isOrdered && numCoeffs === 0) return undefined;
|
|
323
468
|
const ordered = isOrdered ? factors : this.sortMonomials(factors, 0);
|
|
@@ -359,7 +504,7 @@ export class PolyRewriter {
|
|
|
359
504
|
|
|
360
505
|
mkUminus(arg: number) {
|
|
361
506
|
this.currSort = this.manager.sorts[arg];
|
|
362
|
-
if (this.
|
|
507
|
+
if (this.isNumeral(arg)) return this.mkNumeral(this.getValue(arg).neg());
|
|
363
508
|
return this.reduce(this.mkMulAppWith(Rational.minusOne, arg), 1);
|
|
364
509
|
}
|
|
365
510
|
|
|
@@ -371,7 +516,7 @@ export class PolyRewriter {
|
|
|
371
516
|
let numCoeffs = 0;
|
|
372
517
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
373
518
|
const arg = this.getMonomial(lhs, index);
|
|
374
|
-
if (
|
|
519
|
+
if (this.isNumeral(arg)) {
|
|
375
520
|
constant = constant.add(this.getValue(arg));
|
|
376
521
|
numCoeffs++;
|
|
377
522
|
continue;
|
|
@@ -380,11 +525,11 @@ export class PolyRewriter {
|
|
|
380
525
|
if (product >= this.visitedStamps.length) this.growStamps(product);
|
|
381
526
|
this.visitedStamps[product] = stamp;
|
|
382
527
|
}
|
|
383
|
-
if (isMoving && numCoeffs === 0 &&
|
|
528
|
+
if (isMoving && numCoeffs === 0 && this.isNumeral(rhs)) return undefined;
|
|
384
529
|
let isMultiple = false;
|
|
385
530
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
386
531
|
const arg = this.getMonomial(rhs, index);
|
|
387
|
-
if (
|
|
532
|
+
if (this.isNumeral(arg)) {
|
|
388
533
|
constant = constant.sub(this.getValue(arg));
|
|
389
534
|
numCoeffs++;
|
|
390
535
|
continue;
|
|
@@ -395,9 +540,9 @@ export class PolyRewriter {
|
|
|
395
540
|
isMultiple = true;
|
|
396
541
|
}
|
|
397
542
|
}
|
|
543
|
+
constant = this.normalize(constant);
|
|
398
544
|
if (!isMultiple && numCoeffs <= 1) {
|
|
399
|
-
if (isMoving ?
|
|
400
|
-
return undefined;
|
|
545
|
+
if (isMoving ? this.isNumeral(rhs) : numCoeffs === 0 || this.isNumeral(rhs)) return undefined;
|
|
401
546
|
}
|
|
402
547
|
const isMultipleProduct = (product: number) =>
|
|
403
548
|
product < this.multipleStamps.length && this.multipleStamps[product] === stamp;
|
|
@@ -405,14 +550,14 @@ export class PolyRewriter {
|
|
|
405
550
|
if (isMultiple) {
|
|
406
551
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
407
552
|
const arg = this.getMonomial(lhs, index);
|
|
408
|
-
if (
|
|
553
|
+
if (this.isNumeral(arg)) continue;
|
|
409
554
|
const product = this.getPowerProduct(arg);
|
|
410
555
|
if (isMultipleProduct(product))
|
|
411
556
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
412
557
|
}
|
|
413
558
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
414
559
|
const arg = this.getMonomial(rhs, index);
|
|
415
|
-
if (
|
|
560
|
+
if (this.isNumeral(arg)) continue;
|
|
416
561
|
const product = this.getPowerProduct(arg);
|
|
417
562
|
if (isMultipleProduct(product))
|
|
418
563
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).sub(this.getCoefficient(arg)));
|
|
@@ -422,7 +567,7 @@ export class PolyRewriter {
|
|
|
422
567
|
const copiedStamp = ++this.stamp;
|
|
423
568
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
424
569
|
const arg = this.getMonomial(lhs, index);
|
|
425
|
-
if (
|
|
570
|
+
if (this.isNumeral(arg)) continue;
|
|
426
571
|
const product = this.getPowerProduct(arg);
|
|
427
572
|
if (!isMultipleProduct(product)) newLhs.push(arg);
|
|
428
573
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
@@ -434,7 +579,7 @@ export class PolyRewriter {
|
|
|
434
579
|
const newRhs: number[] = [];
|
|
435
580
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
436
581
|
const arg = this.getMonomial(rhs, index);
|
|
437
|
-
if (
|
|
582
|
+
if (this.isNumeral(arg)) continue;
|
|
438
583
|
const product = this.getPowerProduct(arg);
|
|
439
584
|
if (isMultipleProduct(product)) continue;
|
|
440
585
|
if (!isMoving) newRhs.push(arg);
|
|
@@ -447,7 +592,7 @@ export class PolyRewriter {
|
|
|
447
592
|
}
|
|
448
593
|
const sortedLhs = isMoving && this.options.isSortSums ? this.sortMonomials(newLhs, 0) : newLhs;
|
|
449
594
|
const isConstantAtRhs = isMoving || newRhs.length === 0 || newLhs.length > 0;
|
|
450
|
-
const value = isConstantAtRhs ? constant.neg() : constant;
|
|
595
|
+
const value = isConstantAtRhs ? this.normalize(constant.neg()) : constant;
|
|
451
596
|
const isLhsConstant = !isConstantAtRhs && (sortedLhs.length === 0 || !value.isZero());
|
|
452
597
|
const isRhsConstant = isConstantAtRhs && (newRhs.length === 0 || !value.isZero());
|
|
453
598
|
if (isLhsConstant) sortedLhs.unshift(this.mkNumeral(value));
|