Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds conversion of DCML harmony labels to Dezrann format #102

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open

Adds conversion of DCML harmony labels to Dezrann format #102

wants to merge 46 commits into from

Commits on Sep 11, 2023

  1. end-of-day commig of dezrann.py 

    collab with Louis Couturier
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    7b8f70e View commit details
    Browse the repository at this point in the history

  2. add 'origin' argument to handle 'layers' attributes in Dezrann labels

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0851ce2 View commit details
    Browse the repository at this point in the history

  3. makes the new argument 'origin' a str|Tuple[str] (lists should be avo… 

    …ided as default arguments)
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d395db5 View commit details
    Browse the repository at this point in the history

  4. corrects output annotation

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    62682e1 View commit details
    Browse the repository at this point in the history

  5. adds CLI skeleton

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    14148c1 View commit details
    Browse the repository at this point in the history

  6. adds import and corrects positional argument

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    a2b40a3 View commit details
    Browse the repository at this point in the history

  7. streamlines CLI arguments and suggests defaults

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    8775778 View commit details
    Browse the repository at this point in the history

  8. work in progress: CLI + line layout

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    ee7e560 View commit details
    Browse the repository at this point in the history

  9. end-of-day commit after collab session LC & JH

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    9095d0e View commit details
    Browse the repository at this point in the history

  10. refines commandline interface with docstrings and better argument tre… 

    …atment; enables deactivating the default layers by passing 0
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    6ec8cd2 View commit details
    Browse the repository at this point in the history

  11. this version converts raw labels, independent of the given line argum… 

    …ents
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    58b2cca View commit details
    Browse the repository at this point in the history

  12. adds to transform_df() the algorithm that copies the preceding label … 

    …onto beat 1 of each alternative ending (volta); also prepares the function for creating labels pertaining to the various layers
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d14f9ca View commit details
    Browse the repository at this point in the history

  13. integrates calls to transform_df with the current logic within genera… 

    …te_dez()
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    aefeb9b View commit details
    Browse the repository at this point in the history

  14. link DCML labels to final Dezrann labels and layout

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0ffd23a View commit details
    Browse the repository at this point in the history

  15. fix label_type naming typo

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    6a9d2e4 View commit details
    Browse the repository at this point in the history

  16. remove fixed manual post-processing steps (NaN durations and handling… 

    … start=0.)
    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    c12c4cf View commit details
    Browse the repository at this point in the history

  17. add safe conversion of quarterbeats

    @pythouille @johentsch
    pythouille authored and johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d9c6d0c View commit details
    Browse the repository at this point in the history

  18. more error handling

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    3c0c6d1 View commit details
    Browse the repository at this point in the history

  19. renames transform_df() => dcml_labels2dicts()

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    b8b0578 View commit details
    Browse the repository at this point in the history

  20. improves type annotations & docstrings

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    455f106 View commit details
    Browse the repository at this point in the history

  21. replaces simple tests by new_tests/test_dezrann.py

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    c567df6 View commit details
    Browse the repository at this point in the history

  22. factors out generate_dez_from_dfs()

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    3fafa71 View commit details
    Browse the repository at this point in the history

  23. generate_dez() and generate_dez_from_dfs() return boolean and also ac… 

    …cept numerical arguments for Dezrann layers
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    683908b View commit details
    Browse the repository at this point in the history

  24. extends test_dcml2dez() so that the number of written .dez labels cor… 

    …respond to the original annotation file
    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    10e1ef0 View commit details
    Browse the repository at this point in the history

  25. adds additional unittest

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    487242a View commit details
    Browse the repository at this point in the history

  26. pre-commit run --all-files

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    f95799e View commit details
    Browse the repository at this point in the history

  27. factors out test_dezrann.py into folder dedicated to tests on Mozart

    @johentsch
    johentsch committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    7fc7733 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. add measure map file with docstring

    @pythouille
    pythouille committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    45cdf71 View commit details
    Browse the repository at this point in the history

  2. add main measure map generation function

    @pythouille
    pythouille committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    48ac790 View commit details
    Browse the repository at this point in the history

  3. add full_info mode, with all keywords

    @pythouille
    pythouille committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    80a0b89 View commit details
    Browse the repository at this point in the history

  4. improve compressed mode

    @pythouille
    pythouille committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    5ae3288 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. computes quarterbeats_all_endings only if not present already

    @johentsch
    johentsch committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    341c610 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge branch 'main' into dezrann_rebased 

    # Conflicts:
#	src/ms3/annotations.py
    @johentsch
    johentsch committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    3ad8bfa View commit details
    Browse the repository at this point in the history

  2. adds review_cmd to debugging.py

    @johentsch
    johentsch committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    41e48b9 View commit details
    Browse the repository at this point in the history

  3. resolves #99

    @johentsch
    johentsch committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    2ae5d72 View commit details
    Browse the repository at this point in the history

  4. enables extracting measure maps using ms3 extract -MM

    @johentsch
    johentsch committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e31c2fc View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. changes MeasureMap suffix to measuremap.json

    @johentsch
    johentsch committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    632364d View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. moves measures2measure_map() to ms3.transformations

    @johentsch
    johentsch committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a179bb2 View commit details
    Browse the repository at this point in the history

  2. has MeasureMap fields start/end_repeat default to False

    @johentsch
    johentsch committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    5c72932 View commit details
    Browse the repository at this point in the history

  3. writes measuremap.json with indent=2

    @johentsch
    johentsch committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    ead673f View commit details
    Browse the repository at this point in the history

  4. corrects time-signature => time_signature

    @johentsch
    johentsch committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    cf1c16f View commit details
    Browse the repository at this point in the history

  5. prevents panda.to_json's strange escaping of characters

    @johentsch
    johentsch committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    b0d50f7 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. fix file formatting and keywords names

    @pythouille
    pythouille committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    2e9f53c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dezrann_rebased' of https://github.com/johentsch/ms3 in… 

    …to dezrann_rebased
    @pythouille
    pythouille committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    efc2af9 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. changes suffix .measuremap.json => .mm.json

    @johentsch
    johentsch committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    9ddaf22 View commit details
    Browse the repository at this point in the history

  2. makes MeasureMaps fully verbose and corrects the order of fields

    @johentsch
    johentsch committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    dbec962 View commit details
    Browse the repository at this point in the history