Multi mode clean #20

Xuan-1998 · 2024-08-07T19:32:37Z

No description provided.

…ode-clean

…List and Dict general struct, add person struct and transfer point struct

…trafficPerson

…nto multi-mode-clean

junzhecao · 2024-08-10T14:49:33Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

+      newTrafficVehicleVec.push_back(vehicle);
+    }
+
+    newTrafficPersonVec.push_back(person);


Add dep_time into the vehicles. whether bus or auto.

Xuan-1998 · 2024-08-21T15:59:12Z

LivingCity/bTraffic/bPMTrafficPerson.cpp

@@ -213,6 +213,12 @@ void BPMTrafficPerson::randomPerson(int p, BTrafficPeople &people,
    people.T[p] = 2.0f + 3.0f * (((float)qrand()) / RAND_MAX); //time heading 2.0-3s
  }

+
+  if (carType == 2) { //bike car


@Luze, what's this for? Did you add this when we need a bike? Should we delete this for now? AFAIK our simulation is not using this cpp file

Xuan-1998 · 2024-08-21T16:04:26Z

LivingCity/traffic/b18TrafficSP.cpp

+  //  }
+  //}
+
+  return all_od_pairs_sets;


Does this include both bus routes and vehicle routes?

Xuan-1998 · 2024-08-24T14:52:45Z

LivingCity/traffic/b18CommandLineVersion.cpp

+
+  }
+
+for (size_t i = 0; i < busRoutes.size(); ++i) {


@SLZ0106 This should be reading trip ID, and use the new bus_shcedule file Junzhe

LivingCity/traffic/b18EdgeData.h

Xuan-1998 · 2024-08-24T14:53:47Z

LivingCity/traffic/b18EdgeData.h

  ushort state;
  ushort stateLine;
  ushort totalInOutEdges;
  uint edge[24];// up to six arms intersection
  float nextEvent;
+  LNode* passengers;


Should be changed into Dnode @YiboZh

Xuan-1998 · 2024-08-24T14:57:49Z

LivingCity/traffic/b18TrafficPerson.h

+struct B18TrafficPerson{
+  int id;
+  Node* transferPoints; //should take which bus line and drop at which intersection
+  float time_departure;


TODO: This will be put into Dnode, so it will be deleted here @YiboZh

Xuan-1998 · 2024-08-24T15:05:12Z

LivingCity/traffic/b18TrafficSimulator.cpp

+    std::vector<std::array<abm::graph::vertex_t, 2>> all_od_pairs_without_mode;
+    all_modes.reserve(all_od_pairs_.size());
+    all_od_pairs_without_mode.reserve(all_od_pairs_.size());
+    for (const auto& od_pair_with_mode : all_od_pairs_) {


all_modes will be used for replacing mode in .cu while running simulation

Xuan-1998 · 2024-08-24T15:12:49Z

LivingCity/traffic/b18TrafficSP.cpp

@@ -277,7 +365,21 @@ const std::vector<abm::graph::edge_id_t> B18TrafficSP::loadPrevPathsFromFile(
  return const_paths_SP;
 }

+//merge multi path into one path


TODO: When we are outputting the things from the simulator, we need to change the things to be output in people and route file.

Xuan-1998 · 2024-08-24T15:14:27Z

LivingCity/traffic/b18TrafficSimulator.cpp

@@ -204,14 +218,37 @@ void savePaths(const std::vector<personPath>& paths, const std::string& filename
        file << personPathToString(path) << "\n";
    }
 }
+std::vector<int> findBuses(
+    const std::vector<std::vector<int>>& busRoutes,


to be deleted

Xuan-1998 · 2024-08-24T15:15:56Z

LivingCity/traffic/b18TrafficSimulator.cpp

@@ -539,11 +599,22 @@ void B18TrafficSimulator::simulateInGPU(const int ngpus, const int numOfPasses,
    float totalNumSteps = 0;
    float totalCO = 0;

+    std::ofstream outFile("output_time_diff.csv", std::ios::app);


why we need this?

for travel time

Xuan-1998 · 2024-08-24T15:18:25Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

@@ -183,6 +243,73 @@ void b18InitCUDA_n(
  for(int i = 0; i < ngpus; i++){
      cudaStreamCreate( &streams[i]);
  }
+
+  // Initialize people and vehicles


Xuan-1998 · 2024-08-24T15:21:46Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

+    newTrafficPersonVec.push_back(person);
+  }
+
+  for (size_t i = 0; i < busRoutes.size(); ++i) {


vehicle and how it will follow its route?

TODO: Auto follows original path, bus follows bus route @YiboZh

Xuan-1998 · 2024-08-24T15:26:32Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

@@ -296,6 +421,22 @@ void b18InitCUDA_n(
      // gpuErrchk(cudaMemPrefetchAsync(trafficLights_d, sizeT, 1, streams[1]));

  }
+


Dnode要初始化departure time

Xuan-1998 · 2024-08-24T15:27:17Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

+}
+
+/*Add transfer function to simulate people change from a bus to another bus*/
+__device__ void transferToNewVehicle(


For bus to Auto

TODO: new vehicle's bus should be initialized outside kernal

potential solution: get route from person struct

YiboZh · 2024-08-25T17:03:22Z

LivingCity/traffic/b18TrafficPerson.h

+  Node* passengers; // a list of persons, key is the intersection id, value is the list of persons to drop off
+
+  //save travel time
+  float time_diff;


Move to person struct

YiboZh · 2024-08-25T17:06:20Z

LivingCity/traffic/b18CUDA_trafficSimulator.cu

@@ -2097,10 +2491,11 @@ void b18SimulateTrafficCUDA(float currentTime,
    cudaSetDevice(i);
    int numPeople_gpu = vehicles_vec[i]->size();
    LC::B18TrafficVehicle* vehicles_ptr = thrust::raw_pointer_cast((*vehicles_vec[i]).data());
+    LC::B18TrafficPerson* person_ptr = trafficPerson_d;


YiboZh · 2024-08-25T17:12:31Z

LivingCity/traffic/b18TrafficPerson.h

+
+struct B18TrafficPerson{
+  int id;
+  Node* transferPoints; //should take which bus line and drop at which intersection


Add num_step to this property to track travel time.
To be fix: init the first segment of trip in transfer point to save travel time

Xuan Jiang and others added 30 commits July 18, 2024 12:52

change innpt and .ini file

10e5c4a

simple read of bus file

926b41a

add merge path in TrafficSP file (step3)

b8bf97b

change od_pairs to od_pairs_set

ea13648

success in compling

9695014

Merge remote-tracking branch 'origin/communication-edit' into multi-m…

071a8b7

…ode-clean

Add multi-mode transfer logic in kernel_trafficSimulation func, add L…

5f673ab

…List and Dict general struct, add person struct and transfer point struct

fix some error

682eab0

fix TODO

5b46eea

complete the multimode logic in transfer people to new auto & update …

fc228d4

…trafficPerson

add bus line and how to read it and bus_sechedule

13ef4c5

add rewrite bus_sechedule

f949d7c

add rewrite bus_sechedule_2

b94cb23

Modify person class and related logic

5c84e85

small fix

4a966e7

initial person waiting for bus and transfer points in b18InitCUDA_n

87e6abf

fix input error

a4f7e8b

fix logic in adding new vehicle

ec8f476

Merge remote-tracking branch 'refs/remotes/origin/multi-mode-clean' i…

9cbbbd3

…nto multi-mode-clean

dumb solution for routting wrapper

12af848

upload bus_schedule

bc7bdcb

add travel mode from input

8a5b46a

input travel_modes&corresponding od_pairs

c9a2ba7

initialize trafficPersonVec

cb869d2

Find possible buslines based on start/end intersection and bus schedule

6486cc3

initialization

bd49d65

Modify findBuses and pass busRoutes into cuda init

ddb10c5

Small fix of function call

08d7a1c

Small fix and added some TODOs

e561dd6

add bus departure time

66f69c5

SLZ0106 and others added 6 commits August 9, 2024 09:11

add routing inputs

cc71e84

add output in simulator.cpp

4bc2106

fix input bug

6b71e7f

Move logic of randomVehicle to cu file and apply

ed4c23c

small fix

ed020d9

fix input_2

88f3f3f

junzhecao reviewed Aug 10, 2024

View reviewed changes

YiboZh and others added 3 commits August 11, 2024 17:23

Fix intersection to bus logic

9b3d76a

add normal dep_time to init_CUDA and kernel

7d1eff9

change init person waiting

20581e3

Xuan-1998 commented Aug 21, 2024

View reviewed changes

LivingCity/traffic/b18TrafficSP.cpp

// }

//}

return all_od_pairs_sets;

Copy link

Owner Author

Xuan-1998 Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this include both bus routes and vehicle routes?

SLZ0106 added 2 commits August 23, 2024 19:37

add bus route in convertPath

9a5b0ac

fix SP covert path

4e54f60

Xuan-1998 commented Aug 24, 2024

View reviewed changes

LivingCity/traffic/b18EdgeData.h Show resolved Hide resolved

Xuan-1998 commented Aug 24, 2024

View reviewed changes

YiboZh reviewed Aug 25, 2024

View reviewed changes

Replace LNode* passenger at intersection to DNode*

1b25ab5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi mode clean #20

Multi mode clean #20

Xuan-1998 commented Aug 7, 2024

junzhecao Aug 10, 2024

Xuan-1998 Aug 21, 2024

Xuan-1998 Aug 21, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

Xuan-1998 Aug 24, 2024

YiboZh Aug 25, 2024 •

edited

Loading

YiboZh Aug 25, 2024

YiboZh Aug 25, 2024

		@@ -296,6 +421,22 @@ void b18InitCUDA_n(
		// gpuErrchk(cudaMemPrefetchAsync(trafficLights_d, sizeT, 1, streams[1]));

		}

Multi mode clean #20

Are you sure you want to change the base?

Multi mode clean #20

Conversation

Xuan-1998 commented Aug 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

YiboZh Aug 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

YiboZh Aug 25, 2024 •

edited

Loading