Update util (#35)

* update util, minor refactorings along the way

Author: patrickbr

CMakeLists.txt

@@ -28,11 +28,11 @@ find_package(LibZip)
 
 # set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake
 if(OPENMP_FOUND)
-	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} -O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wno-keyword-macro -Wformat-security -Wformat=2")
+	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} -O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2")
 
 else()
 	message(STATUS "Configuring without OpenMP")
-	set(CMAKE_CXX_FLAGS "-O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wno-keyword-macro -Wformat-security -Wformat=2")
+	set(CMAKE_CXX_FLAGS "-O3 -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2")
 endif()
 
 if(GUROBI_FOUND)

src/gtfs2graph/CMakeLists.txt

@@ -16,4 +16,4 @@ add_executable(gtfs2graph ${gtfs2graph_main})
 add_library(gtfs2graph_dep ${gtfs2graph_SRC})
 
 target_include_directories(gtfs2graph_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src)
-target_link_libraries(gtfs2graph gtfs2graph_dep util ad_cppgtfs -lpthread)
+target_link_libraries(gtfs2graph gtfs2graph_dep pb_util_geo pb_util_graph pb_util_json ad_cppgtfs -lpthread)

src/gtfs2graph/Gtfs2GraphMain.cpp

@@ -20,13 +20,11 @@
 #include "util/log/Log.h"
 
 using namespace gtfs2graph;
-using std::string;
+using util::ERROR;
+using util::DEBUG;
 
 // _____________________________________________________________________________
 int main(int argc, char** argv) {
-  // disable output buffering for standard output
-  setbuf(stdout, NULL);
-
   // initialize randomness
   srand(time(NULL) + rand());
 

src/gtfs2graph/builder/Builder.cpp

@@ -32,6 +32,8 @@ using ad::cppgtfs::gtfs::Stop;
 using ad::cppgtfs::gtfs::StopTime;
 using ad::cppgtfs::gtfs::Trip;
 
+using util::DEBUG;
+
 // _____________________________________________________________________________
 Builder::Builder(const config::Config* cfg) : _cfg(cfg) {}
 

src/loom/CMakeLists.txt

@@ -22,4 +22,4 @@ configure_file (
 add_executable(loom ${loom_main})
 add_library(loom_dep ${loom_SRC})
 
-target_link_libraries(loom loom_dep shared_dep dot_dep util ${GLPK_LIBRARY} ${GUROBI_LIBRARY} ${COIN_LIBRARIES} -lpthread)
+target_link_libraries(loom loom_dep shared_dep dot_dep pb_util_graph pb_util pb_util_json pb_util_geo ${GLPK_LIBRARY} ${GUROBI_LIBRARY} ${COIN_LIBRARIES} -lpthread)

src/loom/LoomMain.cpp

@@ -21,6 +21,8 @@
 #include "util/log/Log.h"
 
 using namespace loom;
+using util::DEBUG;
+using util::ERROR;
 
 // _____________________________________________________________________________
 int main(int argc, char** argv) {

src/loom/optim/CombNoILPOptimizer.cpp

@@ -18,18 +18,20 @@
 
 using loom::optim::CombNoILPOptimizer;
 using shared::rendergraph::HierarOrderCfg;
+using util::DEBUG;
 
 // _____________________________________________________________________________
-double CombNoILPOptimizer::optimizeComp(OptGraph* og, const std::set<OptNode*>& g,
-                                   HierarOrderCfg* hc, size_t depth,
-                                   OptResStats& stats) const {
+double CombNoILPOptimizer::optimizeComp(OptGraph* og,
+                                        const std::set<OptNode*>& g,
+                                        HierarOrderCfg* hc, size_t depth,
+                                        OptResStats& stats) const {
   size_t maxC = maxCard(g);
   double solSp = solutionSpaceSize(g);
 
   LOGTO(DEBUG, std::cerr) << prefix(depth)
-                          << "(CombNoILPOptimizer) Optimizing comp with " << g.size()
-                          << " nodes, max card " << maxC << ", sol space size "
-                          << solSp;
+                          << "(CombNoILPOptimizer) Optimizing comp with "
+                          << g.size() << " nodes, max card " << maxC
+                          << ", sol space size " << solSp;
 
   if (maxC == 1) {
     return _nullOpt.optimizeComp(og, g, hc, depth + 1, stats);

src/loom/optim/CombOptimizer.cpp

@@ -18,6 +18,7 @@
 
 using loom::optim::CombOptimizer;
 using shared::rendergraph::HierarOrderCfg;
+using util::DEBUG;
 
 // _____________________________________________________________________________
 double CombOptimizer::optimizeComp(OptGraph* og, const std::set<OptNode*>& g,

src/loom/optim/ExhaustiveOptimizer.cpp

@@ -3,7 +3,10 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include <algorithm>
+#include <random>
+#include <chrono>
 #include <unordered_map>
+
 #include "loom/optim/ExhaustiveOptimizer.h"
 #include "shared/linegraph/Line.h"
 #include "util/log/Log.h"
@@ -14,6 +17,8 @@ using loom::optim::ExhaustiveOptimizer;
 using shared::linegraph::Line;
 using shared::rendergraph::HierarOrderCfg;
 
+using util::DEBUG;
+
 // _____________________________________________________________________________
 double ExhaustiveOptimizer::optimizeComp(OptGraph* og,
                                          const std::set<OptNode*>& g,
@@ -127,6 +132,9 @@ void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
 // _____________________________________________________________________________
 void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
                                         OptOrderCfg* cfg, bool sorted) const {
+  auto seed = std::chrono::system_clock::now().time_since_epoch().count();
+  auto randEng = std::default_random_engine(seed);
+
   for (OptNode* n : g) {
     for (OptEdge* e : n->getAdjList()) {
       if (e->getFrom() != n) continue;
@@ -140,7 +148,7 @@ void ExhaustiveOptimizer::initialConfig(const std::set<OptNode*>& g,
       if (sorted) {
         std::sort((*cfg)[e].begin(), (*cfg)[e].end());
       } else {
-        std::random_shuffle((*cfg)[e].begin(), (*cfg)[e].end());
+        std::shuffle((*cfg)[e].begin(), (*cfg)[e].end(), randEng);
       }
     }
   }

src/loom/optim/GreedyOptimizer.cpp

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <unordered_map>
+
 #include "loom/optim/GreedyOptimizer.h"
 #include "shared/linegraph/Line.h"
 #include "util/log/Log.h"
@@ -14,11 +15,12 @@ using loom::optim::GreedyOptimizer;
 using loom::optim::SettledEdgs;
 using shared::linegraph::Line;
 using shared::rendergraph::HierarOrderCfg;
+using util::DEBUG;
 
 // _____________________________________________________________________________
 double GreedyOptimizer::optimizeComp(OptGraph* og, const std::set<OptNode*>& g,
-                                  HierarOrderCfg* hc, size_t depth,
-                                  OptResStats& stats) const {
+                                     HierarOrderCfg* hc, size_t depth,
+                                     OptResStats& stats) const {
   UNUSED(og);
   UNUSED(stats);
   LOGTO(DEBUG, std::cerr) << prefix(depth)
@@ -36,7 +38,7 @@ double GreedyOptimizer::optimizeComp(OptGraph* og, const std::set<OptNode*>& g,
 
 // _____________________________________________________________________________
 void GreedyOptimizer::getFlatConfig(const std::set<OptNode*>& g,
-                                   OptOrderCfg* cfg) const {
+                                    OptOrderCfg* cfg) const {
   const OptEdge* e = 0;
   SettledEdgs settled;