From 16a13104442b84b46d07d31dd482e62c829ebee6 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 18 Apr 2024 16:42:31 +0100 Subject: [PATCH 01/11] Ensuring at least one on all elements --- examples/NML2_FullCell.nml | 2 ++ examples/NML2_FullNeuroML.nml | 11 ++--------- examples/NML2_InhomogeneousParams.nml | 2 ++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/NML2_FullCell.nml b/examples/NML2_FullCell.nml index a80c073..cc6fc5b 100644 --- a/examples/NML2_FullCell.nml +++ b/examples/NML2_FullCell.nml @@ -88,6 +88,8 @@ + + diff --git a/examples/NML2_FullNeuroML.nml b/examples/NML2_FullNeuroML.nml index a824e3e..99957b4 100644 --- a/examples/NML2_FullNeuroML.nml +++ b/examples/NML2_FullNeuroML.nml @@ -9,9 +9,8 @@ - - + @@ -63,20 +62,14 @@ ion="na" erev="50mV"/> - + - - - diff --git a/examples/NML2_InhomogeneousParams.nml b/examples/NML2_InhomogeneousParams.nml index 3172cd6..7afc806 100644 --- a/examples/NML2_InhomogeneousParams.nml +++ b/examples/NML2_InhomogeneousParams.nml @@ -71,6 +71,8 @@ + + From 9ff64acb72efbbaa26d4a9908e6afbd6e0a8b285 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Fri, 19 Apr 2024 10:23:47 +0100 Subject: [PATCH 02/11] Update eden spike times to 0.2.3 behaviour --- LEMSexamples/test/.test.ex0.jnmleden.omt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LEMSexamples/test/.test.ex0.jnmleden.omt b/LEMSexamples/test/.test.ex0.jnmleden.omt index 51a8777..db1942b 100644 --- a/LEMSexamples/test/.test.ex0.jnmleden.omt +++ b/LEMSexamples/test/.test.ex0.jnmleden.omt @@ -25,7 +25,7 @@ experiments: spike detection: method: threshold threshold: -55.1 - tolerance: 0.00010867391304343428 + tolerance: 0.00010869565217381418 iafPop0: observables: spike times: @@ -36,7 +36,7 @@ experiments: spike detection: method: threshold threshold: -55.1 - tolerance: 0.00014932775619959672 + tolerance: 0.00014938751120392748 iafRefPop0: observables: spike times: From 5c2e0d930916d872758b100d93d074ae6d9d5df1 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 24 Apr 2024 14:22:15 +0100 Subject: [PATCH 03/11] Update GHA versions --- .github/workflows/ci.yml | 2 +- .github/workflows/omv-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfb639f..eb68408 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: java: [ '8', '11', '16', '17', '19' ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index bec4a7c..8510691 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -25,10 +25,10 @@ jobs: - PyLEMS_NeuroML2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From 8c5b64433c93da478da083d9fe428aefa311d7c2 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Mon, 29 Apr 2024 14:38:51 +0100 Subject: [PATCH 04/11] feat(core-types): add annotation component types Fixes #224 --- NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml | 106 ++++++++++++++++----- 1 file changed, 83 insertions(+), 23 deletions(-) diff --git a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml index 5bac908..0a59cff 100644 --- a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml +++ b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml @@ -36,38 +36,75 @@ + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105,18 +142,41 @@ + - - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + From 98d2ffdac9ed5efc1ee6802b9c2012507ec82295 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 16:42:51 +0100 Subject: [PATCH 05/11] Test on java 21 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb68408..86b5668 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,13 +13,13 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '16', '17', '19' ] + java: [ '8', '11', '16', '17', '19', '21' ] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} java-package: jdk From 23fabbed1e1f181665c1e837129bd3d7c523c69c Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 3 May 2024 21:33:49 +0100 Subject: [PATCH 06/11] feat(annotations): update keywords --- NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml index 0a59cff..f47983d 100644 --- a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml +++ b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml @@ -162,7 +162,7 @@ - + From 09f066d601f63e13e8b7c073f099ab823209f61a Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 3 May 2024 21:37:09 +0100 Subject: [PATCH 07/11] feat(annotations): update combine specifications URL --- NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml index f47983d..581bb85 100644 --- a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml +++ b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml @@ -106,45 +106,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From ff2587f6bbf55e3671b363a4c1b25f36f5688f65 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 3 May 2024 23:51:45 +0100 Subject: [PATCH 08/11] feat(annotations): add remaining FOAF bits --- NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml | 67 ++++++++++++++++++---- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml index 581bb85..983d5f1 100644 --- a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml +++ b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml @@ -55,6 +55,18 @@ + + + + + + + + + + + + @@ -80,11 +92,10 @@ + - - @@ -126,9 +137,7 @@ - - - + @@ -136,9 +145,7 @@ - - - + @@ -155,13 +162,26 @@ - + + + + + + + - + + + + + + + + @@ -177,6 +197,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 089514713ee047a2d92cb5d9316ae1c7a0053880 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 7 May 2024 18:08:42 +0100 Subject: [PATCH 09/11] feat(annotations): use Child instead of Children Not sure why this is given that Child is meant to mean "one and only one" and Children mean "one or more". But, using Children causes tests to fail in org.neuroml.export etc. when building jNeuroML. This needs looking into. See also https://github.com/NeuroML/NeuroML2/issues/54 --- NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml | 102 +++++++++++---------- 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml index 983d5f1..3255598 100644 --- a/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml +++ b/NeuroML2CoreTypes/NeuroMLCoreCompTypes.xml @@ -67,51 +67,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - + - + @@ -143,15 +153,15 @@ - + - + - + - + - + @@ -179,23 +189,23 @@ - - + + - + - + - + - + - - + + - + - + From ed7b92b91ec075a687d07c8a275c1937f888c745 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 29 May 2024 14:27:12 +0100 Subject: [PATCH 10/11] Add soma_group, as it's referred to in channelDensity --- examples/NML2_FullNeuroML.nml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/NML2_FullNeuroML.nml b/examples/NML2_FullNeuroML.nml index 99957b4..b44f4b3 100644 --- a/examples/NML2_FullNeuroML.nml +++ b/examples/NML2_FullNeuroML.nml @@ -20,6 +20,10 @@ + + + + From fe3aa27d2ed146938be3efa19dfb15ddd8cc3804 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Fri, 31 May 2024 10:29:46 +0100 Subject: [PATCH 11/11] Make membraneProperties require at least one each of specificCapacitance and initMembPotential --- Schemas/NeuroML2/NeuroML_v2.3.1.xsd | 4 ++-- examples/NML2_FullCell.nml | 2 ++ examples/NML2_FullNeuroML.nml | 2 ++ examples/NML2_InhomogeneousParams.nml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Schemas/NeuroML2/NeuroML_v2.3.1.xsd b/Schemas/NeuroML2/NeuroML_v2.3.1.xsd index 877edef..741f1e8 100644 --- a/Schemas/NeuroML2/NeuroML_v2.3.1.xsd +++ b/Schemas/NeuroML2/NeuroML_v2.3.1.xsd @@ -2118,8 +2118,8 @@ - - + + diff --git a/examples/NML2_FullCell.nml b/examples/NML2_FullCell.nml index cc6fc5b..51b0288 100644 --- a/examples/NML2_FullCell.nml +++ b/examples/NML2_FullCell.nml @@ -94,6 +94,8 @@ + + diff --git a/examples/NML2_FullNeuroML.nml b/examples/NML2_FullNeuroML.nml index b44f4b3..32fb42c 100644 --- a/examples/NML2_FullNeuroML.nml +++ b/examples/NML2_FullNeuroML.nml @@ -67,6 +67,8 @@ erev="50mV"/> + + diff --git a/examples/NML2_InhomogeneousParams.nml b/examples/NML2_InhomogeneousParams.nml index 85f8ac9..5703d38 100644 --- a/examples/NML2_InhomogeneousParams.nml +++ b/examples/NML2_InhomogeneousParams.nml @@ -74,6 +74,8 @@ + +