Skip to content
Snippets Groups Projects
Commit 9897ce84 authored by Benjamin Cumming's avatar Benjamin Cumming
Browse files

merge with master

parent 66b35c60
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,7 @@ public: ...@@ -65,7 +65,7 @@ public:
clear_spikes(); clear_spikes();
clear_events(); clear_events();
reset_samplers(); reset_samplers();
initialize_cells(); //initialize_cells();
for (auto& spike_source: spike_sources_) { for (auto& spike_source: spike_sources_) {
spike_source.source.reset(cell_, 0.f); spike_source.source.reset(cell_, 0.f);
} }
...@@ -175,11 +175,6 @@ public: ...@@ -175,11 +175,6 @@ public:
} }
private: private:
void initialize_cells() {
cell_.voltage()(memory::all) = -65.;
cell_.initialize();
}
/// gid of first cell in group /// gid of first cell in group
cell_gid_type gid_base_; cell_gid_type gid_base_;
......
...@@ -55,12 +55,6 @@ struct sequence_traits { ...@@ -55,12 +55,6 @@ struct sequence_traits {
using const_sentinel = decltype(cend(std::declval<Seq&>())); 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 // Convenience short cuts
template <typename T> template <typename T>
......
...@@ -89,15 +89,17 @@ public: ...@@ -89,15 +89,17 @@ public:
} }
virtual void OnTestCaseEnd(const TestCase& test_case) override { virtual void OnTestCaseEnd(const TestCase& test_case) override {
pprintf( pprintf(
"TESTCASE %s : %2d:%-2d pass:fail of %2d tests\n\n", "[PASSED %3d; FAILED %3d] of %3d tests in %s\n\n",
test_case.name(), test_case_tests_-test_case_failures_,
test_case_failures_, test_case_tests_-test_case_failures_, test_case_tests_ test_case_failures_,
test_case_tests_,
test_case.name()
); );
} }
// Called before a test starts. // Called before a test starts.
virtual void OnTestStart(const TestInfo& test_info) override { 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; test_failures_ = 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment