Skip to content

errorcheck for 0 valid csv lines #679

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

Open
yakra wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −16
Open

errorcheck for 0 valid csv lines #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion siteupdate/cplusplus/classes/ConnectedRoute/ConnectedRoute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ConnectedRoute::ConnectedRoute(std::string &line, HighwaySystem *sys, ErrorList
{ mileage = 0;
disconnected = 0;

// parse chopped routes csv line
// parse connected routes csv line
system = sys;
size_t NumFields = 5;
std::string sys_str, roots_str;
Expand Down
41 changes: 26 additions & 15 deletions siteupdate/cplusplus/classes/HighwaySystem/HighwaySystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ HighwaySystem::HighwaySystem(std::string &line, ErrorList &el)
std::cout /*<< systemname*/ << '.' << std::flush;

// read chopped routes CSV
size_t chopped_lines = 1;
file.open(Args::datapath+"/data/_systems/"+systemname+".csv");
if (!file) el.add_error("Could not open "+Args::datapath+"/data/_systems/"+systemname+".csv");
else { getline(file, line); // ignore header line
Expand All @@ -82,14 +83,17 @@ HighwaySystem::HighwaySystem(std::string &line, ErrorList &el)
while ( line.size() && strchr("\r\t ", line.back()) ) line.pop_back();
if (line.size()) lines.emplace_back(std::move(line));
}
Route* r = routes.alloc(lines.size());
for (std::string& l : lines)
try { new(r) Route(l, this, el);
// placement new
r->region->routes.push_back(r);
r++;
}
catch (const int) {--routes.size;}
if ( (chopped_lines = lines.size()) )
{ Route* r = routes.alloc(lines.size());
for (std::string& l : lines)
try { new(r) Route(l, this, el);
// placement new
r->region->routes.push_back(r);
r++;
}
catch (const int) {--routes.size;}
}
else el.add_error("0 valid lines in "+systemname+".csv");
}
file.close();

Expand All @@ -103,15 +107,22 @@ HighwaySystem::HighwaySystem(std::string &line, ErrorList &el)
while ( line.size() && strchr("\r\t ", line.back()) ) line.pop_back();
if (line.size()) lines.emplace_back(std::move(line));
}
ConnectedRoute* cr = con_routes.alloc(lines.size());
for (std::string& l : lines)
try { new(cr) ConnectedRoute(l, this, el);
// placement new
cr++;
}
catch (const int) {--con_routes.size;}
if (lines.size())
{ ConnectedRoute* cr = con_routes.alloc(lines.size());
for (std::string& l : lines)
try { new(cr) ConnectedRoute(l, this, el);
// placement new
cr++;
}
catch (const int) {--con_routes.size;}
}
else { el.add_error("0 valid lines in "+systemname+"_con.csv");
throw 0xc0c57;
}
}
file.close();

if (!chopped_lines) throw 0xc57;;
}

void HighwaySystem::systems_csv(ErrorList& el)
Expand Down