Commit 61274ee0 authored by Gauthier Quesnel's avatar Gauthier Quesnel
Browse files

core: remove time step for observers

parent 90ed4b96
......@@ -2747,7 +2747,7 @@ editor::show_editor() noexcept
plot = &tf;
out.plot_id = plot_outs.get_id(tf);
auto& o =
sim.observers.alloc(0.01, names[i].c_str(), tf);
sim.observers.alloc(names[i].c_str(), tf);
sim.observe(*mdl, o);
}
......@@ -2765,7 +2765,7 @@ editor::show_editor() noexcept
file = &tf;
out.file_id = file_outs.get_id(tf);
auto& o =
sim.observers.alloc(0.01, names[i].c_str(), tf);
sim.observers.alloc(names[i].c_str(), tf);
sim.observe(*mdl, o);
}
ImGui::InputText(
......
......@@ -238,6 +238,7 @@ struct plot_output
std::vector<float> ys;
small_string<24u> name;
double tl = 0.0;
double time_step = 0.1;
float min = -1.f;
float max = +1.f;
};
......
......@@ -47,7 +47,7 @@ plot_output::operator()(const irt::observer& obs,
min = std::min(min, value);
max = std::max(max, value);
for (auto to_fill = tl; to_fill < t; to_fill += obs.time_step) {
for (auto to_fill = tl; to_fill < t; to_fill += time_step) {
ys.emplace_back(value);
xs.emplace_back(static_cast<float>(t));
}
......
......@@ -147,7 +147,7 @@ lif_benchmark(double simulation_duration, double quantum)
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(
sim.qss2_integrator_models.get(neuron_model.integrator).id),
obs_a);
......@@ -311,7 +311,7 @@ izhikevich_benchmark(double simulation_duration,
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
file_name = "output_izhikevitch_aqss_b_sd_" +
std::to_string(simulation_duration) + "_q_" +
std::to_string(quantum) + "_a_" + std::to_string(a) + "_b_" +
......@@ -319,7 +319,7 @@ izhikevich_benchmark(double simulation_duration,
std::to_string(d) + ".csv";
file_output fo_b(file_name.c_str());
expect(fo_b.os != nullptr);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......
......@@ -137,7 +137,7 @@ lif_benchmark(double simulation_duration, double quantum)
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.1, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(
sim.qss1_integrator_models.get(neuron_model.integrator).id),
obs_a);
......@@ -255,7 +255,7 @@ izhikevich_benchmark(double simulation_duration,
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
file_name = "output_izhikevitch_qss1_b_sd_" +
std::to_string(simulation_duration) + "_q_" +
......@@ -264,7 +264,7 @@ izhikevich_benchmark(double simulation_duration,
std::to_string(d) + ".csv";
file_output fo_b(file_name.c_str());
expect(fo_b.os != nullptr);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......
......@@ -136,7 +136,7 @@ lif_benchmark(double simulation_duration, double quantum)
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(
sim.qss2_integrator_models.get(neuron_model.integrator).id),
......@@ -255,7 +255,7 @@ izhikevich_benchmark(double simulation_duration,
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
file_name = "output_izhikevitch_qss2_b_sd_" +
std::to_string(simulation_duration) + "_q_" +
std::to_string(quantum) + "_a_" + std::to_string(a) + "_b_" +
......@@ -263,7 +263,7 @@ izhikevich_benchmark(double simulation_duration,
std::to_string(d) + ".csv";
file_output fo_b(file_name.c_str());
expect(fo_b.os != nullptr);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......
......@@ -14,7 +14,6 @@
#include <fstream>
using namespace std;
struct file_output
......@@ -54,8 +53,8 @@ file_output_observe(const irt::observer& obs,
fmt::print(output->os, "{},{}\n", t, msg.real[0]);
}
struct neuron {
struct neuron
{
irt::dynamics_id sum;
irt::dynamics_id integrator;
irt::dynamics_id constant;
......@@ -63,7 +62,6 @@ struct neuron {
irt::dynamics_id constant_cross;
};
struct neuron
make_neuron(irt::simulation* sim, long unsigned int i, double quantum) noexcept
{
......@@ -72,18 +70,14 @@ make_neuron(irt::simulation* sim, long unsigned int i, double quantum) noexcept
double Vr_lif = 0.0;
double Vt_lif = 10.0;
auto& sum_lif = sim->qss3_wsum_2_models.alloc();
auto& integrator_lif = sim->qss3_integrator_models.alloc();
auto& constant_lif = sim->constant_models.alloc();
auto& constant_cross_lif = sim->constant_models.alloc();
auto& cross_lif = sim->qss3_cross_models.alloc();
sum_lif.default_input_coeffs[0] = -1.0/tau_lif;
sum_lif.default_input_coeffs[1] = 20.0/tau_lif;
sum_lif.default_input_coeffs[0] = -1.0 / tau_lif;
sum_lif.default_input_coeffs[1] = 20.0 / tau_lif;
constant_lif.default_value = 1.0;
constant_cross_lif.default_value = Vr_lif;
......@@ -93,33 +87,31 @@ make_neuron(irt::simulation* sim, long unsigned int i, double quantum) noexcept
cross_lif.default_threshold = Vt_lif;
sim->alloc(sum_lif, sim->qss3_wsum_2_models.get_id(sum_lif));
sim->alloc(integrator_lif, sim->qss3_integrator_models.get_id(integrator_lif));
sim->alloc(integrator_lif,
sim->qss3_integrator_models.get_id(integrator_lif));
sim->alloc(constant_lif, sim->constant_models.get_id(constant_lif));
sim->alloc(cross_lif, sim->qss3_cross_models.get_id(cross_lif));
sim->alloc(constant_cross_lif, sim->constant_models.get_id(constant_cross_lif));
sim->alloc(constant_cross_lif,
sim->constant_models.get_id(constant_cross_lif));
struct neuron neuron_model = {sim->qss3_wsum_2_models.get_id(sum_lif),
struct neuron neuron_model = {
sim->qss3_wsum_2_models.get_id(sum_lif),
sim->qss3_integrator_models.get_id(integrator_lif),
sim->constant_models.get_id(constant_lif),
sim->qss3_cross_models.get_id(cross_lif),
sim->constant_models.get_id(constant_cross_lif),
};
// Connections
expect(sim->connect(cross_lif.y[0], integrator_lif.x[1]) ==
irt::status::success);
expect(sim->connect(cross_lif.y[1], sum_lif.x[0]) ==
irt::status::success);
expect(sim->connect(integrator_lif.y[0],cross_lif.x[0]) ==
expect(sim->connect(cross_lif.y[1], sum_lif.x[0]) == irt::status::success);
expect(sim->connect(integrator_lif.y[0], cross_lif.x[0]) ==
irt::status::success);
expect(sim->connect(integrator_lif.y[0],cross_lif.x[2]) ==
expect(sim->connect(integrator_lif.y[0], cross_lif.x[2]) ==
irt::status::success);
expect(sim->connect(constant_cross_lif.y[0],cross_lif.x[1]) ==
expect(sim->connect(constant_cross_lif.y[0], cross_lif.x[1]) ==
irt::status::success);
expect(sim->connect(constant_lif.y[0], sum_lif.x[1]) ==
irt::status::success);
......@@ -128,33 +120,27 @@ make_neuron(irt::simulation* sim, long unsigned int i, double quantum) noexcept
return neuron_model;
}
void lif_benchmark(double simulation_duration, double quantum)
void
lif_benchmark(double simulation_duration, double quantum)
{
using namespace boost::ut;
irt::simulation sim;
expect(irt::is_success(sim.init(2600lu, 40000lu)));
struct neuron neuron_model = make_neuron(&sim,0.0,quantum);
struct neuron neuron_model = make_neuron(&sim, 0.0, quantum);
irt::time t = 0.0;
std::string file_name = "output_lif_qss3_sd_"+
std::to_string(simulation_duration)+
"_q_"+std::to_string(quantum)+
".csv";
std::string file_name = "output_lif_qss3_sd_" +
std::to_string(simulation_duration) + "_q_" +
std::to_string(quantum) + ".csv";
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01,
"A",
static_cast<void*>(&fo_a),
&file_output_initialize,
&file_output_observe,
nullptr);
sim.observe(sim.models.get(sim.qss3_integrator_models.get(neuron_model.integrator).id), obs_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(
sim.qss3_integrator_models.get(neuron_model.integrator).id),
obs_a);
expect(irt::status::success == sim.initialize(t));
......@@ -165,7 +151,15 @@ void lif_benchmark(double simulation_duration, double quantum)
} while (t < simulation_duration);
}
void izhikevich_benchmark(double simulation_duration, double quantum, double a, double b, double c, double d, double I, double vini)
void
izhikevich_benchmark(double simulation_duration,
double quantum,
double a,
double b,
double c,
double d,
double I,
double vini)
{
using namespace boost::ut;
irt::simulation sim;
......@@ -183,7 +177,6 @@ void izhikevich_benchmark(double simulation_duration, double quantum, double a,
auto& cross = sim.qss3_cross_models.alloc();
auto& cross2 = sim.qss3_cross_models.alloc();
double vt = 30.0;
constant.default_value = 1.0;
......@@ -210,7 +203,6 @@ void izhikevich_benchmark(double simulation_duration, double quantum, double a,
sum_d.default_input_coeffs[0] = 1.0;
sum_d.default_input_coeffs[1] = d;
sim.alloc(constant3, sim.constant_models.get_id(constant3));
sim.alloc(constant, sim.constant_models.get_id(constant));
sim.alloc(constant2, sim.constant_models.get_id(constant2));
......@@ -224,12 +216,9 @@ void izhikevich_benchmark(double simulation_duration, double quantum, double a,
sim.alloc(cross, sim.qss3_cross_models.get_id(cross));
sim.alloc(cross2, sim.qss3_cross_models.get_id(cross2));
expect(sim.connect(integrator_a.y[0], cross.x[0]) ==
irt::status::success);
expect(sim.connect(integrator_a.y[0], cross.x[0]) == irt::status::success);
expect(sim.connect(constant2.y[0], cross.x[1]) == irt::status::success);
expect(sim.connect(integrator_a.y[0], cross.x[2]) ==
irt::status::success);
expect(sim.connect(integrator_a.y[0], cross.x[2]) == irt::status::success);
expect(sim.connect(cross.y[1], product.x[0]) == irt::status::success);
expect(sim.connect(cross.y[1], product.x[1]) == irt::status::success);
......@@ -244,61 +233,36 @@ void izhikevich_benchmark(double simulation_duration, double quantum, double a,
// expect(sim.connect(integrator_b.y[0], sum_a.x[1]) ==
// irt::status::success);
expect(sim.connect(cross2.y[1], sum_a.x[1]) == irt::status::success);
expect(sim.connect(sum_a.y[0], integrator_a.x[0]) ==
irt::status::success);
expect(sim.connect(cross.y[0], integrator_a.x[1]) ==
irt::status::success);
expect(sim.connect(sum_a.y[0], integrator_a.x[0]) == irt::status::success);
expect(sim.connect(cross.y[0], integrator_a.x[1]) == irt::status::success);
expect(sim.connect(cross2.y[1], sum_b.x[0]) == irt::status::success);
expect(sim.connect(sum_b.y[0], integrator_b.x[0]) ==
irt::status::success);
expect(sim.connect(sum_b.y[0], integrator_b.x[0]) == irt::status::success);
expect(sim.connect(cross2.y[0], integrator_b.x[1]) ==
irt::status::success);
expect(sim.connect(integrator_a.y[0], cross2.x[0]) ==
irt::status::success);
expect(sim.connect(integrator_b.y[0], cross2.x[2]) ==
irt::status::success);
expect(sim.connect(cross2.y[0], integrator_b.x[1]) == irt::status::success);
expect(sim.connect(integrator_a.y[0], cross2.x[0]) == irt::status::success);
expect(sim.connect(integrator_b.y[0], cross2.x[2]) == irt::status::success);
expect(sim.connect(sum_d.y[0], cross2.x[1]) == irt::status::success);
expect(sim.connect(integrator_b.y[0], sum_d.x[0]) ==
irt::status::success);
expect(sim.connect(integrator_b.y[0], sum_d.x[0]) == irt::status::success);
expect(sim.connect(constant.y[0], sum_d.x[1]) == irt::status::success);
std::string file_name = "output_izhikevitch_qss3_a_sd_"+
std::to_string(simulation_duration)+
"_q_"+std::to_string(quantum)+
"_a_"+std::to_string(a)+
"_b_"+std::to_string(b)+
"_c_"+std::to_string(c)+
"_d_"+std::to_string(d)+
".csv";
std::string file_name =
"output_izhikevitch_qss3_a_sd_" + std::to_string(simulation_duration) +
"_q_" + std::to_string(quantum) + "_a_" + std::to_string(a) + "_b_" +
std::to_string(b) + "_c_" + std::to_string(c) + "_d_" +
std::to_string(d) + ".csv";
file_output fo_a(file_name.c_str());
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01,
"A",
static_cast<void*>(&fo_a),
&file_output_initialize,
&file_output_observe,
nullptr);
file_name = "output_izhikevitch_qss3_b_sd_"+
std::to_string(simulation_duration)+
"_q_"+std::to_string(quantum)+
"_a_"+std::to_string(a)+
"_b_"+std::to_string(b)+
"_c_"+std::to_string(c)+
"_d_"+std::to_string(d)+
".csv";
auto& obs_a = sim.observers.alloc("A", fo_a);
file_name = "output_izhikevitch_qss3_b_sd_" +
std::to_string(simulation_duration) + "_q_" +
std::to_string(quantum) + "_a_" + std::to_string(a) + "_b_" +
std::to_string(b) + "_c_" + std::to_string(c) + "_d_" +
std::to_string(d) + ".csv";
file_output fo_b(file_name.c_str());
expect(fo_b.os != nullptr);
auto& obs_b = sim.observers.alloc(0.01,
"B",
static_cast<void*>(&fo_b),
&file_output_initialize,
&file_output_observe,
nullptr);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......@@ -314,32 +278,59 @@ void izhikevich_benchmark(double simulation_duration, double quantum, double a,
} while (t < simulation_duration);
};
BENCHMARK_P(LIF, QSS3, 10, 1,( double simulation_duration, double quantum))
BENCHMARK_P(LIF, QSS3, 10, 1, (double simulation_duration, double quantum))
{
lif_benchmark(simulation_duration,quantum);
lif_benchmark(simulation_duration, quantum);
}
BENCHMARK_P(Izhikevich, QSS3, 1, 1,( double simulation_duration, double quantum, double a, double b, double c, double d, double I, double vini))
BENCHMARK_P(Izhikevich,
QSS3,
1,
1,
(double simulation_duration,
double quantum,
double a,
double b,
double c,
double d,
double I,
double vini))
{
izhikevich_benchmark(simulation_duration,quantum,a,b,c,d,I,vini);
izhikevich_benchmark(simulation_duration, quantum, a, b, c, d, I, vini);
}
BENCHMARK_P_INSTANCE(LIF, QSS3, (1000,1e-6));
BENCHMARK_P_INSTANCE(LIF, QSS3, (1000, 1e-6));
// Regular spiking (RS)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.02,0.2,-65.0,8.0,10.0,0.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.02, 0.2, -65.0, 8.0, 10.0, 0.0));
// Intrinsical bursting (IB)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.02,0.2,-55.0,4.0,10.0,0.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.02, 0.2, -55.0, 4.0, 10.0, 0.0));
// Chattering spiking (CH)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.02,0.2,-50.0,2.0,10.0,0.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.02, 0.2, -50.0, 2.0, 10.0, 0.0));
// Fast spiking (FS)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.1,0.2,-65.0,2.0,10.0,0.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.1, 0.2, -65.0, 2.0, 10.0, 0.0));
// Thalamo-Cortical (TC)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.02,0.25,-65.0,0.05,10.0,-87.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.02, 0.25, -65.0, 0.05, 10.0, -87.0));
// Rezonator (RZ)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.1,0.26,-65.0,2.0,10.0,-63.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.1, 0.26, -65.0, 2.0, 10.0, -63.0));
// Low-threshold spiking (LTS)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.02,0.25,-65.0,2.0,10.0,-63.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.02, 0.25, -65.0, 2.0, 10.0, -63.0));
// Problematic (P)
BENCHMARK_P_INSTANCE(Izhikevich, QSS3, (1000,1e-6,0.2,2,-56.0,-16.0,-99.0,0.0));
BENCHMARK_P_INSTANCE(Izhikevich,
QSS3,
(1000, 1e-6, 0.2, 2, -56.0, -16.0, -99.0, 0.0));
int
main()
......@@ -348,7 +339,4 @@ main()
hayai::Benchmarker::AddOutputter(consoleOutputter);
hayai::Benchmarker::RunAllTests();
}
......@@ -2465,17 +2465,13 @@ struct observer
using update_fn =
function_ref<void(const observer&, const time, const observer::status)>;
observer() noexcept = default;
observer(const time time_step_, const char* name_, update_fn cb_)
observer(const char* name_, update_fn cb_) noexcept
: cb(cb_)
, time_step(std::clamp(time_step_, 0.0, time_domain<time>::infinity))
, name(name_)
{}
update_fn cb;
double tl = 0.0;
double time_step = 0.0;
small_string<8> name;
model_id model = static_cast<model_id>(0);
message msg;
......@@ -6573,14 +6569,10 @@ public:
if constexpr (is_detected_v<observation_function_t, Dynamics>) {
if (mdl.obs_id != static_cast<observer_id>(0)) {
if (auto* observer = observers.try_to_get(mdl.obs_id);
observer && !observer->cb.empty()) {
if (observer->time_step == 0.0 ||
t - observer->tl >= observer->time_step) {
observer->msg = dyn.observation(t - mdl.tl);
observer->cb(*observer, t, observer::status::run);
observer->tl = t;
}
if (auto* obs = observers.try_to_get(mdl.obs_id); obs) {
obs->msg = dyn.observation(t - mdl.tl);
obs->cb(*obs, t, observer::status::run);
obs->tl = t;
} else {
mdl.obs_id = static_cast<observer_id>(0);
}
......
......@@ -522,7 +522,7 @@ main()
file_output fo_a("output_laudanski.csv");
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.0001, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(
sim.models.get(
......
......@@ -1118,8 +1118,8 @@ main()
expect(fo_a.os != nullptr);
expect(fo_b.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_a = sim.observers.alloc("A", fo_a);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......@@ -1305,11 +1305,11 @@ main()
file_output fo_a("izhikevitch_a.csv");
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
file_output fo_b("izhikevitch_b.csv");
expect(fo_b.os != nullptr);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......@@ -1395,8 +1395,8 @@ main()
expect(fo_a.os != nullptr);
expect(fo_b.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_a = sim.observers.alloc("A", fo_a);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......@@ -1482,8 +1482,8 @@ main()
expect(fo_a.os != nullptr);
expect(fo_b.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_b = sim.observers.alloc(0.01, "B", fo_b);
auto& obs_a = sim.observers.alloc("A", fo_a);
auto& obs_b = sim.observers.alloc("B", fo_b);
sim.observe(sim.models.get(integrator_a.id), obs_a);
sim.observe(sim.models.get(integrator_b.id), obs_b);
......@@ -1582,7 +1582,7 @@ main()
file_output fo_a("lif-qss.csv");
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(integrator.id), obs_a);
......@@ -1668,7 +1668,7 @@ main()
file_output fo_a("lif-qss1.csv");
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.01, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);
sim.observe(sim.models.get(integrator.id), obs_a);
......@@ -1755,7 +1755,7 @@ main()
file_output fo_a("lif-qss2.csv");
expect(fo_a.os != nullptr);
auto& obs_a = sim.observers.alloc(0.001, "A", fo_a);
auto& obs_a = sim.observers.alloc("A", fo_a);