Skip to content

Commit e91ba6f

Browse files
burgergaburgerga
committed
Update xsd to new structure
1 parent cae951a commit e91ba6f

File tree

3 files changed

+70
-56
lines changed

3 files changed

+70
-56
lines changed

‎morpheus/plugins/initialization/csv_reader.xsd

+13-8
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
33

44
<xs:group name="PopulationInitPlugins">
5-
<xs:choice>
6-
<xs:element name="CSVReader" type="CSVReaderPop"/>
7-
</xs:choice>
5+
<xs:all>
6+
<xs:element name="CSVReader" type="CSVReaderPop" minOccurs="0"/>
7+
</xs:all>
88
</xs:group>
99

1010
<xs:complexType name="CSVReaderPop">
11-
<xs:annotation>
12-
<xs:appinfo>Initialization</xs:appinfo>
13-
</xs:annotation>
14-
<xs:attribute name="filename" use="required" type="cpmSystemFile" />
15-
<xs:attribute name="scaling" type="cpmVectorMathExpression" default="1.0, 1.0, 1.0"/>
11+
<xs:complexContent>
12+
<xs:extension base="morphPlugin">
13+
<xs:annotation>
14+
<xs:appinfo>Initialization</xs:appinfo>
15+
</xs:annotation>
16+
17+
<xs:attribute name="filename" use="required" type="cpmSystemFile" />
18+
<xs:attribute name="scaling" type="cpmVectorMathExpression" default="1.0, 1.0, 1.0"/>
19+
</xs:extension>
20+
</xs:complexContent>
1621
</xs:complexType>
1722

1823
</xs:schema>

‎morpheus/plugins/miscellaneous/gab_pseudopodia.xsd

+26-21
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,37 @@
66
<!-- Declaration of plugin group and name of its XML element -->
77
<!-- This plugin will be merged with other CellTypePlugins -->
88
<xs:group name="CellTypePlugins">
9-
<xs:choice>
9+
<xs:all>
1010
<!-- Plugin will appear as "Pseudopodia" in XML and GUI -->
11-
<xs:element name="Pseudopodia" type="Pseudopodia"/>
12-
</xs:choice>
11+
<xs:element name="Pseudopodia" type="Pseudopodia" minOccurs="0" maxOccurs="unbounded"/>
12+
</xs:all>
1313
</xs:group>
1414

1515
<!-- Specification of XML element, its subelements and its attributes -->
1616
<xs:complexType name="Pseudopodia">
17-
<xs:annotation>
18-
<xs:appinfo>Miscellaneous</xs:appinfo>
19-
</xs:annotation>
20-
<!-- Attributes with their type, usage and default value -->
21-
<xs:attribute name="field" type="cpmMathExpression" use="required"/>
22-
<xs:attribute name="moving-direction" type="cpmDoubleSymbolRef"/>
23-
<xs:attribute name="max-growth-time" type="cpmInteger" use="optional" default="20"/>
24-
<xs:attribute name="max-pseudopods" type="cpmInteger" use="optional" default="1"/>
25-
<xs:attribute name="time-between-extensions" type="cpmInteger" use="optional" default="100"/>
26-
<xs:attribute name="tip-bonus" type="cpmDouble" use="optional" default="2e5"/>
27-
<xs:attribute name="max-distance-for-tip-bonus" type="cpmDouble" use="optional" default="5"/>
28-
<xs:attribute name="neighboring-actin-bonus" type="cpmDouble" use="optional" default="1e2"/>
29-
<xs:attribute name="init-dir-strength" type="cpmDouble" use="optional" default="8.0"/>
30-
<xs:attribute name="cont-dir-strength" type="cpmDouble" use="optional" default="16.0"/>
31-
<xs:attribute name="retraction-mode" type="cpmPPRetractMode" default="backward"/>
32-
<xs:attribute name="touch-behavior" type="cpmPPTouchBehavior" default="nothing"/>
33-
<xs:attribute name="pull-strength" type="cpmDouble" use="optional" default="300.0"/>
34-
<xs:attribute name="pull" type="cpmBoolean" default="false"/>
17+
<xs:complexContent>
18+
<xs:extension base="morphPlugin">
19+
<xs:annotation>
20+
<xs:appinfo>Miscellaneous</xs:appinfo>
21+
</xs:annotation>
22+
23+
<!-- Attributes with their type, usage and default value -->
24+
<xs:attribute name="field" type="cpmMathExpression" use="required"/>
25+
<xs:attribute name="moving-direction" type="cpmDoubleSymbolRef"/>
26+
<xs:attribute name="max-growth-time" type="cpmInteger" use="optional" default="20"/>
27+
<xs:attribute name="max-pseudopods" type="cpmInteger" use="optional" default="1"/>
28+
<xs:attribute name="time-between-extensions" type="cpmInteger" use="optional" default="100"/>
29+
<xs:attribute name="tip-bonus" type="cpmDouble" use="optional" default="2e5"/>
30+
<xs:attribute name="max-distance-for-tip-bonus" type="cpmDouble" use="optional" default="5"/>
31+
<xs:attribute name="neighboring-actin-bonus" type="cpmDouble" use="optional" default="1e2"/>
32+
<xs:attribute name="init-dir-strength" type="cpmDouble" use="optional" default="8.0"/>
33+
<xs:attribute name="cont-dir-strength" type="cpmDouble" use="optional" default="16.0"/>
34+
<xs:attribute name="retraction-mode" type="cpmPPRetractMode" default="backward"/>
35+
<xs:attribute name="touch-behavior" type="cpmPPTouchBehavior" default="nothing"/>
36+
<xs:attribute name="pull-strength" type="cpmDouble" use="optional" default="300.0"/>
37+
<xs:attribute name="pull" type="cpmBoolean" default="false"/>
38+
</xs:extension>
39+
</xs:complexContent>
3540
</xs:complexType>
3641

3742
<xs:simpleType name="cpmPPTouchBehavior">

‎morpheus/plugins/reporters/buffered_vector_reporter.xsd

+31-27
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,40 @@
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
33

44
<xs:group name="CellTypePlugins">
5-
<xs:choice>
6-
<xs:element name="BufferedVectorReporter" type="BufferedVectorReporter"/>
7-
</xs:choice>
8-
</xs:group>
9-
10-
<xs:complexType name="BufferedVectorReporter">
11-
<xs:annotation>
12-
<xs:appinfo>Reporter</xs:appinfo>
13-
</xs:annotation>
14-
155
<xs:all>
16-
<xs:element name="Input">
17-
<xs:complexType>
18-
<xs:attribute name="value" type="cpmMathExpression" use="required" />
19-
</xs:complexType>
20-
21-
</xs:element>
22-
23-
<xs:element name="Output">
24-
<xs:complexType>
25-
<xs:attribute name="mapping" type="cpmVectorArrayStatistics" use="required" />
26-
<xs:attribute name="symbol-ref" type="cpmVectorSymbolRef" use="required" />
27-
</xs:complexType>
28-
</xs:element>
29-
6+
<xs:element name="BufferedVectorReporter" type="BufferedVectorReporter" minOccurs="0"/>
307
</xs:all>
8+
</xs:group>
319

32-
<xs:attribute name="buffer-size" type="cpmInteger" use="required" />
33-
<xs:attribute name="name" type="cpmString" use="optional" />
34-
<xs:attribute name="time-step" type="cpmDouble" use="required" />
10+
<xs:complexType name="BufferedVectorReporter">
11+
<xs:complexContent>
12+
<xs:extension base="morphPlugin">
13+
<xs:annotation>
14+
<xs:appinfo>Reporter</xs:appinfo>
15+
</xs:annotation>
16+
17+
<xs:all>
18+
<xs:element name="Input">
19+
<xs:complexType>
20+
<xs:attribute name="value" type="cpmMathExpression" use="required" />
21+
</xs:complexType>
22+
23+
</xs:element>
24+
25+
<xs:element name="Output">
26+
<xs:complexType>
27+
<xs:attribute name="mapping" type="cpmVectorArrayStatistics" use="required" />
28+
<xs:attribute name="symbol-ref" type="cpmVectorSymbolRef" use="required" />
29+
</xs:complexType>
30+
</xs:element>
31+
32+
</xs:all>
33+
34+
<xs:attribute name="buffer-size" type="cpmInteger" use="required" />
35+
<xs:attribute name="name" type="cpmString" use="optional" />
36+
<xs:attribute name="time-step" type="cpmDouble" use="required" />
37+
</xs:extension>
38+
</xs:complexContent>
3539
</xs:complexType>
3640

3741
<xs:simpleType name="cpmVectorArrayStatistics">

0 commit comments

Comments
 (0)