diff --git a/tests/validation/validate_ball_and_stick.cpp b/tests/validation/validate_ball_and_stick.cpp index 0e31bcaad33723829317a02d183ba9f40bb20f76..109155a69a7829b9300665bd5523ec7eaf1c3558 100644 --- a/tests/validation/validate_ball_and_stick.cpp +++ b/tests/validation/validate_ball_and_stick.cpp @@ -9,6 +9,10 @@ TEST(ball_and_stick, neuron_ref) { validate_ball_and_stick<lowered_cell>(); } +TEST(ball_and_taper, neuron_ref) { + validate_ball_and_taper<lowered_cell>(); +} + TEST(ball_and_3stick, neuron_ref) { validate_ball_and_3stick<lowered_cell>(); } diff --git a/tests/validation/validate_ball_and_stick.cu b/tests/validation/validate_ball_and_stick.cu index b753b6b5d744c822aef7e65fc41e88b7dbeeeafb..52d1bf0dc84925e858c775002e210d3c630fc1d3 100644 --- a/tests/validation/validate_ball_and_stick.cu +++ b/tests/validation/validate_ball_and_stick.cu @@ -9,6 +9,10 @@ TEST(ball_and_stick, neuron_ref) { validate_ball_and_stick<lowered_cell>(); } +TEST(ball_and_taper, neuron_ref) { + validate_ball_and_taper<lowered_cell>(); +} + TEST(ball_and_3stick, neuron_ref) { validate_ball_and_3stick<lowered_cell>(); } diff --git a/tests/validation/validate_ball_and_stick.hpp b/tests/validation/validate_ball_and_stick.hpp index bed16d4d59663d7d3bcd8bf069358a386a53b2bd..0a438f9df90e25ca8ce2ebc68895adae82cff299 100644 --- a/tests/validation/validate_ball_and_stick.hpp +++ b/tests/validation/validate_ball_and_stick.hpp @@ -59,7 +59,6 @@ void run_ncomp_convergence_test( runner.assert_all_convergence(); } - template <typename LoweredCell> void validate_ball_and_stick() { using namespace nest::mc; @@ -81,6 +80,27 @@ void validate_ball_and_stick() { samplers); } +template <typename LoweredCell> +void validate_ball_and_taper() { + using namespace nest::mc; + + cell c = make_cell_ball_and_taper(); + add_common_voltage_probes(c); + + float sample_dt = 0.025f; + sampler_info samplers[] = { + {"soma.mid", {0u, 0u}, simple_sampler(sample_dt)}, + {"taper.mid", {0u, 1u}, simple_sampler(sample_dt)}, + {"taper.end", {0u, 2u}, simple_sampler(sample_dt)} + }; + + run_ncomp_convergence_test<LoweredCell>( + "ball_and_taper", + "neuron_ball_and_taper.json", + c, + samplers); +} + template <typename LoweredCell> void validate_ball_and_3stick() { using namespace nest::mc;