Revert "unify include path for includes in examples/cpp for both source and binary installations"

This reverts commit 990bfce875.

examples/cpp/cvrptw.cc

@@ -30,7 +30,7 @@
 #include "base/logging.h"
 #include "constraint_solver/routing.h"
 #include "constraint_solver/routing_flags.h"
-#include "cvrptw_lib.h"
+#include "cpp/cvrptw_lib.h"
 
 using operations_research::RoutingModel;
 using operations_research::RoutingSearchParameters;

examples/cpp/cvrptw_lib.cc

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cvrptw_lib.h"
+#include "cpp/cvrptw_lib.h"
 
 #include <set>
 

examples/cpp/cvrptw_with_refueling.cc

@@ -28,7 +28,7 @@
 #include "base/logging.h"
 #include "constraint_solver/routing.h"
 #include "constraint_solver/routing_flags.h"
-#include "cvrptw_lib.h"
+#include "cpp/cvrptw_lib.h"
 #include "base/random.h"
 
 using operations_research::GetSeed;

examples/cpp/cvrptw_with_resources.cc

@@ -30,7 +30,7 @@
 #include "base/logging.h"
 #include "constraint_solver/routing.h"
 #include "constraint_solver/routing_flags.h"
-#include "cvrptw_lib.h"
+#include "cpp/cvrptw_lib.h"
 #include "base/random.h"
 
 using operations_research::RoutingModel;

examples/cpp/cvrptw_with_stop_times_and_resources.cc

@@ -29,7 +29,7 @@
 #include "base/join.h"
 #include "constraint_solver/routing.h"
 #include "constraint_solver/routing_flags.h"
-#include "cvrptw_lib.h"
+#include "cpp/cvrptw_lib.h"
 #include "base/random.h"
 
 using operations_research::IntervalVar;

examples/cpp/dimacs_assignment.cc

@@ -25,8 +25,8 @@
 #include "base/stringprintf.h"
 #include "base/timer.h"
 #include "algorithms/hungarian.h"
-#include "parse_dimacs_assignment.h"
-#include "print_dimacs_assignment.h"
+#include "cpp/parse_dimacs_assignment.h"
+#include "cpp/print_dimacs_assignment.h"
 #include "graph/ebert_graph.h"
 #include "graph/linear_assignment.h"
 

examples/cpp/fap_model_printer.cc

@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-#include "fap_model_printer.h"
+#include "cpp/fap_model_printer.h"
 
 #include <map>
 #include <string>

examples/cpp/fap_model_printer.h

@@ -21,7 +21,7 @@
 #include <map>
 #include <vector>
 
-#include "fap_parser.h"
+#include "cpp/fap_parser.h"
 
 using std::string;
 

examples/cpp/fap_parser.cc

@@ -20,7 +20,7 @@
 #include "base/concise_iterator.h"
 #include "base/map_util.h"
 
-#include "fap_parser.h"
+#include "cpp/fap_parser.h"
 
 namespace operations_research {
 

examples/cpp/fap_utilities.cc

@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-#include "fap_utilities.h"
+#include "cpp/fap_utilities.h"
 
 #include <map>
 #include <set>

examples/cpp/flexible_jobshop.cc

@@ -41,7 +41,7 @@
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "constraint_solver/constraint_solver.h"
-#include "flexible_jobshop.h"
+#include "cpp/flexible_jobshop.h"
 #include "util/string_array.h"
 
 DEFINE_string(

examples/cpp/frequency_assignment_problem.cc

@@ -51,9 +51,9 @@
 #include "base/map_util.h"
 #include "base/hash.h"
 #include "constraint_solver/constraint_solver.h"
-#include "fap_model_printer.h"
-#include "fap_parser.h"
-#include "fap_utilities.h"
+#include "cpp/fap_model_printer.h"
+#include "cpp/fap_parser.h"
+#include "cpp/fap_utilities.h"
 
 DEFINE_string(directory, "", "Specifies the directory of the data.");
 DEFINE_string(evaluator, "",

examples/cpp/jobshop.cc

@@ -33,7 +33,7 @@
 //
 // Search will then be applied on the sequence constraints.
 
-#include "jobshop.h"
+#include "cpp/jobshop.h"
 #include <cstdio>
 #include <cstdlib>
 

examples/cpp/jobshop_earlytardy.cc

@@ -44,8 +44,8 @@
 #include "constraint_solver/constraint_solver.h"
 #include "linear_solver/linear_solver.h"
 #include "util/string_array.h"
-#include "jobshop_earlytardy.h"
-#include "jobshop_ls.h"
+#include "cpp/jobshop_earlytardy.h"
+#include "cpp/jobshop_ls.h"
 
 DEFINE_string(
     jet_file,

examples/cpp/jobshop_ls.cc

@@ -33,7 +33,7 @@
 //
 // Search will be implemented as local search on the sequence variables.
 
-#include "jobshop_ls.h"
+#include "cpp/jobshop_ls.h"
 #include <cstdio>
 #include <cstdlib>
 
@@ -45,7 +45,7 @@
 #include "base/bitmap.h"
 #include "constraint_solver/constraint_solver.h"
 #include "constraint_solver/constraint_solveri.h"
-#include "jobshop.h"
+#include "cpp/jobshop.h"
 
 DEFINE_string(
     data_file, "",

examples/cpp/parse_dimacs_assignment.cc

@@ -12,7 +12,7 @@
 // limitations under the License.
 
 
-#include "parse_dimacs_assignment.h"
+#include "cpp/parse_dimacs_assignment.h"
 
 #include "base/commandlineflags.h"
 

examples/cpp/print_dimacs_assignment.cc

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "print_dimacs_assignment.h"
+#include "cpp/print_dimacs_assignment.h"
 
 #include <cstdio>
 #include <string>

examples/cpp/sat_runner.cc

@@ -27,9 +27,9 @@
 #include "base/strutil.h"
 #include "algorithms/sparse_permutation.h"
 #include "sat/boolean_problem.h"
-#include "opb_reader.h"
+#include "cpp/opb_reader.h"
 #include "sat/optimization.h"
-#include "sat_cnf_reader.h"
+#include "cpp/sat_cnf_reader.h"
 #include "sat/sat_solver.h"
 #include "sat/simplification.h"
 #include "sat/symmetry.h"