Skip to content

Commit 5bc289f

Browse files
pgleesonpgleeson
committed
Merge branch 'master' into experimental
2 parents cf02425 + ebd1d5d commit 5bc289f

11 files changed

Lines changed: 43 additions & 43 deletions

‎NeuroML2/ConnectionsTest.net.nml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="ConnectionsTest">
1+
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="ConnectionsTest">
22
<notes>
33
This NeuroML 2 file has been generated from:
4-
PyNN v0.10.1
5-
libNeuroML v0.5.8
6-
pyNeuroML v1.1.14
4+
PyNN v0.11.0
5+
libNeuroML v0.6.3
6+
pyNeuroML v1.3.7
77
</notes>
88
<IF_cond_alpha id="IF_cond_alpha_pop_pre" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
99
<IF_cond_alpha id="IF_cond_alpha_pop_post" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
@@ -17,38 +17,38 @@
1717
<property tag="radius" value="5"/>
1818
<property tag="color" value="0 0.6 0"/>
1919
<instance id="0">
20-
<location x="41.12765866873962" y="77.849455297045836" z="-33.682009571727953"/>
20+
<location x="-9.771402205615921" y="41.107735197887862" z="8.380479496098125"/>
2121
</instance>
2222
<instance id="1">
23-
<location x="24.434227084339511" y="68.73617121399451" z="50.090658409532821"/>
23+
<location x="11.787241779479075" y="-22.917415323944468" z="-69.969358778846896"/>
2424
</instance>
2525
<instance id="2">
26-
<location x="-71.418219691173974" y="-30.7712574921011" z="-8.906127091012506"/>
26+
<location x="24.148166862976762" y="-10.126267539995236" z="-6.507356698049249"/>
2727
</instance>
2828
<instance id="3">
29-
<location x="41.570399410983526" y="29.635511935195424" z="56.761427893603653"/>
29+
<location x="-14.878199498615952" y="49.650874267039804" z="18.835272881150388"/>
3030
</instance>
3131
<instance id="4">
32-
<location x="-48.171408056176233" y="6.763429120094999" z="-0.29940764736387"/>
32+
<location x="37.92567221050809" y="-22.437678624311431" z="-38.190180651135641"/>
3333
</instance>
3434
</population>
3535
<population id="pop_post" component="IF_cond_alpha_pop_post" size="5" type="populationList">
3636
<property tag="radius" value="5"/>
3737
<property tag="color" value="0 0.2 0.6"/>
3838
<instance id="0">
39-
<location x="33.545375762463017" y="167.030045862469905" z="26.387936726469885"/>
39+
<location x="-30.357177121657621" y="148.821597074248928" z="41.550393258456353"/>
4040
</instance>
4141
<instance id="1">
42-
<location x="-64.520990306567128" y="185.315473984196842" z="68.394588084493435"/>
42+
<location x="-75.487951984450333" y="241.449664932469261" z="4.06371645195327"/>
4343
</instance>
4444
<instance id="2">
45-
<location x="24.109891751889045" y="254.969724483040494" z="37.942890131910985"/>
45+
<location x="53.196249421914075" y="144.47758109254687" z="46.851975572138628"/>
4646
</instance>
4747
<instance id="3">
48-
<location x="39.187472616301264" y="166.933480864660993" z="76.627657875335473"/>
48+
<location x="-20.844985362062317" y="188.239068673352108" z="-57.809991974759043"/>
4949
</instance>
5050
<instance id="4">
51-
<location x="-54.192338767409673" y="124.413799909109613" z="3.670152241987878"/>
51+
<location x="41.000859853632619" y="279.306766456403295" z="35.048479751214437"/>
5252
</instance>
5353
</population>
5454
<projection id="pop_pre__TO__pop_post" presynapticPopulation="pop_pre" postsynapticPopulation="pop_post" synapse="syn__pop_pre__TO__pop_post">

‎NeuroML2/Inputs.net.nml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="Inputs">
1+
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Inputs">
22
<notes>
33
This NeuroML 2 file has been generated from:
4-
PyNN v0.10.1
5-
libNeuroML v0.5.8
6-
pyNeuroML v1.1.14
4+
PyNN v0.11.0
5+
libNeuroML v0.6.3
6+
pyNeuroML v1.3.7
77
</notes>
88
<pulseGenerator id="DCSource_DCSource_0" delay="50.0ms" duration="350.0ms" amplitude="0.9nA"/>
99
<compoundInput id="ACSource_ACSource_1">

‎NeuroML2/LEMS_Sim_Inputs.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<!--
44
This LEMS file has been generated from:
5-
PyNN v0.10.1
6-
libNeuroML v0.5.8
7-
pyNeuroML v1.1.14
5+
PyNN v0.11.0
6+
libNeuroML v0.6.3
7+
pyNeuroML v1.3.7
88
-->
99

1010
<!-- Specify which component to run -->

‎NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<!--
44
This LEMS file has been generated from:
5-
PyNN v0.10.1
6-
libNeuroML v0.5.8
7-
pyNeuroML v1.1.14
5+
PyNN v0.11.0
6+
libNeuroML v0.6.3
7+
pyNeuroML v1.3.7
88
-->
99

1010
<!-- Specify which component to run -->

‎NeuroML2/Positions.net.nml.h5‎

-9 Bytes
Binary file not shown.

‎NeuroML2/PyNN_NeuroML2_Export.net.nml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="PyNN_NeuroML2_Export">
1+
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="PyNN_NeuroML2_Export">
22
<notes>
33
This NeuroML 2 file has been generated from:
4-
PyNN v0.10.1
5-
libNeuroML v0.5.8
6-
pyNeuroML v1.1.14
4+
PyNN v0.11.0
5+
libNeuroML v0.6.3
6+
pyNeuroML v1.3.7
77
</notes>
88
<IF_curr_alpha id="IF_curr_alpha_pop_IF_curr_alpha" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="10.0" v_reset="-62.0" v_rest="-65.0" v_thresh="-52.0"/>
99
<IF_curr_exp id="IF_curr_exp_pop_IF_curr_exp" cm="1.0" i_offset="1.0" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="8.0" v_reset="-70.0" v_rest="-65.0" v_thresh="-50.0"/>

‎PyNN/LEMS_2007One_pynn.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
1010
1111
This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
12-
org.neuroml.export v1.10.0
13-
org.neuroml.model v1.10.0
14-
jLEMS v0.11.0
12+
org.neuroml.export v1.10.1
13+
org.neuroml.model v1.10.1
14+
jLEMS v0.11.1
1515
1616
'''
1717
# Main PyNN script for: net1

‎PyNN/RS.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS type=izhikevich2007Cell)
33
COMMENT
44

55
This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
6-
org.neuroml.export v1.10.0
7-
org.neuroml.model v1.10.0
8-
jLEMS v0.11.0
6+
org.neuroml.export v1.10.1
7+
org.neuroml.model v1.10.1
8+
jLEMS v0.11.1
99

1010
ENDCOMMENT
1111

‎PyNN/RS_Iext.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS_Iext type=pulseGenerator)
33
COMMENT
44

55
This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
6-
org.neuroml.export v1.10.0
7-
org.neuroml.model v1.10.0
8-
jLEMS v0.11.0
6+
org.neuroml.export v1.10.1
7+
org.neuroml.model v1.10.1
8+
jLEMS v0.11.1
99

1010
ENDCOMMENT
1111

‎PyNN/RS_Iext_inputdefinition.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
---------------------------------------------
1010
1111
This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
12-
org.neuroml.export v1.10.0
13-
org.neuroml.model v1.10.0
14-
jLEMS v0.11.0
12+
org.neuroml.export v1.10.1
13+
org.neuroml.model v1.10.1
14+
jLEMS v0.11.1
1515
1616
'''
1717
# Input file for Component: RS_Iext

0 commit comments

Comments
 (0)