Skip to content

Commit 95b5736

Browse files
committed
#266 Improve folder name convention
1 parent bf4e1cc commit 95b5736

File tree

88 files changed

+49
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+49
-33
lines changed

wordbank/static/json/datasets.json

+27-27
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dataset": "Norming",
55
"instrument_language": "English (American)",
66
"instrument_form": "WS",
7-
"file": "raw_data/English_WS/EnglishWS_Marchman_Norming.csv",
7+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Norming.csv",
88
"splitcol": false,
99
"norming": true,
1010
"longitudinal": false,
@@ -18,7 +18,7 @@
1818
"dataset": "Wisconsin",
1919
"instrument_language": "English (American)",
2020
"instrument_form": "WS",
21-
"file": "raw_data/English_WS/EnglishWS_Marchman_Wisconsin.csv",
21+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Wisconsin.csv",
2222
"splitcol": false,
2323
"norming": false,
2424
"longitudinal": false,
@@ -32,7 +32,7 @@
3232
"dataset": "Dallas",
3333
"instrument_language": "English (American)",
3434
"instrument_form": "WS",
35-
"file": "raw_data/English_WS/EnglishWS_Marchman_Dallas.csv",
35+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Dallas.csv",
3636
"splitcol": false,
3737
"norming": false,
3838
"longitudinal": false,
@@ -46,7 +46,7 @@
4646
"dataset": "Dallas Bilingual",
4747
"instrument_language": "English (American)",
4848
"instrument_form": "WS",
49-
"file": "raw_data/English_WS/EnglishWS_Marchman_Dallas_Bilingual.csv",
49+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Dallas_Bilingual.csv",
5050
"splitcol": false,
5151
"norming": false,
5252
"longitudinal": false,
@@ -61,7 +61,7 @@
6161
"dataset": "electronic",
6262
"instrument_language": "English (American)",
6363
"instrument_form": "WS",
64-
"file": "raw_data/English_WS/EnglishWS_Smith_electronic.csv",
64+
"file": "raw_data/English_American_WS/EnglishWS_Smith_electronic.csv",
6565
"splitcol": false,
6666
"norming": false,
6767
"longitudinal": false,
@@ -75,7 +75,7 @@
7575
"dataset": "paper",
7676
"instrument_language": "English (American)",
7777
"instrument_form": "WS",
78-
"file": "raw_data/English_WS/EnglishWS_Smith_paper.csv",
78+
"file": "raw_data/English_American_WS/EnglishWS_Smith_paper.csv",
7979
"splitcol": false,
8080
"norming": false,
8181
"longitudinal": false,
@@ -89,7 +89,7 @@
8989
"dataset": "",
9090
"instrument_language": "English (American)",
9191
"instrument_form": "WS",
92-
"file": "raw_data/English_WS/EnglishWS_Byers.csv",
92+
"file": "raw_data/English_American_WS/EnglishWS_Byers.csv",
9393
"splitcol": false,
9494
"norming": false,
9595
"longitudinal": false,
@@ -104,7 +104,7 @@
104104
"dataset": "16",
105105
"instrument_language": "English (American)",
106106
"instrument_form": "WS",
107-
"file": "raw_data/English_WS/EnglishWS_Thal_16.csv",
107+
"file": "raw_data/English_American_WS/EnglishWS_Thal_16.csv",
108108
"splitcol": false,
109109
"norming": false,
110110
"longitudinal": true,
@@ -119,7 +119,7 @@
119119
"dataset": "28",
120120
"instrument_language": "English (American)",
121121
"instrument_form": "WS",
122-
"file": "raw_data/English_WS/EnglishWS_Thal_28.csv",
122+
"file": "raw_data/English_American_WS/EnglishWS_Thal_28.csv",
123123
"splitcol": false,
124124
"norming": false,
125125
"longitudinal": true,
@@ -133,7 +133,7 @@
133133
"dataset": "Norming",
134134
"instrument_language": "English (American)",
135135
"instrument_form": "WG",
136-
"file": "raw_data/English_WG/EnglishWG_Marchman_Norming.csv",
136+
"file": "raw_data/English_American_WG/EnglishWG_Marchman_Norming.csv",
137137
"splitcol": true,
138138
"norming": true,
139139
"longitudinal": false,
@@ -147,7 +147,7 @@
147147
"dataset": "",
148148
"instrument_language": "English (American)",
149149
"instrument_form": "WG",
150-
"file": "raw_data/English_WG/EnglishWG_Byers.csv",
150+
"file": "raw_data/English_American_WG/EnglishWG_Byers.csv",
151151
"splitcol": false,
152152
"norming": false,
153153
"longitudinal": false,
@@ -162,7 +162,7 @@
162162
"dataset": "13",
163163
"instrument_language": "English (American)",
164164
"instrument_form": "WG",
165-
"file": "raw_data/English_WG/EnglishWG_Thal_13.csv",
165+
"file": "raw_data/English_American_WG/EnglishWG_Thal_13.csv",
166166
"splitcol": true,
167167
"norming": false,
168168
"longitudinal": true,
@@ -177,7 +177,7 @@
177177
"dataset": "16",
178178
"instrument_language": "English (American)",
179179
"instrument_form": "WG",
180-
"file": "raw_data/English_WG/EnglishWG_Thal_16.csv",
180+
"file": "raw_data/English_American_WG/EnglishWG_Thal_16.csv",
181181
"splitcol": true,
182182
"norming": false,
183183
"longitudinal": true,
@@ -515,7 +515,7 @@
515515
"dataset": "xsface",
516516
"instrument_language": "English (American)",
517517
"instrument_form": "WG",
518-
"file": "raw_data/English_WG/EnglishWG_Frank_xsface.csv",
518+
"file": "raw_data/English_American_WG/EnglishWG_Frank_xsface.csv",
519519
"splitcol": false,
520520
"norming": false,
521521
"longitudinal": false,
@@ -799,7 +799,7 @@
799799
"dataset": "",
800800
"instrument_language": "English (Australian)",
801801
"instrument_form": "WS",
802-
"file": "raw_data/Australian_WS/AustralianWS_Kalashnikova.csv",
802+
"file": "raw_data/English_Australian_WS/AustralianWS_Kalashnikova.csv",
803803
"splitcol": false,
804804
"norming": false,
805805
"longitudinal": false,
@@ -893,7 +893,7 @@
893893
"dataset": "Outreach1",
894894
"instrument_language": "English (American)",
895895
"instrument_form": "WS",
896-
"file": "raw_data/English_WS/EnglishWS_Marchman_Outreach1.csv",
896+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Outreach1.csv",
897897
"splitcol": false,
898898
"norming": false,
899899
"longitudinal": false,
@@ -1122,7 +1122,7 @@
11221122
"dataset": "PoulinDubois_English_French_Bilingual",
11231123
"instrument_language": "English (American)",
11241124
"instrument_form": "WG",
1125-
"file": "raw_data/English_WG/EnglishWG_PoulinDubois.csv",
1125+
"file": "raw_data/English_American_WG/EnglishWG_PoulinDubois.csv",
11261126
"splitcol": false,
11271127
"norming": false,
11281128
"longitudinal": true,
@@ -1136,7 +1136,7 @@
11361136
"dataset": "PoulinDubois_English_French_Bilingual",
11371137
"instrument_language": "English (American)",
11381138
"instrument_form": "WS",
1139-
"file": "raw_data/English_WS/EnglishWS_PoulinDubois.csv",
1139+
"file": "raw_data/English_American_WS/EnglishWS_PoulinDubois.csv",
11401140
"splitcol": false,
11411141
"norming": false,
11421142
"longitudinal": true,
@@ -1178,7 +1178,7 @@
11781178
"dataset": "HDPM",
11791179
"instrument_language": "English (American)",
11801180
"instrument_form": "WS",
1181-
"file": "raw_data/English_WS/EnglishWS_Hoff_HDPM.csv",
1181+
"file": "raw_data/English_American_WS/EnglishWS_Hoff_HDPM.csv",
11821182
"splitcol": false,
11831183
"norming": false,
11841184
"longitudinal": true,
@@ -1192,7 +1192,7 @@
11921192
"dataset": "R01",
11931193
"instrument_language": "English (American)",
11941194
"instrument_form": "WS",
1195-
"file": "raw_data/English_WS/EnglishWS_Hoff_R01.csv",
1195+
"file": "raw_data/English_American_WS/EnglishWS_Hoff_R01.csv",
11961196
"splitcol": false,
11971197
"norming": false,
11981198
"longitudinal": true,
@@ -1248,7 +1248,7 @@
12481248
"dataset": "Armon-Lotem",
12491249
"instrument_language": "English (American)",
12501250
"instrument_form": "WS",
1251-
"file": "raw_data/English_WS/EnglishWS_Armon-Lotem.csv",
1251+
"file": "raw_data/English_American_WS/EnglishWS_Armon-Lotem.csv",
12521252
"splitcol": false,
12531253
"norming": false,
12541254
"longitudinal": true,
@@ -1587,7 +1587,7 @@
15871587
"dataset": "",
15881588
"instrument_language": "English (American)",
15891589
"instrument_form": "WG",
1590-
"file": "raw_data/English_WG/EnglishWG_Edgin.csv",
1590+
"file": "raw_data/English_American_WG/EnglishWG_Edgin.csv",
15911591
"splitcol": false,
15921592
"norming": false,
15931593
"longitudinal": true,
@@ -1600,7 +1600,7 @@
16001600
"dataset": "",
16011601
"instrument_language": "English (American)",
16021602
"instrument_form": "WS",
1603-
"file": "raw_data/English_WS/EnglishWS_Edgin.csv",
1603+
"file": "raw_data/English_American_WS/EnglishWS_Edgin.csv",
16041604
"splitcol": false,
16051605
"norming": false,
16061606
"longitudinal": true,
@@ -1626,7 +1626,7 @@
16261626
"dataset": "",
16271627
"instrument_language": "English (American)",
16281628
"instrument_form": "WGShort",
1629-
"file": "raw_data/English_WGShort/EnglishWGShort_Walle.csv",
1629+
"file": "raw_data/English_American_WGShort/EnglishWGShort_Walle.csv",
16301630
"splitcol": false,
16311631
"norming": false,
16321632
"longitudinal": true,
@@ -1639,7 +1639,7 @@
16391639
"dataset": "",
16401640
"instrument_language": "English (American)",
16411641
"instrument_form": "WSShort",
1642-
"file": "raw_data/English_WSShort/EnglishWSShort_Walle.csv",
1642+
"file": "raw_data/English_American_WSShort/EnglishWSShort_Walle.csv",
16431643
"splitcol": false,
16441644
"norming": false,
16451645
"longitudinal": true,
@@ -1665,7 +1665,7 @@
16651665
"dataset": "Norming2",
16661666
"instrument_language": "English (American)",
16671667
"instrument_form": "WG",
1668-
"file": "raw_data/English_WG/EnglishWG_Marchman_Norming2.csv",
1668+
"file": "raw_data/English_American_WG/EnglishWG_Marchman_Norming2.csv",
16691669
"splitcol": false,
16701670
"norming": true,
16711671
"longitudinal": false,
@@ -1679,7 +1679,7 @@
16791679
"dataset": "Norming2",
16801680
"instrument_language": "English (American)",
16811681
"instrument_form": "WS",
1682-
"file": "raw_data/English_WS/EnglishWS_Marchman_Norming2.csv",
1682+
"file": "raw_data/English_American_WS/EnglishWS_Marchman_Norming2.csv",
16831683
"splitcol": false,
16841684
"norming": true,
16851685
"longitudinal": false,

wordbank/static/json/instruments.json

+22-6
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
{
5151
"language": "English (American)",
5252
"form": "WG",
53-
"file": "raw_data/English_WG/[English_WG].csv",
53+
"file": "raw_data/English_American_WG/[English_WG].csv",
5454
"age_min": 8,
5555
"age_max": 18,
5656
"has_grammar": false
5757
},
5858
{
5959
"language": "English (American)",
6060
"form": "WS",
61-
"file": "raw_data/English_WS/[English_WS].csv",
61+
"file": "raw_data/English_American_WS/[English_WS].csv",
6262
"age_min": 16,
6363
"age_max": 30,
6464
"has_grammar": true
@@ -346,15 +346,15 @@
346346
{
347347
"language": "English (Australian)",
348348
"form": "WS",
349-
"file": "raw_data/Australian_WS/[Australian_WS].csv",
349+
"file": "raw_data/English_Australian_WS/[Australian_WS].csv",
350350
"age_min": 12,
351351
"age_max": 30,
352352
"has_grammar": true
353353
},
354354
{
355355
"language": "English (British)",
356356
"form": "Oxford CDI",
357-
"file": "raw_data/English_British_Oxford/[EnglishBritish_Oxford].csv",
357+
"file": "raw_data/English_British_Oxford/[_Oxford].csv",
358358
"age_min": 12,
359359
"age_max": 25,
360360
"has_grammar": false
@@ -455,6 +455,22 @@
455455
"age_max": 36,
456456
"has_grammar": false
457457
},
458+
{
459+
"language": "Henry Test Language",
460+
"form": "WG",
461+
"file": "raw_data/Henry_WG/[Henry_WG].csv",
462+
"age_min": 8,
463+
"age_max": 36,
464+
"has_grammar": false
465+
},
466+
{
467+
"language": "Henry Second Language",
468+
"form": "WG",
469+
"file": "raw_data/Henry_Lang_2_WG/[Henry_WG].csv",
470+
"age_min": 8,
471+
"age_max": 36,
472+
"has_grammar": false
473+
},
458474
{
459475
"language": "English (Irish)",
460476
"form": "WS",
@@ -602,15 +618,15 @@
602618
{
603619
"language": "English (American)",
604620
"form": "WSShort",
605-
"file": "raw_data/English_WSShort/[English_WSShort].csv",
621+
"file": "raw_data/English_American_WSShort/[English_WSShort].csv",
606622
"age_min": 16,
607623
"age_max": 36,
608624
"has_grammar": false
609625
},
610626
{
611627
"language": "English (American)",
612628
"form": "WGShort",
613-
"file": "raw_data/English_WGShort/[English_WGShort].csv",
629+
"file": "raw_data/English_American_WGShort/[English_WGShort].csv",
614630
"age_min": 16,
615631
"age_max": 36,
616632
"has_grammar": false

0 commit comments

Comments
 (0)