ZYM/BH-TicketSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix arg parse error of add_train

Browse Source
This commit is contained in:
happyZYM
2024-05-24 00:39:20 +00:00
parent 0c4c6371a5
commit 698ff4069c
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/stop_register.hpp
View File

@ -78,6 +78,11 @@ class StopRegister : public DataDriverBase {
inline void AddStopInfo(hash_t station_hash, hash_t train_hash, uint16_t true_saleDate_beg,
uint16_t true_saleDate_end, uint16_t startTime, uint16_t arrive_time_offset,
uint16_t leave_time_offset, uint8_t stop_id) {
LOG->debug(
"AddStopInfo: station_hash {} train_hash {} true_saleDate_beg {} true_saleDate_end {} startTime {} "
"arrive_time_offset {} leave_time_offset {} stop_id {}",
station_hash, train_hash, true_saleDate_beg, true_saleDate_end, startTime, arrive_time_offset,
leave_time_offset, stop_id);
MinimalTrainRecord record_arrive, record_leave;
const static int June_1st_2024 = 152;
record_arrive.saleDate_beg = true_saleDate_beg - June_1st_2024;
@ -101,13 +106,15 @@ class StopRegister : public DataDriverBase {
while (it_from != bpt_indexer->end_const()) {
const auto &key_from = it_from.GetKey();
const auto &value_from = it_from.GetValue();
LOG->debug("it_from now tries to check station_id_hash {} train_id_hash {} stop_id {}", key_from.station_ID_hash,
key_from.train_ID_hash, key_from.stop_id);
if (key_from.station_ID_hash != from_station_ID) break;
if (key_from.type != 1) {
++it_from;
continue;
}
// LOG->debug("it_from now checks station_id_hash {} train_id_hash {} stop_id {}", key_from.station_ID_hash,
// key_from.train_ID_hash, key_from.stop_id);
LOG->debug("it_from now checks station_id_hash {} train_id_hash {} stop_id {}", key_from.station_ID_hash,
key_from.train_ID_hash, key_from.stop_id);
int true_saleDate_beg = (*reinterpret_cast<const MinimalTrainRecord *>(&value_from)).saleDate_beg + June_1st_2024;
int true_saleDate_end = (*reinterpret_cast<const MinimalTrainRecord *>(&value_from)).saleDate_end + June_1st_2024;
int leave_time_offset = (*reinterpret_cast<const MinimalTrainRecord *>(&value_from)).vis_time_offset;
@ -132,8 +139,8 @@ class StopRegister : public DataDriverBase {
++it_to;
continue;
}
// LOG->debug("it_to now checks station_id_hash {} train_id_hash {} stop_id {}", key_to.station_ID_hash,
// key_to.train_ID_hash, key_to.stop_id);
LOG->debug("it_to now checks station_id_hash {} train_id_hash {} stop_id {}", key_to.station_ID_hash,
key_to.train_ID_hash, key_to.stop_id);
if (key_to.train_ID_hash > key_from.train_ID_hash) break;
if (key_to.train_ID_hash == key_from.train_ID_hash) {
entry.arrive_time_stamp = entry.actual_start_date * 1440 + startTime +

34
src/train_system.cpp
View File

@ -44,18 +44,16 @@ std::string TicketSystemEngine::AddTrain(const std::string &command) {
command_stream >> station_raw;
std::stringstream station_raw_stream(station_raw);
// the sperator is '|' in the raw string
for (int i = 0; i < stationNum; i++) {
std::getline(station_raw_stream, stations[i], '|');
}
for (int i = 0; std::getline(station_raw_stream, stations[i], '|'); i++)
;
break;
}
case 'p': {
std::string price_raw;
command_stream >> price_raw;
std::stringstream price_raw_stream(price_raw);
for (int i = 0; i < stationNum - 1; i++) {
std::string tmp;
std::getline(price_raw_stream, tmp, '|');
std::string tmp;
for (int i = 0; std::getline(price_raw_stream, tmp, '|'); i++) {
sscanf(tmp.c_str(), "%d", &prices[i]);
}
break;
@ -72,10 +70,11 @@ std::string TicketSystemEngine::AddTrain(const std::string &command) {
std::string travelTime_raw;
command_stream >> travelTime_raw;
std::stringstream travelTime_raw_stream(travelTime_raw);
for (int i = 0; i < stationNum - 1; i++) {
std::string tmp;
std::getline(travelTime_raw_stream, tmp, '|');
LOG->debug("travelTime_raw: {}", travelTime_raw);
std::string tmp;
for (int i = 0; std::getline(travelTime_raw_stream, tmp, '|'); i++) {
sscanf(tmp.c_str(), "%d", &travelTimes[i]);
LOG->debug("i={} tmp={} travelTimes[{}]={}", i, tmp, i, travelTimes[i]);
}
break;
}
@ -83,9 +82,8 @@ std::string TicketSystemEngine::AddTrain(const std::string &command) {
std::string stopoverTime_raw;
command_stream >> stopoverTime_raw;
std::stringstream stopoverTime_raw_stream(stopoverTime_raw);
for (int i = 1; i < stationNum - 1; i++) {
std::string tmp;
std::getline(stopoverTime_raw_stream, tmp);
std::string tmp;
for (int i = 1; std::getline(stopoverTime_raw_stream, tmp, '|'); i++) {
sscanf(tmp.c_str(), "%d", &stopoverTimes[i]);
}
break;
@ -148,12 +146,15 @@ std::string TicketSystemEngine::AddTrain(const std::string &command) {
core_train_data.stationNum = stationNum;
for (int i = 0; i < stationNum; i++) {
core_train_data.stations_hash[i] = SplitMix64Hash(stations[i]);
LOG->debug("set core_train_data.stations_hash[{}]={}", i, core_train_data.stations_hash[i]);
}
core_train_data.seatNum = seatNum;
core_train_data.startTime = startTime;
for (int i = 0; i < stationNum - 1; i++) {
core_train_data.travelTime[i] = travelTimes[i];
core_train_data.stopoverTime[i] = stopoverTimes[i];
LOG->debug("set core_train_data.travelTime[{}]={}", i, core_train_data.travelTime[i]);
LOG->debug("set core_train_data.stopoverTime[{}]={}", i, core_train_data.stopoverTime[i]);
}
core_train_data.saleDate_beg = saleDate_begin;
core_train_data.saleDate_end = saleDate_end;
@ -253,13 +254,20 @@ std::string TicketSystemEngine::ReleaseTrain(const std::string &command) {
for (int i = 0; i < core_train_data.stationNum; i++) {
uint16_t arrive_time_offset = -1;
uint16_t leave_time_offset = -1;
LOG->debug("i={}", i);
if (i != 0) {
vis_time_offset += core_train_data.travelTime[i - 1];
LOG->debug("vis_time_offset += travelTime[{}]={}", i - 1, core_train_data.travelTime[i - 1]);
arrive_time_offset = vis_time_offset;
LOG->debug("set arrive_time_offset={}", arrive_time_offset);
}
if (i != core_train_data.stationNum - 1) {
if (i != 0) vis_time_offset += core_train_data.stopoverTime[i];
if (i != 0) {
vis_time_offset += core_train_data.stopoverTime[i];
LOG->debug("vis_time_offset += stopoverTime[{}]={}", i, core_train_data.stopoverTime[i]);
}
leave_time_offset = vis_time_offset;
LOG->debug("set leave_time_offset={}", leave_time_offset);
}
stop_register.AddStopInfo(core_train_data.stations_hash[i], train_id_hash, core_train_data.saleDate_beg,
core_train_data.saleDate_end, core_train_data.startTime, arrive_time_offset,