docs

gesellkammer · Jul 15, 2023 · 120ac41 · 120ac41
1 parent d2c9468
commit 120ac41
Show file tree

Hide file tree

Showing 9 changed files with 646 additions and 768 deletions.
diff --git a/docs/assets/notebook-musicxmlio.png b/docs/assets/notebook-musicxmlio.png
diff --git a/docs/core.rst b/docs/core.rst
@@ -136,7 +136,7 @@ Table of Contents
     coreplayintro
     config
     workspace
-    coretools
-    symbols
-    coreio
+    Input / Output (import/export to musicxml, lilypond, MiDI, ...) <coreio>
+    Pure Notation <symbols>
+    Miscellaneous Tools <coretools>
 
diff --git a/docs/coreio.rst b/docs/coreio.rst
@@ -4,6 +4,7 @@ Input / Output
 
 .. toctree::
     :maxdepth: 1
+    :hidden:
 
     musicxmlio <notebooks/musicxmlio>
 
@@ -25,10 +26,6 @@ Musicxml
 
         Introduction to notes, chords, voices, etc. Notation and playback
 
-#.. figure:: assets/notebook-musicxmlio.png
-#    :height: 300px
-#    :target: notebooks/musicxmlio
-
 
 Lilypond
 ========

diff --git a/docs/getWorkspace.rst b/docs/getWorkspace.rst
diff --git a/docs/notebooks/getWorkspace.ipynb b/docs/notebooks/getWorkspace.ipynb
diff --git a/docs/notebooks/setTempo.ipynb b/docs/notebooks/setTempo.ipynb
@@ -167,14 +167,6 @@
     "setTempo(84, 2)\n",
     "getScoreStruct().show()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "8c20ea91-5779-4214-a057-aed2c984d9b9",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -193,7 +185,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "version": "3.9.15"
   }
  },
  "nbformat": 4,

diff --git a/docs/workspace.rst b/docs/workspace.rst
@@ -30,9 +30,18 @@ from previous sessions (see :meth:`CoreConfig.save() <maelzel.core.config.CoreCo
 
 .. admonition:: See Also
 
-    - :func:`~maelzel.core.workspace.makeConfig`
     - :ref:`config`
 
+Example Notebooks
+~~~~~~~~~~~~~~~~~
+
+.. toctree::
+    :maxdepth: 1
+
+    The active Workspace <notebooks/getWorkspace>
+    setTempo: modify the tempo of the active ScoreStruct <notebooks/setTempo>
+
+
 Example
 ~~~~~~~
 
@@ -91,14 +100,6 @@ active config are used:
 .. image:: assets/workspace-temporaryworkspace.png
 
 
-Example Notebooks
------------------
-
-.. toctree::
-    :maxdepth: 1
-
-    The active Workspace <getWorkspace>
-    setTempo: modify the tempo of the active ScoreStruct <setTempo>
 
 
 
@@ -107,5 +108,5 @@ Example Notebooks
 .. automodapi:: maelzel.core.workspace
     :allowed-package-names: maelzel.core.workspace,maelzel.core.config,maelzel.music.dynamics
     :no-inheritance-diagram:
-    :headings: =-
+    :no-heading:
 
diff --git a/maelzel/core/chain.py b/maelzel/core/chain.py
@@ -134,12 +134,19 @@ def __init__(self,
                  properties: dict[str, Any] = None,
                  parent: MObj = None,
                  _init=True):
+        if isinstance(items,  str):
+            _init = True
+
         if _init:
             if offset is not None:
                 offset = asF(offset)
             if items is not None:
-                items = [item if isinstance(item, (MEvent, Chain)) else asEvent(item)
-                         for item in items]
+                if isinstance(items, str):
+                    items = [line.strip() for line in items.splitlines()]
+                    items = [asEvent(item) for item in items if item]
+                else:
+                    items = [item if isinstance(item, (MEvent, Chain)) else asEvent(item)
+                             for item in items]
 
         if items is not None:
             for item in items:

diff --git a/maelzel/scoring/quantprofile.py b/maelzel/scoring/quantprofile.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+from math import sqrt
 from functools import cache
 from dataclasses import dataclass, field as _field, fields as _fields
 from maelzel.scoring.common import F, division_t, number_t, logger
@@ -122,7 +123,7 @@ class QuantizationProfile:
     numNestedTupletsPenalty: list[float] = _factory([0., 0.1, 0.4, 0.5, 0.8, 0.8])
     """Penalty applied to nested levels by level"""
 
-    complexNestedTupletsFactor: float = 1.5
+    complexNestedTupletsFactor: float = 1.8
     """For certain combinations of nested tuplets an extra complexity factor can be applied.
     If this factor is 1.0, then no extra penalty is calculated. Any number above 1 will
     penalize complex nested tuplets (prefer (5, 5, 5) over (3, 3, 3, 3, 3)).
@@ -414,12 +415,14 @@ def _divisionPenalty(division: division_t,
         numSubdivsPenalty = profile.numSubdivsPenaltyMap[1]
         cardinality = 1
     else:
-        internalPenalty = sum(_divisionPenalty(subdiv, profile, nestingLevel+1, maxPenalty=maxPenalty)[0]
-                              for subdiv in division)
+        internalPenalty = sqrt(sum(_divisionPenalty(subdiv, profile, nestingLevel+1, maxPenalty=maxPenalty)[0]**2
+                                   for subdiv in division))
         divPenalty = internalPenalty + profile.divisionPenaltyMap.get(len(division), maxPenalty)
         numSubdivsPenalty = profile.numSubdivsPenaltyMap.get(len(division), maxPenalty)
         cardinality = max(1, _divisionCardinality(division, excludeBinary=True))
+
     cardinalityPenalty = profile.divisionCardinalityPenaltyMap.get(cardinality, maxPenalty)
+
     # We only calculate level penalty on the outmost level
     levelPenalty = profile.numNestedTupletsPenalty[_divisionDepth(division)] if nestingLevel == 0 else 0