Skip to content

Refactor coils #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 7, 2025
Merged

Refactor coils #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba6f4b8
Refactor coils
Grufoony Nov 6, 2025
74b6bbe
Fixing
Grufoony Nov 7, 2025
474d4f2
A number is not a string, apparently
Grufoony Nov 7, 2025
fdc50f7
Copilot suggestions
Grufoony Nov 7, 2025
62f89f1
I don't think this is actually useful
Grufoony Nov 7, 2025
3c03a8d
Bump version
Grufoony Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include README.md
include LICENSE
include requirements.txt
include CMakeLists.txt
include Doxyfile
recursive-include src *
Expand Down
14 changes: 7 additions & 7 deletions benchmark/Bench_Dynamics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ static const auto DATA_FOLDER =
std::filesystem::path(__FILE__).parent_path().parent_path() / "test/data";

static void BM_FirstOrderDynamics_Empty_Evolve(benchmark::State& state) {
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
dsf::mobility::FirstOrderDynamics dynamics(network);
for (auto _ : state) {
dynamics.evolve();
}
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
dsf::mobility::FirstOrderDynamics dynamics(network);
for (auto _ : state) {
dynamics.evolve();
}
}

BENCHMARK(BM_FirstOrderDynamics_Empty_Evolve);
Expand Down
35 changes: 18 additions & 17 deletions benchmark/Bench_Network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,34 +36,35 @@
}
}
static void BM_RoadNetwork_NodesLooping(benchmark::State& state) {
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
for (auto _ : state) {
for (auto const& [id, node] : network.nodes()) {
benchmark::DoNotOptimize(id);
benchmark::DoNotOptimize(node);
}
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
for (auto _ : state) {
for (auto const& [id, node] : network.nodes()) {

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
benchmark::DoNotOptimize(id);
benchmark::DoNotOptimize(node);
}
}
}
static void BM_RoadNetwork_EdgesLooping(benchmark::State& state) {
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
for (auto _ : state) {
for (auto const& [id, edge] : network.edges()) {
benchmark::DoNotOptimize(id);
benchmark::DoNotOptimize(edge);
}
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
for (auto _ : state) {
for (auto const& [id, edge] : network.edges()) {

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
benchmark::DoNotOptimize(id);
benchmark::DoNotOptimize(edge);
}
}
}
static void BM_RoadNetwork_ShortestPath(benchmark::State& state) {
dsf::mobility::RoadNetwork network;
network.importEdges((DATA_FOLDER / "forlì_edges.csv").string());
network.importNodeProperties((DATA_FOLDER / "forlì_nodes.csv").string());
auto itNode = network.nodes().cbegin();
for (auto _ : state) {
auto paths = network.allPathsTo(itNode->first, [](auto const& pEdge) { return pEdge->length(); });
auto paths = network.allPathsTo(itNode->first,
[](auto const& pEdge) { return pEdge->length(); });

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.5 rule Note test

MISRA 15.5 rule
++itNode;
}
}
Expand Down
164 changes: 32 additions & 132 deletions benchmark/Bench_Street.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,8 @@

static void BM_Street_Construction(benchmark::State& state) {
for (auto _ : state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
std::nullopt,
1.0);
dsf::mobility::Street street(
0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, std::nullopt, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
benchmark::DoNotOptimize(street);
}
}
Expand All @@ -36,15 +29,7 @@
}

static void BM_Street_Enqueue(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -60,15 +45,7 @@
}

static void BM_Street_Dequeue(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -85,20 +62,13 @@
}

static void BM_Street_nAgents(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
street.addAgent(std::move(agent));
if (i % 2 == 0) street.enqueue(0);
if (i % 2 == 0)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note test

MISRA 15.6 rule

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.1 rule Note test

MISRA 12.1 rule
street.enqueue(0);
}
for (auto _ : state) {
int n = street.nAgents();
Expand All @@ -107,20 +77,13 @@
}

static void BM_Street_Density(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
street.addAgent(std::move(agent));
if (i % 2 == 0) street.enqueue(0);
if (i % 2 == 0)

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.1 rule Note test

MISRA 12.1 rule

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.6 rule Note test

MISRA 15.6 rule
street.enqueue(0);
}
for (auto _ : state) {
double d = street.density(false);
Expand All @@ -129,15 +92,7 @@
}

static void BM_Street_nMovingAgents(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -150,15 +105,7 @@
}

static void BM_Street_nExitingAgents(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -172,86 +119,47 @@
}

static void BM_Street_SetLaneMapping(benchmark::State& state) {
dsf::mobility::Street street(0,
{0, 1},
100.0,
13.8888888889,
3,
"test",
{},
std::nullopt,
1.0);
dsf::mobility::Street street(
0, {0, 1}, 100.0, 13.8888888889, 3, "test", {}, std::nullopt, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
std::vector<dsf::Direction> laneMapping = {
dsf::Direction::RIGHTANDSTRAIGHT,
dsf::Direction::STRAIGHT,
dsf::Direction::LEFT};
dsf::Direction::RIGHTANDSTRAIGHT, dsf::Direction::STRAIGHT, dsf::Direction::LEFT};
for (auto _ : state) {
street.setLaneMapping(laneMapping);
}
}

static void BM_StochasticStreet_SetFlowRate(benchmark::State& state) {
dsf::mobility::Street baseStreet(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
std::nullopt,
1.0);
dsf::mobility::Street baseStreet(
0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, std::nullopt, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
dsf::mobility::StochasticStreet street(std::move(baseStreet), 0.5);
for (auto _ : state) {
street.setFlowRate(0.8);
}
}

static void BM_StochasticStreet_FlowRate(benchmark::State& state) {
dsf::mobility::Street baseStreet(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
std::nullopt,
1.0);
dsf::mobility::Street baseStreet(
0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, std::nullopt, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
dsf::mobility::StochasticStreet street(std::move(baseStreet), 0.5);
for (auto _ : state) {
double fr = street.flowRate();
benchmark::DoNotOptimize(fr);
}
}

static void BM_SpireStreet_AddAgent(benchmark::State& state) {
dsf::mobility::Street baseStreet(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::SpireStreet street(std::move(baseStreet));
static void BM_CoilStreet_AddAgent(benchmark::State& state) {

Check warning

Code scanning / Cppcheck (reported by Codacy)

Parameter 'state' can be declared with const Warning test

Parameter 'state' can be declared with const
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
street.enableCounter();
std::time_t spawnTime = 0;
for (auto _ : state) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
street.addAgent(std::move(agent));
}
}

static void BM_SpireStreet_MeanFlow(benchmark::State& state) {
dsf::mobility::Street baseStreet(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::SpireStreet street(std::move(baseStreet));
static void BM_CoilStreet_MeanFlow(benchmark::State& state) {

Check warning

Code scanning / Cppcheck (reported by Codacy)

Parameter 'state' can be declared with const Warning test

Parameter 'state' can be declared with const
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
street.enableCounter();
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -262,22 +170,14 @@
}
}
for (auto _ : state) {
int flow = street.meanFlow();
auto flow = street.counts();
benchmark::DoNotOptimize(flow);
}
}

static void BM_SpireStreet_Dequeue(benchmark::State& state) {
dsf::mobility::Street baseStreet(0,
{0, 1},
100.0,
13.8888888889,
2,
"test",
{},
100,
1.0);
dsf::mobility::SpireStreet street(std::move(baseStreet));
static void BM_CoilStreet_Dequeue(benchmark::State& state) {

Check warning

Code scanning / Cppcheck (reported by Codacy)

Parameter 'state' can be declared with const Warning test

Parameter 'state' can be declared with const
dsf::mobility::Street street(0, {0, 1}, 100.0, 13.8888888889, 2, "test", {}, 100, 1.0);

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
street.enableCounter();
std::time_t spawnTime = 0;
for (int i = 0; i < 50; ++i) {
auto agent = std::make_unique<dsf::mobility::Agent>(spawnTime++, 1, 0);
Expand All @@ -304,8 +204,8 @@
BENCHMARK(BM_Street_SetLaneMapping);
BENCHMARK(BM_StochasticStreet_SetFlowRate);
BENCHMARK(BM_StochasticStreet_FlowRate);
BENCHMARK(BM_SpireStreet_AddAgent);
BENCHMARK(BM_SpireStreet_MeanFlow);
BENCHMARK(BM_SpireStreet_Dequeue);
BENCHMARK(BM_CoilStreet_AddAgent);
BENCHMARK(BM_CoilStreet_MeanFlow);
BENCHMARK(BM_CoilStreet_Dequeue);

BENCHMARK_MAIN();
Loading
Loading