Add dsf::geometry and Manhattan network creation tool (#353)

- Add `dsf::geometry` namespace
- Add `create_manhattan_cartography`
- Remove deprecated functions

Author: Grufoony

benchmark/Graph/BenchGraph.cpp

@@ -56,11 +56,4 @@ int main() {
   // std::cout << "Benchmarking building the adjacency matrix\n";
   // b3.benchmark([&g2]() -> void { g2.buildAdj(); });
   // b3.print<sb::microseconds>();
-
-  // Bench b4(3);
-  // RoadNetwork g3;
-  // g3.importMatrix("./RoadNetwork/data/matrix.dat");
-  // std::cout << "Benchmarking the algorithm for the shortest path\n";
-  // b4.benchmark([&g3]() -> void { g3.shortestPath(0, 1); });
-  // b4.print<sb::microseconds>();
 }

benchmark/Street/BenchStreet.cpp

@@ -13,7 +13,7 @@ using SparseMatrix = dsf::SparseMatrix<bool>;
 using Bench = sb::Bench<long long int>;
 
 int main() {
-  Street street(0, std::make_pair(0, 1), 5000.);
+  Street street(0, dsf::geometry::Point(0, 1), 5000.);
   Agent agent(0, 0, 0);
   Bench b(1000);
 

examples/README.md

@@ -4,11 +4,11 @@ Many of these simulations were used as thesis work.
 
 To compile all simulations, use cmake inside the *examples* folder:
 ```shell
-cmake -B build -DCMAKE_BUILD_TYPE=Release && make -C build
+cmake -B build -DCMAKE_BUILD_TYPE=Release && make -C build -j$(nproc)
 ```
 If anything goes wrong, try to build the example in debug mode:
 ```shell
-cmake -B build -DCMAKE_BUILD_TYPE=Debug && make -C build
+cmake -B build -DCMAKE_BUILD_TYPE=Debug && make -C build -j$(nproc)
 ```
 
 ## Simulation files

examples/data/coordinates.csv

@@ -31,9 +31,6 @@ std::atomic<bool> bExitFlag{false};
 #define PRINT_OUT_SPIRES
 // #define PRINT_SPEEDS
 
-using Unit = unsigned int;
-using Delay = uint8_t;
-
 using RoadNetwork = dsf::RoadNetwork;
 using Dynamics = dsf::FirstOrderDynamics;
 using Street = dsf::Street;
@@ -67,8 +64,6 @@ int main(int argc, char** argv) {
   std::cout << "Initial number of agents: " << nAgents << '\n';
   std::cout << "-------------------------------------------------\n";
 
-  const std::string IN_MATRIX{"./data/matrix.dat"};       // input matrix file
-  const std::string IN_COORDS{"./data/coordinates.dsf"};  // input coords file
   const std::string OUT_FOLDER{std::format("{}output_scrb_{}_{}/",
                                            BASE_OUT_FOLDER,
                                            ERROR_PROBABILITY,
@@ -86,16 +81,16 @@ int main(int argc, char** argv) {
   // Starting
   std::cout << "Using dsf version: " << dsf::version() << '\n';
   RoadNetwork graph{};
-  std::cout << "Importing matrix.dat...\n";
-  graph.importMatrix(IN_MATRIX, false);
-  graph.importCoordinates(IN_COORDS);
+  std::cout << "Importing Manhattan-like network...\n";
+  graph.importEdges("../test/data/manhattan_edges.csv");
+  graph.importNodeProperties("../test/data/manhattan_nodes.csv");
   std::cout << "Setting street parameters..." << '\n';
 
   std::cout << "Number of nodes: " << graph.nNodes() << '\n';
   std::cout << "Number of streets: " << graph.nEdges() << '\n';
 
   std::cout << "Rounding the simulation...\n";
-  for (Unit i{0}; i < graph.nNodes(); ++i) {
+  for (std::size_t i{0}; i < graph.nNodes(); ++i) {
     graph.makeRoundabout(i);
   }
   std::cout << "Making every street a spire...\n";
@@ -110,7 +105,7 @@ int main(int argc, char** argv) {
   Dynamics dynamics{graph, true, SEED, 0.6};
 
   {
-    std::vector<Unit> destinationNodes;
+    std::vector<dsf::Id> destinationNodes;
     for (auto const& [nodeId, pNode] : dynamics.graph().nodes()) {
       if (pNode->outgoingEdges().size() < 4) {
         destinationNodes.push_back(nodeId);