Skip to content

Reorganizing data collections. #66

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

Merged
napulen merged 1 commit into from
Jun 14, 2022
Merged

Reorganizing data collections. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AugmentedNet/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from argparse import ArgumentParser

from . import models
from .common import availableCollections
from .data import available_collections as availableCollections
from .dataset_npz_generator import __doc__ as npz_description
from .dataset_tsv_generator import __doc__ as tsv_description
from .train import __doc__ as train_description
Expand Down Expand Up @@ -112,7 +112,7 @@ def npz(is_parent_parser=False):
parser = ArgumentParser(description=npz_description, parents=parents)
parser.add_argument(
"--collections",
choices=availableCollections(),
choices=list(availableCollections.keys()),
nargs="+",
help="Include training files from a specific corpus/collection.",
)
Expand Down Expand Up @@ -159,7 +159,7 @@ def npz(is_parent_parser=False):
)
parser.add_argument(
"--testCollections",
choices=availableCollections(),
choices=list(availableCollections.keys()),
nargs="+",
help="Include test files from a specific corpus/collection.",
)
Expand Down
1,817 changes: 8 additions & 1,809 deletions AugmentedNet/common.py
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions AugmentedNet/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from . import abc_dcml, bps, haydnsun, tavern, wir, wirwtc

available_collections = {
"abc": abc_dcml,
"bps": bps,
"haydnop20": haydnsun,
"tavern": tavern,
"wir": wir,
"wirwtc": wirwtc,
}
361 changes: 361 additions & 0 deletions AugmentedNet/data/abc_dcml.py
View file
Open in desktop

Large diffs are not rendered by default.

171 changes: 171 additions & 0 deletions AugmentedNet/data/bps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
annotation_score_duples = {
"bps-01-op002-no1-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op002_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_01_01.mxl",
),
"bps-02-op002-no2-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op002_No2/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_02_01.mxl",
),
"bps-03-op002-no3-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op002_No3/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_03_01.mxl",
),
"bps-04-op007-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op007/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_04_01.mxl",
),
"bps-05-op010-no1-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op010_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_05_01.mxl",
),
"bps-06-op010-no2-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op010_No2/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_06_01.mxl",
),
"bps-07-op010-no3-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op010_No3/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_07_01.mxl",
),
"bps-08-op013-pathetique-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op013(Pathetique)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_08_01.mxl",
),
"bps-09-op014-no1-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op014_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_09_01.mxl",
),
"bps-10-op014-no2-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op014_No2/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_10_01.mxl",
),
"bps-11-op022-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op022/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_11_01.mxl",
),
"bps-12-op026-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op026/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_12_01.mxl",
),
"bps-13-op027-no1-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op027_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_13_01.mxl",
),
"bps-14-op027-no2-moonlight-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op027_No2(Moonlight)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_14_01.mxl",
),
"bps-15-op028-pastorale-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op028(Pastorale)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_15_01.mxl",
),
"bps-16-op031-no1-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op031_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_16_01.mxl",
),
"bps-17-op031-no2-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op031_No2/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_17_01.mxl",
),
"bps-18-op031-no3-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op031_No3/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_18_01.mxl",
),
"bps-19-op049-no1-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op049_No1/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_19_01.mxl",
),
"bps-20-op049-no2-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op049_No2/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_20_01.mxl",
),
"bps-21-op053-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op053/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_21_01.mxl",
),
"bps-22-op054-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op054/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_22_01.mxl",
),
"bps-23-op057-appassionata-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op057(Appassionata)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_23_01.mxl",
),
"bps-24-op078-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op078/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_24_01.mxl",
),
"bps-25-op079-sonatina-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op079(Sonatina)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_25_01.mxl",
),
"bps-26-op081a-les-adieux-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op081a(Les_Adieux)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_26_01.mxl",
),
"bps-27-op090-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op090/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_27_01.mxl",
),
"bps-28-op101-1": (
"rawdata/When-in-Rome/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op101/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_28_01.mxl",
),
"bps-29-op106-hammerklavier-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op106(Hammerklavier)/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_29_01.mxl",
),
"bps-30-op109-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op109/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_30_01.mxl",
),
"bps-31-op110-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op110/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_31_01.mxl",
),
"bps-32-op111-1": (
"rawdata/corrections/WiR/Corpus/Piano_Sonatas/Beethoven,_Ludwig_van/Op111/1/analysis.txt",
"rawdata/functional-harmony-micchi/data/BPS/scores/bps_32_01.mxl",
),
}

splits = {
"training": [
"bps-02-op002-no2-1",
"bps-03-op002-no3-1",
"bps-04-op007-1",
"bps-05-op010-no1-1",
"bps-09-op014-no1-1",
"bps-11-op022-1",
"bps-12-op026-1",
"bps-13-op027-no1-1",
"bps-17-op031-no2-1",
"bps-18-op031-no3-1",
"bps-21-op053-1",
"bps-22-op054-1",
"bps-24-op078-1",
"bps-27-op090-1",
"bps-28-op101-1",
"bps-30-op109-1",
"bps-31-op110-1",
"bps-32-op111-1",
],
"validation": [
"bps-08-op013-pathetique-1",
"bps-19-op049-no1-1",
"bps-29-op106-hammerklavier-1",
"bps-16-op031-no1-1",
"bps-26-op081a-les-adieux-1",
"bps-06-op010-no2-1",
"bps-20-op049-no2-1",
],
"test": [
"bps-01-op002-no1-1",
"bps-14-op027-no2-moonlight-1",
"bps-23-op057-appassionata-1",
"bps-15-op028-pastorale-1",
"bps-10-op014-no2-1",
"bps-25-op079-sonatina-1",
"bps-07-op010-no3-1",
],
}
131 changes: 131 additions & 0 deletions AugmentedNet/data/haydnsun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
annotation_score_duples = {
"haydnop20-no1-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No1/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/1/i/op20n1-01.krn",
),
"haydnop20-no1-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No1/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/1/ii/op20n1-02.krn",
),
"haydnop20-no1-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No1/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/1/iii/op20n1-03.krn",
),
"haydnop20-no1-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No1/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/1/iv/op20n1-04.krn",
),
"haydnop20-no2-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No2/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/2/i/op20n2-01.krn",
),
"haydnop20-no2-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No2/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/2/ii/op20n2-02.krn",
),
"haydnop20-no2-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No2/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/2/iii/op20n2-03.krn",
),
"haydnop20-no2-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No2/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/2/iv/op20n2-04.krn",
),
"haydnop20-no3-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No3/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/3/i/op20n3-01.krn",
),
"haydnop20-no3-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No3/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/3/ii/op20n3-02.krn",
),
"haydnop20-no3-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No3/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/3/iii/op20n3-03.krn",
),
"haydnop20-no3-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No3/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/3/iv/op20n3-04.krn",
),
"haydnop20-no4-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No4/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/4/i/op20n4-01.krn",
),
"haydnop20-no4-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No4/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/4/ii/op20n4-02.krn",
),
"haydnop20-no4-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No4/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/4/iii/op20n4-03.krn",
),
"haydnop20-no4-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No4/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/4/iv/op20n4-04.krn",
),
"haydnop20-no5-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No5/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/5/i/op20n5-01.krn",
),
"haydnop20-no5-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No5/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/5/ii/op20n5-02.krn",
),
"haydnop20-no5-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No5/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/5/iii/op20n5-03.krn",
),
"haydnop20-no5-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No5/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/5/iv/op20n5-04.krn",
),
"haydnop20-no6-1": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No6/1/analysis.txt",
"rawdata/haydn_op20_harm/op20/6/i/op20n6-01.krn",
),
"haydnop20-no6-2": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No6/2/analysis.txt",
"rawdata/haydn_op20_harm/op20/6/ii/op20n6-02.krn",
),
"haydnop20-no6-3": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No6/3/analysis.txt",
"rawdata/haydn_op20_harm/op20/6/iii/op20n6-03.krn",
),
"haydnop20-no6-4": (
"rawdata/When-in-Rome/Corpus/Quartets/Haydn,_Franz_Joseph/Op20_No6/4/analysis.txt",
"rawdata/haydn_op20_harm/op20/6/iv/op20n6-04.krn",
),
}

splits = {
"training": [
"haydnop20-no6-3",
"haydnop20-no1-1",
"haydnop20-no4-1",
"haydnop20-no4-3",
"haydnop20-no1-3",
"haydnop20-no6-2",
"haydnop20-no3-1",
"haydnop20-no5-1",
"haydnop20-no1-4",
"haydnop20-no2-3",
"haydnop20-no5-4",
"haydnop20-no3-2",
"haydnop20-no4-4",
"haydnop20-no2-1",
"haydnop20-no4-2",
"haydnop20-no6-1",
],
"validation": [
"haydnop20-no1-2",
"haydnop20-no2-4",
"haydnop20-no3-3",
"haydnop20-no5-2",
],
"test": [
"haydnop20-no2-2",
"haydnop20-no3-4",
"haydnop20-no5-3",
"haydnop20-no6-4",
],
}
Loading