From 9897ce8495ddd0d9ad9ad80f4ee6f95f18881549 Mon Sep 17 00:00:00 2001
From: bcumming <bcumming@cscs.ch>
Date: Thu, 25 Aug 2016 13:18:46 +0200
Subject: [PATCH] merge with master
---
src/cell_group.hpp | 7 +------
src/util/meta.hpp | 6 ------
tests/global_communication/mpi_listener.hpp | 10 ++++++----
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/cell_group.hpp b/src/cell_group.hpp
index 5cb724ee..7bfd4bb3 100644
--- a/src/cell_group.hpp
+++ b/src/cell_group.hpp
@@ -65,7 +65,7 @@ public:
clear_spikes();
clear_events();
reset_samplers();
- initialize_cells();
+ //initialize_cells();
for (auto& spike_source: spike_sources_) {
spike_source.source.reset(cell_, 0.f);
}
@@ -175,11 +175,6 @@ public:
}
private:
- void initialize_cells() {
- cell_.voltage()(memory::all) = -65.;
- cell_.initialize();
- }
-
/// gid of first cell in group
cell_gid_type gid_base_;
diff --git a/src/util/meta.hpp b/src/util/meta.hpp
index 210cb439..40f08d48 100644
--- a/src/util/meta.hpp
+++ b/src/util/meta.hpp
@@ -55,12 +55,6 @@ struct sequence_traits {
using const_sentinel = decltype(cend(std::declval<Seq&>()));
};
-template <typename X>
-std::size_t size(const X& x) { return x.size(); }
-
-template <typename X, std::size_t N>
-constexpr std::size_t size(X (&)[N]) { return N; }
-
// Convenience short cuts
template <typename T>
diff --git a/tests/global_communication/mpi_listener.hpp b/tests/global_communication/mpi_listener.hpp
index 968424c3..159616dd 100644
--- a/tests/global_communication/mpi_listener.hpp
+++ b/tests/global_communication/mpi_listener.hpp
@@ -89,15 +89,17 @@ public:
}
virtual void OnTestCaseEnd(const TestCase& test_case) override {
pprintf(
- "TESTCASE %s : %2d:%-2d pass:fail of %2d tests\n\n",
- test_case.name(),
- test_case_failures_, test_case_tests_-test_case_failures_, test_case_tests_
+ "[PASSED %3d; FAILED %3d] of %3d tests in %s\n\n",
+ test_case_tests_-test_case_failures_,
+ test_case_failures_,
+ test_case_tests_,
+ test_case.name()
);
}
// Called before a test starts.
virtual void OnTestStart(const TestInfo& test_info) override {
- pprintf( " TEST %s::%s\n", test_info.test_case_name(), test_info.name());
+ pprintf( " TEST %s::%s\n", test_info.test_case_name(), test_info.name());
test_failures_ = 0;
}
--
GitLab