gtfs-actions/generate-shapes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring

Browse source
This commit is contained in:
Patrick Brosi 2018-07-25 20:14:46 +02:00
parent 7f0443243c
commit 5703eb47bd
5 changed files with 58 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pfaedle/PfaedleMain.cpp
View file

@ -36,6 +36,7 @@ using pfaedle::config::ConfigReader;
using pfaedle::eval::Collector;
std::string getMotStr(const MOTs& mots);
std::string getFileNameMotStr(const MOTs& mots);
MOTs getContMots(const MotConfig& motCfg, const MOTs& mots);
// _____________________________________________________________________________
@ -116,8 +117,11 @@ int main(int argc, char** argv) {
Collector ecoll(cfg.evalPath, dfBins);
for (const auto& motCfg : motCfgReader.getConfigs()) {
std::string filePost;
auto usedMots = getContMots(motCfg, cmdCfgMots);
if (!usedMots.size()) continue;
if (motCfgReader.getConfigs().size() > 1)
filePost = getFileNameMotStr(usedMots);
std::string motStr = getMotStr(usedMots);
LOG(INFO) << "Calculating shapes for mots " << motStr;
@ -125,7 +129,7 @@ int main(int argc, char** argv) {
ShapeBuilder shapeBuilder(&gtfs, cmdCfgMots, motCfg, &ecoll, cfg);
if (cfg.writeGraph) {
LOG(INFO) << "Outputting graph.json...";
LOG(INFO) << "Outputting graph" + filePost + ".json...";
util::geo::output::GeoGraphJsonOutput out;
std::ofstream fstr(cfg.dbgOutputPath + "/graph.json");
out.print(*shapeBuilder.getGraph(), fstr);
@ -155,9 +159,9 @@ int main(int argc, char** argv) {
shapeBuilder.shape(&ng);
if (cfg.buildTransitGraph) {
LOG(INFO) << "Outputting trgraph.json...";
util::geo::output::GeoGraphJsonOutput out;
std::ofstream fstr(cfg.dbgOutputPath + "/trgraph.json");
LOG(INFO) << "Outputting trgraph" + filePost + ".json...";
std::ofstream fstr(cfg.dbgOutputPath + "/trgraph" + filePost + ".json");
out.print(ng, fstr);
fstr.close();
}
@ -187,6 +191,16 @@ std::string getMotStr(const MOTs& mots) {
return motStr;
}
// _____________________________________________________________________________
std::string getFileNameMotStr(const MOTs& mots) {
std::string motStr;
for (const auto& mot : mots) {
motStr += "-" + Route::getTypeString(mot);
}
return motStr;
}
// _____________________________________________________________________________
MOTs getContMots(const MotConfig& motCfg, const MOTs& mots) {
MOTs ret;