Skip to content

Commit 355a563

Browse files
MartinOtterMartinOtter
committed
Resources file updated
1 parent 791cc98 commit 355a563

File tree

2 files changed

+51
-26
lines changed

2 files changed

+51
-26
lines changed

‎docs/resources/examples/fileIO/VariousTypes_compact.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"_class":"SignalTable","time":{"_class":"Var","values":[0.0,0.1,0.2,0.3,0.4,0.5],"unit":"s","independent":true},"load.r":{"_class":"Var","values":{"_class":"Array","eltype":"Float64","size":[6,3],"values":[0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203,1.0,0.9950041652780258,0.9800665778412416,0.955336489125606,0.9210609940028851,0.8775825618903728,0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203]},"unit":"m"},"motor.angle":{"_class":"Var","values":[0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203],"unit":"rad","state":true,"der":"motor.w"},"motor.w":{"_class":"Var","values":[1.0,0.9950041652780258,0.9800665778412416,0.955336489125606,0.9210609940028851,0.8775825618903728],"unit":"rad/s"},"motor.w_ref":{"_class":"Var","values":{"_class":"Array","eltype":"Float64","size":[6,2],"values":[0.0,0.08985007498214534,0.1788023977155551,0.2659681859952056,0.35047650807778546,0.4314829847437827,0.9,0.8955037487502232,0.8820599200571175,0.8598028402130454,0.8289548946025966,0.7898243057013355]},"unit":["rad","1/s"],"info":"Reference angle and speed"},"wm":{"_class":"Var","values":[1.0,0.9950041652780258,0.9800665778412416,0.955336489125606,0.9210609940028851,0.8775825618903728],"unit":"rad/s","alias":"motor.w"},"ref.clock":{"_class":"Var","values":[true,null,null,true,null,null],"variability":"clock"},"motor.w_c":{"_class":"Var","values":[0.6,null,null,0.8,null,null],"variability":"clocked","clock":"ref.clock"},"motor.inertia":{"_class":"Par","value":{"_class":"Number","type":"Float32","value":0.02},"unit":"kg*m/s^2"},"motor.data":{"_class":"Par","value":"resources/motorMap.json"},"attributes":{"_class":"Par","info":"This is a test signal table"}}
1+
{"_class":"SignalTable","_classVersion":"0.3.5","time":{"_class":"Var","values":[0.0,0.1,0.2,0.3,0.4,0.5],"unit":"s","independent":true},"load.r":{"_class":"Var","values":{"_class":"Array","eltype":"Float64","size":[6,3],"layout":"column-major","values":[0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203,1.0,0.9950041652780258,0.9800665778412416,0.955336489125606,0.9210609940028851,0.8775825618903728,0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203]},"unit":"m"},"motor.angle":{"_class":"Var","values":[0.0,0.09983341664682815,0.19866933079506122,0.29552020666133955,0.3894183423086505,0.479425538604203],"unit":"rad","state":true,"der":"motor.w"},"motor.w":{"_class":"Var","values":[1.0,0.9950041652780258,0.9800665778412416,0.955336489125606,0.9210609940028851,0.8775825618903728],"unit":"rad/s","state":true,"start":{"_class":"Number","unit":"rad*s^-1","type":"Float64","value":1.0}},"motor.w_ref":{"_class":"Var","values":{"_class":"Array","eltype":"Float64","size":[6,2],"layout":"column-major","values":[0.0,0.08985007498214534,0.1788023977155551,0.2659681859952056,0.35047650807778546,0.4314829847437827,0.9,0.8955037487502232,0.8820599200571175,0.8598028402130454,0.8289548946025966,0.7898243057013355]},"unit":["rad","1/s"],"info":"Reference angle and speed"},"wm":{"_class":"Var","unit":"rad/s","state":true,"start":{"_class":"Number","unit":"rad*s^-1","type":"Float64","value":1.0},"alias":"motor.w"},"ref.clock":{"_class":"Var","values":{"_class":"Array","eltype":"Union{Missing, Bool}","size":[6],"layout":"column-major","values":[true,null,null,true,null,null]},"variability":"clock"},"motor.w_c":{"_class":"Var","values":{"_class":"Array","eltype":"Union{Missing, Float64}","size":[6],"layout":"column-major","values":[0.6,null,null,0.8,null,null]},"variability":"clocked","clock":"ref.clock"},"motor.inertia":{"_class":"Par","value":{"_class":"Number","type":"Float32","value":0.02},"unit":"kg*m/s^2"},"motor.data":{"_class":"Par","value":"resources/motorMap.json"},"attributes":{"_class":"Par","info":"This is a test signal table"}}

‎docs/resources/examples/fileIO/VariousTypes_prettyPrint.json‎

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"_class": "SignalTable",
3+
"_classVersion": "0.3.5",
34
"time": {
45
"_class": "Var",
56
"values": [
@@ -22,6 +23,7 @@
2223
6,
2324
3
2425
],
26+
"layout": "column-major",
2527
"values": [
2628
0.0,
2729
0.09983341664682815,
@@ -69,7 +71,14 @@
6971
0.9210609940028851,
7072
0.8775825618903728
7173
],
72-
"unit": "rad/s"
74+
"unit": "rad/s",
75+
"state": true,
76+
"start": {
77+
"_class": "Number",
78+
"unit": "rad*s^-1",
79+
"type": "Float64",
80+
"value": 1.0
81+
}
7382
},
7483
"motor.w_ref": {
7584
"_class": "Var",
@@ -80,6 +89,7 @@
8089
6,
8190
2
8291
],
92+
"layout": "column-major",
8393
"values": [
8494
0.0,
8595
0.08985007498214534,
@@ -103,39 +113,54 @@
103113
},
104114
"wm": {
105115
"_class": "Var",
106-
"values": [
107-
1.0,
108-
0.9950041652780258,
109-
0.9800665778412416,
110-
0.955336489125606,
111-
0.9210609940028851,
112-
0.8775825618903728
113-
],
114116
"unit": "rad/s",
117+
"state": true,
118+
"start": {
119+
"_class": "Number",
120+
"unit": "rad*s^-1",
121+
"type": "Float64",
122+
"value": 1.0
123+
},
115124
"alias": "motor.w"
116125
},
117126
"ref.clock": {
118127
"_class": "Var",
119-
"values": [
120-
true,
121-
null,
122-
null,
123-
true,
124-
null,
125-
null
126-
],
128+
"values": {
129+
"_class": "Array",
130+
"eltype": "Union{Missing, Bool}",
131+
"size": [
132+
6
133+
],
134+
"layout": "column-major",
135+
"values": [
136+
true,
137+
null,
138+
null,
139+
true,
140+
null,
141+
null
142+
]
143+
},
127144
"variability": "clock"
128145
},
129146
"motor.w_c": {
130147
"_class": "Var",
131-
"values": [
132-
0.6,
133-
null,
134-
null,
135-
0.8,
136-
null,
137-
null
138-
],
148+
"values": {
149+
"_class": "Array",
150+
"eltype": "Union{Missing, Float64}",
151+
"size": [
152+
6
153+
],
154+
"layout": "column-major",
155+
"values": [
156+
0.6,
157+
null,
158+
null,
159+
0.8,
160+
null,
161+
null
162+
]
163+
},
139164
"variability": "clocked",
140165
"clock": "ref.clock"
141166
},

0 commit comments

Comments
 (0)