Skip to content

Commit d754141

Browse files
restenbrestenb
authored
Merge pull request #139 from open-simulation-platform/update-for-ecco
Update github pages wrt. recent XSD changes
2 parents 3be1b77 + 2273b37 commit d754141

File tree

3 files changed

+255
-70
lines changed

3 files changed

+255
-70
lines changed

‎Gemfile.lock‎

Lines changed: 66 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.1.7.5)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (8.1.1)
5+
base64
6+
bigdecimal
7+
concurrent-ruby (~> 1.0, >= 1.3.1)
8+
connection_pool (>= 2.2.5)
9+
drb
610
i18n (>= 1.6, < 2)
11+
json
12+
logger (>= 1.4.2)
713
minitest (>= 5.1)
8-
tzinfo (~> 2.0)
9-
zeitwerk (~> 2.3)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
17+
addressable (2.8.7)
18+
public_suffix (>= 2.0.2, < 7.0)
19+
base64 (0.3.0)
20+
bigdecimal (3.3.1)
1221
coffee-script (2.4.1)
1322
coffee-script-source
1423
execjs
1524
coffee-script-source (1.12.2)
1625
colorator (1.1.0)
17-
commonmarker (0.23.11)
26+
commonmarker (0.23.12)
1827
concurrent-ruby (1.3.5)
28+
connection_pool (2.5.4)
1929
csv (3.3.5)
20-
dnsruby (1.61.5)
21-
simpleidn (~> 0.1)
22-
em-websocket (0.5.2)
30+
dnsruby (1.73.1)
31+
base64 (>= 0.2)
32+
logger (~> 1.6)
33+
simpleidn (~> 0.2.1)
34+
drb (2.2.3)
35+
em-websocket (0.5.3)
2336
eventmachine (>= 0.12.9)
24-
http_parser.rb (~> 0.6.0)
25-
ethon (0.13.0)
37+
http_parser.rb (~> 0)
38+
ethon (0.15.0)
2639
ffi (>= 1.15.0)
2740
eventmachine (1.2.7)
28-
eventmachine (1.2.7-x64-mingw32)
29-
execjs (2.7.0)
30-
faraday (1.3.0)
31-
faraday-net_http (~> 1.0)
32-
multipart-post (>= 1.2, < 3)
33-
ruby2_keywords
34-
faraday-net_http (1.0.1)
35-
ffi (1.15.0)
36-
ffi (1.15.0-x64-mingw32)
41+
execjs (2.10.0)
42+
faraday (2.14.0)
43+
faraday-net_http (>= 2.0, < 3.5)
44+
json
45+
logger
46+
faraday-net_http (3.4.2)
47+
net-http (~> 0.5)
48+
ffi (1.17.2-x64-mingw-ucrt)
3749
forwardable-extended (2.6.0)
38-
gemoji (3.0.1)
50+
gemoji (4.1.0)
3951
github-pages (232)
4052
github-pages-health-check (= 1.18.2)
4153
jekyll (= 3.10.0)
@@ -88,10 +100,10 @@ GEM
88100
octokit (>= 4, < 8)
89101
public_suffix (>= 3.0, < 6.0)
90102
typhoeus (~> 1.3)
91-
html-pipeline (2.14.0)
103+
html-pipeline (2.14.3)
92104
activesupport (>= 2)
93105
nokogiri (>= 1.4)
94-
http_parser.rb (0.6.0)
106+
http_parser.rb (0.8.0)
95107
i18n (1.14.7)
96108
concurrent-ruby (~> 1.0)
97109
jekyll (3.10.0)
@@ -204,78 +216,72 @@ GEM
204216
gemoji (>= 3, < 5)
205217
html-pipeline (~> 2.2)
206218
jekyll (>= 3.0, < 5.0)
207-
just-the-docs (0.3.3)
219+
json (2.16.0)
220+
just-the-docs (0.10.1)
208221
jekyll (>= 3.8.5)
209-
jekyll-seo-tag (~> 2.0)
210-
rake (>= 12.3.1, < 13.1.0)
222+
jekyll-include-cache
223+
jekyll-seo-tag (>= 2.0)
224+
rake (>= 12.3.1)
211225
kramdown (2.4.0)
212226
rexml
213227
kramdown-parser-gfm (1.1.0)
214228
kramdown (~> 2.0)
215229
liquid (4.0.4)
216-
listen (3.5.1)
230+
listen (3.9.0)
217231
rb-fsevent (~> 0.10, >= 0.10.3)
218232
rb-inotify (~> 0.9, >= 0.9.10)
233+
logger (1.7.0)
219234
mercenary (0.3.6)
220-
mini_portile2 (2.8.9)
221235
minima (2.5.1)
222236
jekyll (>= 3.5, < 5.0)
223237
jekyll-feed (~> 0.9)
224238
jekyll-seo-tag (~> 2.1)
225-
minitest (5.25.5)
226-
multipart-post (2.1.1)
227-
nokogiri (1.18.9)
228-
mini_portile2 (~> 2.8.2)
229-
racc (~> 1.4)
230-
nokogiri (1.18.9-x86_64-linux-gnu)
239+
minitest (5.26.1)
240+
net-http (0.7.0)
241+
uri
242+
nokogiri (1.18.10-x64-mingw-ucrt)
231243
racc (~> 1.4)
232-
octokit (4.20.0)
233-
faraday (>= 0.9)
234-
sawyer (~> 0.8.0, >= 0.5.3)
244+
octokit (4.25.1)
245+
faraday (>= 1, < 3)
246+
sawyer (~> 0.9)
235247
pathutil (0.16.2)
236248
forwardable-extended (~> 2.6)
237-
public_suffix (4.0.6)
249+
public_suffix (5.1.1)
238250
racc (1.8.1)
239-
rake (13.0.3)
240-
rb-fsevent (0.10.4)
241-
rb-inotify (0.10.1)
251+
rake (13.3.1)
252+
rb-fsevent (0.11.2)
253+
rb-inotify (0.11.1)
242254
ffi (~> 1.0)
243-
rexml (3.4.2)
255+
rexml (3.4.4)
244256
rouge (3.30.0)
245-
ruby2_keywords (0.0.4)
246-
rubyzip (2.3.0)
257+
rubyzip (2.4.1)
247258
safe_yaml (1.0.5)
248259
sass (3.7.4)
249260
sass-listen (~> 4.0.0)
250261
sass-listen (4.0.0)
251262
rb-fsevent (~> 0.9, >= 0.9.4)
252263
rb-inotify (~> 0.9, >= 0.9.7)
253-
sawyer (0.8.2)
264+
sawyer (0.9.3)
254265
addressable (>= 2.3.5)
255-
faraday (> 0.8, < 2.0)
256-
simpleidn (0.2.1)
257-
unf (~> 0.1.4)
266+
faraday (>= 0.17.3, < 3)
267+
securerandom (0.4.1)
268+
simpleidn (0.2.3)
258269
terminal-table (1.8.0)
259270
unicode-display_width (~> 1.1, >= 1.1.1)
260-
typhoeus (1.4.0)
261-
ethon (>= 0.9.0)
271+
typhoeus (1.5.0)
272+
ethon (>= 0.9.0, < 0.16.0)
262273
tzinfo (2.0.6)
263274
concurrent-ruby (~> 1.0)
264-
unf (0.1.4)
265-
unf_ext
266-
unf_ext (0.0.7.7)
267-
unf_ext (0.0.7.7-x64-mingw32)
268-
unicode-display_width (1.7.0)
275+
unicode-display_width (1.8.0)
276+
uri (1.1.1)
269277
webrick (1.9.1)
270-
zeitwerk (2.7.3)
271278

272279
PLATFORMS
273-
x64-mingw32
274-
x86_64-linux
280+
x64-mingw-ucrt
275281

276282
DEPENDENCIES
277283
github-pages
278284
just-the-docs
279285

280286
BUNDLED WITH
281-
2.1.4
287+
2.7.2

‎assets/files/OspSystemStructure-0.1.1.xsd‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!-- This Source Code Form is subject to the terms of the Mozilla Public
3+
- License, v. 2.0. If a copy of the MPL was not distributed with this
4+
- file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
5+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
6+
targetNamespace="http://opensimulationplatform.com/MSMI/OSPSystemStructure"
7+
xmlns:osp="http://opensimulationplatform.com/MSMI/OSPSystemStructure"
8+
version="0.1.1">
9+
<xs:element name="OspSystemStructure">
10+
<xs:complexType>
11+
<xs:sequence>
12+
<xs:element name="StartTime" minOccurs="0" maxOccurs="1" default="0.0" type="xs:double"/>
13+
<xs:element name="EndTime" minOccurs="0" maxOccurs="1" type="xs:double"/>
14+
<xs:element name="BaseStepSize" minOccurs="0" maxOccurs="1" type="xs:double"/>
15+
<xs:element name="Algorithm" minOccurs="0" maxOccurs="1" default="fixedStep" type="xs:string"/>
16+
<xs:element name="Simulators" type="osp:simulators"/>
17+
<xs:element name="Functions" type="osp:functions" minOccurs="0"/>
18+
<xs:element name="Connections" type="osp:connections" minOccurs="0"/>
19+
<xs:element name="EccoConfiguration" type="osp:eccoconfiguration" minOccurs="0" maxOccurs="1"/>
20+
</xs:sequence>
21+
<xs:attribute name="version" type="xs:normalizedString" use="required" fixed="0.1">
22+
<xs:annotation>
23+
<xs:documentation>Version of CSE configuration format</xs:documentation>
24+
</xs:annotation>
25+
</xs:attribute>
26+
</xs:complexType>
27+
</xs:element>
28+
<xs:complexType name="eccoconfiguration">
29+
<xs:all>
30+
<xs:element name="SafetyFactor" type="xs:double"/>
31+
<xs:element name="StepSize" type="xs:double"/>
32+
<xs:element name="MinimumStepSize" type="xs:double"/>
33+
<xs:element name="MaximumStepSize" type="xs:double"/>
34+
<xs:element name="MinimumChangeRate" type="xs:double"/>
35+
<xs:element name="MaximumChangeRate" type="xs:double"/>
36+
<xs:element name="ProportionalGain" type="xs:double"/>
37+
<xs:element name="IntegralGain" type="xs:double"/>
38+
<xs:element name="RelativeTolerance" type="xs:double"/>
39+
<xs:element name="AbsoluteTolerance" type="xs:double"/>
40+
</xs:all>
41+
</xs:complexType>
42+
<xs:complexType name="connections">
43+
<xs:choice maxOccurs="unbounded">
44+
<xs:element name="VariableConnection" minOccurs="0" maxOccurs="unbounded">
45+
<xs:complexType>
46+
<xs:sequence>
47+
<xs:element name="Variable" type="osp:variableEndpoint" minOccurs="2" maxOccurs="2"/>
48+
</xs:sequence>
49+
<xs:attribute name="powerBond" use="optional" type="xs:string"/>
50+
</xs:complexType>
51+
</xs:element>
52+
<xs:element name="SignalConnection" minOccurs="0" maxOccurs="unbounded">
53+
<xs:complexType>
54+
<xs:all>
55+
<xs:element name="Variable" type="osp:variableEndpoint"/>
56+
<xs:element name="Signal" type="osp:signalEndpoint"/>
57+
</xs:all>
58+
</xs:complexType>
59+
</xs:element>
60+
<xs:element name="VariableGroupConnection" minOccurs="0" maxOccurs="unbounded">
61+
<xs:complexType>
62+
<xs:sequence>
63+
<xs:element name="VariableGroup" type="osp:variableEndpoint" minOccurs="2" maxOccurs="2"/>
64+
</xs:sequence>
65+
<xs:attribute name="powerBond" use="optional" type="xs:string"/>
66+
</xs:complexType>
67+
</xs:element>
68+
<xs:element name="SignalGroupConnection" minOccurs="0" maxOccurs="unbounded">
69+
<xs:complexType>
70+
<xs:all>
71+
<xs:element name="SignalGroup" type="osp:signalEndpoint"/>
72+
<xs:element name="VariableGroup" type="osp:variableEndpoint"/>
73+
</xs:all>
74+
</xs:complexType>
75+
</xs:element>
76+
</xs:choice>
77+
</xs:complexType>
78+
<xs:complexType name="variableEndpoint">
79+
<xs:attribute name="simulator" use="required" type="xs:string"/>
80+
<xs:attribute name="name" use="required" type="xs:string"/>
81+
<xs:attribute name="causality" type="xs:string"/>
82+
</xs:complexType>
83+
<xs:complexType name="signalEndpoint">
84+
<xs:attribute name="function" use="required" type="xs:string"/>
85+
<xs:attribute name="name" use="required" type="xs:string"/>
86+
</xs:complexType>
87+
<xs:complexType name="simulators">
88+
<xs:sequence>
89+
<xs:element name="Simulator" minOccurs="0" maxOccurs="unbounded">
90+
<xs:complexType>
91+
<xs:sequence>
92+
<xs:element name="InitialValues" minOccurs="0">
93+
<xs:complexType>
94+
<xs:sequence>
95+
<xs:element name="InitialValue" minOccurs="0" maxOccurs="unbounded">
96+
<xs:complexType>
97+
<xs:choice>
98+
<xs:element name="Real">
99+
<xs:complexType>
100+
<xs:attribute name="value" type="xs:double" use="required"/>
101+
</xs:complexType>
102+
</xs:element>
103+
<xs:element name="Integer">
104+
<xs:complexType>
105+
<xs:attribute name="value" type="xs:int" use="required"/>
106+
</xs:complexType>
107+
</xs:element>
108+
<xs:element name="Boolean">
109+
<xs:complexType>
110+
<xs:attribute name="value" type="xs:boolean" use="required"/>
111+
</xs:complexType>
112+
</xs:element>
113+
<xs:element name="String">
114+
<xs:complexType>
115+
<xs:attribute name="value" type="xs:string" use="required"/>
116+
</xs:complexType>
117+
</xs:element>
118+
</xs:choice>
119+
<xs:attribute name="variable" use="required"/>
120+
</xs:complexType>
121+
</xs:element>
122+
</xs:sequence>
123+
</xs:complexType>
124+
</xs:element>
125+
</xs:sequence>
126+
<xs:attribute name="name" type="xs:string" use="required"/>
127+
<xs:attribute name="source" type="xs:anyURI" use="required"/>
128+
<xs:attribute name="stepSize" type="xs:double"/>
129+
</xs:complexType>
130+
</xs:element>
131+
</xs:sequence>
132+
</xs:complexType>
133+
<xs:complexType name="functions">
134+
<xs:sequence>
135+
<xs:element name="LinearTransformation" type="osp:linearTransformationFunction" minOccurs="0"
136+
maxOccurs="unbounded"/>
137+
<xs:element name="Sum" type="osp:sumFunction" minOccurs="0" maxOccurs="unbounded"/>
138+
<xs:element name="VectorSum" type="osp:vectorSumFunction" minOccurs="0" maxOccurs="unbounded"/>
139+
</xs:sequence>
140+
</xs:complexType>
141+
<xs:complexType name="linearTransformationFunction">
142+
<xs:attribute name="name" use="required" type="xs:string"/>
143+
<xs:attribute name="factor" type="xs:double"/>
144+
<xs:attribute name="offset" type="xs:double"/>
145+
</xs:complexType>
146+
<xs:complexType name="sumFunction">
147+
<xs:attribute name="name" use="required" type="xs:string"/>
148+
<xs:attribute name="inputCount" use="required" type="xs:positiveInteger"/>
149+
</xs:complexType>
150+
<xs:complexType name="vectorSumFunction">
151+
<xs:attribute name="name" use="required" type="xs:string"/>
152+
<xs:attribute name="inputCount" use="required" type="xs:positiveInteger"/>
153+
<xs:attribute name="dimension" use="required" type="xs:positiveInteger"/>
154+
</xs:complexType>
155+
156+
157+
</xs:schema>

0 commit comments

Comments
 (0)