From e8eb2e64d2196836572808fab4873a2c599ed368 Mon Sep 17 00:00:00 2001 From: Michael Deistler Date: Thu, 9 Nov 2023 10:21:47 +0100 Subject: [PATCH] Make tests run --- tests/neurax_identical/test_basic_modules.py | 70 +++++++++---------- .../test_radius_and_length.py | 70 +++++++++---------- tests/neurax_identical/test_swc.py | 46 ++++++------ 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/tests/neurax_identical/test_basic_modules.py b/tests/neurax_identical/test_basic_modules.py index de7278db..bc8a9ee4 100644 --- a/tests/neurax_identical/test_basic_modules.py +++ b/tests/neurax_identical/test_basic_modules.py @@ -34,13 +34,13 @@ def test_compartment(): -66.53085703, -50.08343917, -20.4930498, - 32.59313718, - 2.43694172, - -26.28659049, - -50.60083575, - -73.00785374, - -75.70088187, - -75.58850932, + 32.6178327, + 2.57004029, + -26.19517261, + -50.50027566, + -72.97019524, + -75.69907171, + -75.58874436, ] ] ) @@ -70,13 +70,13 @@ def test_branch(): -66.53085703, -56.84345977, -47.34841899, - -31.44840463, - 31.42082062, - 7.06374191, - -22.55693822, - -46.57781433, - -71.30357569, - -75.67506729, + -32.63377325, + 30.99759112, + 8.03521283, + -21.81119545, + -45.8401624, + -70.88960656, + -75.66123707, ] ] ) @@ -110,13 +110,13 @@ def test_cell(): -66.53085703, -60.77514388, -57.04487857, - -57.47607922, - -56.17604462, - -54.14448985, - -50.28092319, - -37.61368601, - 24.47352735, - 10.24274831, + -57.6428012, + -56.38585422, + -54.48571678, + -51.04843459, + -40.91384567, + 16.39867998, + 14.60929039, ] ] ) @@ -160,26 +160,26 @@ def test_net(): -66.53085703, -60.77514388, -57.04487857, - -57.47607922, - -56.17604462, - -54.14448985, - -50.28092319, - -37.61368601, - 24.47352735, - 10.24274831, + -57.6428012, + -56.38585422, + -54.48571678, + -51.04843459, + -40.91384567, + 16.39867998, + 14.60929039, ], [ -70.0, -66.12980895, -59.94208128, -55.74082517, - -55.34657106, - -52.32113275, - -44.76100591, - -3.65687352, - 22.581919, - -8.29885715, - -33.70855517, + -55.53078341, + -52.62810187, + -45.67771987, + -9.62810283, + 24.39010232, + -6.25386699, + -32.08138378, ], ] ) diff --git a/tests/neurax_identical/test_radius_and_length.py b/tests/neurax_identical/test_radius_and_length.py index 4056e565..06e06ae3 100644 --- a/tests/neurax_identical/test_radius_and_length.py +++ b/tests/neurax_identical/test_radius_and_length.py @@ -39,13 +39,13 @@ def test_radius_and_length_compartment(): -66.53085703, 45.83306656, 29.72581199, - -15.44336119, - -39.98282246, - -66.77430474, - -75.56725325, - -75.75072145, - -75.48894182, - -75.15588746, + -15.28462737, + -39.8274255, + -66.59985023, + -75.55397377, + -75.74933676, + -75.48829132, + -75.15524717, ] ] ) @@ -80,13 +80,13 @@ def test_radius_and_length_branch(): -66.53085703, 57.69711962, 27.50364167, - -20.46106389, - -44.65846514, - -70.81919426, - -75.78039147, - -75.74705134, - -75.46858134, - -75.13087565, + -20.26260571, + -44.421609, + -70.6396421, + -75.76980478, + -75.74539948, + -75.46741856, + -75.12962902, ] ] ) @@ -126,13 +126,13 @@ def test_radius_and_length_cell(): -66.53085703, 1.40098029, 41.85849945, - -3.41062602, - -30.40531156, - -54.43060925, - -73.96911419, - -75.74495833, - -75.58187443, - -75.27068799, + -3.29312727, + -30.32559832, + -54.3463986, + -73.94743834, + -75.74328911, + -75.58138665, + -75.27029656, ] ] ) @@ -185,26 +185,26 @@ def test_radius_and_length_net(): -66.53085703, 1.40098029, 41.85849945, - -3.41062602, - -30.40531156, - -54.43060925, - -73.96911419, - -75.74495833, - -75.58187443, - -75.27068799, + -3.29312727, + -30.32559832, + -54.3463986, + -73.94743834, + -75.74328911, + -75.58138665, + -75.27029656, ], [ -70.0, -66.46899201, -14.64499375, 43.92453203, - 3.25054262, - -25.60587037, - -49.03042036, - -71.89299285, - -75.57211264, - -75.4917933, - -75.16938855, + 3.34867388, + -25.54194841, + -48.97174933, + -71.86633324, + -75.57015321, + -75.49132708, + -75.16903774, ], ] ) diff --git a/tests/neurax_identical/test_swc.py b/tests/neurax_identical/test_swc.py index f76521f6..3d748735 100644 --- a/tests/neurax_identical/test_swc.py +++ b/tests/neurax_identical/test_swc.py @@ -18,7 +18,7 @@ def test_swc_cell(): dt = 0.025 # ms t_max = 5.0 # ms - current = nx.step_current(0.5, 1.0, 0.02, dt, t_max) + current = nx.step_current(0.5, 1.0, 0.2, dt, t_max) cell = nx.read_swc("../morph.swc", nseg=2, max_branch_len=300.0) cell.insert(HHChannel()) @@ -34,13 +34,13 @@ def test_swc_cell(): -66.53085703, -57.02065054, -49.74541341, - -46.15576812, - -23.71760359, - 25.19649297, - 1.99881676, - -25.42530891, - -48.23078669, - -69.2479302, + -46.92144876, + -27.85593412, + 25.00515973, + 4.52875333, + -23.36842446, + -46.25720697, + -68.22233297, ] ] ) @@ -52,7 +52,7 @@ def test_swc_cell(): def test_swc_net(): dt = 0.025 # ms t_max = 5.0 # ms - current = nx.step_current(0.5, 1.0, 0.02, dt, t_max) + current = nx.step_current(0.5, 1.0, 0.2, dt, t_max) cell1 = nx.read_swc("../morph.swc", nseg=2, max_branch_len=300.0) cell2 = nx.read_swc("../morph.swc", nseg=2, max_branch_len=300.0) @@ -78,26 +78,26 @@ def test_swc_net(): -66.53085703, -57.02065054, -49.74541341, - -46.15576812, - -23.71760359, - 25.19649297, - 1.99881676, - -25.42530891, - -48.23078669, - -69.2479302, + -46.92144876, + -27.85593412, + 25.00515973, + 4.52875333, + -23.36842446, + -46.25720697, + -68.22233297, ], [ -70.0, -66.52400879, -57.01032453, -49.72868896, - -46.10615669, - -23.43965885, - 25.17580247, - 1.83985193, - -25.55061179, - -48.34838475, - -69.29381344, + -46.87353462, + -27.60185258, + 25.04026114, + 4.3565282, + -23.50819992, + -46.38431714, + -68.28501838, ], ] )