Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for NeuroML v2.3.1 release #73

Merged
merged 41 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2fa06ef
Regenerate using latest libnml libs
pgleeson Sep 21, 2023
ee8b8c0
Merge branch 'master' into development
pgleeson Sep 22, 2023
67d3bb0
To v0.5.8
pgleeson Sep 22, 2023
e33c266
Updating sonata test example
pgleeson Sep 29, 2023
7381f40
Some black formatting
pgleeson Sep 29, 2023
417bc11
Merge pull request #62 from NeuroML/experimental
pgleeson Oct 18, 2023
5795fa5
feat: update for matplotlib 3.6
sanjayankur31 Oct 26, 2023
59309c2
Merge pull request #63 from NeuroML/feat/matplotlib-3.6
pgleeson Oct 26, 2023
3c67140
feat(matrix-handler): tweak tick size relative to defaults
sanjayankur31 Nov 7, 2023
0d7c4a2
Merge pull request #64 from NeuroML/feat/matrix-handler-tick-sizes
pgleeson Nov 17, 2023
c686cd3
Regenerated nml
pgleeson Dec 14, 2023
8342b57
Fix 3d plot
pgleeson Dec 14, 2023
07dbd90
Merge pull request #65 from NeuroML/experimental
pgleeson Dec 14, 2023
024cf90
Regenerated examples with latest pynml
pgleeson Jan 30, 2024
6b8109c
Regenerated
pgleeson Feb 13, 2024
bd191f5
Tested param sweep file
pgleeson Feb 13, 2024
3f649c9
Update gha versions
pgleeson Feb 13, 2024
c3cf392
To v0.5.9
pgleeson Feb 13, 2024
4fe5bb4
Add ppft requirement - needed for param sweep
pgleeson Feb 13, 2024
be07c5a
Merge pull request #67 from NeuroML/experimental
pgleeson Feb 13, 2024
e8c688e
Better plotting in sweep
pgleeson Feb 20, 2024
c2de4a4
Regenerated
pgleeson Feb 20, 2024
4647be2
Merge pull request #68 from NeuroML/experimental
pgleeson Feb 20, 2024
e24f06f
Add slight delay in generate network when extra_lems_components present
pgleeson Feb 20, 2024
db6dcdf
Merge branch 'development' into experimental
pgleeson Mar 1, 2024
2513478
Updated matrix handler for saving figures to file
pgleeson Mar 1, 2024
d667049
Tweak eden times
pgleeson May 1, 2024
3ca1f64
Merge pull request #69 from NeuroML/experimental
pgleeson May 1, 2024
d286145
Test also on py 3.12
pgleeson May 1, 2024
b409fc0
Merge branch 'development' into experimental
pgleeson May 22, 2024
658c8fc
Not testing 3.12 for now...
pgleeson May 22, 2024
28c3250
Regenerated
pgleeson May 28, 2024
1caa73a
Fix get_cmap("jet") in nmlliteui
pgleeson May 29, 2024
8c9b25a
Regenerated
pgleeson Jun 11, 2024
ebc78d6
To v0.6.0
pgleeson Jun 11, 2024
9f5e1bf
Merge pull request #70 from NeuroML/experimental
pgleeson Aug 19, 2024
5df2dfa
Only pin on numpy is <2.0
pgleeson Aug 19, 2024
1556ca5
Merge pull request #71 from NeuroML/experimental
pgleeson Aug 19, 2024
984aafe
Regenerated files
pgleeson Aug 19, 2024
beb07f1
Merge branch 'development' into experimental
pgleeson Aug 19, 2024
476b1f5
Merge pull request #72 from NeuroML/experimental
pgleeson Aug 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
HDF5_DISABLE_VERSION_CHECK: 1

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -35,7 +35,7 @@ jobs:
pip install .
pip install -r requirements-extra.txt

pip install 'numpy<=1.23.0' # temp fix, see https://github.com/OpenSourceBrain/osb-model-validation/issues/91
#pip install 'numpy<=1.23.0' # temp fix, see https://github.com/OpenSourceBrain/osb-model-validation/issues/91


- name: Lint with flake8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/NeuroMLlite_specification.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"specification": {
"Network": {
"definition": "A Network containing multiple Population's, connected by Projection's and receiving Input's",
Expand Down
2 changes: 1 addition & 1 deletion docs/NeuroMLlite_specification.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: NeuroMLlite v0.5.7
version: NeuroMLlite v0.6.0
specification:
Network:
definition: A Network containing multiple Population's, connected by Projection's
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Specification of NeuroMLlite v0.5.7
# Specification of NeuroMLlite v0.6.0
**Note: the NeuroMLlite specification is still in development! Subject to change...**

## Network
Expand Down
2 changes: 1 addition & 1 deletion examples/Example10_Lorenz.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example10_Lorenz": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 10: Lorenz",
"parameters": {
"N": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example11_Synapses.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example11_Synapses": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 11: synaptic properties",
"parameters": {
"input_amp": 0.23,
Expand Down
4 changes: 2 additions & 2 deletions examples/Example11_Synapses.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example11_Synapses">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example11_Synapses">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example11_Synapses
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example12_MultiComp.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example12_MultiComp": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 12: Multicompartmental cells...",
"parameters": {
"N": 20,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example1_TestNetwork.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"TestNetwork": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "A simple network with 2 populations & projection between them. No info yet on what the cells are so network can't be simulated.",
"populations": {
"pop0": {
Expand Down
2 changes: 1 addition & 1 deletion examples/Example2_TestNetwork.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example2_TestNetwork": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "A simple network with 2 populations & projection between them. Cells are specified to be NeuroML 2 HH cell models & pre population is given a spiking input.",
"cells": {
"hhcell": {
Expand Down
4 changes: 2 additions & 2 deletions examples/Example2_TestNetwork.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example2_TestNetwork">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example2_TestNetwork">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example2_TestNetwork
Generation seed: 1234</notes>
<include href="test_files/inputs.nml"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Example3_Network.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example3_Network": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 3: simple network with 2 populations of NeuroML2 cells, a projection between them and spiking input.",
"cells": {
"hhcell": {
Expand Down
4 changes: 2 additions & 2 deletions examples/Example3_Network.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example3_Network">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example3_Network">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example3_Network
Generation seed: 1234</notes>
<include href="test_files/inputs.nml"/>
Expand Down
1 change: 1 addition & 0 deletions examples/Example4.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
print(net.to_json())
net_json_file = net.to_json_file("%s.json" % net.id)
net_yaml_file = net.to_yaml_file("%s.yaml" % net.id)
net_xml_file = net.to_xml_file("%s.nmllite.xml" % net.id)


################################################################################
Expand Down
2 changes: 1 addition & 1 deletion examples/Example4_PyNN.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example4_PyNN": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 4: a network with PyNN cells & inputs",
"parameters": {
"input_amp": 0.99
Expand Down
4 changes: 2 additions & 2 deletions examples/Example4_PyNN.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example4_PyNN">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example4_PyNN">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example4_PyNN
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example4_PyNN.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Example4_PyNN:
version: NeuroMLlite v0.5.7
version: NeuroMLlite v0.6.0
notes: 'Example 4: a network with PyNN cells & inputs'
parameters:
input_amp: 0.99
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example6_PyNN": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Another network for PyNN - work in progress...",
"parameters": {
"N_scaling": 0.005,
Expand Down
4 changes: 2 additions & 2 deletions examples/Example6_PyNN.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example6_PyNN">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example6_PyNN">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example6_PyNN
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN_noinputs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example6_PyNN_noinputs": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Another network for PyNN - work in progress...",
"parameters": {
"N_scaling": 0.005,
Expand Down
4 changes: 2 additions & 2 deletions examples/Example6_PyNN_noinputs.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example6_PyNN_noinputs">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example6_PyNN_noinputs">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example6_PyNN_noinputs
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example7_Brunel2000.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example7_Brunel2000": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 7: based on network of Brunel 2000",
"parameters": {
"g": 4,
Expand Down
4 changes: 2 additions & 2 deletions examples/Example7_Brunel2000.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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="Example7_Brunel2000">
<notes>Generated by NeuroMLlite v0.5.7
<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="Example7_Brunel2000">
<notes>Generated by NeuroMLlite v0.6.0
Generated network: Example7_Brunel2000
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example8_Extension.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example8_Extension": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 8: general testing...",
"parameters": {
"N": 10,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example9_HindmarshRose.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example9_HindmarshRose": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"notes": "Example 9: HindmarshRose",
"parameters": {
"N": 1,
Expand Down
49 changes: 24 additions & 25 deletions examples/LEMS_SimExample3.xml
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
<Lems>

<!--

This LEMS file has been automatically generated using PyNeuroML v1.0.10 (libNeuroML v0.5.3)
This LEMS file has been automatically generated using PyNeuroML v1.3.7 (libNeuroML v0.6.3)

-->

<!-- Specify which component to run -->
<Target component="SimExample3" reportFile="report.SimExample3.txt"/>

<!-- Include core NeuroML2 ComponentType definitions -->
<Include file="Cells.xml"/>
<Include file="Networks.xml"/>
<Include file="Simulation.xml"/>

<Include file="PyNN.xml"/>
<Include file="Example3_Network.net.nml"/>
<Include file="test_files/inputs.nml"/>
<Include file="test_files/hhcell.cell.nml"/>

<Simulation id="SimExample3" length="1000.0ms" step="0.025ms" target="Example3_Network" seed="5678"> <!-- Note seed: ensures same random numbers used every run -->

<Display id="pop0_v" title="Plots of pop0_v" timeScale="1ms" xmin="-100.0" xmax="1100.0" ymin="-80" ymax="40">
<Line id="pop0_0_hhcell_v" quantity="pop0/0/hhcell/v" scale="1mV" color="#d54f33" timeScale="1ms"/>
<Line id="pop0_1_hhcell_v" quantity="pop0/1/hhcell/v" scale="1mV" color="#0534e4" timeScale="1ms"/>
<Line id="pop0_2_hhcell_v" quantity="pop0/2/hhcell/v" scale="1mV" color="#98e752" timeScale="1ms"/>
<Line id="pop0_3_hhcell_v" quantity="pop0/3/hhcell/v" scale="1mV" color="#bca074" timeScale="1ms"/>
<Line id="pop0_4_hhcell_v" quantity="pop0/4/hhcell/v" scale="1mV" color="#632794" timeScale="1ms"/>
</Display>

<Display id="pop1_v" title="Plots of pop1_v" timeScale="1ms" xmin="-100.0" xmax="1100.0" ymin="-80" ymax="40">
<Line id="pop1_0_hhcell_v" quantity="pop1/0/hhcell/v" scale="1mV" color="#8a5d88" timeScale="1ms"/>
<Line id="pop1_1_hhcell_v" quantity="pop1/1/hhcell/v" scale="1mV" color="#df5954" timeScale="1ms"/>
Expand All @@ -41,28 +40,28 @@
<Line id="pop1_8_hhcell_v" quantity="pop1/8/hhcell/v" scale="1mV" color="#5fa56f" timeScale="1ms"/>
<Line id="pop1_9_hhcell_v" quantity="pop1/9/hhcell/v" scale="1mV" color="#b5b5a2" timeScale="1ms"/>
</Display>

<OutputFile id="SimExample3_pop0_v_dat" fileName="SimExample3.pop0.v.dat">
<OutputColumn id="pop0_0_hhcell_v" quantity="pop0/0/hhcell/v"/>
<OutputColumn id="pop0_1_hhcell_v" quantity="pop0/1/hhcell/v"/>
<OutputColumn id="pop0_2_hhcell_v" quantity="pop0/2/hhcell/v"/>
<OutputColumn id="pop0_3_hhcell_v" quantity="pop0/3/hhcell/v"/>
<OutputColumn id="pop0_4_hhcell_v" quantity="pop0/4/hhcell/v"/>
<OutputColumn id="pop0_0_hhcell_v" quantity="pop0/0/hhcell/v"/>
<OutputColumn id="pop0_1_hhcell_v" quantity="pop0/1/hhcell/v"/>
<OutputColumn id="pop0_2_hhcell_v" quantity="pop0/2/hhcell/v"/>
<OutputColumn id="pop0_3_hhcell_v" quantity="pop0/3/hhcell/v"/>
<OutputColumn id="pop0_4_hhcell_v" quantity="pop0/4/hhcell/v"/>
</OutputFile>

<OutputFile id="SimExample3_pop1_v_dat" fileName="SimExample3.pop1.v.dat">
<OutputColumn id="pop1_0_hhcell_v" quantity="pop1/0/hhcell/v"/>
<OutputColumn id="pop1_1_hhcell_v" quantity="pop1/1/hhcell/v"/>
<OutputColumn id="pop1_2_hhcell_v" quantity="pop1/2/hhcell/v"/>
<OutputColumn id="pop1_3_hhcell_v" quantity="pop1/3/hhcell/v"/>
<OutputColumn id="pop1_4_hhcell_v" quantity="pop1/4/hhcell/v"/>
<OutputColumn id="pop1_5_hhcell_v" quantity="pop1/5/hhcell/v"/>
<OutputColumn id="pop1_6_hhcell_v" quantity="pop1/6/hhcell/v"/>
<OutputColumn id="pop1_7_hhcell_v" quantity="pop1/7/hhcell/v"/>
<OutputColumn id="pop1_8_hhcell_v" quantity="pop1/8/hhcell/v"/>
<OutputColumn id="pop1_9_hhcell_v" quantity="pop1/9/hhcell/v"/>
<OutputColumn id="pop1_0_hhcell_v" quantity="pop1/0/hhcell/v"/>
<OutputColumn id="pop1_1_hhcell_v" quantity="pop1/1/hhcell/v"/>
<OutputColumn id="pop1_2_hhcell_v" quantity="pop1/2/hhcell/v"/>
<OutputColumn id="pop1_3_hhcell_v" quantity="pop1/3/hhcell/v"/>
<OutputColumn id="pop1_4_hhcell_v" quantity="pop1/4/hhcell/v"/>
<OutputColumn id="pop1_5_hhcell_v" quantity="pop1/5/hhcell/v"/>
<OutputColumn id="pop1_6_hhcell_v" quantity="pop1/6/hhcell/v"/>
<OutputColumn id="pop1_7_hhcell_v" quantity="pop1/7/hhcell/v"/>
<OutputColumn id="pop1_8_hhcell_v" quantity="pop1/8/hhcell/v"/>
<OutputColumn id="pop1_9_hhcell_v" quantity="pop1/9/hhcell/v"/>
</OutputFile>

</Simulation>

</Lems>
39 changes: 19 additions & 20 deletions examples/LEMS_SimExample4.xml
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
<Lems>

<!--

This LEMS file has been automatically generated using PyNeuroML v1.0.10 (libNeuroML v0.5.3)
This LEMS file has been automatically generated using PyNeuroML v1.3.7 (libNeuroML v0.6.3)

-->

<!-- Specify which component to run -->
<Target component="SimExample4" reportFile="report.SimExample4.txt"/>

<!-- Include core NeuroML2 ComponentType definitions -->
<Include file="Cells.xml"/>
<Include file="Networks.xml"/>
<Include file="Simulation.xml"/>

<Include file="PyNN.xml"/>
<Include file="Example4_PyNN.net.nml"/>

<Simulation id="SimExample4" length="1000.0ms" step="0.01ms" target="Example4_PyNN" seed="5678"> <!-- Note seed: ensures same random numbers used every run -->

<Display id="pop0_v" title="Plots of pop0_v" timeScale="1ms" xmin="-100.0" xmax="1100.0" ymin="-80" ymax="40">
<Line id="pop0_0_testcell_v" quantity="pop0/0/testcell/v" scale="1mV" color="#d54f33" timeScale="1ms"/>
<Line id="pop0_1_testcell_v" quantity="pop0/1/testcell/v" scale="1mV" color="#0534e4" timeScale="1ms"/>
</Display>

<Display id="pop1_v" title="Plots of pop1_v" timeScale="1ms" xmin="-100.0" xmax="1100.0" ymin="-80" ymax="40">
<Line id="pop1_0_testcell2_v" quantity="pop1/0/testcell2/v" scale="1mV" color="#98e752" timeScale="1ms"/>
<Line id="pop1_1_testcell2_v" quantity="pop1/1/testcell2/v" scale="1mV" color="#bca074" timeScale="1ms"/>
</Display>

<Display id="pop2_v" title="Plots of pop2_v" timeScale="1ms" xmin="-100.0" xmax="1100.0" ymin="-80" ymax="40">
<Line id="pop2_0_testcell2_v" quantity="pop2/0/testcell2/v" scale="1mV" color="#632794" timeScale="1ms"/>
</Display>

<OutputFile id="SimExample4_pop0_v_dat" fileName="SimExample4.pop0.v.dat">
<OutputColumn id="pop0_0_testcell_v" quantity="pop0/0/testcell/v"/>
<OutputColumn id="pop0_1_testcell_v" quantity="pop0/1/testcell/v"/>
<OutputColumn id="pop0_0_testcell_v" quantity="pop0/0/testcell/v"/>
<OutputColumn id="pop0_1_testcell_v" quantity="pop0/1/testcell/v"/>
</OutputFile>

<OutputFile id="SimExample4_pop1_v_dat" fileName="SimExample4.pop1.v.dat">
<OutputColumn id="pop1_0_testcell2_v" quantity="pop1/0/testcell2/v"/>
<OutputColumn id="pop1_1_testcell2_v" quantity="pop1/1/testcell2/v"/>
<OutputColumn id="pop1_0_testcell2_v" quantity="pop1/0/testcell2/v"/>
<OutputColumn id="pop1_1_testcell2_v" quantity="pop1/1/testcell2/v"/>
</OutputFile>

<OutputFile id="SimExample4_pop2_v_dat" fileName="SimExample4.pop2.v.dat">
<OutputColumn id="pop2_0_testcell2_v" quantity="pop2/0/testcell2/v"/>
<OutputColumn id="pop2_0_testcell2_v" quantity="pop2/0/testcell2/v"/>
</OutputFile>

<EventOutputFile id="SimExample4_pop0_spikes" fileName="SimExample4.pop0.spikes" format="ID_TIME">
<EventSelection id="0" select="pop0/0/testcell" eventPort="spike"/>
<EventSelection id="1" select="pop0/1/testcell" eventPort="spike"/>
<EventSelection id="0" select="pop0/0/testcell" eventPort="spike"/>
<EventSelection id="1" select="pop0/1/testcell" eventPort="spike"/>
</EventOutputFile>

</Simulation>

</Lems>
2 changes: 1 addition & 1 deletion examples/SimExample10.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample10": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"network": "Example10_Lorenz.json",
"duration": 10000.0,
"dt": 1.0,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample11.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample11": {
"version": "NeuroMLlite v0.5.7",
"version": "NeuroMLlite v0.6.0",
"network": "Example11_Synapses.json",
"duration": 1000.0,
"dt": 0.01,
Expand Down
Loading
Loading