Skip to content

Commit b469752

Browse files
douwedouwe
committed
update schema and guide to enable atomicclass vectors
1 parent 9cd9c1b commit b469752

15 files changed

+339
-261
lines changed

‎data-raw/_obsolete_guide_competition_1_0_source.yml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
guide.version: '1.0'
2+
template.name: competition
3+
template.min.version: '9.3'
4+
template.max.version: ~
5+
plate.format: 96
6+
locations:
7+
- sheet: description
8+
type: cells
9+
varname: .template
10+
translate: false
11+
variables:
12+
- name: version
13+
cell: B2
14+
- sheet: description
15+
type: keyvalue
16+
translate: true
17+
varname: metadata
18+
ranges:
19+
- A10:B14
20+
- A16:B16
21+
- A18:B18
22+
- A20:B20
23+
- A24:B25
24+
- sheet: description
25+
type: keyvalue
26+
translate: true
27+
atomicclass: numeric
28+
varname: metadata
29+
ranges:
30+
- A17:B17
31+
- A19:B19
32+
- A21:B21
33+
- sheet: description
34+
type: keyvalue
35+
translate: true
36+
atomicclass: date
37+
varname: metadata
38+
ranges:
39+
- A15:B15
40+
- sheet: _data
41+
type: platedata
42+
translate: false
43+
varname: plate
44+
ranges:
45+
- A1:M9
46+
- A11:M19
47+
- A21:M29
48+
- A31:M39
49+
- A41:M49
50+
- A51:M59
51+
- A61:M69
52+
- A71:M79
53+
- A81:M89
54+
- A91:M99
55+
- sheet: _data
56+
type: table
57+
translate: false
58+
varname: rejections
59+
ranges:
60+
- A101:B111
61+
- sheet: _parameters
62+
type: keyvalue
63+
translate: false
64+
varname: parameters
65+
atomicclass: numeric
66+
ranges:
67+
- A24:B24
68+
- A27:B28
69+
- A31:B32
70+
- A35:B36
71+
- sheet: _parameters
72+
type: keyvalue
73+
translate: false
74+
varname: parameters
75+
ranges:
76+
- A39:B39
77+
- sheet: concentration response
78+
type: table
79+
translate: false
80+
varname: userresults
81+
atomicclass: numeric
82+
ranges:
83+
- J3:M5
84+
- sheet: BGfluo
85+
type: cells
86+
varname: userchecks
87+
translate: false
88+
atomicclass: numeric
89+
variables:
90+
- name: spread.itm1
91+
cell: G6
92+
- name: spread.itm2
93+
cell: G33
94+
- sheet: "plate + experiment control"
95+
type: cells
96+
varname: userresults
97+
translate: false
98+
variables:
99+
- name: rfu.rc.ref
100+
cell: C27
101+
- name: rfu.t4.ref
102+
cell: C28
103+
translations:
104+
- long: Version
105+
short: template.version
106+
- long: Template Name
107+
short: template.name
108+
- long: Study identifier
109+
short: studyID
110+
- long: Experiment identifier
111+
short: exptID
112+
- long: Plate identifier
113+
short: plateID
114+
- long: Run identifier
115+
short: runID
116+
- long: Instrument identifier
117+
short: instrID
118+
- long: Experimenter name
119+
short: experimenter
120+
- long: Date of experiment
121+
short: date
122+
- long: Laboratory identifier
123+
short: labID
124+
- long: Temperature (°C)
125+
short: temp
126+
- long: Item 1
127+
short: itm1ID
128+
- long: Molar mass 1
129+
short: itm1Mw
130+
- long: Run identifier 1
131+
short: run1ID
132+
- long: Item 2
133+
short: itm2ID
134+
- long: Molar mass 2
135+
short: itm2Mw
136+
- long: Run identifier 2
137+
short: run2ID

‎data-raw/excelguide_schema.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@
9999
"pattern": "^[A-Z]+\\d+(:[A-Z]\\d+)?$"
100100
}
101101
},
102-
"atomicclass": { "$ref": "#/definitions/atomicclass" }
102+
"atomicclass": {
103+
"anyOf": [
104+
{ "$ref": "#/definitions/atomicclass" },
105+
{ "type": "array", "items": { "$ref": "#/definitions/atomicclass" } }
106+
]
107+
}
103108
}
104109
},
105110
"celllocation" :{

‎data-raw/guide_competition_1_0_source.yml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,25 @@ locations:
1414
- sheet: description
1515
type: keyvalue
1616
translate: true
17+
atomicclass:
18+
- character
19+
- character
20+
- character
21+
- character
22+
- character
23+
- date
24+
- character
25+
- numeric
26+
- character
27+
- numeric
28+
- character
29+
- numeric
30+
- character
31+
- character
1732
varname: metadata
1833
ranges:
19-
- A10:B14
20-
- A16:B16
21-
- A18:B18
22-
- A20:B20
34+
- A10:B21
2335
- A24:B25
24-
- sheet: description
25-
type: keyvalue
26-
translate: true
27-
atomicclass: numeric
28-
varname: metadata
29-
ranges:
30-
- A17:B17
31-
- A19:B19
32-
- A21:B21
33-
- sheet: description
34-
type: keyvalue
35-
translate: true
36-
atomicclass: date
37-
varname: metadata
38-
ranges:
39-
- A15:B15
4036
- sheet: _data
4137
type: platedata
4238
translate: false

‎data-raw/schema_tests/invalid_atomicclass.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,14 @@ locations:
1111
variables:
1212
- name: version
1313
cell: B2
14-
- factor
1514
- sheet: description
1615
type: keyvalue
1716
translate: true
18-
atomicclass: numeric
19-
varname: metadata
20-
ranges:
21-
- A17:B17
22-
- A19:B19
23-
- A21:B21
24-
- sheet: description
25-
type: keyvalue
26-
translate: true
27-
atomicclass: date
17+
atomicclass: factor
2818
varname: metadata
2919
ranges:
30-
- A15:B15
20+
- A10:B21
21+
- A24:B25
3122
- sheet: _data
3223
type: platedata
3324
translate: false

‎data-raw/schema_tests/invalid_plate_format.yml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,25 @@ locations:
1414
- sheet: description
1515
type: keyvalue
1616
translate: true
17+
atomicclass:
18+
- character
19+
- character
20+
- character
21+
- character
22+
- character
23+
- date
24+
- character
25+
- numeric
26+
- character
27+
- numeric
28+
- character
29+
- numeric
30+
- character
31+
- character
1732
varname: metadata
1833
ranges:
19-
- A10:B14
20-
- A16:B16
21-
- A18:B18
22-
- A20:B20
34+
- A10:B21
2335
- A24:B25
24-
- sheet: description
25-
type: keyvalue
26-
translate: true
27-
atomicclass: numeric
28-
varname: metadata
29-
ranges:
30-
- A17:B17
31-
- A19:B19
32-
- A21:B21
33-
- sheet: description
34-
type: keyvalue
35-
translate: true
36-
atomicclass: date
37-
varname: metadata
38-
ranges:
39-
- A15:B15
4036
- sheet: _data
4137
type: platedata
4238
translate: false

‎data-raw/schema_tests/invalid_type.yml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,25 @@ locations:
1414
- sheet: description
1515
type: invalidtype
1616
translate: true
17+
atomicclass:
18+
- character
19+
- character
20+
- character
21+
- character
22+
- character
23+
- date
24+
- character
25+
- numeric
26+
- character
27+
- numeric
28+
- character
29+
- numeric
30+
- character
31+
- character
1732
varname: metadata
1833
ranges:
19-
- A10:B14
20-
- A16:B16
21-
- A18:B18
22-
- A20:B20
34+
- A10:B21
2335
- A24:B25
24-
- sheet: description
25-
type: keyvalue
26-
translate: true
27-
atomicclass: numeric
28-
varname: metadata
29-
ranges:
30-
- A17:B17
31-
- A19:B19
32-
- A21:B21
33-
- sheet: description
34-
type: keyvalue
35-
translate: true
36-
atomicclass: date
37-
varname: metadata
38-
ranges:
39-
- A15:B15
4036
- sheet: _data
4137
type: platedata
4238
translate: false

‎data-raw/schema_tests/maximal_version.yml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,25 @@ locations:
1414
- sheet: description
1515
type: keyvalue
1616
translate: true
17+
atomicclass:
18+
- character
19+
- character
20+
- character
21+
- character
22+
- character
23+
- date
24+
- character
25+
- numeric
26+
- character
27+
- numeric
28+
- character
29+
- numeric
30+
- character
31+
- character
1732
varname: metadata
1833
ranges:
19-
- A10:B14
20-
- A16:B16
21-
- A18:B18
22-
- A20:B20
34+
- A10:B21
2335
- A24:B25
24-
- sheet: description
25-
type: keyvalue
26-
translate: true
27-
atomicclass: numeric
28-
varname: metadata
29-
ranges:
30-
- A17:B17
31-
- A19:B19
32-
- A21:B21
33-
- sheet: description
34-
type: keyvalue
35-
translate: true
36-
atomicclass: date
37-
varname: metadata
38-
ranges:
39-
- A15:B15
4036
- sheet: _data
4137
type: platedata
4238
translate: false

0 commit comments

Comments
 (0)