From a29d943515b55a1bd0147a034ea0d05e84e98a92 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 14 Dec 2023 12:21:34 +0000 Subject: [PATCH 1/3] Regenerated files --- NeuroML2/ConnectionsTest.net.nml | 24 +++--- NeuroML2/Inputs.net.nml | 4 +- NeuroML2/LEMS_Sim_Inputs.xml | 35 ++++---- NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml | 89 ++++++++++----------- NeuroML2/Positions.net.nml.h5 | Bin 23814 -> 23793 bytes NeuroML2/PyNN_NeuroML2_Export.net.nml | 4 +- PyNN/LEMS_2007One_pynn.py | 6 +- PyNN/RS.mod | 6 +- PyNN/RS_Iext.mod | 6 +- PyNN/RS_Iext_inputdefinition.py | 6 +- PyNN/RS_celldefinition.py | 6 +- 11 files changed, 92 insertions(+), 94 deletions(-) diff --git a/NeuroML2/ConnectionsTest.net.nml b/NeuroML2/ConnectionsTest.net.nml index beace0b..93540e2 100644 --- a/NeuroML2/ConnectionsTest.net.nml +++ b/NeuroML2/ConnectionsTest.net.nml @@ -2,8 +2,8 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 - libNeuroML v0.5.5 - pyNeuroML v1.1.1 + libNeuroML v0.5.8 + pyNeuroML v1.1.10 @@ -17,38 +17,38 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/NeuroML2/Inputs.net.nml b/NeuroML2/Inputs.net.nml index f11b66c..911c9f1 100644 --- a/NeuroML2/Inputs.net.nml +++ b/NeuroML2/Inputs.net.nml @@ -2,8 +2,8 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 - libNeuroML v0.5.5 - pyNeuroML v1.1.1 + libNeuroML v0.5.8 + pyNeuroML v1.1.10 diff --git a/NeuroML2/LEMS_Sim_Inputs.xml b/NeuroML2/LEMS_Sim_Inputs.xml index eea8282..81e2ee7 100644 --- a/NeuroML2/LEMS_Sim_Inputs.xml +++ b/NeuroML2/LEMS_Sim_Inputs.xml @@ -1,12 +1,12 @@ - + - + @@ -14,33 +14,32 @@ - + - + - - + - - - - + + + + - + - - - - + + + + - + diff --git a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml index 9e8af0c..2d6a0d0 100644 --- a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml +++ b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml @@ -1,12 +1,12 @@ - + - + @@ -14,100 +14,99 @@ - + - + - - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - + + + - + - + - + diff --git a/NeuroML2/Positions.net.nml.h5 b/NeuroML2/Positions.net.nml.h5 index e143c954783984b7d6bb84d5f41586a1ac1b11b3..803c86d4c06d33197eaffb7e45d82ad229f0e624 100644 GIT binary patch delta 8678 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 delta 8679 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 FR|bP8i8BBI diff --git a/NeuroML2/PyNN_NeuroML2_Export.net.nml b/NeuroML2/PyNN_NeuroML2_Export.net.nml index 726ef6e..20c8b1f 100644 --- a/NeuroML2/PyNN_NeuroML2_Export.net.nml +++ b/NeuroML2/PyNN_NeuroML2_Export.net.nml @@ -2,8 +2,8 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 - libNeuroML v0.5.5 - pyNeuroML v1.1.1 + libNeuroML v0.5.8 + pyNeuroML v1.1.10 diff --git a/PyNN/LEMS_2007One_pynn.py b/PyNN/LEMS_2007One_pynn.py index 9cc5b0c..805fccc 100644 --- a/PyNN/LEMS_2007One_pynn.py +++ b/PyNN/LEMS_2007One_pynn.py @@ -9,9 +9,9 @@ This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.9.1 - org.neuroml.model v1.9.1 - jLEMS v0.10.8 + org.neuroml.export v1.10.0 + org.neuroml.model v1.10.0 + jLEMS v0.11.0 ''' # Main PyNN script for: net1 diff --git a/PyNN/RS.mod b/PyNN/RS.mod index 2ae959f..7b061fa 100644 --- a/PyNN/RS.mod +++ b/PyNN/RS.mod @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS type=izhikevich2007Cell) COMMENT This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.9.1 - org.neuroml.model v1.9.1 - jLEMS v0.10.8 + org.neuroml.export v1.10.0 + org.neuroml.model v1.10.0 + jLEMS v0.11.0 ENDCOMMENT diff --git a/PyNN/RS_Iext.mod b/PyNN/RS_Iext.mod index aba0b88..1bb35f0 100644 --- a/PyNN/RS_Iext.mod +++ b/PyNN/RS_Iext.mod @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS_Iext type=pulseGenerator) COMMENT This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.9.1 - org.neuroml.model v1.9.1 - jLEMS v0.10.8 + org.neuroml.export v1.10.0 + org.neuroml.model v1.10.0 + jLEMS v0.11.0 ENDCOMMENT diff --git a/PyNN/RS_Iext_inputdefinition.py b/PyNN/RS_Iext_inputdefinition.py index e9aa19e..f683153 100644 --- a/PyNN/RS_Iext_inputdefinition.py +++ b/PyNN/RS_Iext_inputdefinition.py @@ -9,9 +9,9 @@ --------------------------------------------- This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.9.1 - org.neuroml.model v1.9.1 - jLEMS v0.10.8 + org.neuroml.export v1.10.0 + org.neuroml.model v1.10.0 + jLEMS v0.11.0 ''' # Input file for Component: RS_Iext diff --git a/PyNN/RS_celldefinition.py b/PyNN/RS_celldefinition.py index 495b5f5..a53d531 100644 --- a/PyNN/RS_celldefinition.py +++ b/PyNN/RS_celldefinition.py @@ -16,9 +16,9 @@ --------------------------------------------- This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.9.1 - org.neuroml.model v1.9.1 - jLEMS v0.10.8 + org.neuroml.export v1.10.0 + org.neuroml.model v1.10.0 + jLEMS v0.11.0 ''' # Cell file for Component: RS From d7512f69af33fc83a3caaadde562df1edd79e34e Mon Sep 17 00:00:00 2001 From: pgleeson Date: Tue, 13 Feb 2024 10:20:51 +0000 Subject: [PATCH 2/3] Regenerated --- NeuroML2/ConnectionsTest.net.nml | 22 ++++++++++----------- NeuroML2/Inputs.net.nml | 2 +- NeuroML2/LEMS_Sim_Inputs.xml | 2 +- NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml | 2 +- NeuroML2/Positions.net.nml.h5 | Bin 23793 -> 23793 bytes NeuroML2/PyNN_NeuroML2_Export.net.nml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NeuroML2/ConnectionsTest.net.nml b/NeuroML2/ConnectionsTest.net.nml index 93540e2..051c17d 100644 --- a/NeuroML2/ConnectionsTest.net.nml +++ b/NeuroML2/ConnectionsTest.net.nml @@ -3,7 +3,7 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 libNeuroML v0.5.8 - pyNeuroML v1.1.10 + pyNeuroML v1.1.14 @@ -17,38 +17,38 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/NeuroML2/Inputs.net.nml b/NeuroML2/Inputs.net.nml index 911c9f1..f3b1234 100644 --- a/NeuroML2/Inputs.net.nml +++ b/NeuroML2/Inputs.net.nml @@ -3,7 +3,7 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 libNeuroML v0.5.8 - pyNeuroML v1.1.10 + pyNeuroML v1.1.14 diff --git a/NeuroML2/LEMS_Sim_Inputs.xml b/NeuroML2/LEMS_Sim_Inputs.xml index 81e2ee7..520af46 100644 --- a/NeuroML2/LEMS_Sim_Inputs.xml +++ b/NeuroML2/LEMS_Sim_Inputs.xml @@ -4,7 +4,7 @@ This LEMS file has been generated from: PyNN v0.10.1 libNeuroML v0.5.8 - pyNeuroML v1.1.10 + pyNeuroML v1.1.14 --> diff --git a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml index 2d6a0d0..1b1ff17 100644 --- a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml +++ b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml @@ -4,7 +4,7 @@ This LEMS file has been generated from: PyNN v0.10.1 libNeuroML v0.5.8 - pyNeuroML v1.1.10 + pyNeuroML v1.1.14 --> diff --git a/NeuroML2/Positions.net.nml.h5 b/NeuroML2/Positions.net.nml.h5 index 803c86d4c06d33197eaffb7e45d82ad229f0e624..cf740c73c713491d6fbb2edf6f1dcb96751a8212 100644 GIT binary patch delta 8623 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 Bb7lYl delta 8614 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

de z(T?ORG*+I7*D5E)Fcj%1`yq~zgSzXf=y6KvBnH>i2Y1>-e9Mb+$O(;LAhWz^7kJEU z4D&W#h>+R8h}k_DTs)Or>ViKeXO83X0#N!`Hh+IHMda&>`(41Fgpo~9iOhZ7GsVJG z5;cy-j`3j5^i)jZh&HQ;SCu3MS24?z#wPQhu*JR%3Eo|FgiB~43D&tN(&eJL{&+)` ztb{4pDPR=%aQwNl5}`0#L=q5byM1^j9*p0m+zuYT+C#QR#ogjfpXr8=SCC?z@G&Sc zl5Z>7??6#`iqkN1j!?10M>?9s`%0#V`Z4?@NVLE7wTNaZVqHh6+gY@IIQcUk*N8~Z zMDR~tiLMKA%Ne{jB`%7^nu(FLc~S3r5~h2TdL`^kktBnK9^}g$T?h?stl!AUN)N&Y zv4E){JRtwu`;$=(B!7VauzGcUeO-M$T3?U+xM~M~*8RA&eme7nyt@T+qc#7J=813MHB>Z_-t=70GT6dv?!J6Y})_?!en`XCea3Gp{HRnYK z2ZatEL_L^XJy=&er>3ZOm48&M9gIY@5^9>%1Zb*j=1}{iqFQT)=-?=jp$`dp=tF{P zHKyrD`^bpaJZp!JqHgGs)r0GZ)^|;|TCK+Spjs=MOFeW~yDmDkVNEJ@ zaEmnb-&YS#8%G&jS8E+dlkk6gK(!8tY7IwocJ#-J=DT*x&whqf>Ett_0T5=ssFe48IiFh2>)UK2XLEe8yyX!lmGw# diff --git a/NeuroML2/PyNN_NeuroML2_Export.net.nml b/NeuroML2/PyNN_NeuroML2_Export.net.nml index 20c8b1f..a14a01b 100644 --- a/NeuroML2/PyNN_NeuroML2_Export.net.nml +++ b/NeuroML2/PyNN_NeuroML2_Export.net.nml @@ -3,7 +3,7 @@ This NeuroML 2 file has been generated from: PyNN v0.10.1 libNeuroML v0.5.8 - pyNeuroML v1.1.10 + pyNeuroML v1.1.14 From 085bbf7c88a20bc75e80234cc0d4e6502aebd6d6 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Mon, 17 Jun 2024 18:47:35 +0100 Subject: [PATCH 3/3] Regenerated --- NeuroML2/ConnectionsTest.net.nml | 28 ++++++++++----------- NeuroML2/Inputs.net.nml | 8 +++--- NeuroML2/LEMS_Sim_Inputs.xml | 6 ++--- NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml | 6 ++--- NeuroML2/Positions.net.nml.h5 | Bin 23793 -> 23815 bytes NeuroML2/PyNN_NeuroML2_Export.net.nml | 8 +++--- PyNN/LEMS_2007One_pynn.py | 6 ++--- PyNN/RS.mod | 6 ++--- PyNN/RS_Iext.mod | 6 ++--- PyNN/RS_Iext_inputdefinition.py | 6 ++--- PyNN/RS_celldefinition.py | 6 ++--- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/NeuroML2/ConnectionsTest.net.nml b/NeuroML2/ConnectionsTest.net.nml index 051c17d..6f54316 100644 --- a/NeuroML2/ConnectionsTest.net.nml +++ b/NeuroML2/ConnectionsTest.net.nml @@ -1,9 +1,9 @@ - + This NeuroML 2 file has been generated from: - PyNN v0.10.1 - libNeuroML v0.5.8 - pyNeuroML v1.1.14 + PyNN v0.11.0 + libNeuroML v0.6.1 + pyNeuroML v1.3.0 @@ -17,38 +17,38 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/NeuroML2/Inputs.net.nml b/NeuroML2/Inputs.net.nml index f3b1234..669d643 100644 --- a/NeuroML2/Inputs.net.nml +++ b/NeuroML2/Inputs.net.nml @@ -1,9 +1,9 @@ - + This NeuroML 2 file has been generated from: - PyNN v0.10.1 - libNeuroML v0.5.8 - pyNeuroML v1.1.14 + PyNN v0.11.0 + libNeuroML v0.6.1 + pyNeuroML v1.3.0 diff --git a/NeuroML2/LEMS_Sim_Inputs.xml b/NeuroML2/LEMS_Sim_Inputs.xml index 520af46..6ec17cd 100644 --- a/NeuroML2/LEMS_Sim_Inputs.xml +++ b/NeuroML2/LEMS_Sim_Inputs.xml @@ -2,9 +2,9 @@ diff --git a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml index 1b1ff17..d3b9791 100644 --- a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml +++ b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml @@ -2,9 +2,9 @@ diff --git a/NeuroML2/Positions.net.nml.h5 b/NeuroML2/Positions.net.nml.h5 index cf740c73c713491d6fbb2edf6f1dcb96751a8212..9a48b875fd923cab4aae57c8165483179115c5c8 100644 GIT binary patch delta 8719 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 tB>mbw+W!@({_n?-`M?Bnbav{{u1bLWkboe#-y= delta 8707 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 diff --git a/NeuroML2/PyNN_NeuroML2_Export.net.nml b/NeuroML2/PyNN_NeuroML2_Export.net.nml index a14a01b..d57a4e7 100644 --- a/NeuroML2/PyNN_NeuroML2_Export.net.nml +++ b/NeuroML2/PyNN_NeuroML2_Export.net.nml @@ -1,9 +1,9 @@ - + This NeuroML 2 file has been generated from: - PyNN v0.10.1 - libNeuroML v0.5.8 - pyNeuroML v1.1.14 + PyNN v0.11.0 + libNeuroML v0.6.1 + pyNeuroML v1.3.0 diff --git a/PyNN/LEMS_2007One_pynn.py b/PyNN/LEMS_2007One_pynn.py index 805fccc..d48ba1d 100644 --- a/PyNN/LEMS_2007One_pynn.py +++ b/PyNN/LEMS_2007One_pynn.py @@ -9,9 +9,9 @@ This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.10.0 - org.neuroml.model v1.10.0 - jLEMS v0.11.0 + org.neuroml.export v1.10.1 + org.neuroml.model v1.10.1 + jLEMS v0.11.1 ''' # Main PyNN script for: net1 diff --git a/PyNN/RS.mod b/PyNN/RS.mod index 7b061fa..7ac284b 100644 --- a/PyNN/RS.mod +++ b/PyNN/RS.mod @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS type=izhikevich2007Cell) COMMENT This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.10.0 - org.neuroml.model v1.10.0 - jLEMS v0.11.0 + org.neuroml.export v1.10.1 + org.neuroml.model v1.10.1 + jLEMS v0.11.1 ENDCOMMENT diff --git a/PyNN/RS_Iext.mod b/PyNN/RS_Iext.mod index 1bb35f0..677626d 100644 --- a/PyNN/RS_Iext.mod +++ b/PyNN/RS_Iext.mod @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS_Iext type=pulseGenerator) COMMENT This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.10.0 - org.neuroml.model v1.10.0 - jLEMS v0.11.0 + org.neuroml.export v1.10.1 + org.neuroml.model v1.10.1 + jLEMS v0.11.1 ENDCOMMENT diff --git a/PyNN/RS_Iext_inputdefinition.py b/PyNN/RS_Iext_inputdefinition.py index f683153..4aedd92 100644 --- a/PyNN/RS_Iext_inputdefinition.py +++ b/PyNN/RS_Iext_inputdefinition.py @@ -9,9 +9,9 @@ --------------------------------------------- This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.10.0 - org.neuroml.model v1.10.0 - jLEMS v0.11.0 + org.neuroml.export v1.10.1 + org.neuroml.model v1.10.1 + jLEMS v0.11.1 ''' # Input file for Component: RS_Iext diff --git a/PyNN/RS_celldefinition.py b/PyNN/RS_celldefinition.py index a53d531..7f6a681 100644 --- a/PyNN/RS_celldefinition.py +++ b/PyNN/RS_celldefinition.py @@ -16,9 +16,9 @@ --------------------------------------------- This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export) - org.neuroml.export v1.10.0 - org.neuroml.model v1.10.0 - jLEMS v0.11.0 + org.neuroml.export v1.10.1 + org.neuroml.model v1.10.1 + jLEMS v0.11.1 ''' # Cell file for Component: RS