Merge pull request #469 from CPJKU/consistent_channel

Consistent MIDI channel default value of 0

Author: CarlosCancino-Chacon

partitura/io/exportmidi.py

@@ -36,34 +36,34 @@ def map_to_track_channel(note_keys, mode):
         if mode == 0:
             trk = tr_helper.setdefault(p, len(tr_helper))
             ch1 = ch_helper.setdefault(p, {})
-            ch2 = ch1.setdefault(v, len(ch1) + 1)
+            ch2 = ch1.setdefault(v, len(ch1))
             track[(pg, p, v)] = trk
             channel[(pg, p, v)] = ch2
         elif mode == 1:
             trk = tr_helper.setdefault(pg, len(tr_helper))
             ch1 = ch_helper.setdefault(pg, {})
-            ch2 = ch1.setdefault(p, len(ch1) + 1)
+            ch2 = ch1.setdefault(p, len(ch1))
             track[(pg, p, v)] = trk
             channel[(pg, p, v)] = ch2
         elif mode == 2:
             track[(pg, p, v)] = 0
-            ch = ch_helper.setdefault(p, len(ch_helper) + 1)
+            ch = ch_helper.setdefault(p, len(ch_helper))
             channel[(pg, p, v)] = ch
         elif mode == 3:
             trk = tr_helper.setdefault(p, len(tr_helper))
             track[(pg, p, v)] = trk
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         elif mode == 4:
             track[(pg, p, v)] = 0
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         elif mode == 5:
             trk = tr_helper.setdefault((p, v), len(tr_helper))
             track[(pg, p, v)] = trk
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         else:
             raise Exception("unsupported part/voice assign mode {}".format(mode))
 
-    result = dict((k, (track.get(k, 0), channel.get(k, 1))) for k in note_keys)
+    result = dict((k, (track.get(k, 0), channel.get(k, 0))) for k in note_keys)
     # for (pg, p, voice), v in result.items():
     #     pgn = pg.group_name if hasattr(pg, 'group_name') else pg.id
     #     print(pgn, p.id, voice)
@@ -177,7 +177,7 @@ def save_performance_midi(
 
         for c in performed_part.controls:
             track = c.get("track", 0)
-            ch = c.get("channel", 1)
+            ch = c.get("channel", 0)
             t = int(np.round(10**6 * ppq * c["time"] / mpq))
             track_events[track][t].append(
                 Message(
@@ -190,7 +190,7 @@ def save_performance_midi(
 
         for n in performed_part.notes:
             track = n.get("track", 0)
-            ch = n.get("channel", 1)
+            ch = n.get("channel", 0)
             t_on = int(np.round(10**6 * ppq * n["note_on"] / mpq))
             t_off = int(np.round(10**6 * ppq * n["note_off"] / mpq))
             vel = n.get("velocity", default_velocity)
@@ -203,7 +203,7 @@ def save_performance_midi(
 
         for p in performed_part.programs:
             track = p.get("track", 0)
-            ch = p.get("channel", 1)
+            ch = p.get("channel", 0)
             t = int(np.round(10**6 * ppq * p["time"] / mpq))
             track_events[track][t].append(
                 Message("program_change", program=int(p["program"]), channel=ch)
@@ -215,11 +215,11 @@ def save_performance_midi(
                 list(
                     set(
                         [
-                            (c.get("channel", 1), c.get("track", 0))
+                            (c.get("channel", 0), c.get("track", 0))
                             for c in performed_part.controls
                         ]
                         + [
-                            (n.get("channel", 1), n.get("track", 0))
+                            (n.get("channel", 0), n.get("track", 0))
                             for n in performed_part.notes
                         ]
                     )

partitura/musicanalysis/performance_codec.py

@@ -672,9 +672,8 @@ def to_matched_score(
         sn_dur = sn_off - sn_on
         # hack for notes with negative durations
         n_dur = max(n["duration_sec"], 60 / 200 * 0.25)
-        pair_info = (sn_on, sn_dur, sn["pitch"], n["onset_sec"], n_dur, n["velocity"])
-        if include_score_markings:
-            pair_info += (sn["voice"].item(),)
+        pair_info = (sn_on, sn_dur, sn["pitch"], n["onset_sec"], n_dur, n["velocity"], sn["voice"].item())
+        if include_score_markings:            
             pair_info += tuple(
                 [sn[field].item() for field in sn.dtype.names if "feature" in field]
             )
@@ -688,9 +687,10 @@ def to_matched_score(
         ("p_onset", "f4"),
         ("p_duration", "f4"),
         ("velocity", "i4"),
+        ("voice", "i4")
     ]
+
     if include_score_markings and not isinstance(score, np.ndarray):
-        fields += [("voice", "i4")]
         fields += [
             (field, sn.dtype.fields[field][0])
             for field in sn.dtype.fields

partitura/musicanalysis/performance_features.py

@@ -40,6 +40,7 @@ def make_performance_features(
     alignment: list,
     feature_functions: Union[List, str],
     add_idx: bool = True,
+    include_score_markings: bool = True
 ):
     """
     Compute the performance features. This function is defined in the same
@@ -61,13 +62,15 @@ def make_performance_features(
         asynchrony_feature, articulation_feature, dynamics_feature, pedal_feature
     add_idx: bool
         add score note idx column to feature array
+    include_score_markings (bool): include dynamcis and articulation
+        markings (Optional)
 
     Returns
     -------
     performance_features : structured array
     """
     m_score, unique_onset_idxs, snote_ids = compute_matched_score(
-        score, performance, alignment
+        score, performance, alignment, include_score_markings
     )
 
     acc = []
@@ -141,6 +144,7 @@ def compute_matched_score(
     score: ScoreLike,
     performance: PerformanceLike,
     alignment: list,
+    include_score_markings = True
 ):
     """
     Compute the matched score and add the score features
@@ -153,6 +157,8 @@ def compute_matched_score(
         Performance information, can be a ppart, performance
     alignment : list
         The score--performance alignment, a list of dictionaries
+    include_score_markings (bool): include dynamcis and articulation
+        markings (Optional)
 
     Returns
     -------
@@ -161,8 +167,9 @@ def compute_matched_score(
     """
 
     m_score, snote_ids = to_matched_score(
-        score, performance, alignment, include_score_markings=True
+        score, performance, alignment, include_score_markings=include_score_markings
     )
+
     (time_params, unique_onset_idxs) = encode_tempo(
         score_onsets=m_score["onset"],
         performed_onsets=m_score["p_onset"],

partitura/performance.py

@@ -209,7 +209,7 @@ def note_array(self, *args, **kwargs) -> np.ndarray:
                     n["midi_pitch"],
                     n["velocity"],
                     n.get("track", 0),
-                    n.get("channel", 1),
+                    n.get("channel", 0),
                     n["id"],
                 )
             )
@@ -364,7 +364,7 @@ def __init__(self, pnote_dict):
             "sound_off", self["note_off"]
         )
         self.pnote_dict["track"] = self.pnote_dict.get("track", 0)
-        self.pnote_dict["channel"] = self.pnote_dict.get("channel", 1)
+        self.pnote_dict["channel"] = self.pnote_dict.get("channel", 0)
         self.pnote_dict["velocity"] = self.pnote_dict.get("velocity", 60)
         self._validate_values(pnote_dict)
         self._accepted_keys = [

tests/test_performance.py

@@ -158,7 +158,7 @@ def test_initialization(self):
 
         # Test initialization to default values
         self.assertEqual(pnote["track"], 0)
-        self.assertEqual(pnote["channel"], 1)
+        self.assertEqual(pnote["channel"], 0)
         self.assertEqual(pnote["velocity"], 60)
         self.assertEqual(pnote["sound_off"], 20)