web files pushed

DCMLab · Sep 12, 2023 · ff16369 · ff16369
1 parent 77a22c7
commit ff16369
Show file tree

Hide file tree

Showing 20 changed files with 1,812 additions and 143 deletions.
diff --git a/_sources/introduction.rst.txt b/_sources/introduction.rst.txt
@@ -163,20 +163,20 @@ When you have made changes to the scores and want to update the TSV files accord
 
 .. code:: python
 
-   ms3 extract -M -N -X -D # for measures, notes, expanded annotations, and metadata
+   ms3 extract -M -N -X -F -D # for measures, notes, expanded harmony labels, form labels, and metadata
 
 If, in addition, you want to generate the reviewed scores with out-of-label notes colored in red, you can do
 
 .. code:: python
 
-   ms3 review -M -N -X -D # for extracting measures, notes, expanded annotations, and metadata
+   ms3 review -M -N -X -F -D # for extracting measures, notes, expanded harmony labels, form labels, and metadata
 
 By adding the flag ``-c`` to the review command, it will additionally compare the (potentially modified) annotations in the score with the ones currently present in the harmonies TSV files and reflect the comparison in the reviewed scores.
 
 Questions, Suggestions, Corrections, Bug Reports
 ================================================
 
-For questions, remarks etc., please `create an issue <https://dcmlab.github.io/debussy_etudes/issues>`__ and feel free to fork and submit pull requests.
+For questions, remarks etc., please `create an issue <https://github.com/DCMLab/debussy_etudes/issues>`__ and feel free to fork and submit pull requests.
 
 License
 =======

diff --git a/_sources/notebooks/annotations.md.txt b/_sources/notebooks/annotations.md.txt
@@ -5,7 +5,7 @@ jupytext:
     extension: .md
     format_name: myst
     format_version: 0.13
-    jupytext_version: 1.14.4
+    jupytext_version: 1.15.0
 kernelspec:
   display_name: corpus_docs
   language: python
@@ -38,7 +38,7 @@ from utils import STD_LAYOUT, CADENCE_COLORS, CORPUS_COLOR_SCALE, TYPE_COLORS, c
 ```{code-cell} ipython3
 :tags: [hide-input]
 
-CORPUS_PATH = os.getenv('CORPUS_PATH', "~/workflow_test_metarepo")
+CORPUS_PATH = os.path.abspath(os.path.join('..', '..'))
 print_heading("Notebook settings")
 print(f"CORPUS_PATH: {CORPUS_PATH!r}")
 CORPUS_PATH = resolve_dir(CORPUS_PATH)
@@ -48,10 +48,8 @@ CORPUS_PATH = resolve_dir(CORPUS_PATH)
 :tags: [hide-input]
 
 repo = Repo(CORPUS_PATH)
-notebook_repo = Repo('.', search_parent_directories=True)
 print_heading("Data and software versions")
-print(f"Notebook repository '{get_repo_name(notebook_repo)}' @ {notebook_repo.commit().hexsha[:7]}")
-print(f"Data repo '{get_repo_name(CORPUS_PATH)}' @ {repo.commit().hexsha[:7]}")
+print(f"Data repo '{get_repo_name(repo)}' @ {repo.commit().hexsha[:7]}")
 print(f"dimcat version {dc.__version__}")
 print(f"ms3 version {ms3.__version__}")
 ```

diff --git a/_sources/notebooks/cadences.md.txt b/_sources/notebooks/cadences.md.txt
@@ -5,7 +5,7 @@ jupytext:
     extension: .md
     format_name: myst
     format_version: 0.13
-    jupytext_version: 1.14.4
+    jupytext_version: 1.15.0
 kernelspec:
   display_name: corpus_docs
   language: python
@@ -37,7 +37,7 @@ from utils import STD_LAYOUT, CADENCE_COLORS, color_background, value_count_df,
 ```{code-cell} ipython3
 :tags: [hide-input]
 
-CORPUS_PATH = os.getenv('CORPUS_PATH', "~/workflow_test_metarepo")
+CORPUS_PATH = os.path.abspath(os.path.join('..', '..'))
 print_heading("Notebook settings")
 print(f"CORPUS_PATH: {CORPUS_PATH!r}")
 CORPUS_PATH = resolve_dir(CORPUS_PATH)
@@ -47,10 +47,8 @@ CORPUS_PATH = resolve_dir(CORPUS_PATH)
 :tags: [hide-input]
 
 repo = Repo(CORPUS_PATH)
-notebook_repo = Repo('.', search_parent_directories=True)
 print_heading("Data and software versions")
-print(f"Notebook repository '{get_repo_name(notebook_repo)}' @ {notebook_repo.commit().hexsha[:7]}")
-print(f"Data repo '{get_repo_name(CORPUS_PATH)}' @ {repo.commit().hexsha[:7]}")
+print(f"Data repo '{get_repo_name(repo)}' @ {repo.commit().hexsha[:7]}")
 print(f"dimcat version {dc.__version__}")
 print(f"ms3 version {ms3.__version__}")
 ```
@@ -182,8 +180,6 @@ fig.update_layout(**STD_LAYOUT)
 ### Number of cadences per phrase
 
 ```{code-cell} ipython3
-:tags: []
-
 segmented = dc.PhraseSlicer().process_data(grouped_by_corpus)
 phrases = segmented.get_slice_info()
 phrase_segments = segmented.get_facet("expanded")

diff --git a/_sources/notebooks/notes_stats.md.txt b/_sources/notebooks/notes_stats.md.txt
@@ -5,7 +5,7 @@ jupytext:
     extension: .md
     format_name: myst
     format_version: 0.13
-    jupytext_version: 1.14.4
+    jupytext_version: 1.15.0
 kernelspec:
   display_name: corpus_docs
   language: python
@@ -37,7 +37,7 @@ from utils import STD_LAYOUT, CADENCE_COLORS, CORPUS_COLOR_SCALE, chronological_
 ```{code-cell} ipython3
 :tags: [hide-input]
 
-CORPUS_PATH = os.getenv('CORPUS_PATH', "~/workflow_test_metarepo")
+CORPUS_PATH = os.path.abspath(os.path.join('..', '..'))
 ANNOTATED_ONLY = os.getenv("ANNOTATED_ONLY", "True").lower() in ('true', '1', 't')
 print_heading("Notebook settings")
 print(f"CORPUS_PATH: {CORPUS_PATH!r}")
@@ -49,10 +49,8 @@ CORPUS_PATH = resolve_dir(CORPUS_PATH)
 :tags: [hide-input]
 
 repo = Repo(CORPUS_PATH)
-notebook_repo = Repo('.', search_parent_directories=True)
 print_heading("Data and software versions")
-print(f"Notebook repository '{get_repo_name(notebook_repo)}' @ {notebook_repo.commit().hexsha[:7]}")
-print(f"Data repo '{get_repo_name(CORPUS_PATH)}' @ {repo.commit().hexsha[:7]}")
+print(f"Data repo '{get_repo_name(repo)}' @ {repo.commit().hexsha[:7]}")
 print(f"dimcat version {dc.__version__}")
 print(f"ms3 version {ms3.__version__}")
 ```

diff --git a/_sources/notebooks/overview.md.txt b/_sources/notebooks/overview.md.txt
@@ -5,15 +5,13 @@ jupytext:
     extension: .md
     format_name: myst
     format_version: 0.13
-    jupytext_version: 1.14.4
+    jupytext_version: 1.15.0
 kernelspec:
   display_name: corpus_docs
   language: python
   name: corpus_docs
 ---
 
-+++ {"tags": []}
-
 # Overview
 
 This notebook gives a general overview of the features included in the dataset.
@@ -42,7 +40,7 @@ from utils import CADENCE_COLORS, CORPUS_COLOR_SCALE, STD_LAYOUT, TYPE_COLORS, c
 ```{code-cell} ipython3
 :tags: [hide-input]
 
-CORPUS_PATH = os.getenv('CORPUS_PATH', "~/workflow_test_metarepo")
+CORPUS_PATH = os.path.abspath(os.path.join('..', '..'))
 ANNOTATED_ONLY = os.getenv("ANNOTATED_ONLY", "True").lower() in ('true', '1', 't')
 print_heading("Notebook settings")
 print(f"CORPUS_PATH: {CORPUS_PATH!r}")
@@ -54,10 +52,8 @@ CORPUS_PATH = resolve_dir(CORPUS_PATH)
 :tags: [hide-input]
 
 repo = Repo(CORPUS_PATH)
-notebook_repo = Repo('.', search_parent_directories=True)
 print_heading("Data and software versions")
-print(f"Notebook repository '{get_repo_name(notebook_repo)}' @ {notebook_repo.commit().hexsha[:7]}")
-print(f"Data repo '{get_repo_name(CORPUS_PATH)}' @ {repo.commit().hexsha[:7]}")
+print(f"Data repo '{get_repo_name(repo)}' @ {repo.commit().hexsha[:7]}")
 print(f"dimcat version {dc.__version__}")
 print(f"ms3 version {ms3.__version__}")
 ```
@@ -113,8 +109,10 @@ corpus_name_colors = {corpus_names[corp]: color for corp, color in corpus_colors
 This section relies on the dataset's metadata.
 
 ```{code-cell} ipython3
-print(f"Composition dates range from {all_metadata.composed_start.min()} {all_metadata.composed_start.idxmin()} "
-      f"to {all_metadata.composed_end.max()} {all_metadata.composed_end.idxmax()}.")
+valid_composed_start = pd.to_numeric(all_metadata.composed_start, errors='coerce')
+valid_composed_end = pd.to_numeric(all_metadata.composed_end, errors='coerce')
+print(f"Composition dates range from {int(valid_composed_start.min())} {valid_composed_start.idxmin()} "
+      f"to {int(valid_composed_end.max())} {valid_composed_end.idxmax()}.")
 ```
 
 ### Mean composition years per corpus