From deea36b537605781d18b29baf01260eb90a29619 Mon Sep 17 00:00:00 2001
From: Nora Abi Akar <nora.abiakar@gmail.com>
Date: Mon, 16 Dec 2019 19:23:54 +0100
Subject: [PATCH] Sort sample events by cell id (#922)
* Rename `sample_event::cell_index` to `intdom_index`.
* Sort `sample_events` by integration domain.
Fixes #921
---
arbor/backends/event.hpp | 8 ++++----
arbor/mc_cell_group.cpp | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arbor/backends/event.hpp b/arbor/backends/event.hpp
index cdf4b5cc..d14bfdea 100644
--- a/arbor/backends/event.hpp
+++ b/arbor/backends/event.hpp
@@ -13,7 +13,7 @@ namespace arb {
struct target_handle {
cell_local_size_type mech_id; // mechanism type identifier (per cell group).
cell_local_size_type mech_index; // instance of the mechanism
- cell_size_type intdom_index; // which integration domain (acts as index into e.g. vec_t)
+ cell_size_type intdom_index; // which integration domain (acts as index into e.g. vec_t)
target_handle() {}
target_handle(cell_local_size_type mech_id, cell_local_size_type mech_index, cell_size_type intdom_index):
@@ -60,8 +60,8 @@ struct raw_probe_info {
struct sample_event {
time_type time;
- cell_size_type cell_index; // which cell probe is on
- raw_probe_info raw; // event payload: what gets put where on sample
+ cell_size_type intdom_index; // which integration domain probe is on
+ raw_probe_info raw; // event payload: what gets put where on sample
};
inline raw_probe_info event_data(const sample_event& ev) {
@@ -69,7 +69,7 @@ inline raw_probe_info event_data(const sample_event& ev) {
}
inline cell_size_type event_index(const sample_event& ev) {
- return ev.cell_index;
+ return ev.intdom_index;
}
diff --git a/arbor/mc_cell_group.cpp b/arbor/mc_cell_group.cpp
index bcd96d2f..ce142817 100644
--- a/arbor/mc_cell_group.cpp
+++ b/arbor/mc_cell_group.cpp
@@ -183,6 +183,7 @@ void mc_cell_group::advance(epoch ep, time_type dt, const event_lane_subrange& e
// Sample events must be ordered by time for the lowered cell.
util::sort_by(sample_events, [](const sample_event& ev) { return event_time(ev); });
+ util::stable_sort_by(sample_events, [](const sample_event& ev) { return event_index(ev); });
PL();
// Run integration and collect samples, spikes.
--
GitLab