Skip to content

Commit c47685f

Browse files
pgleesonpgleeson
committed
Remove space in xsi:schemaLocation; more docs
1 parent 024ea24 commit c47685f

File tree

6 files changed

+56
-21
lines changed

6 files changed

+56
-21
lines changed

‎examples/neuroml2/NeuroML2.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,21 @@ Some description...
1313
<tr>
1414
<td><b>xmlns</b></td>
1515
<td>str</td>
16-
<td><i>Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2</i></td>
16+
<td><i>Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2</i></td>
17+
</tr>
18+
19+
20+
<tr>
21+
<td><b>xmlns_xsi</b></td>
22+
<td>str</td>
23+
<td><i>Namespace for XMLSchema-instance</i></td>
24+
</tr>
25+
26+
27+
<tr>
28+
<td><b>xmlns_loc</b></td>
29+
<td>str</td>
30+
<td><i>Specifies location of the main namespace</i></td>
1731
</tr>
1832

1933

@@ -24,14 +38,14 @@ Some description...
2438
<tr>
2539
<td><b>izhikevich2007Cells</b></td>
2640
<td><a href="#izhikevich2007cell">izhikevich2007Cell</a></td>
27-
<td><i></i></td>
41+
<td><i>The izhikevich2007Cells</i></td>
2842
</tr>
2943

3044

3145
<tr>
3246
<td><b>pulseGenerators</b></td>
3347
<td><a href="#pulsegenerator">pulseGenerator</a></td>
34-
<td><i></i></td>
48+
<td><i>The pulse current generators</i></td>
3549
</tr>
3650

3751

‎examples/neuroml2/NeuroML2.rst

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ Some description...
55

66
**Allowed parameters**
77

8-
=============== =========== ====================================================================
8+
=============== =========== ======================================================================================
99
Allowed field Data Type Description
10-
=============== =========== ====================================================================
10+
=============== =========== ======================================================================================
1111
**id** str The id of the NeuroML 2 document
12-
**xmlns** str Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
13-
=============== =========== ====================================================================
12+
**xmlns** str Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
13+
**xmlns_xsi** str Namespace for XMLSchema-instance
14+
**xmlns_loc** str Specifies location of the main namespace
15+
=============== =========== ======================================================================================
1416

1517
**Allowed children**
1618

17-
======================= ============================================ ====================
19+
======================= ============================================ ============================
1820
Allowed child Data Type Description
19-
======================= ============================================ ====================
20-
**izhikevich2007Cells** `izhikevich2007Cell <#izhikevich2007cell>`__
21-
**pulseGenerators** `pulseGenerator <#pulsegenerator>`__
21+
======================= ============================================ ============================
22+
**izhikevich2007Cells** `izhikevich2007Cell <#izhikevich2007cell>`__ The izhikevich2007Cells
23+
**pulseGenerators** `pulseGenerator <#pulsegenerator>`__ The pulse current generators
2224
**networks** `network <#network>`__ The networks present
23-
======================= ============================================ ====================
25+
======================= ============================================ ============================
2426

2527
==================
2628
izhikevich2007Cell

‎examples/neuroml2/NeuroML2.specification.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,25 @@
88
},
99
"xmlns": {
1010
"type": "str",
11-
"description": "Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2"
11+
"description": "Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2"
12+
},
13+
"xmlns_xsi": {
14+
"type": "str",
15+
"description": "Namespace for XMLSchema-instance"
16+
},
17+
"xmlns_loc": {
18+
"type": "str",
19+
"description": "Specifies location of the main namespace"
1220
}
1321
},
1422
"allowed_children": {
1523
"izhikevich2007Cells": {
1624
"type": "izhikevich2007Cell",
17-
"description": ""
25+
"description": "The izhikevich2007Cells"
1826
},
1927
"pulseGenerators": {
2028
"type": "pulseGenerator",
21-
"description": ""
29+
"description": "The pulse current generators"
2230
},
2331
"networks": {
2432
"type": "network",

‎examples/neuroml2/NeuroML2.specification.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ neuroml:
66
description: The id of the NeuroML 2 document
77
xmlns:
88
type: str
9-
description: Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
9+
description: Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
10+
xmlns_xsi:
11+
type: str
12+
description: Namespace for XMLSchema-instance
13+
xmlns_loc:
14+
type: str
15+
description: Specifies location of the main namespace
1016
allowed_children:
1117
izhikevich2007Cells:
1218
type: izhikevich2007Cell
13-
description: ''
19+
description: The izhikevich2007Cells
1420
pulseGenerators:
1521
type: pulseGenerator
16-
description: ''
22+
description: The pulse current generators
1723
networks:
1824
type: network
1925
description: The networks present

‎examples/neuroml2/TestNeuroML.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" ?>
2-
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="TestNeuroML" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd">
2+
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="TestNeuroML" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd">
33
<izhikevich2007Cell id="izh2007RS0" C="100pF" v0="-60mV" k="0.7nS_per_mV" vr="-60mV" vt="-40mV" vpeak="35mV" a="0.03per_ms" b="-2nS" c="-50.0mV" d="100pA"/>
44
<pulseGenerator id="pulseGen_0" delay="100ms" duration="800ms" amplitude="0.07 nA"/>
55
<network id="IzNet">

‎examples/neuroml2/neuroml2_spec.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,16 @@ class neuroml(Base):
101101
102102
Args:
103103
id: The id of the NeuroML 2 document
104-
xmlns: Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
104+
xmlns: Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
105+
xmlns_xsi: Namespace for XMLSchema-instance
106+
xmlns_loc: Specifies location of the main namespace
107+
izhikevich2007Cells: The izhikevich2007Cells
108+
pulseGenerators: The pulse current generators
105109
networks: The networks present
106110
"""
107111

108112
id: str = field(validator=instance_of(str))
113+
109114
xmlns: str = field(
110115
validator=instance_of(str), default="http://www.neuroml.org/schema/neuroml2"
111116
)
@@ -114,7 +119,7 @@ class neuroml(Base):
114119
)
115120
xmlns_loc: str = field(
116121
validator=instance_of(str),
117-
default="http://www.neuroml.org/schema/neuroml2https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd",
122+
default="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd",
118123
)
119124

120125
izhikevich2007Cells: List[izhikevich2007Cell] = field(factory=list)

0 commit comments

Comments
 (0)