sync with internal version; major work on sat solver (symmetries, speedups); speed up on routing library

2014-03-12 17:30:11 +00:00
parent 55fdea60b0
commit 96df1d4c97
92 changed files with 3079 additions and 519 deletions
--- a/examples/cpp/network_routing.cc
+++ b/examples/cpp/network_routing.cc
@@ -36,7 +36,6 @@
 #include "base/commandlineflags.h"
 #include "base/integral_types.h"
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/concise_iterator.h"
 #include "base/map_util.h"