From 66b8d230798f9b8a3c98c26a997daf04974400b8 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Wed, 26 Apr 2017 17:30:25 +0200 Subject: [PATCH] move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files --- examples/cpp/costas_array.cc | 18 +- examples/cpp/cryptarithm.cc | 8 +- examples/cpp/cvrp_disjoint_tw.cc | 19 +- examples/cpp/cvrptw.cc | 21 +- examples/cpp/cvrptw_lib.cc | 12 +- examples/cpp/cvrptw_lib.h | 4 +- examples/cpp/cvrptw_with_breaks.cc | 23 +- examples/cpp/cvrptw_with_refueling.cc | 21 +- examples/cpp/cvrptw_with_resources.cc | 21 +- .../cvrptw_with_stop_times_and_resources.cc | 25 +- examples/cpp/dimacs_assignment.cc | 26 +- examples/cpp/dobble_ls.cc | 22 +- examples/cpp/fap_model_printer.cc | 6 +- examples/cpp/fap_model_printer.h | 2 +- examples/cpp/fap_parser.cc | 10 +- examples/cpp/fap_parser.h | 10 +- examples/cpp/fap_utilities.cc | 8 +- examples/cpp/fap_utilities.h | 4 +- examples/cpp/flexible_jobshop.cc | 16 +- examples/cpp/flexible_jobshop.h | 14 +- examples/cpp/flow_api.cc | 10 +- examples/cpp/frequency_assignment_problem.cc | 27 +- examples/cpp/global_arith.cc | 6 +- examples/cpp/golomb.cc | 12 +- examples/cpp/integer_programming.cc | 6 +- examples/cpp/jobshop.cc | 18 +- examples/cpp/jobshop.h | 12 +- examples/cpp/jobshop_earlytardy.cc | 20 +- examples/cpp/jobshop_earlytardy.h | 14 +- examples/cpp/jobshop_ls.cc | 22 +- examples/cpp/jobshop_ls.h | 16 +- examples/cpp/jobshop_sat.cc | 30 +- examples/cpp/linear_assignment_api.cc | 8 +- examples/cpp/linear_programming.cc | 10 +- .../cpp/linear_solver_protocol_buffers.cc | 8 +- examples/cpp/ls_api.cc | 18 +- examples/cpp/magic_square.cc | 14 +- examples/cpp/model_util.cc | 32 +- examples/cpp/mps_driver.cc | 34 +- examples/cpp/multidim_knapsack.cc | 28 +- examples/cpp/network_routing.cc | 32 +- examples/cpp/nqueens.cc | 19 +- examples/cpp/nqueens2.cc | 10 +- examples/cpp/opb_reader.h | 16 +- examples/cpp/parse_dimacs_assignment.cc | 4 +- examples/cpp/parse_dimacs_assignment.h | 30 +- examples/cpp/pdptw.cc | 27 +- examples/cpp/print_dimacs_assignment.cc | 2 +- examples/cpp/print_dimacs_assignment.h | 18 +- examples/cpp/rcpsp_sat.cc | 24 +- examples/cpp/sat_cnf_reader.h | 23 +- examples/cpp/sat_runner.cc | 48 +- examples/cpp/shift_minimization_sat.cc | 30 +- examples/cpp/slitherlink.cc | 6 +- examples/cpp/solve.cc | 32 +- examples/cpp/sports_scheduling.cc | 12 +- ...trawberry_fields_with_column_generation.cc | 12 +- examples/cpp/tsp.cc | 21 +- examples/cpp/weighted_tardiness_sat.cc | 30 +- examples/tests/testcp.cs | 124 + makefiles/Makefile.cpp.mk | 140 +- makefiles/Makefile.csharp.mk | 144 +- makefiles/Makefile.gen.mk | 5010 +++++++++-------- makefiles/Makefile.java.mk | 66 +- makefiles/Makefile.python.mk | 100 +- makefiles/Makefile.third_party.unix.mk | 100 +- makefiles/Makefile.unix.mk | 6 +- makefiles/Makefile.win.mk | 6 +- {src => ortools}/WORKSPACE | 0 {src => ortools}/algorithms/BUILD | 0 .../graph => ortools/algorithms}/__init__.py | 4 +- .../algorithms/csharp/knapsack_solver.i | 8 +- .../algorithms/dense_doubly_linked_list.h | 2 +- .../algorithms/dynamic_partition.cc | 8 +- .../algorithms/dynamic_partition.h | 2 +- .../algorithms/dynamic_permutation.cc | 4 +- .../algorithms/dynamic_permutation.h | 2 +- .../algorithms/find_graph_symmetries.cc | 20 +- .../algorithms/find_graph_symmetries.h | 16 +- {src => ortools}/algorithms/hungarian.cc | 2 +- {src => ortools}/algorithms/hungarian.h | 2 +- {src => ortools}/algorithms/hungarian_test.cc | 14 +- .../algorithms/java/knapsack_solver.i | 8 +- .../algorithms/knapsack_solver.cc | 10 +- {src => ortools}/algorithms/knapsack_solver.h | 10 +- .../algorithms/python/knapsack_solver.i | 10 +- .../algorithms/sparse_permutation.cc | 6 +- .../algorithms/sparse_permutation.h | 2 +- {src => ortools}/base/BUILD | 0 {src => ortools}/base/accurate_sum.h | 0 .../base/adjustable_priority_queue-inl.h | 2 +- .../base/adjustable_priority_queue.h | 6 +- src/base/base.swig => ortools/base/base.i | 8 +- {src => ortools}/base/basictypes.h | 4 +- {src => ortools}/base/bitmap.cc | 4 +- {src => ortools}/base/bitmap.h | 2 +- {src => ortools}/base/callback.cc | 2 +- {src => ortools}/base/callback.h | 2 +- {src => ortools}/base/casts.h | 0 {src => ortools}/base/cleanup.h | 0 {src => ortools}/base/commandlineflags.h | 0 {src => ortools}/base/encodingutils.h | 2 - {src => ortools}/base/file.cc | 11 +- {src => ortools}/base/file.h | 11 +- {src => ortools}/base/filelinereader.cc | 6 +- {src => ortools}/base/filelinereader.h | 6 +- {src => ortools}/base/hash.h | 2 +- {src => ortools}/base/int_type.h | 4 +- .../base/int_type_indexed_vector.h | 4 +- {src => ortools}/base/integral_types.h | 0 {src => ortools}/base/jniutil.h | 2 +- {src => ortools}/base/join.cc | 13 +- {src => ortools}/base/join.h | 11 +- {src => ortools}/base/logging.cc | 2 +- {src => ortools}/base/logging.h | 6 +- {src => ortools}/base/macros.h | 0 {src => ortools}/base/map_util.h | 2 +- {src => ortools}/base/mathutil.h | 10 +- {src => ortools}/base/murmur.h | 2 +- {src => ortools}/base/mutex.cc | 2 +- {src => ortools}/base/mutex.h | 2 +- {src => ortools}/base/numbers.cc | 2 +- {src => ortools}/base/numbers.h | 4 +- {src => ortools}/base/port.h | 0 {src => ortools}/base/python-swig.h | 4 +- .../base/python/callbacks.i | 8 +- {src => ortools}/base/random.cc | 4 +- {src => ortools}/base/random.h | 2 +- {src => ortools}/base/recordio.cc | 14 +- {src => ortools}/base/recordio.h | 6 +- {src => ortools}/base/small_map.h | 0 {src => ortools}/base/small_ordered_set.h | 0 {src => ortools}/base/sparsetable.h | 2 +- {src => ortools}/base/split.cc | 8 +- {src => ortools}/base/split.h | 14 +- {src => ortools}/base/status.h | 7 +- {src => ortools}/base/statusor.h | 4 +- {src => ortools}/base/stl_util.h | 0 {src => ortools}/base/stringpiece.cc | 7 +- {src => ortools}/base/stringpiece.h | 25 +- {src => ortools}/base/stringpiece_utils.h | 8 +- {src => ortools}/base/stringprintf.cc | 2 +- {src => ortools}/base/stringprintf.h | 2 +- .../base/strongly_connected_components.h | 6 +- {src => ortools}/base/strtoint.h | 2 +- {src => ortools}/base/strutil.h | 2 +- {src => ortools}/base/synchronization.h | 2 +- {src => ortools}/base/sysinfo.cc | 4 +- {src => ortools}/base/sysinfo.h | 2 +- {src => ortools}/base/thorough_hash.h | 2 +- {src => ortools}/base/threadpool.cc | 2 +- {src => ortools}/base/threadpool.h | 0 {src => ortools}/base/time_support.cc | 4 +- {src => ortools}/base/time_support.h | 5 +- {src => ortools}/base/timer.cc | 6 +- {src => ortools}/base/timer.h | 11 +- {src => ortools}/base/typeid.h | 0 {src => ortools}/bazel/BUILD | 0 {src => ortools}/bazel/glpk.BUILD | 0 {src => ortools}/bazel/gtest.BUILD | 0 {src => ortools}/bazel/swig.BUILD | 0 {src => ortools}/bazel/swig.bzl | 0 {src => ortools}/bop/BUILD | 0 {src => ortools}/bop/bop_base.cc | 4 +- {src => ortools}/bop/bop_base.h | 18 +- {src => ortools}/bop/bop_fs.cc | 26 +- {src => ortools}/bop/bop_fs.h | 30 +- {src => ortools}/bop/bop_lns.cc | 22 +- {src => ortools}/bop/bop_lns.h | 32 +- {src => ortools}/bop/bop_ls.cc | 6 +- {src => ortools}/bop/bop_ls.h | 16 +- {src => ortools}/bop/bop_parameters.proto | 0 {src => ortools}/bop/bop_portfolio.cc | 18 +- {src => ortools}/bop/bop_portfolio.h | 20 +- {src => ortools}/bop/bop_solution.cc | 2 +- {src => ortools}/bop/bop_solution.h | 6 +- {src => ortools}/bop/bop_solver.cc | 32 +- {src => ortools}/bop/bop_solver.h | 30 +- {src => ortools}/bop/bop_types.h | 6 +- {src => ortools}/bop/bop_util.cc | 14 +- {src => ortools}/bop/bop_util.h | 10 +- {src => ortools}/bop/complete_optimizer.cc | 8 +- {src => ortools}/bop/complete_optimizer.h | 12 +- {src => ortools}/bop/integral_solver.cc | 6 +- {src => ortools}/bop/integral_solver.h | 10 +- .../ortools/algorithms/IntArrayHelper.cs | 0 .../constraintsolver/IntArrayHelper.cs | 0 .../constraintsolver/IntVarArrayHelper.cs | 0 .../IntervalVarArrayHelper.cs | 0 .../constraintsolver/JavaDecisionBuilder.java | 0 .../constraintsolver/NetDecisionBuilder.cs | 0 .../constraintsolver/RoutingModelHelper.cs | 0 .../ortools/constraintsolver/SolverHelper.cs | 0 .../ortools/constraintsolver/ValCstPair.cs | 0 .../ortools/linearsolver/DoubleArrayHelper.cs | 0 .../ortools/linearsolver/LinearConstraint.cs | 0 .../google/ortools/linearsolver/LinearExpr.cs | 0 .../ortools/linearsolver/SolverHelper.cs | 0 .../ortools/linearsolver/VariableHelper.cs | 0 .../google/ortools/util/NestedArrayHelper.cs | 0 .../com/google/ortools/util/ProtoHelper.cs | 0 {src => ortools}/constraint_solver/BUILD | 0 {src => ortools}/constraint_solver/README | 0 .../constraint_solver}/__init__.py | 4 +- .../constraint_solver/ac4_mdd_reset_table.cc | 20 +- .../constraint_solver/ac4r_table.cc | 20 +- .../constraint_solver/alldiff_cst.cc | 10 +- .../constraint_solver/assignment.cc | 26 +- .../constraint_solver/assignment.proto | 0 .../constraint_solver/collect_variables.cc | 14 +- .../constraint_solver/constraint_solver.cc | 31 +- .../constraint_solver/constraint_solver.h | 34 +- .../constraint_solver/constraint_solveri.h | 37 +- .../constraint_solver/constraints.cc | 14 +- .../constraint_solver/count_cst.cc | 14 +- .../csharp/constraint_solver.i | 28 +- .../constraint_solver/csharp/routing.i | 11 +- .../constraint_solver/default_search.cc | 22 +- .../constraint_solver/demon_profiler.cc | 22 +- .../constraint_solver/demon_profiler.proto | 0 .../constraint_solver/deviation.cc | 12 +- {src => ortools}/constraint_solver/diffn.cc | 18 +- {src => ortools}/constraint_solver/element.cc | 18 +- .../constraint_solver/expr_array.cc | 18 +- .../constraint_solver/expr_cst.cc | 20 +- .../constraint_solver/expressions.cc | 30 +- {src => ortools}/constraint_solver/gcc.cc | 24 +- .../constraint_solver/graph_constraints.cc | 16 +- {src => ortools}/constraint_solver/hybrid.cc | 22 +- {src => ortools}/constraint_solver/hybrid.h | 2 +- .../constraint_solver/interval.cc | 16 +- {src => ortools}/constraint_solver/io.cc | 26 +- .../java/constraint_solver.i | 36 +- .../constraint_solver/java/javawrapcp_util.h | 0 .../constraint_solver/java/routing.i | 14 +- .../constraint_solver/local_search.cc | 30 +- .../constraint_solver/model.proto | 2 +- .../constraint_solver/model_cache.cc | 12 +- {src => ortools}/constraint_solver/nogoods.cc | 14 +- {src => ortools}/constraint_solver/pack.cc | 12 +- .../python/constraint_solver.i | 52 +- .../python/constraint_solver_helpers.i | 0 .../constraint_solver/python/pywrapcp_util.h | 8 +- .../constraint_solver/python/routing.i | 12 +- .../constraint_solver/range_cst.cc | 6 +- .../constraint_solver/resource.cc | 32 +- {src => ortools}/constraint_solver/routing.cc | 34 +- {src => ortools}/constraint_solver/routing.h | 36 +- .../constraint_solver/routing_enums.proto | 0 .../constraint_solver/routing_flags.cc | 8 +- .../constraint_solver/routing_flags.h | 4 +- .../routing_neighborhoods.cc | 2 +- .../constraint_solver/routing_neighborhoods.h | 6 +- .../routing_parameters.proto | 4 +- .../constraint_solver/routing_search.cc | 12 +- .../constraint_solver/routing_types.h | 6 +- .../constraint_solver/sat_constraint.cc | 2 +- .../constraint_solver/sat_constraint.h | 16 +- .../constraint_solver/sched_constraints.cc | 14 +- .../constraint_solver/sched_expr.cc | 12 +- .../constraint_solver/sched_search.cc | 12 +- {src => ortools}/constraint_solver/search.cc | 36 +- .../constraint_solver/search_limit.proto | 0 {src => ortools}/constraint_solver/softgcc.cc | 10 +- .../constraint_solver/solver_parameters.proto | 0 {src => ortools}/constraint_solver/table.cc | 26 +- .../constraint_solver/timetabling.cc | 12 +- {src => ortools}/constraint_solver/trace.cc | 18 +- .../constraint_solver/tree_monitor.cc | 22 +- .../constraint_solver/utilities.cc | 22 +- {src => ortools}/constraint_solver/visitor.cc | 18 +- {src => ortools}/flatzinc/BUILD | 0 {src => ortools}/flatzinc/checker.cc | 8 +- {src => ortools}/flatzinc/checker.h | 2 +- {src => ortools}/flatzinc/constraints.cc | 24 +- {src => ortools}/flatzinc/constraints.h | 4 +- .../flatzinc/csharp/flatzinc.i | 0 .../flatzinc/flatzinc_constraints.cc | 10 +- .../flatzinc/flatzinc_constraints.h | 2 +- {src => ortools}/flatzinc/fz.cc | 30 +- {src => ortools}/flatzinc/logging.cc | 2 +- {src => ortools}/flatzinc/logging.h | 4 +- {src => ortools}/flatzinc/model.cc | 12 +- {src => ortools}/flatzinc/model.h | 10 +- .../flatzinc/mznlib_cp/all_different_int.mzn | 0 .../mznlib_cp/alldifferent_except_0.mzn | 0 {src => ortools}/flatzinc/mznlib_cp/among.mzn | 0 .../flatzinc/mznlib_cp/arg_max_int.mzn | 0 .../flatzinc/mznlib_cp/arg_min_int.mzn | 0 .../flatzinc/mznlib_cp/at_most_int.mzn | 0 .../flatzinc/mznlib_cp/circuit.mzn | 0 {src => ortools}/flatzinc/mznlib_cp/count.mzn | 0 .../flatzinc/mznlib_cp/count_eq.mzn | 0 .../flatzinc/mznlib_cp/count_geq.mzn | 0 .../flatzinc/mznlib_cp/count_gt.mzn | 0 .../flatzinc/mznlib_cp/count_leq.mzn | 0 .../flatzinc/mznlib_cp/count_lt.mzn | 0 .../flatzinc/mznlib_cp/count_neq.mzn | 0 .../flatzinc/mznlib_cp/count_reif.mzn | 0 .../flatzinc/mznlib_cp/cumulative.mzn | 0 {src => ortools}/flatzinc/mznlib_cp/diffn.mzn | 0 .../flatzinc/mznlib_cp/diffn_k.mzn | 0 .../flatzinc/mznlib_cp/diffn_nonstrict.mzn | 0 .../flatzinc/mznlib_cp/diffn_nonstrict_k.mzn | 0 .../flatzinc/mznlib_cp/disjunctive.mzn | 0 .../flatzinc/mznlib_cp/disjunctive_opt.mzn | 0 .../flatzinc/mznlib_cp/disjunctive_strict.mzn | 0 .../flatzinc/mznlib_cp/global_cardinality.mzn | 0 .../mznlib_cp/global_cardinality_closed.mzn | 0 .../mznlib_cp/global_cardinality_low_up.mzn | 0 .../global_cardinality_low_up_closed.mzn | 0 .../flatzinc/mznlib_cp/int_mod.mzn | 0 .../flatzinc/mznlib_cp/inverse.mzn | 0 .../flatzinc/mznlib_cp/lex_less_bool.mzn | 0 .../flatzinc/mznlib_cp/lex_less_int.mzn | 0 .../flatzinc/mznlib_cp/lex_lesseq_bool.mzn | 0 .../flatzinc/mznlib_cp/lex_lesseq_int.mzn | 0 .../flatzinc/mznlib_cp/maximum.mzn | 0 .../flatzinc/mznlib_cp/maximum_int.mzn | 0 .../flatzinc/mznlib_cp/minimum.mzn | 0 .../flatzinc/mznlib_cp/minimum_int.mzn | 0 .../flatzinc/mznlib_cp/nvalue.mzn | 0 .../flatzinc/mznlib_cp/redefinitions-2.0.mzn | 0 .../flatzinc/mznlib_cp/regular.mzn | 0 .../flatzinc/mznlib_cp/regular_nfa.mzn | 0 .../flatzinc/mznlib_cp/sequence.mzn | 0 .../flatzinc/mznlib_cp/sliding_sum.mzn | 0 {src => ortools}/flatzinc/mznlib_cp/sort.mzn | 0 .../flatzinc/mznlib_cp/subcircuit.mzn | 0 .../mznlib_cp/symmetric_all_different.mzn | 0 {src => ortools}/flatzinc/mznlib_cp/table.mzn | 0 .../flatzinc/mznlib_cp/table_bool.mzn | 0 .../flatzinc/mznlib_cp/table_int.mzn | 0 {src => ortools}/flatzinc/mznlib_sat/BUILD | 0 .../flatzinc/mznlib_sat/all_different_int.mzn | 0 .../flatzinc/mznlib_sat/circuit.mzn | 0 .../flatzinc/mznlib_sat/cumulative.mzn | 0 .../flatzinc/mznlib_sat/diffn.mzn | 0 .../flatzinc/mznlib_sat/diffn_nonstrict.mzn | 0 .../flatzinc/mznlib_sat/maximum.mzn | 0 .../flatzinc/mznlib_sat/maximum_int.mzn | 0 .../flatzinc/mznlib_sat/minimum.mzn | 0 .../flatzinc/mznlib_sat/minimum_int.mzn | 0 .../flatzinc/mznlib_sat/network_flow.mzn | 0 .../flatzinc/mznlib_sat/redefinitions-2.0.mzn | 0 .../flatzinc/mznlib_sat/regular.mzn | 0 .../flatzinc/mznlib_sat/subcircuit.mzn | 0 .../flatzinc/mznlib_sat/table.mzn | 0 .../flatzinc/mznlib_sat/table_bool.mzn | 0 .../flatzinc/mznlib_sat/table_int.mzn | 0 {src => ortools}/flatzinc/parser.cc | 4 +- {src => ortools}/flatzinc/parser.h | 2 +- {src => ortools}/flatzinc/parser.lex | 6 +- {src => ortools}/flatzinc/parser.tab.cc | 305 +- {src => ortools}/flatzinc/parser.tab.hh | 10 +- {src => ortools}/flatzinc/parser.yy | 10 +- {src => ortools}/flatzinc/parser.yy.cc | 147 +- {src => ortools}/flatzinc/parser_main.cc | 12 +- {src => ortools}/flatzinc/parser_util.cc | 14 +- {src => ortools}/flatzinc/parser_util.h | 4 +- {src => ortools}/flatzinc/presolve.cc | 18 +- {src => ortools}/flatzinc/presolve.h | 10 +- {src => ortools}/flatzinc/reporting.cc | 22 +- {src => ortools}/flatzinc/reporting.h | 14 +- {src => ortools}/flatzinc/sat_constraint.cc | 28 +- {src => ortools}/flatzinc/sat_constraint.h | 2 +- {src => ortools}/flatzinc/sat_fz_solver.cc | 40 +- {src => ortools}/flatzinc/sat_fz_solver.h | 4 +- {src => ortools}/flatzinc/solver.cc | 26 +- {src => ortools}/flatzinc/solver.h | 10 +- {src => ortools}/flatzinc/solver_data.cc | 4 +- {src => ortools}/flatzinc/solver_data.h | 6 +- {src => ortools}/flatzinc/solver_util.cc | 6 +- {src => ortools}/flatzinc/solver_util.h | 6 +- {src => ortools}/glop/BUILD | 0 {src => ortools}/glop/basis_representation.cc | 12 +- {src => ortools}/glop/basis_representation.h | 16 +- {src => ortools}/glop/dual_edge_norms.cc | 4 +- {src => ortools}/glop/dual_edge_norms.h | 10 +- {src => ortools}/glop/entering_variable.cc | 18 +- {src => ortools}/glop/entering_variable.h | 24 +- {src => ortools}/glop/initial_basis.cc | 6 +- {src => ortools}/glop/initial_basis.h | 6 +- {src => ortools}/glop/lp_solver.cc | 26 +- {src => ortools}/glop/lp_solver.h | 10 +- {src => ortools}/glop/lu_factorization.cc | 8 +- {src => ortools}/glop/lu_factorization.h | 10 +- {src => ortools}/glop/markowitz.cc | 14 +- {src => ortools}/glop/markowitz.h | 12 +- {src => ortools}/glop/parameters.proto | 0 {src => ortools}/glop/preprocessor.cc | 12 +- {src => ortools}/glop/preprocessor.h | 14 +- {src => ortools}/glop/primal_edge_norms.cc | 6 +- {src => ortools}/glop/primal_edge_norms.h | 14 +- {src => ortools}/glop/rank_one_update.h | 10 +- {src => ortools}/glop/reduced_costs.cc | 4 +- {src => ortools}/glop/reduced_costs.h | 20 +- {src => ortools}/glop/revised_simplex.cc | 92 +- {src => ortools}/glop/revised_simplex.h | 38 +- {src => ortools}/glop/status.cc | 4 +- {src => ortools}/glop/status.h | 8 +- {src => ortools}/glop/update_row.cc | 4 +- {src => ortools}/glop/update_row.h | 10 +- {src => ortools}/glop/variable_values.cc | 6 +- {src => ortools}/glop/variable_values.h | 8 +- {src => ortools}/glop/variables_info.cc | 2 +- {src => ortools}/glop/variables_info.h | 4 +- {src => ortools}/graph/BUILD | 0 {src => ortools}/graph/README | 0 .../graph}/__init__.py | 4 +- {src => ortools}/graph/assignment.cc | 8 +- {src => ortools}/graph/assignment.h | 4 +- {src => ortools}/graph/astar.cc | 8 +- {src => ortools}/graph/bellman_ford.cc | 2 +- {src => ortools}/graph/christofides.h | 12 +- {src => ortools}/graph/cliques.cc | 7 +- {src => ortools}/graph/cliques.h | 25 +- {src => ortools}/graph/connectivity.h | 6 +- .../graph/csharp/graph.i | 18 +- {src => ortools}/graph/dijkstra.cc | 6 +- {src => ortools}/graph/ebert_graph.h | 14 +- {src => ortools}/graph/eulerian_path.h | 6 +- {src => ortools}/graph/flow_problem.proto | 0 {src => ortools}/graph/graph.h | 10 +- {src => ortools}/graph/graphs.h | 4 +- {src => ortools}/graph/hamiltonian_path.h | 10 +- {src => ortools}/graph/io.h | 18 +- .../graph.swig => ortools/graph/java/graph.i | 18 +- {src => ortools}/graph/linear_assignment.cc | 4 +- {src => ortools}/graph/linear_assignment.h | 22 +- {src => ortools}/graph/max_flow.cc | 6 +- {src => ortools}/graph/max_flow.h | 16 +- {src => ortools}/graph/min_cost_flow.cc | 12 +- {src => ortools}/graph/min_cost_flow.h | 16 +- .../graph/minimum_spanning_tree.h | 12 +- {src => ortools}/graph/one_tree_lower_bound.h | 6 +- .../graph/python/graph.i | 33 +- {src => ortools}/graph/shortestpaths.cc | 15 +- {src => ortools}/graph/shortestpaths.h | 4 +- {src => ortools}/graph/util.cc | 2 +- {src => ortools}/graph/util.h | 10 +- {src => ortools}/linear_solver/BUILD | 0 {src => ortools}/linear_solver/README | 0 .../linear_solver}/__init__.py | 4 +- .../linear_solver/bop_interface.cc | 18 +- .../linear_solver/cbc_interface.cc | 16 +- .../linear_solver/clp_interface.cc | 18 +- .../linear_solver/cplex_interface.cc | 10 +- .../linear_solver/csharp/linear_solver.i | 12 +- .../linear_solver/glop_interface.cc | 30 +- {src => ortools}/linear_solver/glop_utils.cc | 2 +- {src => ortools}/linear_solver/glop_utils.h | 4 +- .../linear_solver/glpk_interface.cc | 16 +- .../linear_solver/gurobi_interface.cc | 16 +- .../linear_solver/java/linear_solver.i | 10 +- {src => ortools}/linear_solver/linear_expr.cc | 12 +- {src => ortools}/linear_solver/linear_expr.h | 4 +- .../linear_solver/linear_solver.cc | 37 +- .../linear_solver/linear_solver.h | 15 +- .../linear_solver/linear_solver.proto | 2 +- .../linear_solver_natural_api.py | 0 .../linear_solver/model_exporter.cc | 20 +- .../linear_solver/model_exporter.h | 6 +- .../linear_solver/model_validator.cc | 11 +- .../linear_solver/model_validator.h | 2 +- .../linear_solver/python/linear_solver.i | 10 +- .../linear_solver/scip_interface.cc | 16 +- {src => ortools}/lp_data/BUILD | 0 {src => ortools}/lp_data/lp_data.cc | 18 +- {src => ortools}/lp_data/lp_data.h | 20 +- {src => ortools}/lp_data/lp_decomposer.cc | 8 +- {src => ortools}/lp_data/lp_decomposer.h | 6 +- {src => ortools}/lp_data/lp_print_utils.cc | 12 +- {src => ortools}/lp_data/lp_print_utils.h | 6 +- {src => ortools}/lp_data/lp_types.cc | 2 +- {src => ortools}/lp_data/lp_types.h | 8 +- {src => ortools}/lp_data/lp_utils.cc | 2 +- {src => ortools}/lp_data/lp_utils.h | 6 +- {src => ortools}/lp_data/matrix_scaler.cc | 10 +- {src => ortools}/lp_data/matrix_scaler.h | 8 +- {src => ortools}/lp_data/matrix_utils.cc | 4 +- {src => ortools}/lp_data/matrix_utils.h | 4 +- {src => ortools}/lp_data/mps_reader.cc | 26 +- {src => ortools}/lp_data/mps_reader.h | 18 +- {src => ortools}/lp_data/permutation.h | 4 +- {src => ortools}/lp_data/proto_utils.cc | 2 +- {src => ortools}/lp_data/proto_utils.h | 4 +- {src => ortools}/lp_data/sparse.cc | 6 +- {src => ortools}/lp_data/sparse.h | 10 +- {src => ortools}/lp_data/sparse_column.cc | 6 +- {src => ortools}/lp_data/sparse_column.h | 2 +- {src => ortools}/lp_data/sparse_row.h | 2 +- {src => ortools}/lp_data/sparse_vector.h | 14 +- {src => ortools}/sat/BUILD | 0 {src => ortools}/sat/boolean_problem.cc | 20 +- {src => ortools}/sat/boolean_problem.h | 10 +- {src => ortools}/sat/boolean_problem.proto | 0 {src => ortools}/sat/clause.cc | 14 +- {src => ortools}/sat/clause.h | 26 +- {src => ortools}/sat/cp_constraints.cc | 6 +- {src => ortools}/sat/cp_constraints.h | 6 +- {src => ortools}/sat/cumulative.cc | 12 +- {src => ortools}/sat/cumulative.h | 8 +- {src => ortools}/sat/disjunctive.cc | 150 +- {src => ortools}/sat/disjunctive.h | 24 +- {src => ortools}/sat/drat.cc | 4 +- {src => ortools}/sat/drat.h | 6 +- {src => ortools}/sat/encoding.cc | 2 +- {src => ortools}/sat/encoding.h | 4 +- {src => ortools}/sat/flow_costs.cc | 2 +- {src => ortools}/sat/flow_costs.h | 8 +- {src => ortools}/sat/integer.cc | 7 +- {src => ortools}/sat/integer.h | 30 +- {src => ortools}/sat/integer_expr.cc | 63 +- {src => ortools}/sat/integer_expr.h | 63 +- {src => ortools}/sat/intervals.cc | 4 +- {src => ortools}/sat/intervals.h | 14 +- .../sat/linear_programming_constraint.cc | 6 +- .../sat/linear_programming_constraint.h | 10 +- {src => ortools}/sat/lp_utils.cc | 10 +- {src => ortools}/sat/lp_utils.h | 8 +- {src => ortools}/sat/model.h | 4 +- {src => ortools}/sat/no_cycle.cc | 4 +- {src => ortools}/sat/no_cycle.h | 6 +- {src => ortools}/sat/optimization.cc | 6 +- {src => ortools}/sat/optimization.h | 8 +- {src => ortools}/sat/overload_checker.cc | 6 +- {src => ortools}/sat/overload_checker.h | 8 +- {src => ortools}/sat/pb_constraint.cc | 6 +- {src => ortools}/sat/pb_constraint.h | 6 +- {src => ortools}/sat/precedences.cc | 6 +- {src => ortools}/sat/precedences.h | 10 +- {src => ortools}/sat/sat_base.h | 10 +- {src => ortools}/sat/sat_parameters.proto | 0 {src => ortools}/sat/sat_solver.cc | 21 +- {src => ortools}/sat/sat_solver.h | 38 +- {src => ortools}/sat/simplification.cc | 14 +- {src => ortools}/sat/simplification.h | 10 +- {src => ortools}/sat/symmetry.cc | 2 +- {src => ortools}/sat/symmetry.h | 6 +- {src => ortools}/sat/table.cc | 6 +- {src => ortools}/sat/table.h | 4 +- ortools/sat/theta_tree.cc | 207 + ortools/sat/theta_tree.h | 209 + {src => ortools}/sat/timetable.cc | 195 +- {src => ortools}/sat/timetable.h | 63 +- {src => ortools}/sat/timetable_edgefinding.cc | 6 +- {src => ortools}/sat/timetable_edgefinding.h | 8 +- {src => ortools}/sat/util.cc | 2 +- {src => ortools}/sat/util.h | 4 +- {src => ortools}/util/BUILD | 0 {src => ortools}/util/README | 0 {src => ortools}/util/bitset.cc | 6 +- {src => ortools}/util/bitset.h | 6 +- {src => ortools}/util/cached_log.cc | 4 +- {src => ortools}/util/cached_log.h | 8 +- .../util/csharp/functions.i | 8 +- .../proto.swig => ortools/util/csharp/proto.i | 4 +- .../util/csharp/tuple_set.i | 8 +- {src => ortools}/util/filelineiter.h | 8 +- {src => ortools}/util/fp_utils.cc | 4 +- {src => ortools}/util/fp_utils.h | 4 +- .../util/functions_swig_helpers.h | 6 +- .../util/functions_swig_test_helpers.h | 2 +- {src => ortools}/util/graph_export.cc | 12 +- {src => ortools}/util/graph_export.h | 6 +- {src => ortools}/util/iterators.h | 0 .../util/java/functions.i | 8 +- .../proto.swig => ortools/util/java/proto.i | 6 +- .../util/java/tuple_set.i | 10 +- .../vector.swig => ortools/util/java/vector.i | 6 +- {src => ortools}/util/monoid_operation_tree.h | 6 +- {src => ortools}/util/permutation.h | 6 +- .../util/piecewise_linear_function.cc | 6 +- .../util/piecewise_linear_function.h | 8 +- {src => ortools}/util/proto_tools.cc | 6 +- {src => ortools}/util/proto_tools.h | 0 .../util/python/functions.i | 2 +- .../proto.swig => ortools/util/python/proto.i | 4 +- .../util/python/vector.i | 10 +- {src => ortools}/util/range_minimum_query.h | 2 +- {src => ortools}/util/range_query_function.cc | 10 +- {src => ortools}/util/range_query_function.h | 2 +- .../util/rational_approximation.cc | 4 +- .../util/rational_approximation.h | 2 +- {src => ortools}/util/rcpsp_parser.cc | 12 +- {src => ortools}/util/rcpsp_parser.h | 2 +- {src => ortools}/util/return_macros.h | 0 {src => ortools}/util/rev.h | 8 +- {src => ortools}/util/running_stat.h | 4 +- {src => ortools}/util/saturated_arithmetic.h | 6 +- {src => ortools}/util/sort.h | 0 {src => ortools}/util/sorted_interval_list.cc | 8 +- {src => ortools}/util/sorted_interval_list.h | 2 +- {src => ortools}/util/stats.cc | 14 +- {src => ortools}/util/stats.h | 2 +- {src => ortools}/util/string_array.h | 0 {src => ortools}/util/time_limit.cc | 4 +- {src => ortools}/util/time_limit.h | 23 +- {src => ortools}/util/tuple_set.h | 14 +- {src => ortools}/util/vector_map.h | 4 +- {src => ortools}/util/vector_or_function.h | 4 +- {src => ortools}/util/xml_helper.cc | 8 +- {src => ortools}/util/xml_helper.h | 2 +- {src => ortools}/util/zvector.h | 6 +- src/algorithms/__init__.py | 3 - src/constraint_solver/__init__.py | 3 - src/graph/__init__.py | 3 - src/linear_solver/__init__.py | 3 - src/ortools/__init__.py | 14 - tools/generate_deps.sh | 40 +- 611 files changed, 6579 insertions(+), 5848 deletions(-) rename {src => ortools}/WORKSPACE (100%) rename {src => ortools}/algorithms/BUILD (100%) rename {src/ortools/graph => ortools/algorithms}/__init__.py (79%) rename src/algorithms/csharp/knapsack_solver.swig => ortools/algorithms/csharp/knapsack_solver.i (85%) rename {src => ortools}/algorithms/dense_doubly_linked_list.h (98%) rename {src => ortools}/algorithms/dynamic_partition.cc (98%) rename {src => ortools}/algorithms/dynamic_partition.h (99%) rename {src => ortools}/algorithms/dynamic_permutation.cc (97%) rename {src => ortools}/algorithms/dynamic_permutation.h (99%) rename {src => ortools}/algorithms/find_graph_symmetries.cc (99%) rename {src => ortools}/algorithms/find_graph_symmetries.h (98%) rename {src => ortools}/algorithms/hungarian.cc (99%) rename {src => ortools}/algorithms/hungarian.h (98%) rename {src => ortools}/algorithms/hungarian_test.cc (95%) rename src/algorithms/java/knapsack_solver.swig => ortools/algorithms/java/knapsack_solver.i (92%) rename {src => ortools}/algorithms/knapsack_solver.cc (99%) rename {src => ortools}/algorithms/knapsack_solver.h (99%) rename src/algorithms/python/knapsack_solver.swig => ortools/algorithms/python/knapsack_solver.i (90%) rename {src => ortools}/algorithms/sparse_permutation.cc (95%) rename {src => ortools}/algorithms/sparse_permutation.h (99%) rename {src => ortools}/base/BUILD (100%) rename {src => ortools}/base/accurate_sum.h (100%) rename {src => ortools}/base/adjustable_priority_queue-inl.h (93%) rename {src => ortools}/base/adjustable_priority_queue.h (97%) rename src/base/base.swig => ortools/base/base.i (98%) rename {src => ortools}/base/basictypes.h (90%) rename {src => ortools}/base/bitmap.cc (94%) rename {src => ortools}/base/bitmap.h (98%) rename {src => ortools}/base/callback.cc (96%) rename {src => ortools}/base/callback.h (99%) rename {src => ortools}/base/casts.h (100%) rename {src => ortools}/base/cleanup.h (100%) rename {src => ortools}/base/commandlineflags.h (100%) rename {src => ortools}/base/encodingutils.h (94%) rename {src => ortools}/base/file.cc (98%) rename {src => ortools}/base/file.h (97%) rename {src => ortools}/base/filelinereader.cc (94%) rename {src => ortools}/base/filelinereader.h (93%) rename {src => ortools}/base/hash.h (99%) rename {src => ortools}/base/int_type.h (99%) rename {src => ortools}/base/int_type_indexed_vector.h (99%) rename {src => ortools}/base/integral_types.h (100%) rename {src => ortools}/base/jniutil.h (98%) rename {src => ortools}/base/join.cc (97%) rename {src => ortools}/base/join.h (96%) rename {src => ortools}/base/logging.cc (97%) rename {src => ortools}/base/logging.h (97%) rename {src => ortools}/base/macros.h (100%) rename {src => ortools}/base/map_util.h (99%) rename {src => ortools}/base/mathutil.h (95%) rename {src => ortools}/base/murmur.h (96%) rename {src => ortools}/base/mutex.cc (97%) rename {src => ortools}/base/mutex.h (98%) rename {src => ortools}/base/numbers.cc (98%) rename {src => ortools}/base/numbers.h (94%) rename {src => ortools}/base/port.h (100%) rename {src => ortools}/base/python-swig.h (98%) rename src/base/python/callbacks.swig => ortools/base/python/callbacks.i (96%) rename {src => ortools}/base/random.cc (97%) rename {src => ortools}/base/random.h (98%) rename {src => ortools}/base/recordio.cc (87%) rename {src => ortools}/base/recordio.h (97%) rename {src => ortools}/base/small_map.h (100%) rename {src => ortools}/base/small_ordered_set.h (100%) rename {src => ortools}/base/sparsetable.h (98%) rename {src => ortools}/base/split.cc (94%) rename {src => ortools}/base/split.h (90%) rename {src => ortools}/base/status.h (93%) rename {src => ortools}/base/statusor.h (94%) rename {src => ortools}/base/stl_util.h (100%) rename {src => ortools}/base/stringpiece.cc (94%) rename {src => ortools}/base/stringpiece.h (84%) rename {src => ortools}/base/stringpiece_utils.h (79%) rename {src => ortools}/base/stringprintf.cc (98%) rename {src => ortools}/base/stringprintf.h (96%) rename {src => ortools}/base/strongly_connected_components.h (98%) rename {src => ortools}/base/strtoint.h (98%) rename {src => ortools}/base/strutil.h (96%) rename {src => ortools}/base/synchronization.h (97%) rename {src => ortools}/base/sysinfo.cc (96%) rename {src => ortools}/base/sysinfo.h (95%) rename {src => ortools}/base/thorough_hash.h (97%) rename {src => ortools}/base/threadpool.cc (98%) rename {src => ortools}/base/threadpool.h (100%) rename {src => ortools}/base/time_support.cc (94%) rename {src => ortools}/base/time_support.h (94%) rename {src => ortools}/base/timer.cc (89%) rename {src => ortools}/base/timer.h (94%) rename {src => ortools}/base/typeid.h (100%) rename {src => ortools}/bazel/BUILD (100%) rename {src => ortools}/bazel/glpk.BUILD (100%) rename {src => ortools}/bazel/gtest.BUILD (100%) rename {src => ortools}/bazel/swig.BUILD (100%) rename {src => ortools}/bazel/swig.bzl (100%) rename {src => ortools}/bop/BUILD (100%) rename {src => ortools}/bop/bop_base.cc (99%) rename {src => ortools}/bop/bop_base.h (96%) rename {src => ortools}/bop/bop_fs.cc (98%) rename {src => ortools}/bop/bop_fs.h (90%) rename {src => ortools}/bop/bop_lns.cc (98%) rename {src => ortools}/bop/bop_lns.h (92%) rename {src => ortools}/bop/bop_ls.cc (99%) rename {src => ortools}/bop/bop_ls.h (98%) rename {src => ortools}/bop/bop_parameters.proto (100%) rename {src => ortools}/bop/bop_portfolio.cc (98%) rename {src => ortools}/bop/bop_portfolio.h (95%) rename {src => ortools}/bop/bop_solution.cc (98%) rename {src => ortools}/bop/bop_solution.h (97%) rename {src => ortools}/bop/bop_solver.cc (91%) rename {src => ortools}/bop/bop_solver.h (85%) rename {src => ortools}/bop/bop_types.h (95%) rename {src => ortools}/bop/bop_util.cc (96%) rename {src => ortools}/bop/bop_util.h (93%) rename {src => ortools}/bop/complete_optimizer.cc (97%) rename {src => ortools}/bop/complete_optimizer.h (92%) rename {src => ortools}/bop/integral_solver.cc (99%) rename {src => ortools}/bop/integral_solver.h (93%) rename {src => ortools}/com/google/ortools/algorithms/IntArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/IntArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/IntVarArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/JavaDecisionBuilder.java (100%) rename {src => ortools}/com/google/ortools/constraintsolver/NetDecisionBuilder.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/RoutingModelHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/SolverHelper.cs (100%) rename {src => ortools}/com/google/ortools/constraintsolver/ValCstPair.cs (100%) rename {src => ortools}/com/google/ortools/linearsolver/DoubleArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/linearsolver/LinearConstraint.cs (100%) rename {src => ortools}/com/google/ortools/linearsolver/LinearExpr.cs (100%) rename {src => ortools}/com/google/ortools/linearsolver/SolverHelper.cs (100%) rename {src => ortools}/com/google/ortools/linearsolver/VariableHelper.cs (100%) rename {src => ortools}/com/google/ortools/util/NestedArrayHelper.cs (100%) rename {src => ortools}/com/google/ortools/util/ProtoHelper.cs (100%) rename {src => ortools}/constraint_solver/BUILD (100%) rename {src => ortools}/constraint_solver/README (100%) rename {src/ortools/algorithms => ortools/constraint_solver}/__init__.py (78%) rename {src => ortools}/constraint_solver/ac4_mdd_reset_table.cc (99%) rename {src => ortools}/constraint_solver/ac4r_table.cc (97%) rename {src => ortools}/constraint_solver/alldiff_cst.cc (99%) rename {src => ortools}/constraint_solver/assignment.cc (98%) rename {src => ortools}/constraint_solver/assignment.proto (100%) rename {src => ortools}/constraint_solver/collect_variables.cc (96%) rename {src => ortools}/constraint_solver/constraint_solver.cc (99%) rename {src => ortools}/constraint_solver/constraint_solver.h (99%) rename {src => ortools}/constraint_solver/constraint_solveri.h (99%) rename {src => ortools}/constraint_solver/constraints.cc (98%) rename {src => ortools}/constraint_solver/count_cst.cc (99%) rename src/constraint_solver/csharp/constraint_solver.swig => ortools/constraint_solver/csharp/constraint_solver.i (98%) rename src/constraint_solver/csharp/routing.swig => ortools/constraint_solver/csharp/routing.i (97%) rename {src => ortools}/constraint_solver/default_search.cc (99%) rename {src => ortools}/constraint_solver/demon_profiler.cc (97%) rename {src => ortools}/constraint_solver/demon_profiler.proto (100%) rename {src => ortools}/constraint_solver/deviation.cc (98%) rename {src => ortools}/constraint_solver/diffn.cc (97%) rename {src => ortools}/constraint_solver/element.cc (99%) rename {src => ortools}/constraint_solver/expr_array.cc (99%) rename {src => ortools}/constraint_solver/expr_cst.cc (99%) rename {src => ortools}/constraint_solver/expressions.cc (99%) rename {src => ortools}/constraint_solver/gcc.cc (97%) rename {src => ortools}/constraint_solver/graph_constraints.cc (99%) rename {src => ortools}/constraint_solver/hybrid.cc (97%) rename {src => ortools}/constraint_solver/hybrid.h (96%) rename {src => ortools}/constraint_solver/interval.cc (99%) rename {src => ortools}/constraint_solver/io.cc (99%) rename src/constraint_solver/java/constraint_solver.swig => ortools/constraint_solver/java/constraint_solver.i (97%) rename {src => ortools}/constraint_solver/java/javawrapcp_util.h (100%) rename src/constraint_solver/java/routing.swig => ortools/constraint_solver/java/routing.i (96%) rename {src => ortools}/constraint_solver/local_search.cc (99%) rename {src => ortools}/constraint_solver/model.proto (98%) rename {src => ortools}/constraint_solver/model_cache.cc (99%) rename {src => ortools}/constraint_solver/nogoods.cc (94%) rename {src => ortools}/constraint_solver/pack.cc (99%) rename src/constraint_solver/python/constraint_solver.swig => ortools/constraint_solver/python/constraint_solver.i (98%) rename src/constraint_solver/python/constraint_solver_helpers.swig => ortools/constraint_solver/python/constraint_solver_helpers.i (100%) rename {src => ortools}/constraint_solver/python/pywrapcp_util.h (95%) rename src/constraint_solver/python/routing.swig => ortools/constraint_solver/python/routing.i (95%) rename {src => ortools}/constraint_solver/range_cst.cc (99%) rename {src => ortools}/constraint_solver/resource.cc (99%) rename {src => ortools}/constraint_solver/routing.cc (99%) rename {src => ortools}/constraint_solver/routing.h (99%) rename {src => ortools}/constraint_solver/routing_enums.proto (100%) rename {src => ortools}/constraint_solver/routing_flags.cc (98%) rename {src => ortools}/constraint_solver/routing_flags.h (96%) rename {src => ortools}/constraint_solver/routing_neighborhoods.cc (99%) rename {src => ortools}/constraint_solver/routing_neighborhoods.h (98%) rename {src => ortools}/constraint_solver/routing_parameters.proto (99%) rename {src => ortools}/constraint_solver/routing_search.cc (99%) rename {src => ortools}/constraint_solver/routing_types.h (94%) rename {src => ortools}/constraint_solver/sat_constraint.cc (98%) rename {src => ortools}/constraint_solver/sat_constraint.h (97%) rename {src => ortools}/constraint_solver/sched_constraints.cc (98%) rename {src => ortools}/constraint_solver/sched_expr.cc (95%) rename {src => ortools}/constraint_solver/sched_search.cc (99%) rename {src => ortools}/constraint_solver/search.cc (99%) rename {src => ortools}/constraint_solver/search_limit.proto (100%) rename {src => ortools}/constraint_solver/softgcc.cc (99%) rename {src => ortools}/constraint_solver/solver_parameters.proto (100%) rename {src => ortools}/constraint_solver/table.cc (98%) rename {src => ortools}/constraint_solver/timetabling.cc (97%) rename {src => ortools}/constraint_solver/trace.cc (98%) rename {src => ortools}/constraint_solver/tree_monitor.cc (98%) rename {src => ortools}/constraint_solver/utilities.cc (98%) rename {src => ortools}/constraint_solver/visitor.cc (95%) rename {src => ortools}/flatzinc/BUILD (100%) rename {src => ortools}/flatzinc/checker.cc (99%) rename {src => ortools}/flatzinc/checker.h (96%) rename {src => ortools}/flatzinc/constraints.cc (99%) rename {src => ortools}/flatzinc/constraints.h (92%) rename src/flatzinc/csharp/flatzinc.swig => ortools/flatzinc/csharp/flatzinc.i (100%) rename {src => ortools}/flatzinc/flatzinc_constraints.cc (99%) rename {src => ortools}/flatzinc/flatzinc_constraints.h (98%) rename {src => ortools}/flatzinc/fz.cc (94%) rename {src => ortools}/flatzinc/logging.cc (96%) rename {src => ortools}/flatzinc/logging.h (94%) rename {src => ortools}/flatzinc/model.cc (99%) rename {src => ortools}/flatzinc/model.h (98%) rename {src => ortools}/flatzinc/mznlib_cp/all_different_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/alldifferent_except_0.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/among.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/arg_max_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/arg_min_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/at_most_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/circuit.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_eq.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_geq.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_gt.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_leq.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_lt.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_neq.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/count_reif.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/cumulative.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/diffn.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/diffn_k.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/diffn_nonstrict.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/diffn_nonstrict_k.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/disjunctive.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/disjunctive_opt.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/disjunctive_strict.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/global_cardinality.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/global_cardinality_closed.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/global_cardinality_low_up.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/global_cardinality_low_up_closed.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/int_mod.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/inverse.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/lex_less_bool.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/lex_less_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/lex_lesseq_bool.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/lex_lesseq_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/maximum.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/maximum_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/minimum.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/minimum_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/nvalue.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/redefinitions-2.0.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/regular.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/regular_nfa.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/sequence.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/sliding_sum.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/sort.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/subcircuit.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/symmetric_all_different.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/table.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/table_bool.mzn (100%) rename {src => ortools}/flatzinc/mznlib_cp/table_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/BUILD (100%) rename {src => ortools}/flatzinc/mznlib_sat/all_different_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/circuit.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/cumulative.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/diffn.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/diffn_nonstrict.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/maximum.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/maximum_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/minimum.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/minimum_int.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/network_flow.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/redefinitions-2.0.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/regular.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/subcircuit.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/table.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/table_bool.mzn (100%) rename {src => ortools}/flatzinc/mznlib_sat/table_int.mzn (100%) rename {src => ortools}/flatzinc/parser.cc (96%) rename {src => ortools}/flatzinc/parser.h (96%) rename {src => ortools}/flatzinc/parser.lex (94%) rename {src => ortools}/flatzinc/parser.tab.cc (89%) rename {src => ortools}/flatzinc/parser.tab.hh (92%) rename {src => ortools}/flatzinc/parser.yy (99%) rename {src => ortools}/flatzinc/parser.yy.cc (97%) rename {src => ortools}/flatzinc/parser_main.cc (90%) rename {src => ortools}/flatzinc/parser_util.cc (88%) rename {src => ortools}/flatzinc/parser_util.h (97%) rename {src => ortools}/flatzinc/presolve.cc (99%) rename {src => ortools}/flatzinc/presolve.h (97%) rename {src => ortools}/flatzinc/reporting.cc (94%) rename {src => ortools}/flatzinc/reporting.h (97%) rename {src => ortools}/flatzinc/sat_constraint.cc (96%) rename {src => ortools}/flatzinc/sat_constraint.h (98%) rename {src => ortools}/flatzinc/sat_fz_solver.cc (98%) rename {src => ortools}/flatzinc/sat_fz_solver.h (92%) rename {src => ortools}/flatzinc/solver.cc (98%) rename {src => ortools}/flatzinc/solver.h (95%) rename {src => ortools}/flatzinc/solver_data.cc (97%) rename {src => ortools}/flatzinc/solver_data.h (95%) rename {src => ortools}/flatzinc/solver_util.cc (98%) rename {src => ortools}/flatzinc/solver_util.h (94%) rename {src => ortools}/glop/BUILD (100%) rename {src => ortools}/glop/basis_representation.cc (98%) rename {src => ortools}/glop/basis_representation.h (98%) rename {src => ortools}/glop/dual_edge_norms.cc (98%) rename {src => ortools}/glop/dual_edge_norms.h (96%) rename {src => ortools}/glop/entering_variable.cc (98%) rename {src => ortools}/glop/entering_variable.h (92%) rename {src => ortools}/glop/initial_basis.cc (99%) rename {src => ortools}/glop/initial_basis.h (97%) rename {src => ortools}/glop/lp_solver.cc (98%) rename {src => ortools}/glop/lp_solver.h (98%) rename {src => ortools}/glop/lu_factorization.cc (99%) rename {src => ortools}/glop/lu_factorization.h (98%) rename {src => ortools}/glop/markowitz.cc (99%) rename {src => ortools}/glop/markowitz.h (98%) rename {src => ortools}/glop/parameters.proto (100%) rename {src => ortools}/glop/preprocessor.cc (99%) rename {src => ortools}/glop/preprocessor.h (99%) rename {src => ortools}/glop/primal_edge_norms.cc (99%) rename {src => ortools}/glop/primal_edge_norms.h (96%) rename {src => ortools}/glop/rank_one_update.h (98%) rename {src => ortools}/glop/reduced_costs.cc (99%) rename {src => ortools}/glop/reduced_costs.h (97%) rename {src => ortools}/glop/revised_simplex.cc (98%) rename {src => ortools}/glop/revised_simplex.h (97%) rename {src => ortools}/glop/status.cc (95%) rename {src => ortools}/glop/status.h (93%) rename {src => ortools}/glop/update_row.cc (99%) rename {src => ortools}/glop/update_row.h (96%) rename {src => ortools}/glop/variable_values.cc (98%) rename {src => ortools}/glop/variable_values.h (97%) rename {src => ortools}/glop/variables_info.cc (99%) rename {src => ortools}/glop/variables_info.h (98%) rename {src => ortools}/graph/BUILD (100%) rename {src => ortools}/graph/README (100%) rename {src/ortools/linear_solver => ortools/graph}/__init__.py (78%) rename {src => ortools}/graph/assignment.cc (94%) rename {src => ortools}/graph/assignment.h (98%) rename {src => ortools}/graph/astar.cc (97%) rename {src => ortools}/graph/bellman_ford.cc (98%) rename {src => ortools}/graph/christofides.h (97%) rename {src => ortools}/graph/cliques.cc (98%) rename {src => ortools}/graph/cliques.h (97%) rename {src => ortools}/graph/connectivity.h (98%) rename src/graph/csharp/graph.swig => ortools/graph/csharp/graph.i (94%) rename {src => ortools}/graph/dijkstra.cc (97%) rename {src => ortools}/graph/ebert_graph.h (99%) rename {src => ortools}/graph/eulerian_path.h (98%) rename {src => ortools}/graph/flow_problem.proto (100%) rename {src => ortools}/graph/graph.h (99%) rename {src => ortools}/graph/graphs.h (97%) rename {src => ortools}/graph/hamiltonian_path.h (99%) rename {src => ortools}/graph/io.h (97%) rename src/graph/java/graph.swig => ortools/graph/java/graph.i (94%) rename {src => ortools}/graph/linear_assignment.cc (92%) rename {src => ortools}/graph/linear_assignment.h (99%) rename {src => ortools}/graph/max_flow.cc (99%) rename {src => ortools}/graph/max_flow.h (99%) rename {src => ortools}/graph/min_cost_flow.cc (99%) rename {src => ortools}/graph/min_cost_flow.h (98%) rename {src => ortools}/graph/minimum_spanning_tree.h (96%) rename {src => ortools}/graph/one_tree_lower_bound.h (99%) rename src/graph/python/graph.swig => ortools/graph/python/graph.i (91%) rename {src => ortools}/graph/shortestpaths.cc (73%) rename {src => ortools}/graph/shortestpaths.h (97%) rename {src => ortools}/graph/util.cc (96%) rename {src => ortools}/graph/util.h (98%) rename {src => ortools}/linear_solver/BUILD (100%) rename {src => ortools}/linear_solver/README (100%) rename {src/ortools/constraint_solver => ortools/linear_solver}/__init__.py (78%) rename {src => ortools}/linear_solver/bop_interface.cc (97%) rename {src => ortools}/linear_solver/cbc_interface.cc (98%) rename {src => ortools}/linear_solver/clp_interface.cc (98%) rename {src => ortools}/linear_solver/cplex_interface.cc (99%) rename src/linear_solver/csharp/linear_solver.swig => ortools/linear_solver/csharp/linear_solver.i (96%) rename {src => ortools}/linear_solver/glop_interface.cc (96%) rename {src => ortools}/linear_solver/glop_utils.cc (98%) rename {src => ortools}/linear_solver/glop_utils.h (93%) rename {src => ortools}/linear_solver/glpk_interface.cc (99%) rename {src => ortools}/linear_solver/gurobi_interface.cc (98%) rename src/linear_solver/java/linear_solver.swig => ortools/linear_solver/java/linear_solver.i (98%) rename {src => ortools}/linear_solver/linear_expr.cc (92%) rename {src => ortools}/linear_solver/linear_expr.h (99%) rename {src => ortools}/linear_solver/linear_solver.cc (98%) rename {src => ortools}/linear_solver/linear_solver.h (99%) rename {src => ortools}/linear_solver/linear_solver.proto (99%) rename {src/ortools => ortools}/linear_solver/linear_solver_natural_api.py (100%) rename {src => ortools}/linear_solver/model_exporter.cc (98%) rename {src => ortools}/linear_solver/model_exporter.h (98%) rename {src => ortools}/linear_solver/model_validator.cc (97%) rename {src => ortools}/linear_solver/model_validator.h (97%) rename src/linear_solver/python/linear_solver.swig => ortools/linear_solver/python/linear_solver.i (98%) rename {src => ortools}/linear_solver/scip_interface.cc (98%) rename {src => ortools}/lp_data/BUILD (100%) rename {src => ortools}/lp_data/lp_data.cc (99%) rename {src => ortools}/lp_data/lp_data.h (98%) rename {src => ortools}/lp_data/lp_decomposer.cc (97%) rename {src => ortools}/lp_data/lp_decomposer.h (96%) rename {src => ortools}/lp_data/lp_print_utils.cc (89%) rename {src => ortools}/lp_data/lp_print_utils.h (95%) rename {src => ortools}/lp_data/lp_types.cc (99%) rename {src => ortools}/lp_data/lp_types.h (98%) rename {src => ortools}/lp_data/lp_utils.cc (99%) rename {src => ortools}/lp_data/lp_utils.h (99%) rename {src => ortools}/lp_data/matrix_scaler.cc (98%) rename {src => ortools}/lp_data/matrix_scaler.h (97%) rename {src => ortools}/lp_data/matrix_utils.cc (99%) rename {src => ortools}/lp_data/matrix_utils.h (97%) rename {src => ortools}/lp_data/mps_reader.cc (97%) rename {src => ortools}/lp_data/mps_reader.h (94%) rename {src => ortools}/lp_data/permutation.h (98%) rename {src => ortools}/lp_data/proto_utils.cc (98%) rename {src => ortools}/lp_data/proto_utils.h (92%) rename {src => ortools}/lp_data/sparse.cc (99%) rename {src => ortools}/lp_data/sparse.h (99%) rename {src => ortools}/lp_data/sparse_column.cc (94%) rename {src => ortools}/lp_data/sparse_column.h (99%) rename {src => ortools}/lp_data/sparse_row.h (98%) rename {src => ortools}/lp_data/sparse_vector.h (99%) rename {src => ortools}/sat/BUILD (100%) rename {src => ortools}/sat/boolean_problem.cc (98%) rename {src => ortools}/sat/boolean_problem.h (96%) rename {src => ortools}/sat/boolean_problem.proto (100%) rename {src => ortools}/sat/clause.cc (99%) rename {src => ortools}/sat/clause.h (97%) rename {src => ortools}/sat/cp_constraints.cc (99%) rename {src => ortools}/sat/cp_constraints.h (99%) rename {src => ortools}/sat/cumulative.cc (97%) rename {src => ortools}/sat/cumulative.h (94%) rename {src => ortools}/sat/disjunctive.cc (86%) rename {src => ortools}/sat/disjunctive.h (92%) rename {src => ortools}/sat/drat.cc (97%) rename {src => ortools}/sat/drat.h (97%) rename {src => ortools}/sat/encoding.cc (99%) rename {src => ortools}/sat/encoding.h (99%) rename {src => ortools}/sat/flow_costs.cc (99%) rename {src => ortools}/sat/flow_costs.h (97%) rename {src => ortools}/sat/integer.cc (99%) rename {src => ortools}/sat/integer.h (98%) rename {src => ortools}/sat/integer_expr.cc (87%) rename {src => ortools}/sat/integer_expr.h (90%) rename {src => ortools}/sat/intervals.cc (99%) rename {src => ortools}/sat/intervals.h (98%) rename {src => ortools}/sat/linear_programming_constraint.cc (99%) rename {src => ortools}/sat/linear_programming_constraint.h (97%) rename {src => ortools}/sat/lp_utils.cc (98%) rename {src => ortools}/sat/lp_utils.h (93%) rename {src => ortools}/sat/model.h (98%) rename {src => ortools}/sat/no_cycle.cc (99%) rename {src => ortools}/sat/no_cycle.h (98%) rename {src => ortools}/sat/optimization.cc (99%) rename {src => ortools}/sat/optimization.h (98%) rename {src => ortools}/sat/overload_checker.cc (99%) rename {src => ortools}/sat/overload_checker.h (97%) rename {src => ortools}/sat/pb_constraint.cc (99%) rename {src => ortools}/sat/pb_constraint.h (99%) rename {src => ortools}/sat/precedences.cc (99%) rename {src => ortools}/sat/precedences.h (99%) rename {src => ortools}/sat/sat_base.h (99%) rename {src => ortools}/sat/sat_parameters.proto (100%) rename {src => ortools}/sat/sat_solver.cc (99%) rename {src => ortools}/sat/sat_solver.h (98%) rename {src => ortools}/sat/simplification.cc (99%) rename {src => ortools}/sat/simplification.h (98%) rename {src => ortools}/sat/symmetry.cc (99%) rename {src => ortools}/sat/symmetry.h (98%) rename {src => ortools}/sat/table.cc (99%) rename {src => ortools}/sat/table.h (97%) create mode 100644 ortools/sat/theta_tree.cc create mode 100644 ortools/sat/theta_tree.h rename {src => ortools}/sat/timetable.cc (66%) rename {src => ortools}/sat/timetable.h (65%) rename {src => ortools}/sat/timetable_edgefinding.cc (99%) rename {src => ortools}/sat/timetable_edgefinding.h (98%) rename {src => ortools}/sat/util.cc (98%) rename {src => ortools}/sat/util.h (92%) rename {src => ortools}/util/BUILD (100%) rename {src => ortools}/util/README (100%) rename {src => ortools}/util/bitset.cc (99%) rename {src => ortools}/util/bitset.h (99%) rename {src => ortools}/util/cached_log.cc (94%) rename {src => ortools}/util/cached_log.h (90%) rename src/util/csharp/functions.swig => ortools/util/csharp/functions.i (92%) rename src/util/csharp/proto.swig => ortools/util/csharp/proto.i (98%) rename src/util/csharp/tuple_set.swig => ortools/util/csharp/tuple_set.i (84%) rename {src => ortools}/util/filelineiter.h (96%) rename {src => ortools}/util/fp_utils.cc (99%) rename {src => ortools}/util/fp_utils.h (98%) rename {src => ortools}/util/functions_swig_helpers.h (94%) rename {src => ortools}/util/functions_swig_test_helpers.h (98%) rename {src => ortools}/util/graph_export.cc (95%) rename {src => ortools}/util/graph_export.h (95%) rename {src => ortools}/util/iterators.h (100%) rename src/util/java/functions.swig => ortools/util/java/functions.i (98%) rename src/util/java/proto.swig => ortools/util/java/proto.i (97%) rename src/util/java/tuple_set.swig => ortools/util/java/tuple_set.i (89%) rename src/util/java/vector.swig => ortools/util/java/vector.i (97%) rename {src => ortools}/util/monoid_operation_tree.h (98%) rename {src => ortools}/util/permutation.h (98%) rename {src => ortools}/util/piecewise_linear_function.cc (99%) rename {src => ortools}/util/piecewise_linear_function.h (98%) rename {src => ortools}/util/proto_tools.cc (97%) rename {src => ortools}/util/proto_tools.h (100%) rename src/util/python/functions.swig => ortools/util/python/functions.i (99%) rename src/util/python/proto.swig => ortools/util/python/proto.i (98%) rename src/util/python/vector.swig => ortools/util/python/vector.i (96%) rename {src => ortools}/util/range_minimum_query.h (99%) rename {src => ortools}/util/range_query_function.cc (97%) rename {src => ortools}/util/range_query_function.h (98%) rename {src => ortools}/util/rational_approximation.cc (96%) rename {src => ortools}/util/rational_approximation.h (97%) rename {src => ortools}/util/rcpsp_parser.cc (98%) rename {src => ortools}/util/rcpsp_parser.h (99%) rename {src => ortools}/util/return_macros.h (100%) rename {src => ortools}/util/rev.h (98%) rename {src => ortools}/util/running_stat.h (98%) rename {src => ortools}/util/saturated_arithmetic.h (98%) rename {src => ortools}/util/sort.h (100%) rename {src => ortools}/util/sorted_interval_list.cc (98%) rename {src => ortools}/util/sorted_interval_list.h (99%) rename {src => ortools}/util/stats.cc (97%) rename {src => ortools}/util/stats.h (99%) rename {src => ortools}/util/string_array.h (100%) rename {src => ortools}/util/time_limit.cc (97%) rename {src => ortools}/util/time_limit.h (97%) rename {src => ortools}/util/tuple_set.h (98%) rename {src => ortools}/util/vector_map.h (98%) rename {src => ortools}/util/vector_or_function.h (97%) rename {src => ortools}/util/xml_helper.cc (94%) rename {src => ortools}/util/xml_helper.h (98%) rename {src => ortools}/util/zvector.h (97%) delete mode 100644 src/algorithms/__init__.py delete mode 100644 src/constraint_solver/__init__.py delete mode 100644 src/graph/__init__.py delete mode 100644 src/linear_solver/__init__.py delete mode 100644 src/ortools/__init__.py diff --git a/examples/cpp/costas_array.cc b/examples/cpp/costas_array.cc index ee435307f8..98a362ea4e 100644 --- a/examples/cpp/costas_array.cc +++ b/examples/cpp/costas_array.cc @@ -24,15 +24,15 @@ #include #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/base/random.h" DEFINE_int32(minsize, 0, "Minimum degree of Costas matrix."); DEFINE_int32(maxsize, 0, "Maximum degree of Costas matrix."); diff --git a/examples/cpp/cryptarithm.cc b/examples/cpp/cryptarithm.cc index 2d26b4b2f4..01f16813b6 100644 --- a/examples/cpp/cryptarithm.cc +++ b/examples/cpp/cryptarithm.cc @@ -20,10 +20,10 @@ // Solution: // S=9; M=1; O=0; E=5; N=6; D=7; R=8; Y=2. -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { diff --git a/examples/cpp/cvrp_disjoint_tw.cc b/examples/cpp/cvrp_disjoint_tw.cc index ed7e9e0a7c..518eb9d6bf 100644 --- a/examples/cpp/cvrp_disjoint_tw.cc +++ b/examples/cpp/cvrp_disjoint_tw.cc @@ -24,14 +24,15 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" using operations_research::RoutingModel; using operations_research::RoutingSearchParameters; @@ -153,7 +154,7 @@ int main(int argc, char** argv) { // Solve, returns a solution if any (owned by RoutingModel). const operations_research::Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { DisplayPlan(routing, *solution, FLAGS_vrp_use_same_vehicle_costs, kMaxNodesPerGroup, kSameVehicleCost, routing.GetDimensionOrDie(kCapacity), diff --git a/examples/cpp/cvrptw.cc b/examples/cpp/cvrptw.cc index e16b56bce7..3bff282658 100644 --- a/examples/cpp/cvrptw.cc +++ b/examples/cpp/cvrptw.cc @@ -23,15 +23,16 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" +#include "ortools/base/random.h" using operations_research::RoutingModel; using operations_research::RoutingSearchParameters; @@ -140,7 +141,7 @@ int main(int argc, char** argv) { // Solve, returns a solution if any (owned by RoutingModel). const operations_research::Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { DisplayPlan(routing, *solution, FLAGS_vrp_use_same_vehicle_costs, kMaxNodesPerGroup, kSameVehicleCost, routing.GetDimensionOrDie(kCapacity), diff --git a/examples/cpp/cvrptw_lib.cc b/examples/cpp/cvrptw_lib.cc index b1b8e83e8b..b6f94279b0 100644 --- a/examples/cpp/cvrptw_lib.cc +++ b/examples/cpp/cvrptw_lib.cc @@ -11,15 +11,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cpp/cvrptw_lib.h" +#include "examples/cpp/cvrptw_lib.h" #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/routing.h" -#include "base/random.h" -#include "base/random.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/base/random.h" +#include "ortools/base/random.h" namespace operations_research { diff --git a/examples/cpp/cvrptw_lib.h b/examples/cpp/cvrptw_lib.h index 4a0ba86b35..9e9bf777da 100644 --- a/examples/cpp/cvrptw_lib.h +++ b/examples/cpp/cvrptw_lib.h @@ -18,8 +18,8 @@ #include -#include "constraint_solver/routing.h" -#include "base/random.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/base/random.h" namespace operations_research { diff --git a/examples/cpp/cvrptw_with_breaks.cc b/examples/cpp/cvrptw_with_breaks.cc index b18dd59a69..c6793ec849 100644 --- a/examples/cpp/cvrptw_with_breaks.cc +++ b/examples/cpp/cvrptw_with_breaks.cc @@ -27,17 +27,17 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_enums.pb.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" +#include "ortools/base/random.h" using operations_research::RoutingModel; using operations_research::RoutingSearchParameters; @@ -46,7 +46,6 @@ using operations_research::RandomDemand; using operations_research::ServiceTimePlusTransition; using operations_research::GetSeed; using operations_research::ACMRandom; -using operations_research::StrCat; DEFINE_int32(vrp_orders, 100, "Nodes in the problem."); diff --git a/examples/cpp/cvrptw_with_refueling.cc b/examples/cpp/cvrptw_with_refueling.cc index ca1deefa06..c4bf9d1905 100644 --- a/examples/cpp/cvrptw_with_refueling.cc +++ b/examples/cpp/cvrptw_with_refueling.cc @@ -21,15 +21,16 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" +#include "ortools/base/random.h" using operations_research::GetSeed; using operations_research::LocationContainer; @@ -147,7 +148,7 @@ int main(int argc, char** argv) { // Solve, returns a solution if any (owned by RoutingModel). const operations_research::Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { DisplayPlan(routing, *solution, /*use_same_vehicle_costs=*/false, /*max_nodes_per_group=*/0, /*same_vehicle_cost=*/0, routing.GetDimensionOrDie(kCapacity), diff --git a/examples/cpp/cvrptw_with_resources.cc b/examples/cpp/cvrptw_with_resources.cc index 85ee032014..223b2c8aec 100644 --- a/examples/cpp/cvrptw_with_resources.cc +++ b/examples/cpp/cvrptw_with_resources.cc @@ -23,15 +23,16 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" +#include "ortools/base/random.h" using operations_research::RoutingModel; using operations_research::RoutingSearchParameters; @@ -142,7 +143,7 @@ int main(int argc, char** argv) { // Solve, returns a solution if any (owned by RoutingModel). const operations_research::Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { DisplayPlan(routing, *solution, /*use_same_vehicle_costs=*/false, /*max_nodes_per_group=*/0, /*same_vehicle_cost=*/0, routing.GetDimensionOrDie(kCapacity), diff --git a/examples/cpp/cvrptw_with_stop_times_and_resources.cc b/examples/cpp/cvrptw_with_stop_times_and_resources.cc index aced964f65..f9303f906f 100644 --- a/examples/cpp/cvrptw_with_stop_times_and_resources.cc +++ b/examples/cpp/cvrptw_with_stop_times_and_resources.cc @@ -21,27 +21,26 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "cpp/cvrptw_lib.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "examples/cpp/cvrptw_lib.h" +#include "ortools/base/random.h" using operations_research::IntervalVar; using operations_research::RoutingModel; using operations_research::RoutingSearchParameters; using operations_research::LocationContainer; using operations_research::RandomDemand; -using operations_research::ServiceTimePlusTransition; using operations_research::GetSeed; using operations_research::StopServiceTimePlusTransition; using operations_research::ACMRandom; -using operations_research::StrCat; using operations_research::StringAppendF; using operations_research::StringPrintf; @@ -172,7 +171,7 @@ int main(int argc, char** argv) { // Solve, returns a solution if any (owned by RoutingModel). const operations_research::Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { DisplayPlan(routing, *solution, /*use_same_vehicle_costs=*/false, /*max_nodes_per_group=*/0, /*same_vehicle_cost=*/0, routing.GetDimensionOrDie(kCapacity), diff --git a/examples/cpp/dimacs_assignment.cc b/examples/cpp/dimacs_assignment.cc index 91a308a1a8..8e4a9981aa 100644 --- a/examples/cpp/dimacs_assignment.cc +++ b/examples/cpp/dimacs_assignment.cc @@ -15,20 +15,20 @@ #include #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "algorithms/hungarian.h" -#include "cpp/parse_dimacs_assignment.h" -#include "cpp/print_dimacs_assignment.h" -#include "graph/ebert_graph.h" -#include "graph/linear_assignment.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/algorithms/hungarian.h" +#include "examples/cpp/parse_dimacs_assignment.h" +#include "examples/cpp/print_dimacs_assignment.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/linear_assignment.h" DEFINE_bool(assignment_compare_hungarian, false, "Compare result and speed against Hungarian method."); @@ -125,11 +125,11 @@ int SolveDimacsAssignment(int argc, char* argv[]) { std::string error_message; // Handle on the graph we will need to delete because the // LinearSumAssignment object does not take ownership of it. - GraphType* graph = NULL; + GraphType* graph = nullptr; DimacsAssignmentParser parser(argv[1]); LinearSumAssignment* assignment = parser.Parse(&error_message, &graph); - if (assignment == NULL) { + if (assignment == nullptr) { LOG(FATAL) << error_message; } if (!FLAGS_assignment_problem_output_file.empty()) { diff --git a/examples/cpp/dobble_ls.cc b/examples/cpp/dobble_ls.cc index a6699e35de..f43d4a282f 100644 --- a/examples/cpp/dobble_ls.cc +++ b/examples/cpp/dobble_ls.cc @@ -33,13 +33,13 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/map_util.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/bitset.h" -#include "base/random.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/bitset.h" +#include "ortools/base/random.h" DEFINE_int32(symbols_per_card, 8, "Number of symbols per card."); DEFINE_int32(ls_seed, 1, @@ -724,10 +724,10 @@ void SolveDobble(int num_cards, int num_symbols, int num_symbols_per_card) { all_card_symbol_vars, build_db, solver.MakeLocalSearchPhaseParameters( solver.ConcatenateOperators(operators, true), - NULL, // Sub decision builder, not needed here. - NULL, // Limit the search for improving move, we will stop - // the exploration of the local search at the first - // improving solution (first accept). + nullptr, // Sub decision builder, not needed here. + nullptr, // Limit the search for improving move, we will stop + // the exploration of the local search at the first + // improving solution (first accept). filters)); std::vector monitors; diff --git a/examples/cpp/fap_model_printer.cc b/examples/cpp/fap_model_printer.cc index acc070d677..7981bc6390 100644 --- a/examples/cpp/fap_model_printer.cc +++ b/examples/cpp/fap_model_printer.cc @@ -13,12 +13,12 @@ // -#include "cpp/fap_model_printer.h" +#include "examples/cpp/fap_model_printer.h" #include #include #include -#include "base/stringprintf.h" +#include "ortools/base/stringprintf.h" namespace operations_research { @@ -36,7 +36,7 @@ FapModelPrinter::~FapModelPrinter() {} void FapModelPrinter::PrintFapVariables() { LOG(INFO) << "Variable File:"; for (const auto& it : variables_) { - std::string domain = StringPrintf("{"); + std::string domain = "{"; for (const int value : it.second.domain) { StringAppendF(&domain, "%d ", value); } diff --git a/examples/cpp/fap_model_printer.h b/examples/cpp/fap_model_printer.h index e30c5b61db..f2eba5e4cc 100644 --- a/examples/cpp/fap_model_printer.h +++ b/examples/cpp/fap_model_printer.h @@ -22,7 +22,7 @@ #include #include -#include "cpp/fap_parser.h" +#include "examples/cpp/fap_parser.h" namespace operations_research { diff --git a/examples/cpp/fap_parser.cc b/examples/cpp/fap_parser.cc index 6d41b770d2..d107022a3c 100644 --- a/examples/cpp/fap_parser.cc +++ b/examples/cpp/fap_parser.cc @@ -13,20 +13,20 @@ // -#include "cpp/fap_parser.h" +#include "examples/cpp/fap_parser.h" #include #include #include -#include "base/file.h" -#include "base/split.h" -#include "base/map_util.h" +#include "ortools/base/file.h" +#include "ortools/base/split.h" +#include "ortools/base/map_util.h" namespace operations_research { void ParseFileByLines(const std::string& filename, std::vector* lines) { CHECK_NOTNULL(lines); std::string result; - CHECK(file::GetContents(filename, &result, file::Defaults()).ok()); + CHECK_OK(file::GetContents(filename, &result, file::Defaults())); *lines = strings::Split(result, '\n', strings::SkipEmpty()); } diff --git a/examples/cpp/fap_parser.h b/examples/cpp/fap_parser.h index bde219e51f..bafc4df3e3 100644 --- a/examples/cpp/fap_parser.h +++ b/examples/cpp/fap_parser.h @@ -19,14 +19,14 @@ #ifndef OR_TOOLS_EXAMPLES_FAP_PARSER_H_ #define OR_TOOLS_EXAMPLES_FAP_PARSER_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/logging.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "base/map_util.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "ortools/base/map_util.h" namespace operations_research { diff --git a/examples/cpp/fap_utilities.cc b/examples/cpp/fap_utilities.cc index 67f11c6bd3..1b29a2a9d1 100644 --- a/examples/cpp/fap_utilities.cc +++ b/examples/cpp/fap_utilities.cc @@ -13,15 +13,15 @@ // -#include "cpp/fap_utilities.h" +#include "examples/cpp/fap_utilities.h" #include #include #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/map_util.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/map_util.h" namespace operations_research { diff --git a/examples/cpp/fap_utilities.h b/examples/cpp/fap_utilities.h index d1cca9b66a..bc6417a823 100644 --- a/examples/cpp/fap_utilities.h +++ b/examples/cpp/fap_utilities.h @@ -21,8 +21,8 @@ #include #include -#include "constraint_solver/constraint_solver.h" -#include "cpp/fap_parser.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "examples/cpp/fap_parser.h" namespace operations_research { diff --git a/examples/cpp/flexible_jobshop.cc b/examples/cpp/flexible_jobshop.cc index 3ddf724da3..3c18289680 100644 --- a/examples/cpp/flexible_jobshop.cc +++ b/examples/cpp/flexible_jobshop.cc @@ -35,14 +35,14 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "cpp/flexible_jobshop.h" -#include "util/string_array.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "examples/cpp/flexible_jobshop.h" +#include "ortools/util/string_array.h" DEFINE_string( data_file, diff --git a/examples/cpp/flexible_jobshop.h b/examples/cpp/flexible_jobshop.h index a22a8b310b..96e4d80409 100644 --- a/examples/cpp/flexible_jobshop.h +++ b/examples/cpp/flexible_jobshop.h @@ -36,13 +36,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "util/string_array.h" -#include "util/filelineiter.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "ortools/util/string_array.h" +#include "ortools/util/filelineiter.h" namespace operations_research { // A FlexibleJobShopData parses data files and stores all data internally for diff --git a/examples/cpp/flow_api.cc b/examples/cpp/flow_api.cc index 714112e5aa..7e9c68a8f2 100644 --- a/examples/cpp/flow_api.cc +++ b/examples/cpp/flow_api.cc @@ -12,11 +12,11 @@ // limitations under the License. -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "graph/ebert_graph.h" -#include "graph/max_flow.h" -#include "graph/min_cost_flow.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/max_flow.h" +#include "ortools/graph/min_cost_flow.h" namespace operations_research { diff --git a/examples/cpp/frequency_assignment_problem.cc b/examples/cpp/frequency_assignment_problem.cc index 0f81d2af03..8772668158 100644 --- a/examples/cpp/frequency_assignment_problem.cc +++ b/examples/cpp/frequency_assignment_problem.cc @@ -51,14 +51,14 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/map_util.h" -#include "constraint_solver/constraint_solver.h" -#include "cpp/fap_model_printer.h" -#include "cpp/fap_parser.h" -#include "cpp/fap_utilities.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "examples/cpp/fap_model_printer.h" +#include "examples/cpp/fap_parser.h" +#include "examples/cpp/fap_utilities.h" DEFINE_string(directory, "", "Specifies the directory of the data."); DEFINE_string(value_evaluator, "", @@ -232,11 +232,11 @@ class OrderingBuilder : public DecisionBuilder { return s->RevAlloc(ordering_decision); } else { // The constraint was dropped. - return NULL; + return nullptr; } } else { // All the constraints were processed. No decision to take. - return NULL; + return nullptr; } } @@ -498,7 +498,7 @@ void CreateAdditionalMonitors(OptimizeVar* const objective, Solver* solver, FLAGS_restart != -1 ? (FLAGS_luby ? solver->MakeLubyRestart(FLAGS_restart) : solver->MakeConstantRestart(FLAGS_restart)) - : NULL; + : nullptr; if (restart) { monitors->push_back(restart); } @@ -701,7 +701,7 @@ void PenalizeConstraintsViolation( ->MakeAbs( solver->MakeDifference(variables[index1], variables[index2])) ->Var(); - IntVar* violation = NULL; + IntVar* violation = nullptr; if (ct.operation == ">") { violation = solver->MakeIsLessCstVar(absolute_difference, ct.value); } else if (ct.operation == "=") { @@ -755,7 +755,8 @@ int SoftFapSolver(const std::map& data_variables, // Penalize variable and constraint violations. std::vector cost; - std::vector violated_constraints(ordered_constraints.size(), NULL); + std::vector violated_constraints(ordered_constraints.size(), + nullptr); PenalizeVariablesViolation(soft_variables, index_from_key, variables, &cost, &solver); PenalizeConstraintsViolation(ordered_constraints, soft_constraints, diff --git a/examples/cpp/global_arith.cc b/examples/cpp/global_arith.cc index f3c6c7d597..182d2952be 100644 --- a/examples/cpp/global_arith.cc +++ b/examples/cpp/global_arith.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/stl_util.h" -#include "constraint_solver/constraint_solveri.h" -#include "examples/global_arith.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "examples/cpp/global_arith.h" namespace operations_research { diff --git a/examples/cpp/golomb.cc b/examples/cpp/golomb.cc index e793a76ea4..70b7c98363 100644 --- a/examples/cpp/golomb.cc +++ b/examples/cpp/golomb.cc @@ -26,12 +26,12 @@ #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" DEFINE_bool(print, false, "If true, print the minimal solution."); DEFINE_int32( diff --git a/examples/cpp/integer_programming.cc b/examples/cpp/integer_programming.cc index 7445af1737..3b64367502 100644 --- a/examples/cpp/integer_programming.cc +++ b/examples/cpp/integer_programming.cc @@ -14,9 +14,9 @@ // // Integer programming example that shows how to use the API. -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/linear_solver/linear_solver.h" namespace operations_research { void RunIntegerProgrammingExample( diff --git a/examples/cpp/jobshop.cc b/examples/cpp/jobshop.cc index 7b8ea82cb0..b788732a94 100644 --- a/examples/cpp/jobshop.cc +++ b/examples/cpp/jobshop.cc @@ -33,17 +33,17 @@ // // Search will then be applied on the sequence constraints. -#include "cpp/jobshop.h" +#include "examples/cpp/jobshop.h" #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" DEFINE_string( data_file, "", @@ -150,7 +150,7 @@ void Jobshop(const JobShopData& data) { SearchMonitor* const search_log = solver.MakeSearchLog(kLogFrequency, objective_monitor); - SearchLimit* limit = NULL; + SearchLimit* limit = nullptr; if (FLAGS_time_limit_in_ms > 0) { limit = solver.MakeTimeLimit(FLAGS_time_limit_in_ms); } diff --git a/examples/cpp/jobshop.h b/examples/cpp/jobshop.h index 50e503a233..d7e9f77c41 100644 --- a/examples/cpp/jobshop.h +++ b/examples/cpp/jobshop.h @@ -37,12 +37,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "util/filelineiter.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "ortools/util/filelineiter.h" namespace operations_research { // ----- JobShopData ----- diff --git a/examples/cpp/jobshop_earlytardy.cc b/examples/cpp/jobshop_earlytardy.cc index 67c45e1a39..dfdf447742 100644 --- a/examples/cpp/jobshop_earlytardy.cc +++ b/examples/cpp/jobshop_earlytardy.cc @@ -36,16 +36,16 @@ #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "linear_solver/linear_solver.h" -#include "util/string_array.h" -#include "cpp/jobshop_earlytardy.h" -#include "cpp/jobshop_ls.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/util/string_array.h" +#include "examples/cpp/jobshop_earlytardy.h" +#include "examples/cpp/jobshop_ls.h" DEFINE_string( jet_file, diff --git a/examples/cpp/jobshop_earlytardy.h b/examples/cpp/jobshop_earlytardy.h index 8a507b0e26..3ce01774d6 100644 --- a/examples/cpp/jobshop_earlytardy.h +++ b/examples/cpp/jobshop_earlytardy.h @@ -39,13 +39,13 @@ #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/strtoint.h" -#include "base/random.h" -#include "base/split.h" -#include "util/filelineiter.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/random.h" +#include "ortools/base/split.h" +#include "ortools/util/filelineiter.h" namespace operations_research { struct Task { diff --git a/examples/cpp/jobshop_ls.cc b/examples/cpp/jobshop_ls.cc index d6b941e9c5..ba3a6bbcce 100644 --- a/examples/cpp/jobshop_ls.cc +++ b/examples/cpp/jobshop_ls.cc @@ -33,19 +33,19 @@ // // Search will be implemented as local search on the sequence variables. -#include "cpp/jobshop_ls.h" +#include "examples/cpp/jobshop_ls.h" #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/bitmap.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "cpp/jobshop.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/bitmap.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "examples/cpp/jobshop.h" DEFINE_string( data_file, "", @@ -203,7 +203,7 @@ void JobshopLs(const JobShopData& data) { SearchLimit* const limit = FLAGS_time_limit_in_ms > 0 ? solver.MakeTimeLimit(FLAGS_time_limit_in_ms) - : NULL; + : nullptr; // Search. solver.Solve(final_db, search_log, objective_monitor, limit); diff --git a/examples/cpp/jobshop_ls.h b/examples/cpp/jobshop_ls.h index f1b98059f0..3321129e41 100644 --- a/examples/cpp/jobshop_ls.h +++ b/examples/cpp/jobshop_ls.h @@ -38,14 +38,14 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "base/random.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/base/random.h" namespace operations_research { // ----- Exchange 2 intervals on a sequence variable ----- diff --git a/examples/cpp/jobshop_sat.cc b/examples/cpp/jobshop_sat.cc index 7730ae3ebd..12665e3434 100644 --- a/examples/cpp/jobshop_sat.cc +++ b/examples/cpp/jobshop_sat.cc @@ -14,22 +14,22 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/timer.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/timer.h" #include "google/protobuf/text_format.h" -#include "base/join.h" -#include "base/stringpiece_utils.h" -#include "base/strutil.h" -#include "cpp/flexible_jobshop.h" -#include "cpp/jobshop.h" -#include "sat/disjunctive.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/optimization.h" -#include "sat/precedences.h" -#include "sat/sat_solver.h" +#include "ortools/base/join.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/strutil.h" +#include "examples/cpp/flexible_jobshop.h" +#include "examples/cpp/jobshop.h" +#include "ortools/sat/disjunctive.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/optimization.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_solver.h" DEFINE_string(input, "", "Jobshop data file name."); DEFINE_string(params, "", "Sat parameters in text proto format."); diff --git a/examples/cpp/linear_assignment_api.cc b/examples/cpp/linear_assignment_api.cc index a8f02b320c..eadfa0a502 100644 --- a/examples/cpp/linear_assignment_api.cc +++ b/examples/cpp/linear_assignment_api.cc @@ -12,10 +12,10 @@ // limitations under the License. -#include "graph/linear_assignment.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "graph/ebert_graph.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/linear_assignment.h" namespace operations_research { diff --git a/examples/cpp/linear_programming.cc b/examples/cpp/linear_programming.cc index 00b5a455bb..2ba4fba975 100644 --- a/examples/cpp/linear_programming.cc +++ b/examples/cpp/linear_programming.cc @@ -14,11 +14,11 @@ // // Linear programming example that shows how to use the API. -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "linear_solver/linear_solver.h" -#include "linear_solver/linear_solver.pb.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { void RunLinearProgrammingExample( diff --git a/examples/cpp/linear_solver_protocol_buffers.cc b/examples/cpp/linear_solver_protocol_buffers.cc index 511a65486b..fad553e25e 100644 --- a/examples/cpp/linear_solver_protocol_buffers.cc +++ b/examples/cpp/linear_solver_protocol_buffers.cc @@ -14,10 +14,10 @@ #include -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "linear_solver/linear_solver.h" -#include "linear_solver/linear_solver.pb.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { void BuildLinearProgrammingMaxExample(MPSolver::OptimizationProblemType type) { diff --git a/examples/cpp/ls_api.cc b/examples/cpp/ls_api.cc index 03e82944f1..d3eb42aa7d 100644 --- a/examples/cpp/ls_api.cc +++ b/examples/cpp/ls_api.cc @@ -16,13 +16,13 @@ // Neighborhood Search approach, a Local Search approach, and a Local // Search with Filter approach. -#include "base/commandlineflags.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "base/random.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/base/random.h" namespace operations_research { class OneVarLns : public BaseLns { @@ -161,7 +161,7 @@ void SolveProblem(SolveType solve_type) { OptimizeVar* const obj = s.MakeMinimize(sum_var, 1); DecisionBuilder* const db = s.MakePhase(vars, Solver::CHOOSE_FIRST_UNBOUND, Solver::ASSIGN_MAX_VALUE); - DecisionBuilder* ls = NULL; + DecisionBuilder* ls = nullptr; switch (solve_type) { case LNS: { LOG(INFO) << "Large Neighborhood Search"; @@ -186,7 +186,7 @@ void SolveProblem(SolveType solve_type) { filters.push_back(s.RevAlloc(new SumFilter(vars))); LocalSearchPhaseParameters* const ls_params = - s.MakeLocalSearchPhaseParameters(one_var_ls, db, NULL, filters); + s.MakeLocalSearchPhaseParameters(one_var_ls, db, nullptr, filters); ls = s.MakeLocalSearchPhase(vars, db, ls_params); break; } diff --git a/examples/cpp/magic_square.cc b/examples/cpp/magic_square.cc index 743173f90c..085f73d024 100644 --- a/examples/cpp/magic_square.cc +++ b/examples/cpp/magic_square.cc @@ -19,12 +19,12 @@ // The problem is trivial for odd orders, but not for even orders. // We do not handle odd orders with the trivial method here. -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" DEFINE_int32(size, 0, "Size of the magic square."); DEFINE_bool(impact, false, "Use impact search."); @@ -125,7 +125,7 @@ void MagicSquare(int grid_size) { FLAGS_restart != -1 ? (FLAGS_luby ? solver.MakeLubyRestart(FLAGS_restart) : solver.MakeConstantRestart(FLAGS_restart)) - : NULL; + : nullptr; if (restart) { monitors.push_back(restart); } diff --git a/examples/cpp/model_util.cc b/examples/cpp/model_util.cc index 6b186f7092..e55af70e9b 100644 --- a/examples/cpp/model_util.cc +++ b/examples/cpp/model_util.cc @@ -14,18 +14,20 @@ #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/file.h" -#include "base/recordio.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/model.pb.h" -#include "util/graph_export.h" -#include "util/string_array.h" -#include "base/status.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/file.h" +#include "ortools/base/recordio.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/model.pb.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/util/graph_export.h" +#include "ortools/util/string_array.h" +#include "ortools/base/status.h" DEFINE_string(input, "", "Input file of the problem."); DEFINE_string(output, "", "Output file when doing modifications."); @@ -141,7 +143,7 @@ void DeclareExpression(int index, const CpModel& proto, if (!expr.name().empty()) { exporter->WriteNode(label, expr.name(), "oval", kGreen1); } else if (GetValueIfConstant(proto, expr, &value)) { - exporter->WriteNode(label, StringPrintf("%lld", value), "oval", kYellow); + exporter->WriteNode(label, StrCat(value), "oval", kYellow); } else { const std::string& type = proto.tags(expr.type_index()); exporter->WriteNode(label, type, "oval", kWhite); @@ -260,7 +262,7 @@ int Run() { } CpModel model_proto; - RecordReader reader(file); + recordio::RecordReader reader(file); if (!(reader.ReadProtocolMessage(&model_proto) && reader.Close())) { LOG(INFO) << "No model found in " << file->filename(); return kProblem; @@ -360,7 +362,7 @@ int Run() { LOG(INFO) << "Cannot open " << FLAGS_output; return kProblem; } - RecordWriter writer(output); + recordio::RecordWriter writer(output); if (!(writer.WriteProtocolMessage(model_proto) && writer.Close())) { return kProblem; } else { diff --git a/examples/cpp/mps_driver.cc b/examples/cpp/mps_driver.cc index 4179823232..d523221ac3 100644 --- a/examples/cpp/mps_driver.cc +++ b/examples/cpp/mps_driver.cc @@ -18,23 +18,23 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/timer.h" -#include "base/file.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/timer.h" +#include "ortools/base/file.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" -#include "base/stringpiece_utils.h" -#include "base/strutil.h" -#include "glop/lp_solver.h" -#include "glop/parameters.pb.h" -#include "lp_data/lp_print_utils.h" -#include "lp_data/mps_reader.h" -#include "lp_data/proto_utils.h" -#include "util/proto_tools.h" -#include "base/status.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/strutil.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/lp_data/mps_reader.h" +#include "ortools/lp_data/proto_utils.h" +#include "ortools/util/proto_tools.h" +#include "ortools/base/status.h" DEFINE_bool(mps_dump_problem, false, "Dumps problem in readable form."); DEFINE_bool(mps_solve, true, "Solves problem."); @@ -60,13 +60,7 @@ using operations_research::glop::MPSReader; using operations_research::glop::MPModelProtoToLinearProgram; using operations_research::glop::ProblemStatus; using operations_research::glop::ToDouble; -using google::protobuf::Descriptor; -using google::protobuf::FieldDescriptor; -using google::protobuf::Message; -using google::protobuf::Reflection; using google::protobuf::TextFormat; -using operations_research::HasSuffixString; -using operations_research::ScopedWallTime; // Parse glop parameters from the flags --params_file and --params. diff --git a/examples/cpp/multidim_knapsack.cc b/examples/cpp/multidim_knapsack.cc index 7c08984df4..e205d84ddc 100644 --- a/examples/cpp/multidim_knapsack.cc +++ b/examples/cpp/multidim_knapsack.cc @@ -17,16 +17,16 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/hybrid.h" -#include "util/filelineiter.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/hybrid.h" +#include "ortools/util/filelineiter.h" DEFINE_string( data_file, "", @@ -112,7 +112,7 @@ class MultiDimKnapsackData { // 6 = name passed switch (mode_) { case 0: { - if (words.size() != 0) { + if (!words.empty()) { CHECK_EQ(2, words.size()); num_dims_ = atoi32(words[0]); num_items_ = atoi32(words[1]); @@ -157,7 +157,7 @@ class MultiDimKnapsackData { break; } case 4: { - if (words.size() != 0) { + if (!words.empty()) { CHECK_EQ(1, words.size()); optimal_value_ = atoi32(words[0]); mode_ = 5; @@ -165,7 +165,7 @@ class MultiDimKnapsackData { break; } case 5: { - if (words.size() != 0) { + if (!words.empty()) { name_ = line; mode_ = 6; } @@ -189,7 +189,7 @@ class MultiDimKnapsackData { break; } case 1: { - if (words.size() != 0) { + if (!words.empty()) { CHECK_EQ(2, words.size()); num_items_ = atoi32(words[0]); num_dims_ = atoi32(words[1]); diff --git a/examples/cpp/network_routing.cc b/examples/cpp/network_routing.cc index dfd5523114..702da28e70 100644 --- a/examples/cpp/network_routing.cc +++ b/examples/cpp/network_routing.cc @@ -26,24 +26,24 @@ // A random problem generator is also included. -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solveri.h" -#include "graph/shortestpaths.h" -#include "util/tuple_set.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/graph/shortestpaths.h" +#include "ortools/util/tuple_set.h" +#include "ortools/base/random.h" // ----- Data Generator ----- DEFINE_int32(clients, 0, @@ -707,7 +707,7 @@ class NetworkRoutingSolver { Decision* Next(Solver* const solver) override { solver->SetBranchSelector([solver]() { return MaxDiscrepancy1(solver); }); - return NULL; + return nullptr; } std::string DebugString() const override { return "ApplyMaxDiscrepancy"; } @@ -726,7 +726,7 @@ class NetworkRoutingSolver { for (int i = 0; i < vars_.size(); ++i) { (*values_)[i] = vars_[i]->Value(); } - return NULL; + return nullptr; } private: diff --git a/examples/cpp/nqueens.cc b/examples/cpp/nqueens.cc index af11d55a14..03aad7cf7d 100644 --- a/examples/cpp/nqueens.cc +++ b/examples/cpp/nqueens.cc @@ -20,13 +20,13 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/map_util.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solveri.h" DEFINE_bool(print, false, "If true, print one of the solution."); DEFINE_bool(print_all, false, "If true, print all the solutions."); @@ -212,8 +212,9 @@ void NQueens(int size) { } s.AddConstraint(s.MakeAllDifferent(vars)); - SolutionCollector* const solution_counter = s.MakeAllSolutionCollector(NULL); - SolutionCollector* const collector = s.MakeFirstSolutionCollector(); + SolutionCollector* const solution_counter = + s.MakeAllSolutionCollector(nullptr); + SolutionCollector* const collector = s.MakeAllSolutionCollector(); collector->Add(queens); std::vector monitors; monitors.push_back(solution_counter); diff --git a/examples/cpp/nqueens2.cc b/examples/cpp/nqueens2.cc index abb74734fc..6f365e3ba2 100644 --- a/examples/cpp/nqueens2.cc +++ b/examples/cpp/nqueens2.cc @@ -18,11 +18,11 @@ // distinct solutions: http://www.research.att.com/~njas/sequences/A002562 -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" DEFINE_int32( size, 88, diff --git a/examples/cpp/opb_reader.h b/examples/cpp/opb_reader.h index 70d1901a89..780eeaf79f 100644 --- a/examples/cpp/opb_reader.h +++ b/examples/cpp/opb_reader.h @@ -17,13 +17,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/strtoint.h" -#include "base/file.h" -#include "base/split.h" -#include "sat/boolean_problem.pb.h" -#include "util/filelineiter.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/file.h" +#include "ortools/base/split.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/util/filelineiter.h" namespace operations_research { namespace sat { @@ -66,7 +66,7 @@ class OpbReader { void ProcessNewLine(LinearBooleanProblem* problem, const std::string& line) { const std::vector words = strings::Split(line, ' ', strings::SkipEmpty()); - if (words.size() == 0 || words[0].empty() || words[0][0] == '*') { + if (words.empty() || words[0].empty() || words[0][0] == '*') { return; } diff --git a/examples/cpp/parse_dimacs_assignment.cc b/examples/cpp/parse_dimacs_assignment.cc index 9d0d9f00d7..d845dbf97a 100644 --- a/examples/cpp/parse_dimacs_assignment.cc +++ b/examples/cpp/parse_dimacs_assignment.cc @@ -12,9 +12,9 @@ // limitations under the License. -#include "cpp/parse_dimacs_assignment.h" +#include "examples/cpp/parse_dimacs_assignment.h" -#include "base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" DEFINE_bool(assignment_maximize_cost, false, "Negate costs so a max-cost assignment is found."); diff --git a/examples/cpp/parse_dimacs_assignment.h b/examples/cpp/parse_dimacs_assignment.h index 8489106b31..075aaccc09 100644 --- a/examples/cpp/parse_dimacs_assignment.h +++ b/examples/cpp/parse_dimacs_assignment.h @@ -25,12 +25,12 @@ #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "graph/ebert_graph.h" -#include "graph/linear_assignment.h" -#include "util/filelineiter.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/linear_assignment.h" +#include "ortools/util/filelineiter.h" DECLARE_bool(assignment_maximize_cost); DECLARE_bool(assignment_optimize_layout); @@ -44,7 +44,7 @@ template class DimacsAssignmentParser { public: explicit DimacsAssignmentParser(const std::string& filename) - : filename_(filename), graph_builder_(NULL), assignment_(NULL) {} + : filename_(filename), graph_builder_(nullptr), assignment_(nullptr) {} // Reads an assignment problem description from the given file in // DIMACS format and returns a LinearSumAssignment object representing @@ -77,7 +77,7 @@ class DimacsAssignmentParser { ErrorTrackingState() : bad(false), nodes_described(false), - reason(NULL), + reason(nullptr), num_left_nodes(0), num_arcs(0) {} @@ -141,7 +141,7 @@ void DimacsAssignmentParser::ParseNodeLine(const std::string& line) { template void DimacsAssignmentParser::ParseArcLine(const std::string& line) { - if (graph_builder_ == NULL) { + if (graph_builder_ == nullptr) { state_.bad = true; state_.reason = "Problem specification line must precede any arc specification."; @@ -150,7 +150,7 @@ void DimacsAssignmentParser::ParseArcLine(const std::string& line) { } if (!state_.nodes_described) { state_.nodes_described = true; - DCHECK(assignment_ == NULL); + DCHECK(assignment_ == nullptr); assignment_ = new LinearSumAssignment(state_.num_left_nodes, state_.num_arcs); } @@ -233,18 +233,18 @@ LinearSumAssignment* DimacsAssignmentParser::Parse( if (state_.bad) { *error_message = state_.reason; *error_message = *error_message + ": \"" + *state_.bad_line + "\""; - return NULL; + return nullptr; } - if (graph_builder_ == NULL) { + if (graph_builder_ == nullptr) { *error_message = "empty graph description"; - return NULL; + return nullptr; } std::unique_ptr > cycle_handler( assignment_->ArcAnnotationCycleHandler()); GraphType* graph = graph_builder_->Graph(cycle_handler.get()); - if (graph == NULL) { + if (graph == nullptr) { *error_message = "unable to create compact static graph"; - return NULL; + return nullptr; } assignment_->SetGraph(graph); *error_message = ""; diff --git a/examples/cpp/pdptw.cc b/examples/cpp/pdptw.cc index 4e3b0c4da7..7aa8e507e0 100644 --- a/examples/cpp/pdptw.cc +++ b/examples/cpp/pdptw.cc @@ -38,15 +38,16 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/strtoint.h" -#include "base/file.h" -#include "base/split.h" -#include "base/mathutil.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/file.h" +#include "ortools/base/split.h" +#include "ortools/base/mathutil.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" DEFINE_string(pdp_file, "", "File containing the Pickup and Delivery Problem to solve."); @@ -68,7 +69,7 @@ typedef std::vector > Coordinates; // coordinates of the nodes. int64 Travel(const Coordinates* const coords, RoutingModel::NodeIndex from, RoutingModel::NodeIndex to) { - DCHECK(coords != NULL); + DCHECK(coords != nullptr); const int xd = coords->at(from.value()).first - coords->at(to.value()).first; const int yd = coords->at(from.value()).second - coords->at(to.value()).second; @@ -154,7 +155,7 @@ bool SafeParseInt64Array(const std::string& str, std::vector* parsed_int) parsed_int->assign(items.size(), 0); for (int i = 0; i < items.size(); ++i) { const char* item = items[i].c_str(); - char* endptr = NULL; + char* endptr = nullptr; (*parsed_int)[i] = strto64(item, &endptr, 10); // The whole item should have been consumed. if (*endptr != '\0') return false; @@ -170,7 +171,7 @@ bool LoadAndSolve(const std::string& pdp_file) { std::vector lines; { std::string contents; - CHECK(file::GetContents(pdp_file, &contents, file::Defaults()).ok()); + CHECK_OK(file::GetContents(pdp_file, &contents, file::Defaults())); const int64 kMaxInputFileSize = 1 << 30; // 1GB if (contents.size() >= kMaxInputFileSize) { LOG(WARNING) << "Input file '" << pdp_file << "' is too large (>" @@ -290,7 +291,7 @@ bool LoadAndSolve(const std::string& pdp_file) { // Solve pickup and delivery problem. const Assignment* assignment = routing.SolveWithParameters(parameters); LOG(INFO) << routing.solver()->LocalSearchProfile(); - if (NULL != assignment) { + if (nullptr != assignment) { LOG(INFO) << "Cost: " << assignment->ObjectiveValue(); LOG(INFO) << VerboseOutput(routing, *assignment, coords, service_times); return true; diff --git a/examples/cpp/print_dimacs_assignment.cc b/examples/cpp/print_dimacs_assignment.cc index 4098821e38..332cffe729 100644 --- a/examples/cpp/print_dimacs_assignment.cc +++ b/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 "cpp/print_dimacs_assignment.h" +#include "examples/cpp/print_dimacs_assignment.h" #include #include diff --git a/examples/cpp/print_dimacs_assignment.h b/examples/cpp/print_dimacs_assignment.h index 0bee7c33c9..5fa12e6fa1 100644 --- a/examples/cpp/print_dimacs_assignment.h +++ b/examples/cpp/print_dimacs_assignment.h @@ -21,12 +21,12 @@ #include #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "graph/ebert_graph.h" -#include "graph/linear_assignment.h" -#include "base/status.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/linear_assignment.h" +#include "ortools/base/status.h" namespace operations_research { @@ -52,13 +52,13 @@ void PrintDimacsAssignmentProblem( const GraphType& graph(assignment.Graph()); std::string output_line = StringPrintf("p asn %d %d\n", graph.num_nodes(), graph.num_arcs()); - CHECK(file::WriteString(output, output_line, file::Defaults()).ok()); + CHECK_OK(file::WriteString(output, output_line, file::Defaults())); for (typename LinearSumAssignment::BipartiteLeftNodeIterator node_it(assignment); node_it.Ok(); node_it.Next()) { output_line = StringPrintf("n %d\n", node_it.Index() + 1); - CHECK(file::WriteString(output, output_line, file::Defaults()).ok()); + CHECK_OK(file::WriteString(output, output_line, file::Defaults())); } tail_array_manager.BuildTailArrayFromAdjacencyListsIfForwardGraph(); @@ -68,7 +68,7 @@ void PrintDimacsAssignmentProblem( ArcIndex arc = arc_it.Index(); output_line = StringPrintf("a %d %d %lld\n", graph.Tail(arc) + 1, graph.Head(arc) + 1, assignment.ArcCost(arc)); - CHECK(file::WriteString(output, output_line, file::Defaults()).ok()); + CHECK_OK(file::WriteString(output, output_line, file::Defaults())); } } diff --git a/examples/cpp/rcpsp_sat.cc b/examples/cpp/rcpsp_sat.cc index c497818cc1..82125fb6fa 100644 --- a/examples/cpp/rcpsp_sat.cc +++ b/examples/cpp/rcpsp_sat.cc @@ -13,18 +13,18 @@ #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/timer.h" -#include "sat/cumulative.h" -#include "sat/disjunctive.h" -#include "sat/integer_expr.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/optimization.h" -#include "sat/precedences.h" -#include "util/rcpsp_parser.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/timer.h" +#include "ortools/sat/cumulative.h" +#include "ortools/sat/disjunctive.h" +#include "ortools/sat/integer_expr.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/optimization.h" +#include "ortools/sat/precedences.h" +#include "ortools/util/rcpsp_parser.h" DEFINE_string(input, "", "Input file."); DEFINE_string(params, "", "Sat parameters in text proto format."); diff --git a/examples/cpp/sat_cnf_reader.h b/examples/cpp/sat_cnf_reader.h index 2daedb736e..1f47962a1b 100644 --- a/examples/cpp/sat_cnf_reader.h +++ b/examples/cpp/sat_cnf_reader.h @@ -18,13 +18,14 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/strtoint.h" -#include "base/split.h" -#include "sat/boolean_problem.pb.h" -#include "util/filelineiter.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/split.h" +#include "absl/ortools/base/string_view.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/util/filelineiter.h" DEFINE_bool(wcnf_use_strong_slack, true, "If true, when we add a slack variable to reify a soft clause, we " @@ -102,7 +103,7 @@ class SatCnfReader { return problem_name; } - int64 StringPieceAtoi(StringPiece input) { + int64 StringPieceAtoi(string_view input) { // Hack: data() is not null terminated, but we do know that it points // inside a std::string where numbers are separated by " " and since atoi64 will // stop at the first invalid char, this works. @@ -114,7 +115,7 @@ class SatCnfReader { words_ = strings::Split( line, kWordDelimiters, static_cast(strings::SkipEmpty())); - if (words_.size() == 0 || words_[0] == "c" || end_marker_seen_) return; + if (words_.empty() || words_[0] == "c" || end_marker_seen_) return; if (words_[0] == "%") { end_marker_seen_ = true; return; @@ -130,7 +131,7 @@ class SatCnfReader { } } else { // TODO(user): The ToString() is only required for the open source. Fix. - LOG(FATAL) << "Unknown file type: " << words_[1].ToString(); + LOG(FATAL) << "Unknown file type: " << words_[1]; } } else { // In the cnf file format, the last words should always be 0. @@ -224,7 +225,7 @@ class SatCnfReader { int num_variables_; // Temporary storage for ProcessNewLine(). - std::vector words_; + std::vector words_; // We stores the objective in a map because we want the variables to appear // only once in the LinearObjective proto. diff --git a/examples/cpp/sat_runner.cc b/examples/cpp/sat_runner.cc index 2673e86d36..b2aa639cd6 100644 --- a/examples/cpp/sat_runner.cc +++ b/examples/cpp/sat_runner.cc @@ -15,31 +15,34 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/strtoint.h" -#include "base/timer.h" -#include "base/file.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/timer.h" +#include "ortools/base/file.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" -#include "base/stringpiece_utils.h" -#include "base/strutil.h" -#include "base/threadpool.h" -#include "algorithms/sparse_permutation.h" -#include "sat/boolean_problem.h" -#include "sat/drat.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/strutil.h" +#include "ortools/base/threadpool.h" +#include "ortools/algorithms/sparse_permutation.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/cp_model.pb.h" +#include "ortools/sat/cp_model_solver.h" +#include "ortools/sat/drat.h" #include "cpp/opb_reader.h" -#include "sat/optimization.h" +#include "ortools/sat/optimization.h" #include "cpp/sat_cnf_reader.h" -#include "sat/sat_solver.h" -#include "sat/simplification.h" -#include "sat/symmetry.h" -#include "util/time_limit.h" -#include "base/random.h" -#include "base/status.h" +#include "ortools/base/join.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/sat/simplification.h" +#include "ortools/sat/symmetry.h" +#include "ortools/util/time_limit.h" +#include "ortools/base/random.h" +#include "ortools/base/status.h" DEFINE_string( input, "", @@ -52,7 +55,7 @@ DEFINE_string( "If non-empty, write the input problem as a LinearBooleanProblem proto to " "this file. By default it uses the binary format except if the file " "extension is '.txt'. If the problem is SAT, a satisfiable assignment is " - "also writen to the file."); + "also written to the file."); DEFINE_bool(output_cnf_solution, false, "If true and the problem was solved to optimality, this output " @@ -155,8 +158,7 @@ std::string SolutionString(const LinearBooleanProblem& problem, BooleanVariable limit(problem.original_num_variables()); for (BooleanVariable index(0); index < limit; ++index) { if (index > 0) output += " "; - output += StringPrintf( - "%d", Literal(index, assignment[index.value()]).SignedValue()); + StrAppend(&output, Literal(index, assignment[index.value()]).SignedValue()); } return output; } diff --git a/examples/cpp/shift_minimization_sat.cc b/examples/cpp/shift_minimization_sat.cc index 83c75d6b85..28d505a404 100644 --- a/examples/cpp/shift_minimization_sat.cc +++ b/examples/cpp/shift_minimization_sat.cc @@ -32,18 +32,18 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/strtoint.h" -#include "util/filelineiter.h" -#include "base/split.h" -#include "sat/cp_constraints.h" -#include "sat/integer_expr.h" -#include "sat/model.h" -#include "sat/optimization.h" -#include "sat/precedences.h" -#include "sat/sat_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/util/filelineiter.h" +#include "ortools/base/split.h" +#include "ortools/sat/cp_constraints.h" +#include "ortools/sat/integer_expr.h" +#include "ortools/sat/model.h" +#include "ortools/sat/optimization.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_solver.h" DEFINE_string(input, "", "Input file."); DEFINE_string(params, "", "Sat parameters in text proto format."); @@ -90,6 +90,12 @@ class ShiftMinimizationParser { return false; } + File* file = nullptr; + if (!file::Open(file_name, "r", &file, file::Defaults()).ok()) { + LOG(WARNING) << "Can't open " << file_name; + return false; + } + load_status_ = STARTED; for (const std::string& line : diff --git a/examples/cpp/slitherlink.cc b/examples/cpp/slitherlink.cc index 612581b16c..1b536a6741 100644 --- a/examples/cpp/slitherlink.cc +++ b/examples/cpp/slitherlink.cc @@ -3,9 +3,9 @@ #include #include -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" const std::vector> small = { { 3, 2, -1, 3 }, diff --git a/examples/cpp/solve.cc b/examples/cpp/solve.cc index f2cca0a6a9..3bb4684b4e 100644 --- a/examples/cpp/solve.cc +++ b/examples/cpp/solve.cc @@ -18,22 +18,22 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/file.h" -//#include "base/options.h" -#include "base/stringpiece_utils.h" -#include "linear_solver/linear_solver.h" -#include "linear_solver/linear_solver.pb.h" -//#include "linear_solver/model_anonymizer.h" -#include "lp_data/lp_data.h" -#include "lp_data/mps_reader.h" -#include "lp_data/proto_utils.h" -#include "util/proto_tools.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/file.h" +//#include "ortools/base/options.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" +//#include "ortools/linear_solver/model_anonymizer.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/mps_reader.h" +#include "ortools/lp_data/proto_utils.h" +#include "ortools/util/proto_tools.h" DEFINE_string(input, "", "REQUIRED: Input file name."); DEFINE_string(solver, "glop", diff --git a/examples/cpp/sports_scheduling.cc b/examples/cpp/sports_scheduling.cc index a5672c6b93..49f339ce78 100644 --- a/examples/cpp/sports_scheduling.cc +++ b/examples/cpp/sports_scheduling.cc @@ -56,12 +56,12 @@ // // Usage: run this with --helpshort for a short usage manual. -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" // Problem main flags. DEFINE_int32(num_teams, 10, "Number of teams in the problem."); diff --git a/examples/cpp/strawberry_fields_with_column_generation.cc b/examples/cpp/strawberry_fields_with_column_generation.cc index 3251ee7a43..f54f8d3611 100644 --- a/examples/cpp/strawberry_fields_with_column_generation.cc +++ b/examples/cpp/strawberry_fields_with_column_generation.cc @@ -60,12 +60,12 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/linear_solver/linear_solver.h" DEFINE_bool(colgen_verbose, false, "print verbosely"); DEFINE_bool(colgen_complete, false, "generate all columns initially"); diff --git a/examples/cpp/tsp.cc b/examples/cpp/tsp.cc index 0b0ad14b6a..ff64ddcc2c 100644 --- a/examples/cpp/tsp.cc +++ b/examples/cpp/tsp.cc @@ -27,15 +27,16 @@ #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/join.h" -#include "base/join.h" -#include "constraint_solver/routing.h" -#include "constraint_solver/routing_flags.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/join.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/constraint_solver/routing_flags.h" +#include "ortools/base/random.h" DEFINE_int32(tsp_size, 10, "Size of Traveling Salesman Problem instance."); DEFINE_bool(tsp_use_random_matrix, true, "Use random cost matrix."); @@ -136,7 +137,7 @@ void Tsp() { } // Solve, returns a solution if any (owned by RoutingModel). const Assignment* solution = routing.SolveWithParameters(parameters); - if (solution != NULL) { + if (solution != nullptr) { // Solution cost. LOG(INFO) << "Cost " << solution->ObjectiveValue(); // Inspect solution. diff --git a/examples/cpp/weighted_tardiness_sat.cc b/examples/cpp/weighted_tardiness_sat.cc index c0e18b472e..310aa4d93e 100644 --- a/examples/cpp/weighted_tardiness_sat.cc +++ b/examples/cpp/weighted_tardiness_sat.cc @@ -14,22 +14,22 @@ #include #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/timer.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/timer.h" #include "google/protobuf/text_format.h" -#include "base/join.h" -#include "base/split.h" -#include "base/strutil.h" -#include "base/strtoint.h" -#include "sat/disjunctive.h" -#include "sat/integer_expr.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/optimization.h" -#include "sat/precedences.h" -#include "util/filelineiter.h" +#include "ortools/base/join.h" +#include "ortools/base/split.h" +#include "ortools/base/strutil.h" +#include "ortools/sat/disjunctive.h" +#include "ortools/sat/integer_expr.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/optimization.h" +#include "ortools/sat/precedences.h" +#include "ortools/util/filelineiter.h" DEFINE_string(input, "examples/data/weighted_tardiness/wt40.txt", "wt data file name."); diff --git a/examples/tests/testcp.cs b/examples/tests/testcp.cs index 01f56315ef..c2079a8f91 100644 --- a/examples/tests/testcp.cs +++ b/examples/tests/testcp.cs @@ -619,6 +619,128 @@ public class CsTestCpOperator copy.EndSearch(); } + static void CpSimpleLoadModelTest() { + + CpModel expected; + + const string constraintName = "equation"; + const string constraintText = "((x(0..10) + y(0..10)) == 5)"; + + // Make sure that resources are isolated in the using block. + using (var s = new Solver("TestConstraint")) + { + var x = s.MakeIntVar(0, 10, "x"); + var y = s.MakeIntVar(0, 10, "y"); + Check(x.Name() == "x", "x variable name incorrect."); + Check(y.Name() == "y", "y variable name incorrect."); + var c = x + y == 5; + // c.Cst.SetName(constraintName); + // Check(c.Cst.Name() == constraintName, "Constraint name incorrect."); + Check(c.Cst.ToString() == constraintText, "Constraint is incorrect."); + s.Add(c); + expected = s.ExportModel(); + Console.WriteLine("Expected model string after export: {0}", expected); + } + + // While interesting, this is not very useful nor especially typical use case scenario. + using (var s = new Solver("TestConstraint")) + { + s.LoadModel(expected); + Check(s.Constraints() == 1, "Incorrect number of constraints."); + var actual = s.ExportModel(); + Console.WriteLine("Actual model string after load: {0}", actual); + // Even the simple example should PASS this I think, but it is not currently. + Check(expected.ToString() == actual.ToString(), "Model string incorrect."); + var loader = s.ModelLoader(); + var x = loader.IntegerExpression(0).Var(); + var y = loader.IntegerExpression(1).Var(); + Check(!ReferenceEquals(null, x), "x variable not found after loaded model."); + Check(!ReferenceEquals(null, y), "y variable not found after loaded model."); + { + // Sanity check that what we loaded from the Proto is actually correct according to what we expected + var c = x + y == 5; + Check(c.Cst.ToString() == constraintText, "Constraint is incorrect."); + } + var db = s.MakePhase(x, y, Solver.CHOOSE_FIRST_UNBOUND, Solver.ASSIGN_MIN_VALUE); + s.NewSearch(db); + while (s.NextSolution()) { + Console.WriteLine("x = {0}, y = {1}", x.Value(), y.Value()); + } + s.EndSearch(); + } + } + + static void CpLoadModelAfterSearchTest() { + + CpModel expected; + + const string constraintName = "equation"; + const string constraintText = "((x(0..10) + y(0..10)) == 5)"; + + // Make sure that resources are isolated in the using block. + using (var s = new Solver("TestConstraint")) + { + var x = s.MakeIntVar(0, 10, "x"); + var y = s.MakeIntVar(0, 10, "y"); + Check(x.Name() == "x", "x variable name incorrect."); + Check(y.Name() == "y", "y variable name incorrect."); + var c = x + y == 5; +// c.Cst.SetName(constraintName); +// Check(c.Cst.Name() == constraintName, "Constraint name incorrect."); + Check(c.Cst.ToString() == constraintText, "Constraint is incorrect."); + s.Add(c); + // TODO: TBD: support solution collector? + var db = s.MakePhase(x, y, Solver.CHOOSE_FIRST_UNBOUND, Solver.ASSIGN_MIN_VALUE); + Check(!ReferenceEquals(null, db), "Expected a valid Decision Builder"); + s.NewSearch(db); + var count = 0; + while (s.NextSolution()) { + Console.WriteLine("x = {0}, y = {1}", x.Value(), y.Value()); + ++count; + // Break after we found at least one solution. + break; + } + s.EndSearch(); + Check(count > 0, "Must find at least one solution."); + // TODO: TBD: export with monitors and/or decision builder? + expected = s.ExportModel(); + Console.WriteLine("Expected model string after export: {0}", expected); + } + + // While interesting, this is not very useful nor especially typical use case scenario. + using (var s = new Solver("TestConstraint")) + { + // TODO: TBD: load with monitors and/or decision builder? + s.LoadModel(expected); + // This is the first test that should PASS when loading; however, it FAILS because the Constraint is NOT loaded as it is a "TrueConstraint()" + Check(s.Constraints() == 1, "Incorrect number of constraints."); + var actual = s.ExportModel(); + Console.WriteLine("Actual model string after load: {0}", actual); + // Should also be correct after re-load, but I suspect isn't even close, but I could be wrong. + Check(expected.ToString() == actual.ToString(), "Model string incorrect."); + var loader = s.ModelLoader(); + var x = loader.IntegerExpression(0).Var(); + var y = loader.IntegerExpression(1).Var(); + Check(!ReferenceEquals(null, x), "x variable not found after loaded model."); + Check(!ReferenceEquals(null, y), "y variable not found after loaded model."); + { + // Do this sanity check that what we loaded is actually what we expected should load. + var c = x + y == 5; + // Further documented verification, provided we got this far, and/or with "proper" unit test Assertions... + Check(c.Cst.ToString() == constraintText, "Constraint is incorrect."); + Check(c.Cst.ToString() != "TrueConstraint()", "Constraint is incorrect."); + } + // TODO: TBD: support solution collector? + // Should pick up where we left off. + var db = s.MakePhase(x, y, Solver.CHOOSE_FIRST_UNBOUND, Solver.ASSIGN_MIN_VALUE); + s.NewSearch(db); + while (s.NextSolution()) { + Console.WriteLine("x = {0}, y = {1}", x.Value(), y.Value()); + } + s.EndSearch(); + } + } + static void Main() { ConstructorsTest(); ConstraintWithExprTest(); @@ -632,6 +754,8 @@ public class CsTestCpOperator DomainIteratorTest(); HoleIteratorTest(); CpModelTest(); + CpSimpleLoadModelTest(); + CpLoadModelAfterSearchTest(); if (error_count_ != 0) { Console.WriteLine("Found " + error_count_ + " errors."); Environment.Exit(1); diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index c0355ba8b1..e3cec23398 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -65,7 +65,7 @@ ortoolslibs: $(OR_TOOLS_LIBS) CVRPTW_LIBS = $(LIB_DIR)/$(LIB_PREFIX)cvrptw_lib.$(LIB_SUFFIX) CVRPTW_DEPS = \ $(EX_DIR)/cpp/cvrptw_lib.h \ - $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h + $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h CVRPTW_LNK = $(PRE_LIB)cvrptw_lib$(POST_LIB) $(OR_TOOLS_LNK) cvrptwlibs: $(CVRPTW_LIBS) @@ -91,20 +91,20 @@ faplibs: $(FAP_LIBS) FLATZINC_LIBS = $(LIB_DIR)/$(LIB_PREFIX)fz.$(LIB_SUFFIX) FLATZINC_DEPS = \ - $(SRC_DIR)/flatzinc/checker.h \ - $(SRC_DIR)/flatzinc/constraints.h \ - $(SRC_DIR)/flatzinc/flatzinc_constraints.h \ - $(SRC_DIR)/flatzinc/logging.h \ - $(SRC_DIR)/flatzinc/model.h \ - $(SRC_DIR)/flatzinc/parser.h \ - $(SRC_DIR)/flatzinc/parser.tab.hh \ - $(SRC_DIR)/flatzinc/presolve.h \ - $(SRC_DIR)/flatzinc/reporting.h \ - $(SRC_DIR)/flatzinc/sat_constraint.h \ - $(SRC_DIR)/flatzinc/sat_fz_solver.h \ - $(SRC_DIR)/flatzinc/solver_data.h \ - $(SRC_DIR)/flatzinc/solver.h \ - $(SRC_DIR)/flatzinc/solver_util.h \ + $(SRC_DIR)/ortools/flatzinc/checker.h \ + $(SRC_DIR)/ortools/flatzinc/constraints.h \ + $(SRC_DIR)/ortools/flatzinc/flatzinc_constraints.h \ + $(SRC_DIR)/ortools/flatzinc/logging.h \ + $(SRC_DIR)/ortools/flatzinc/model.h \ + $(SRC_DIR)/ortools/flatzinc/parser.h \ + $(SRC_DIR)/ortools/flatzinc/parser.tab.hh \ + $(SRC_DIR)/ortools/flatzinc/presolve.h \ + $(SRC_DIR)/ortools/flatzinc/reporting.h \ + $(SRC_DIR)/ortools/flatzinc/sat_constraint.h \ + $(SRC_DIR)/ortools/flatzinc/sat_fz_solver.h \ + $(SRC_DIR)/ortools/flatzinc/solver_data.h \ + $(SRC_DIR)/ortools/flatzinc/solver.h \ + $(SRC_DIR)/ortools/flatzinc/solver_util.h \ $(CP_DEPS) \ $(SAT_DEPS) FLATZINC_LNK = $(PRE_LIB)fz$(POST_LIB) $(OR_TOOLS_LNK) @@ -156,7 +156,7 @@ ccexe: $(CC_BINARIES) CVRPTW_OBJS=\ $(OBJ_DIR)/cvrptw_lib.$O -$(OBJ_DIR)/cvrptw_lib.$O: $(EX_DIR)/cpp/cvrptw_lib.cc $(EX_DIR)/cpp/cvrptw_lib.h $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h +$(OBJ_DIR)/cvrptw_lib.$O: $(EX_DIR)/cpp/cvrptw_lib.cc $(EX_DIR)/cpp/cvrptw_lib.h $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/cvrptw_lib.cc $(OBJ_OUT)$(OBJ_DIR)$Scvrptw_lib.$O $(LIB_DIR)/$(LIB_PREFIX)cvrptw_lib.$(LIB_SUFFIX): $(CVRPTW_OBJS) @@ -209,63 +209,63 @@ FLATZINC_OBJS=\ $(OBJ_DIR)/flatzinc/solver_data.$O \ $(OBJ_DIR)/flatzinc/solver_util.$O -fz_parser: $(SRC_DIR)/flatzinc/parser.lex $(SRC_DIR)/flatzinc/parser.yy - flex -o$(SRC_DIR)/flatzinc/parser.yy.cc $(SRC_DIR)/flatzinc/parser.lex - bison -t -o $(SRC_DIR)/flatzinc/parser.tab.cc -d $< +fz_parser: $(SRC_DIR)/ortools/flatzinc/parser.lex $(SRC_DIR)/ortools/flatzinc/parser.yy + flex -o$(SRC_DIR)/ortools/flatzinc/parser.yy.cc $(SRC_DIR)/ortools/flatzinc/parser.lex + bison -t -o $(SRC_DIR)/ortools/flatzinc/parser.tab.cc -d $< -$(OBJ_DIR)/flatzinc/checker.$O: $(SRC_DIR)/flatzinc/checker.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Schecker.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Schecker.$O +$(OBJ_DIR)/flatzinc/checker.$O: $(SRC_DIR)/ortools/flatzinc/checker.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Schecker.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Schecker.$O -$(OBJ_DIR)/flatzinc/constraints.$O: $(SRC_DIR)/flatzinc/constraints.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sconstraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sconstraints.$O +$(OBJ_DIR)/flatzinc/constraints.$O: $(SRC_DIR)/ortools/flatzinc/constraints.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sconstraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sconstraints.$O -$(OBJ_DIR)/flatzinc/flatzinc_constraints.$O: $(SRC_DIR)/flatzinc/flatzinc_constraints.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sflatzinc_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sflatzinc_constraints.$O +$(OBJ_DIR)/flatzinc/flatzinc_constraints.$O: $(SRC_DIR)/ortools/flatzinc/flatzinc_constraints.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sflatzinc_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sflatzinc_constraints.$O -$(OBJ_DIR)/flatzinc/logging.$O: $(SRC_DIR)/flatzinc/logging.cc $(SRC_DIR)/flatzinc/logging.h $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Slogging.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Slogging.$O +$(OBJ_DIR)/flatzinc/logging.$O: $(SRC_DIR)/ortools/flatzinc/logging.cc $(SRC_DIR)/ortools/flatzinc/logging.h $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Slogging.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Slogging.$O -$(OBJ_DIR)/flatzinc/model.$O: $(SRC_DIR)/flatzinc/model.cc $(SRC_DIR)/flatzinc/model.h $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Smodel.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Smodel.$O +$(OBJ_DIR)/flatzinc/model.$O: $(SRC_DIR)/ortools/flatzinc/model.cc $(SRC_DIR)/ortools/flatzinc/model.h $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Smodel.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Smodel.$O -$(OBJ_DIR)/flatzinc/parser.$O: $(SRC_DIR)/flatzinc/parser.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sparser.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.$O +$(OBJ_DIR)/flatzinc/parser.$O: $(SRC_DIR)/ortools/flatzinc/parser.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sparser.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.$O -$(OBJ_DIR)/flatzinc/parser.tab.$O: $(SRC_DIR)/flatzinc/parser.tab.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sparser.tab.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.tab.$O +$(OBJ_DIR)/flatzinc/parser.tab.$O: $(SRC_DIR)/ortools/flatzinc/parser.tab.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sparser.tab.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.tab.$O -$(OBJ_DIR)/flatzinc/parser.yy.$O: $(SRC_DIR)/flatzinc/parser.yy.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sparser.yy.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.yy.$O +$(OBJ_DIR)/flatzinc/parser.yy.$O: $(SRC_DIR)/ortools/flatzinc/parser.yy.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sparser.yy.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser.yy.$O -$(OBJ_DIR)/flatzinc/presolve.$O: $(SRC_DIR)/flatzinc/presolve.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Spresolve.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Spresolve.$O +$(OBJ_DIR)/flatzinc/presolve.$O: $(SRC_DIR)/ortools/flatzinc/presolve.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Spresolve.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Spresolve.$O -$(OBJ_DIR)/flatzinc/reporting.$O: $(SRC_DIR)/flatzinc/reporting.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sreporting.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sreporting.$O +$(OBJ_DIR)/flatzinc/reporting.$O: $(SRC_DIR)/ortools/flatzinc/reporting.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sreporting.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sreporting.$O -$(OBJ_DIR)/flatzinc/sat_constraint.$O: $(SRC_DIR)/flatzinc/sat_constraint.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Ssat_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssat_constraint.$O +$(OBJ_DIR)/flatzinc/sat_constraint.$O: $(SRC_DIR)/ortools/flatzinc/sat_constraint.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Ssat_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssat_constraint.$O -$(OBJ_DIR)/flatzinc/sat_fz_solver.$O: $(SRC_DIR)/flatzinc/sat_fz_solver.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Ssat_fz_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssat_fz_solver.$O +$(OBJ_DIR)/flatzinc/sat_fz_solver.$O: $(SRC_DIR)/ortools/flatzinc/sat_fz_solver.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Ssat_fz_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssat_fz_solver.$O -$(OBJ_DIR)/flatzinc/solver.$O: $(SRC_DIR)/flatzinc/solver.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Ssolver.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver.$O +$(OBJ_DIR)/flatzinc/solver.$O: $(SRC_DIR)/ortools/flatzinc/solver.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Ssolver.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver.$O -$(OBJ_DIR)/flatzinc/solver_data.$O: $(SRC_DIR)/flatzinc/solver_data.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Ssolver_data.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver_data.$O +$(OBJ_DIR)/flatzinc/solver_data.$O: $(SRC_DIR)/ortools/flatzinc/solver_data.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Ssolver_data.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver_data.$O -$(OBJ_DIR)/flatzinc/solver_util.$O: $(SRC_DIR)/flatzinc/solver_util.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Ssolver_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver_util.$O +$(OBJ_DIR)/flatzinc/solver_util.$O: $(SRC_DIR)/ortools/flatzinc/solver_util.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Ssolver_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Ssolver_util.$O $(LIB_DIR)/$(LIB_PREFIX)fz.$(LIB_SUFFIX): $(FLATZINC_OBJS) $(LINK_CMD) $(LINK_PREFIX)$(LIB_DIR)$S$(LIB_PREFIX)fz.$(LIB_SUFFIX) $(FLATZINC_OBJS) -$(OBJ_DIR)/flatzinc/fz.$O: $(SRC_DIR)/flatzinc/fz.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sfz.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sfz.$O +$(OBJ_DIR)/flatzinc/fz.$O: $(SRC_DIR)/ortools/flatzinc/fz.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sfz.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sfz.$O -$(OBJ_DIR)/flatzinc/parser_main.$O: $(SRC_DIR)/flatzinc/parser_main.cc $(FLATZINC_DEPS) - $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sflatzinc$Sparser_main.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser_main.$O +$(OBJ_DIR)/flatzinc/parser_main.$O: $(SRC_DIR)/ortools/flatzinc/parser_main.cc $(FLATZINC_DEPS) + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sflatzinc$Sparser_main.cc $(OBJ_OUT)$(OBJ_DIR)$Sflatzinc$Sparser_main.$O fz : $(BIN_DIR)/fz$E $(BIN_DIR)/parser_main$E @@ -297,25 +297,25 @@ $(BIN_DIR)/dimacs_assignment$E: $(DIMACS_LIBS) $(OR_TOOLS_LIBS) $(OBJ_DIR)/dimac # Pure CP and Routing Examples -$(OBJ_DIR)/acp_challenge.$O: $(EX_DIR)/cpp/acp_challenge.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/acp_challenge.$O: $(EX_DIR)/cpp/acp_challenge.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/acp_challenge.cc $(OBJ_OUT)$(OBJ_DIR)$Sacp_challenge.$O $(BIN_DIR)/acp_challenge$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/acp_challenge.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/acp_challenge.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sacp_challenge$E -$(OBJ_DIR)/acp_challenge_routing.$O: $(EX_DIR)/cpp/acp_challenge_routing.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/acp_challenge_routing.$O: $(EX_DIR)/cpp/acp_challenge_routing.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/acp_challenge_routing.cc $(OBJ_OUT)$(OBJ_DIR)$Sacp_challenge_routing.$O $(BIN_DIR)/acp_challenge_routing$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/acp_challenge_routing.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/acp_challenge_routing.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sacp_challenge_routing$E -$(OBJ_DIR)/costas_array.$O: $(EX_DIR)/cpp/costas_array.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/costas_array.$O: $(EX_DIR)/cpp/costas_array.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/costas_array.cc $(OBJ_OUT)$(OBJ_DIR)$Scostas_array.$O $(BIN_DIR)/costas_array$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/costas_array.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/costas_array.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Scostas_array$E -$(OBJ_DIR)/cryptarithm.$O: $(EX_DIR)/cpp/cryptarithm.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/cryptarithm.$O: $(EX_DIR)/cpp/cryptarithm.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/cryptarithm.cc $(OBJ_OUT)$(OBJ_DIR)$Scryptarithm.$O $(BIN_DIR)/cryptarithm$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/cryptarithm.$O @@ -435,7 +435,7 @@ $(OBJ_DIR)/nqueens2.$O: $(EX_DIR)/cpp/nqueens2.cc $(CP_DEPS) $(BIN_DIR)/nqueens2$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/nqueens2.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/nqueens2.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Snqueens2$E -$(OBJ_DIR)/pdptw.$O: $(EX_DIR)/cpp/pdptw.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h +$(OBJ_DIR)/pdptw.$O: $(EX_DIR)/cpp/pdptw.cc $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/pdptw.cc $(OBJ_OUT)$(OBJ_DIR)$Spdptw.$O $(BIN_DIR)/pdptw$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/pdptw.$O @@ -465,7 +465,7 @@ $(OBJ_DIR)/sports_scheduling.$O: $(EX_DIR)/cpp/sports_scheduling.cc $(CP_DEPS) $(BIN_DIR)/sports_scheduling$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/sports_scheduling.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/sports_scheduling.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Ssports_scheduling$E -$(OBJ_DIR)/tsp.$O: $(EX_DIR)/cpp/tsp.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h +$(OBJ_DIR)/tsp.$O: $(EX_DIR)/cpp/tsp.cc $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/tsp.cc $(OBJ_OUT)$(OBJ_DIR)$Stsp.$O $(BIN_DIR)/tsp$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/tsp.$O @@ -491,55 +491,55 @@ $(OBJ_DIR)/bug_fz1.$O: $(EX_DIR)/tests/bug_fz1.cc $(CP_DEPS) $(BIN_DIR)/bug_fz1$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/bug_fz1.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/bug_fz1.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sbug_fz1$E -$(OBJ_DIR)/ac4r_table_test.$O: $(EX_DIR)/tests/ac4r_table_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/ac4r_table_test.$O: $(EX_DIR)/tests/ac4r_table_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/ac4r_table_test.cc $(OBJ_OUT)$(OBJ_DIR)$Sac4r_table_test.$O $(BIN_DIR)/ac4r_table_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/ac4r_table_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/ac4r_table_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sac4r_table_test$E -$(OBJ_DIR)/forbidden_intervals_test.$O: $(EX_DIR)/tests/forbidden_intervals_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/forbidden_intervals_test.$O: $(EX_DIR)/tests/forbidden_intervals_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/forbidden_intervals_test.cc $(OBJ_OUT)$(OBJ_DIR)$Sforbidden_intervals_test.$O $(BIN_DIR)/forbidden_intervals_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/forbidden_intervals_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/forbidden_intervals_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sforbidden_intervals_test$E -$(OBJ_DIR)/gcc_test.$O: $(EX_DIR)/tests/gcc_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/gcc_test.$O: $(EX_DIR)/tests/gcc_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/gcc_test.cc $(OBJ_OUT)$(OBJ_DIR)$Sgcc_test.$O $(BIN_DIR)/gcc_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/gcc_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/gcc_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sgcc_test$E -$(OBJ_DIR)/min_max_test.$O: $(EX_DIR)/tests/min_max_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/min_max_test.$O: $(EX_DIR)/tests/min_max_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/min_max_test.cc $(OBJ_OUT)$(OBJ_DIR)$Smin_max_test.$O $(BIN_DIR)/min_max_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/min_max_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/min_max_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Smin_max_test$E -$(OBJ_DIR)/issue57.$O: $(EX_DIR)/tests/issue57.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/issue57.$O: $(EX_DIR)/tests/issue57.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/issue57.cc $(OBJ_OUT)$(OBJ_DIR)$Sissue57.$O $(BIN_DIR)/issue57$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/issue57.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/issue57.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sissue57$E -$(OBJ_DIR)/issue173.$O: $(EX_DIR)/tests/issue173.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/issue173.$O: $(EX_DIR)/tests/issue173.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/issue173.cc $(OBJ_OUT)$(OBJ_DIR)$Sissue173.$O $(BIN_DIR)/issue173$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/issue173.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/issue173.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sissue173$E -$(OBJ_DIR)/visitor_test.$O: $(EX_DIR)/tests/visitor_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/visitor_test.$O: $(EX_DIR)/tests/visitor_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/visitor_test.cc $(OBJ_OUT)$(OBJ_DIR)$Svisitor_test.$O $(BIN_DIR)/visitor_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/visitor_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/visitor_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Svisitor_test$E -$(OBJ_DIR)/boolean_test.$O: $(EX_DIR)/tests/boolean_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/boolean_test.$O: $(EX_DIR)/tests/boolean_test.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/boolean_test.cc $(OBJ_OUT)$(OBJ_DIR)$Sboolean_test.$O $(BIN_DIR)/boolean_test$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/boolean_test.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/boolean_test.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sboolean_test$E -$(OBJ_DIR)/ls_api.$O: $(EX_DIR)/cpp/ls_api.cc $(SRC_DIR)/constraint_solver/constraint_solver.h +$(OBJ_DIR)/ls_api.$O: $(EX_DIR)/cpp/ls_api.cc $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/ls_api.cc $(OBJ_OUT)$(OBJ_DIR)$Sls_api.$O $(BIN_DIR)/ls_api$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/ls_api.$O @@ -585,13 +585,13 @@ $(OBJ_DIR)/integer_programming.$O: $(EX_DIR)/cpp/integer_programming.cc $(LP_DEP $(BIN_DIR)/integer_programming$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/integer_programming.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/integer_programming.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Sinteger_programming$E -$(OBJ_DIR)/glop/mps_driver.$O: $(EX_DIR)/cpp/mps_driver.cc $(GEN_DIR)/glop/parameters.pb.h +$(OBJ_DIR)/glop/mps_driver.$O: $(EX_DIR)/cpp/mps_driver.cc $(GEN_DIR)/ortools/glop/parameters.pb.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp$Smps_driver.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Smps_driver.$O $(BIN_DIR)/mps_driver$E: $(OBJ_DIR)/glop/mps_driver.$O $(OR_TOOLS_LIBS) $(CCC) $(CFLAGS) $(OBJ_DIR)$Sglop$Smps_driver.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Smps_driver$E -$(OBJ_DIR)/glop/solve.$O: $(EX_DIR)/cpp/solve.cc $(GEN_DIR)/glop/parameters.pb.h $(GEN_DIR)/linear_solver/linear_solver.pb.h +$(OBJ_DIR)/glop/solve.$O: $(EX_DIR)/cpp/solve.cc $(GEN_DIR)/ortools/glop/parameters.pb.h $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp$Ssolve.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Ssolve.$O $(BIN_DIR)/solve$E: $(OBJ_DIR)/glop/solve.$O $(OR_TOOLS_LIBS) diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk index bde7d6aef7..f845508c29 100755 --- a/makefiles/Makefile.csharp.mk +++ b/makefiles/Makefile.csharp.mk @@ -97,11 +97,11 @@ clean_csharp: -$(DEL) $(LIB_DIR)$S$(LIB_PREFIX)Google.OrTools.Flatzinc*.exp -$(DEL) $(LIB_DIR)$S$(LIB_PREFIX)Google.OrTools.Flatzinc*.netmodule -$(DEL) $(LIB_DIR)$S$(LIB_PREFIX)Google.OrTools.Flatzinc.$(SWIG_LIB_SUFFIX) - -$(DEL) $(GEN_DIR)$Slinear_solver$S*csharp_wrap* - -$(DEL) $(GEN_DIR)$Sconstraint_solver$S*csharp_wrap* - -$(DEL) $(GEN_DIR)$Salgorithms$S*csharp_wrap* - -$(DEL) $(GEN_DIR)$Sgraph$S*csharp_wrap* - -$(DEL) $(GEN_DIR)$Sflatzinc$S*csharp_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Slinear_solver$S*csharp_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Sconstraint_solver$S*csharp_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Salgorithms$S*csharp_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Sgraph$S*csharp_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Sflatzinc$S*csharp_wrap* -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.cs -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver$S*.cs -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.cs @@ -148,70 +148,70 @@ csharportools: $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL) $(BIN_DIR)/$(CLR_PROTOBU $(BIN_DIR)/$(CLR_PROTOBUF_DLL_NAME)$(DLL): tools/$(CLR_PROTOBUF_DLL_NAME)$(DLL) $(COPY) tools$S$(CLR_PROTOBUF_DLL_NAME)$(DLL) $(BIN_DIR) -$(GEN_DIR)/linear_solver/linear_solver_csharp_wrap.cc: \ - $(SRC_DIR)/linear_solver/csharp/linear_solver.swig \ - $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/csharp/proto.swig \ +$(GEN_DIR)/ortools/linear_solver/linear_solver_csharp_wrap.cc: \ + $(SRC_DIR)/ortools/linear_solver/csharp/linear_solver.i \ + $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/csharp/proto.i \ $(LP_DEPS) - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Slinear_solver$Slinear_solver_csharp_wrap.cc -module operations_research_linear_solver -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).LinearSolver -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver $(SRC_DIR)/linear_solver$Scsharp$Slinear_solver.swig + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver_csharp_wrap.cc -module operations_research_linear_solver -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).LinearSolver -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver $(SRC_DIR)/ortools/linear_solver$Scsharp$Slinear_solver.i -$(OBJ_DIR)/swig/linear_solver_csharp_wrap.$O: $(GEN_DIR)/linear_solver/linear_solver_csharp_wrap.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/linear_solver/linear_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Slinear_solver_csharp_wrap.$O +$(OBJ_DIR)/swig/linear_solver_csharp_wrap.$O: $(GEN_DIR)/ortools/linear_solver/linear_solver_csharp_wrap.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/linear_solver/linear_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Slinear_solver_csharp_wrap.$O -$(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.cc: \ - $(SRC_DIR)/constraint_solver/csharp/routing.swig \ - $(SRC_DIR)/constraint_solver/csharp/constraint_solver.swig \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/csharp/proto.swig \ - $(SRC_DIR)/util/csharp/functions.swig \ +$(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.cc: \ + $(SRC_DIR)/ortools/constraint_solver/csharp/routing.i \ + $(SRC_DIR)/ortools/constraint_solver/csharp/constraint_solver.i \ + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/csharp/proto.i \ + $(SRC_DIR)/ortools/util/csharp/functions.i \ $(CP_DEPS) - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_csharp_wrap.cc -module operations_research_constraint_solver -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).ConstraintSolver -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver $(SRC_DIR)$Sconstraint_solver$Scsharp$Srouting.swig - $(SED) -i -e 's/CSharp_new_Solver/CSharp_new_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* - $(SED) -i -e 's/CSharp_delete_Solver/CSharp_delete_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* - $(SED) -i -e 's/CSharp_Solver/CSharp_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* - $(SED) -i -e 's/CSharp_new_Constraint/CSharp_new_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* - $(SED) -i -e 's/CSharp_delete_Constraint/CSharp_delete_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* - $(SED) -i -e 's/CSharp_Constraint/CSharp_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.* + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_csharp_wrap.cc -module operations_research_constraint_solver -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).ConstraintSolver -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver $(SRC_DIR)$Sortools$Sconstraint_solver$Scsharp$Srouting.i + $(SED) -i -e 's/CSharp_new_Solver/CSharp_new_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* + $(SED) -i -e 's/CSharp_delete_Solver/CSharp_delete_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* + $(SED) -i -e 's/CSharp_Solver/CSharp_CpSolver/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* + $(SED) -i -e 's/CSharp_new_Constraint/CSharp_new_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* + $(SED) -i -e 's/CSharp_delete_Constraint/CSharp_delete_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* + $(SED) -i -e 's/CSharp_Constraint/CSharp_CpConstraint/g' $(GEN_DIR)/com/google/ortools/constraintsolver/*cs $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.* $(OBJ_DIR)/swig/constraint_solver_csharp_wrap.$O: \ - $(GEN_DIR)/constraint_solver/constraint_solver_csharp_wrap.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sconstraint_solver_csharp_wrap.$O + $(GEN_DIR)/ortools/constraint_solver/constraint_solver_csharp_wrap.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sconstraint_solver_csharp_wrap.$O -$(GEN_DIR)/algorithms/knapsack_solver_csharp_wrap.cc: \ - $(SRC_DIR)/algorithms/csharp/knapsack_solver.swig \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/csharp/proto.swig \ - $(SRC_DIR)/algorithms/knapsack_solver.h - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Salgorithms$Sknapsack_solver_csharp_wrap.cc -module operations_research_algorithms -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Algorithms -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms $(SRC_DIR)$Salgorithms$Scsharp$Sknapsack_solver.swig +$(GEN_DIR)/ortools/algorithms/knapsack_solver_csharp_wrap.cc: \ + $(SRC_DIR)/ortools/algorithms/csharp/knapsack_solver.i \ + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/csharp/proto.i \ + $(SRC_DIR)/ortools/algorithms/knapsack_solver.h + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sortools$Salgorithms$Sknapsack_solver_csharp_wrap.cc -module operations_research_algorithms -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Algorithms -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms $(SRC_DIR)$Sortools$Salgorithms$Scsharp$Sknapsack_solver.i -$(OBJ_DIR)/swig/knapsack_solver_csharp_wrap.$O: $(GEN_DIR)/algorithms/knapsack_solver_csharp_wrap.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/algorithms/knapsack_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sknapsack_solver_csharp_wrap.$O +$(OBJ_DIR)/swig/knapsack_solver_csharp_wrap.$O: $(GEN_DIR)/ortools/algorithms/knapsack_solver_csharp_wrap.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/algorithms/knapsack_solver_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sknapsack_solver_csharp_wrap.$O -$(GEN_DIR)/graph/graph_csharp_wrap.cc: \ - $(SRC_DIR)/graph/csharp/graph.swig \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/csharp/proto.swig \ +$(GEN_DIR)/ortools/graph/graph_csharp_wrap.cc: \ + $(SRC_DIR)/ortools/graph/csharp/graph.i \ + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/csharp/proto.i \ $(GRAPH_DEPS) - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sgraph$Sgraph_csharp_wrap.cc -module operations_research_graph -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Graph -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph $(SRC_DIR)$Sgraph$Scsharp$Sgraph.swig + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -csharp -o $(GEN_DIR)$Sortools$Sgraph$Sgraph_csharp_wrap.cc -module operations_research_graph -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Graph -dllimport "$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph $(SRC_DIR)$Sortools$Sgraph$Scsharp$Sgraph.i -$(OBJ_DIR)/swig/graph_csharp_wrap.$O: $(GEN_DIR)/graph/graph_csharp_wrap.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)$Sgraph$Sgraph_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sgraph_csharp_wrap.$O +$(OBJ_DIR)/swig/graph_csharp_wrap.$O: $(GEN_DIR)/ortools/graph/graph_csharp_wrap.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)$Sortools$Sgraph$Sgraph_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sgraph_csharp_wrap.$O # Protobufs -$(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimit.g.cs: $(SRC_DIR)/constraint_solver/search_limit.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sconstraint_solver$Ssearch_limit.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimit.g.cs: $(SRC_DIR)/ortools/constraint_solver/search_limit.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sortools$Sconstraint_solver$Ssearch_limit.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.g.cs: $(SRC_DIR)/constraint_solver/solver_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sconstraint_solver$Ssolver_parameters.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.g.cs: $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sortools$Sconstraint_solver$Ssolver_parameters.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/Model.g.cs: $(SRC_DIR)/constraint_solver/solver_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sconstraint_solver$Smodel.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/Model.g.cs: $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sortools$Sconstraint_solver$Smodel.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.g.cs: $(SRC_DIR)/constraint_solver/routing_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sconstraint_solver$Srouting_parameters.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.g.cs: $(SRC_DIR)/ortools/constraint_solver/routing_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.g.cs: $(SRC_DIR)/constraint_solver/routing_enums.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sconstraint_solver$Srouting_enums.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.g.cs: $(SRC_DIR)/ortools/constraint_solver/routing_enums.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --csharp_out=$(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver --csharp_opt=file_extension=.g.cs $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_enums.proto # Main DLL @@ -228,20 +228,20 @@ $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL): \ $(OBJ_DIR)/swig/constraint_solver_csharp_wrap.$O \ $(OBJ_DIR)/swig/knapsack_solver_csharp_wrap.$O \ $(OBJ_DIR)/swig/graph_csharp_wrap.$O \ - $(SRC_DIR)/com/google/ortools/algorithms/IntArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/IntVarArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/IntArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/NetDecisionBuilder.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/SolverHelper.cs \ - $(SRC_DIR)/com/google/ortools/constraintsolver/ValCstPair.cs \ - $(SRC_DIR)/com/google/ortools/linearsolver/DoubleArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/linearsolver/LinearExpr.cs \ - $(SRC_DIR)/com/google/ortools/linearsolver/LinearConstraint.cs \ - $(SRC_DIR)/com/google/ortools/linearsolver/SolverHelper.cs \ - $(SRC_DIR)/com/google/ortools/linearsolver/VariableHelper.cs \ - $(SRC_DIR)/com/google/ortools/util/NestedArrayHelper.cs \ - $(SRC_DIR)/com/google/ortools/util/ProtoHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/algorithms/IntArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/IntVarArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/IntArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/NetDecisionBuilder.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/SolverHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/ValCstPair.cs \ + $(SRC_DIR)/ortools/com/google/ortools/linearsolver/DoubleArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/linearsolver/LinearExpr.cs \ + $(SRC_DIR)/ortools/com/google/ortools/linearsolver/LinearConstraint.cs \ + $(SRC_DIR)/ortools/com/google/ortools/linearsolver/SolverHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/linearsolver/VariableHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/util/NestedArrayHelper.cs \ + $(SRC_DIR)/ortools/com/google/ortools/util/ProtoHelper.cs \ $(GEN_DIR)/com/google/ortools/constraintsolver/Model.g.cs\ $(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimit.g.cs\ $(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.g.cs\ @@ -252,7 +252,7 @@ ifeq ($(SYSTEM),win) $(CSC) /target:module /out:$(LIB_DIR)$S$(LIB_PREFIX)$(CLR_ORTOOLS_DLL_NAME).netmodule /lib:$(BIN_DIR) /r:$(CLR_PROTOBUF_DLL_NAME)$(DLL) /warn:0 /nologo /debug $(GEN_DIR)\\com\\google\\ortools\\linearsolver\\*.cs $(SRC_DIR)\\com\\google\\ortools\\linearsolver\\*.cs $(GEN_DIR)\\com\\google\\ortools\\constraintsolver\\*.cs $(SRC_DIR)\\com\\google\\ortools\\constraintsolver\\*.cs $(GEN_DIR)\\com\\google\\ortools\\algorithms\\*.cs $(SRC_DIR)\\com\\google\\ortools\\algorithms\\*.cs $(GEN_DIR)\\com\\google\\ortools\\graph\\*.cs $(SRC_DIR)\\com\\google\\ortools\\util\\*.cs $(GEN_DIR)\\com\\google\\ortools\\properties\\*.cs $(DYNAMIC_LD) $(SIGNING_FLAGS) $(LDOUT)$(BIN_DIR)$S$(CLR_ORTOOLS_DLL_NAME)$(DLL) $(LIB_DIR)$S$(LIB_PREFIX)$(CLR_ORTOOLS_DLL_NAME).netmodule $(OBJ_DIR)$Sswig$Slinear_solver_csharp_wrap.$O $(OBJ_DIR)$Sswig$Sconstraint_solver_csharp_wrap.$O $(OBJ_DIR)$Sswig$Sknapsack_solver_csharp_wrap.$O $(OBJ_DIR)$Sswig$Sgraph_csharp_wrap.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) else - $(CSC) /target:library /out:$(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL) /lib:$(BIN_DIR) /r:$(CLR_PROTOBUF_DLL_NAME)$(DLL) /warn:0 /nologo /debug $(SRC_DIR)/com/google/ortools/util/*.cs $(GEN_DIR)/com/google/ortools/linearsolver/*.cs $(SRC_DIR)/com/google/ortools/linearsolver/*.cs $(GEN_DIR)/com/google/ortools/constraintsolver/*.cs $(SRC_DIR)/com/google/ortools/constraintsolver/*.cs $(SRC_DIR)/com/google/ortools/algorithms/*.cs $(GEN_DIR)/com/google/ortools/algorithms/*.cs $(GEN_DIR)/com/google/ortools/graph/*.cs $(GEN_DIR)/com/google/ortools/properties/*.cs + $(CSC) /target:library /out:$(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL) /lib:$(BIN_DIR) /r:$(CLR_PROTOBUF_DLL_NAME)$(DLL) /warn:0 /nologo /debug $(SRC_DIR)/ortools/com/google/ortools/util/*.cs $(GEN_DIR)/com/google/ortools/linearsolver/*.cs $(SRC_DIR)/ortools/com/google/ortools/linearsolver/*.cs $(GEN_DIR)/com/google/ortools/constraintsolver/*.cs $(SRC_DIR)/ortools/com/google/ortools/constraintsolver/*.cs $(SRC_DIR)/ortools/com/google/ortools/algorithms/*.cs $(GEN_DIR)/com/google/ortools/algorithms/*.cs $(GEN_DIR)/com/google/ortools/graph/*.cs $(GEN_DIR)/com/google/ortools/properties/*.cs $(DYNAMIC_LD) $(LDOUT)$(LIB_DIR)$S$(LIB_PREFIX)$(CLR_ORTOOLS_DLL_NAME).$(SWIG_LIB_SUFFIX) $(OBJ_DIR)/swig/linear_solver_csharp_wrap.$O $(OBJ_DIR)/swig/constraint_solver_csharp_wrap.$O $(OBJ_DIR)/swig/knapsack_solver_csharp_wrap.$O $(OBJ_DIR)/swig/graph_csharp_wrap.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) endif @@ -366,14 +366,14 @@ csharpfz: \ $(BIN_DIR)/Google.OrTools.Flatzinc$(DLL) \ $(BIN_DIR)/csfz$(CLR_EXE_SUFFIX).exe -$(GEN_DIR)/flatzinc/flatzinc_csharp_wrap.cc: \ - $(SRC_DIR)/flatzinc/csharp/flatzinc.swig \ - $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/csharp/proto.swig \ +$(GEN_DIR)/ortools/flatzinc/flatzinc_csharp_wrap.cc: \ + $(SRC_DIR)/ortools/flatzinc/csharp/flatzinc.i \ + $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/csharp/proto.i \ $(FLATZINC_DEPS) - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -nodefaultctor -csharp -o $(GEN_DIR)$Sflatzinc$Sflatzinc_csharp_wrap.cc -module operations_research_flatzinc -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Flatzinc -dllimport "Google.OrTools.Flatzinc.$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sflatzinc $(SRC_DIR)/flatzinc$Scsharp$Sflatzinc.swig + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -nodefaultctor -csharp -o $(GEN_DIR)$Sortools$Sflatzinc$Sflatzinc_csharp_wrap.cc -module operations_research_flatzinc -namespace $(BASE_CLR_ORTOOLS_DLL_NAME).Flatzinc -dllimport "Google.OrTools.Flatzinc.$(SWIG_LIB_SUFFIX)" -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sflatzinc $(SRC_DIR)/ortools/flatzinc$Scsharp$Sflatzinc.i -$(OBJ_DIR)/swig/flatzinc_csharp_wrap.$O: $(GEN_DIR)/flatzinc/flatzinc_csharp_wrap.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/flatzinc/flatzinc_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sflatzinc_csharp_wrap.$O +$(OBJ_DIR)/swig/flatzinc_csharp_wrap.$O: $(GEN_DIR)/ortools/flatzinc/flatzinc_csharp_wrap.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/flatzinc/flatzinc_csharp_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sflatzinc_csharp_wrap.$O $(BIN_DIR)/Google.OrTools.Flatzinc$(DLL): assembly_info \ $(OBJ_DIR)/swig/flatzinc_csharp_wrap.$O \ diff --git a/makefiles/Makefile.gen.mk b/makefiles/Makefile.gen.mk index fd2a343618..738574b9c1 100644 --- a/makefiles/Makefile.gen.mk +++ b/makefiles/Makefile.gen.mk @@ -1,20 +1,20 @@ BASE_DEPS = \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h BASE_LIB_OBJS = \ $(OBJ_DIR)/base/bitmap.$O \ @@ -35,250 +35,250 @@ BASE_LIB_OBJS = \ $(OBJ_DIR)/base/timer.$O \ $(OBJ_DIR)/base/time_support.$O -$(SRC_DIR)/base/adjustable_priority_queue.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/adjustable_priority_queue.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/adjustable_priority_queue-inl.h: \ - $(SRC_DIR)/base/adjustable_priority_queue.h +$(SRC_DIR)/ortools/base/adjustable_priority_queue-inl.h: \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h -$(SRC_DIR)/base/basictypes.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/basictypes.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/bitmap.h: \ - $(SRC_DIR)/base/basictypes.h +$(SRC_DIR)/ortools/base/bitmap.h: \ + $(SRC_DIR)/ortools/base/basictypes.h -$(SRC_DIR)/base/callback.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/callback.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/file.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/status.h +$(SRC_DIR)/ortools/base/file.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/status.h -$(SRC_DIR)/base/filelinereader.h: \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/base/filelinereader.h: \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/base/hash.h: \ - $(SRC_DIR)/base/basictypes.h +$(SRC_DIR)/ortools/base/hash.h: \ + $(SRC_DIR)/ortools/base/basictypes.h -$(SRC_DIR)/base/int_type.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/int_type.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/int_type_indexed_vector.h: \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/int_type_indexed_vector.h: \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/jniutil.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/jniutil.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/join.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/stringpiece.h +$(SRC_DIR)/ortools/base/join.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/stringpiece.h -$(SRC_DIR)/base/logging.h: \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/logging.h: \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/map_util.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/map_util.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/mathutil.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/mathutil.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/murmur.h: \ - $(SRC_DIR)/base/thorough_hash.h +$(SRC_DIR)/ortools/base/murmur.h: \ + $(SRC_DIR)/ortools/base/thorough_hash.h -$(SRC_DIR)/base/mutex.h: \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/mutex.h: \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/numbers.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h +$(SRC_DIR)/ortools/base/numbers.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h -$(SRC_DIR)/base/random.h: \ - $(SRC_DIR)/base/basictypes.h +$(SRC_DIR)/ortools/base/random.h: \ + $(SRC_DIR)/ortools/base/basictypes.h -$(SRC_DIR)/base/recordio.h: \ - $(SRC_DIR)/base/file.h +$(SRC_DIR)/ortools/base/recordio.h: \ + $(SRC_DIR)/ortools/base/file.h -$(SRC_DIR)/base/sparsetable.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/sparsetable.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/split.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringpiece.h +$(SRC_DIR)/ortools/base/split.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringpiece.h -$(SRC_DIR)/base/status.h: \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/status.h: \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/statusor.h: \ - $(SRC_DIR)/base/status.h +$(SRC_DIR)/ortools/base/statusor.h: \ + $(SRC_DIR)/ortools/base/status.h -$(SRC_DIR)/base/stringpiece_utils.h: \ - $(SRC_DIR)/base/stringpiece.h +$(SRC_DIR)/ortools/base/stringpiece_utils.h: \ + $(SRC_DIR)/ortools/base/stringpiece.h -$(SRC_DIR)/base/stringprintf.h: \ - $(SRC_DIR)/base/stringpiece.h +$(SRC_DIR)/ortools/base/stringprintf.h: \ + $(SRC_DIR)/ortools/base/stringpiece.h -$(SRC_DIR)/base/strongly_connected_components.h: \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/base/strongly_connected_components.h: \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/base/strtoint.h: \ - $(SRC_DIR)/base/basictypes.h +$(SRC_DIR)/ortools/base/strtoint.h: \ + $(SRC_DIR)/ortools/base/basictypes.h -$(SRC_DIR)/base/strutil.h: \ - $(SRC_DIR)/base/stringpiece.h +$(SRC_DIR)/ortools/base/strutil.h: \ + $(SRC_DIR)/ortools/base/stringpiece.h -$(SRC_DIR)/base/synchronization.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/base/synchronization.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/base/sysinfo.h: \ - $(SRC_DIR)/base/basictypes.h +$(SRC_DIR)/ortools/base/sysinfo.h: \ + $(SRC_DIR)/ortools/base/basictypes.h -$(SRC_DIR)/base/thorough_hash.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/base/thorough_hash.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/base/timer.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/time_support.h +$(SRC_DIR)/ortools/base/timer.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/time_support.h -$(SRC_DIR)/base/time_support.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/base/time_support.h: \ + $(SRC_DIR)/ortools/base/integral_types.h $(OBJ_DIR)/base/bitmap.$O: \ - $(SRC_DIR)/base/bitmap.cc \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/bitmap.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/bitmap.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sbitmap.$O + $(SRC_DIR)/ortools/base/bitmap.cc \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/bitmap.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sbitmap.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sbitmap.$O $(OBJ_DIR)/base/callback.$O: \ - $(SRC_DIR)/base/callback.cc \ - $(SRC_DIR)/base/callback.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/callback.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Scallback.$O + $(SRC_DIR)/ortools/base/callback.cc \ + $(SRC_DIR)/ortools/base/callback.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Scallback.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Scallback.$O $(OBJ_DIR)/base/file.$O: \ - $(SRC_DIR)/base/file.cc \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/file.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sfile.$O + $(SRC_DIR)/ortools/base/file.cc \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sfile.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sfile.$O $(OBJ_DIR)/base/filelinereader.$O: \ - $(SRC_DIR)/base/filelinereader.cc \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/filelinereader.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/filelinereader.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sfilelinereader.$O + $(SRC_DIR)/ortools/base/filelinereader.cc \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/filelinereader.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sfilelinereader.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sfilelinereader.$O $(OBJ_DIR)/base/join.$O: \ - $(SRC_DIR)/base/join.cc \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/join.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sjoin.$O + $(SRC_DIR)/ortools/base/join.cc \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sjoin.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sjoin.$O $(OBJ_DIR)/base/logging.$O: \ - $(SRC_DIR)/base/logging.cc \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/logging.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Slogging.$O + $(SRC_DIR)/ortools/base/logging.cc \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Slogging.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Slogging.$O $(OBJ_DIR)/base/mutex.$O: \ - $(SRC_DIR)/base/mutex.cc \ - $(SRC_DIR)/base/mutex.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/mutex.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Smutex.$O + $(SRC_DIR)/ortools/base/mutex.cc \ + $(SRC_DIR)/ortools/base/mutex.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Smutex.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Smutex.$O $(OBJ_DIR)/base/numbers.$O: \ - $(SRC_DIR)/base/numbers.cc \ - $(SRC_DIR)/base/numbers.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/numbers.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Snumbers.$O + $(SRC_DIR)/ortools/base/numbers.cc \ + $(SRC_DIR)/ortools/base/numbers.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Snumbers.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Snumbers.$O $(OBJ_DIR)/base/random.$O: \ - $(SRC_DIR)/base/random.cc \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/random.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/random.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srandom.$O + $(SRC_DIR)/ortools/base/random.cc \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/random.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Srandom.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srandom.$O $(OBJ_DIR)/base/recordio.$O: \ - $(SRC_DIR)/base/recordio.cc \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/recordio.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/recordio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srecordio.$O + $(SRC_DIR)/ortools/base/recordio.cc \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/recordio.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Srecordio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srecordio.$O $(OBJ_DIR)/base/split.$O: \ - $(SRC_DIR)/base/split.cc \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/split.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/split.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Ssplit.$O + $(SRC_DIR)/ortools/base/split.cc \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/split.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Ssplit.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Ssplit.$O $(OBJ_DIR)/base/stringpiece.$O: \ - $(SRC_DIR)/base/stringpiece.cc \ - $(SRC_DIR)/base/stringpiece.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/stringpiece.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sstringpiece.$O + $(SRC_DIR)/ortools/base/stringpiece.cc \ + $(SRC_DIR)/ortools/base/stringpiece.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sstringpiece.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sstringpiece.$O $(OBJ_DIR)/base/stringprintf.$O: \ - $(SRC_DIR)/base/stringprintf.cc \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/stringprintf.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sstringprintf.$O + $(SRC_DIR)/ortools/base/stringprintf.cc \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sstringprintf.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sstringprintf.$O $(OBJ_DIR)/base/sysinfo.$O: \ - $(SRC_DIR)/base/sysinfo.cc \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/sysinfo.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/sysinfo.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Ssysinfo.$O + $(SRC_DIR)/ortools/base/sysinfo.cc \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/sysinfo.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Ssysinfo.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Ssysinfo.$O $(OBJ_DIR)/base/threadpool.$O: \ - $(SRC_DIR)/base/threadpool.cc \ - $(SRC_DIR)/base/threadpool.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/threadpool.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sthreadpool.$O + $(SRC_DIR)/ortools/base/threadpool.cc \ + $(SRC_DIR)/ortools/base/threadpool.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sthreadpool.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sthreadpool.$O $(OBJ_DIR)/base/timer.$O: \ - $(SRC_DIR)/base/timer.cc \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/timer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Stimer.$O + $(SRC_DIR)/ortools/base/timer.cc \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Stimer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Stimer.$O $(OBJ_DIR)/base/time_support.$O: \ - $(SRC_DIR)/base/time_support.cc \ - $(SRC_DIR)/base/time_support.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/base/time_support.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Stime_support.$O + $(SRC_DIR)/ortools/base/time_support.cc \ + $(SRC_DIR)/ortools/base/time_support.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Stime_support.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Stime_support.$O UTIL_DEPS = \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h UTIL_LIB_OBJS = \ $(OBJ_DIR)/util/bitset.$O \ @@ -295,246 +295,248 @@ UTIL_LIB_OBJS = \ $(OBJ_DIR)/util/time_limit.$O \ $(OBJ_DIR)/util/xml_helper.$O -$(SRC_DIR)/util/bitset.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/util/bitset.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/util/cached_log.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/cached_log.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/filelineiter.h: \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringpiece_utils.h \ - $(SRC_DIR)/base/strutil.h +$(SRC_DIR)/ortools/util/filelineiter.h: \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringpiece_utils.h \ + $(SRC_DIR)/ortools/base/strutil.h -$(SRC_DIR)/util/fp_utils.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/util/fp_utils.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/util/functions_swig_helpers.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/functions_swig_helpers.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/functions_swig_test_helpers.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/functions_swig_test_helpers.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/graph_export.h: \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/graph_export.h: \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/monoid_operation_tree.h: \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h +$(SRC_DIR)/ortools/util/monoid_operation_tree.h: \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h -$(SRC_DIR)/util/permutation.h: \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/permutation.h: \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/piecewise_linear_function.h: \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/piecewise_linear_function.h: \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/range_minimum_query.h: \ - $(SRC_DIR)/util/bitset.h +$(SRC_DIR)/ortools/util/range_minimum_query.h: \ + $(SRC_DIR)/ortools/util/bitset.h -$(SRC_DIR)/util/range_query_function.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/range_query_function.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/rational_approximation.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/rational_approximation.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/rcpsp_parser.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/rcpsp_parser.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/rev.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h +$(SRC_DIR)/ortools/util/rev.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h -$(SRC_DIR)/util/running_stat.h: \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/running_stat.h: \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/saturated_arithmetic.h: \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/saturated_arithmetic.h: \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/sorted_interval_list.h: \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/util/sorted_interval_list.h: \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/util/stats.h: \ - $(SRC_DIR)/base/timer.h +$(SRC_DIR)/ortools/util/stats.h: \ + $(SRC_DIR)/ortools/base/timer.h -$(SRC_DIR)/util/time_limit.h: \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/port.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/base/time_support.h +$(SRC_DIR)/ortools/util/time_limit.h: \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/port.h \ + $(SRC_DIR)/ortools/base/sysinfo.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/base/time_support.h -$(SRC_DIR)/util/tuple_set.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h +$(SRC_DIR)/ortools/util/tuple_set.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h -$(SRC_DIR)/util/vector_map.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/map_util.h +$(SRC_DIR)/ortools/util/vector_map.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/map_util.h -$(SRC_DIR)/util/vector_or_function.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/util/vector_or_function.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/util/xml_helper.h: \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/xml_helper.h: \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/util/zvector.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/util/zvector.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h $(OBJ_DIR)/util/bitset.$O: \ - $(SRC_DIR)/util/bitset.cc \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/bitset.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sbitset.$O + $(SRC_DIR)/ortools/util/bitset.cc \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sbitset.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sbitset.$O $(OBJ_DIR)/util/cached_log.$O: \ - $(SRC_DIR)/util/cached_log.cc \ - $(SRC_DIR)/util/cached_log.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/cached_log.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Scached_log.$O + $(SRC_DIR)/ortools/util/cached_log.cc \ + $(SRC_DIR)/ortools/util/cached_log.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Scached_log.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Scached_log.$O $(OBJ_DIR)/util/fp_utils.$O: \ - $(SRC_DIR)/util/fp_utils.cc \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/fp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/fp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sfp_utils.$O + $(SRC_DIR)/ortools/util/fp_utils.cc \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/fp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sfp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sfp_utils.$O $(OBJ_DIR)/util/graph_export.$O: \ - $(SRC_DIR)/util/graph_export.cc \ - $(SRC_DIR)/util/graph_export.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/graph_export.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sgraph_export.$O + $(SRC_DIR)/ortools/util/graph_export.cc \ + $(SRC_DIR)/ortools/util/graph_export.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sgraph_export.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sgraph_export.$O $(OBJ_DIR)/util/piecewise_linear_function.$O: \ - $(SRC_DIR)/util/piecewise_linear_function.cc \ - $(SRC_DIR)/util/piecewise_linear_function.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/piecewise_linear_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Spiecewise_linear_function.$O + $(SRC_DIR)/ortools/util/piecewise_linear_function.cc \ + $(SRC_DIR)/ortools/util/piecewise_linear_function.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Spiecewise_linear_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Spiecewise_linear_function.$O $(OBJ_DIR)/util/proto_tools.$O: \ - $(SRC_DIR)/util/proto_tools.cc \ - $(SRC_DIR)/util/proto_tools.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/proto_tools.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sproto_tools.$O + $(SRC_DIR)/ortools/util/proto_tools.cc \ + $(SRC_DIR)/ortools/util/proto_tools.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sproto_tools.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sproto_tools.$O $(OBJ_DIR)/util/range_query_function.$O: \ - $(SRC_DIR)/util/range_query_function.cc \ - $(SRC_DIR)/util/range_minimum_query.h \ - $(SRC_DIR)/util/range_query_function.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/range_query_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srange_query_function.$O + $(SRC_DIR)/ortools/util/range_query_function.cc \ + $(SRC_DIR)/ortools/util/range_minimum_query.h \ + $(SRC_DIR)/ortools/util/range_query_function.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Srange_query_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srange_query_function.$O $(OBJ_DIR)/util/rational_approximation.$O: \ - $(SRC_DIR)/util/rational_approximation.cc \ - $(SRC_DIR)/util/rational_approximation.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/rational_approximation.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srational_approximation.$O + $(SRC_DIR)/ortools/util/rational_approximation.cc \ + $(SRC_DIR)/ortools/util/rational_approximation.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Srational_approximation.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srational_approximation.$O $(OBJ_DIR)/util/rcpsp_parser.$O: \ - $(SRC_DIR)/util/rcpsp_parser.cc \ - $(SRC_DIR)/util/filelineiter.h \ - $(SRC_DIR)/util/rcpsp_parser.h \ - $(SRC_DIR)/base/numbers.h \ - $(SRC_DIR)/base/split.h \ - $(SRC_DIR)/base/stringpiece_utils.h \ - $(SRC_DIR)/base/strtoint.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/rcpsp_parser.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srcpsp_parser.$O + $(SRC_DIR)/ortools/util/rcpsp_parser.cc \ + $(SRC_DIR)/ortools/util/filelineiter.h \ + $(SRC_DIR)/ortools/util/rcpsp_parser.h \ + $(SRC_DIR)/ortools/base/numbers.h \ + $(SRC_DIR)/ortools/base/split.h \ + $(SRC_DIR)/ortools/base/stringpiece_utils.h \ + $(SRC_DIR)/ortools/base/strtoint.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Srcpsp_parser.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srcpsp_parser.$O $(OBJ_DIR)/util/sorted_interval_list.$O: \ - $(SRC_DIR)/util/sorted_interval_list.cc \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/sorted_interval_list.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/sorted_interval_list.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Ssorted_interval_list.$O + $(SRC_DIR)/ortools/util/sorted_interval_list.cc \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Ssorted_interval_list.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Ssorted_interval_list.$O $(OBJ_DIR)/util/stats.$O: \ - $(SRC_DIR)/util/stats.cc \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/base/encodingutils.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/sysinfo.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/stats.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sstats.$O + $(SRC_DIR)/ortools/util/stats.cc \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/base/encodingutils.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/sysinfo.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sstats.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sstats.$O $(OBJ_DIR)/util/time_limit.$O: \ - $(SRC_DIR)/util/time_limit.cc \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/base/join.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/time_limit.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Stime_limit.$O + $(SRC_DIR)/ortools/util/time_limit.cc \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/base/join.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Stime_limit.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Stime_limit.$O $(OBJ_DIR)/util/xml_helper.$O: \ - $(SRC_DIR)/util/xml_helper.cc \ - $(SRC_DIR)/util/xml_helper.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/strutil.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/util/xml_helper.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sxml_helper.$O + $(SRC_DIR)/ortools/util/xml_helper.cc \ + $(SRC_DIR)/ortools/util/xml_helper.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/strutil.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sxml_helper.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sxml_helper.$O LP_DATA_DEPS = \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/lp_data/sparse_vector.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h LP_DATA_LIB_OBJS = \ $(OBJ_DIR)/lp_data/lp_data.$O \ @@ -549,224 +551,224 @@ LP_DATA_LIB_OBJS = \ $(OBJ_DIR)/lp_data/sparse.$O \ $(OBJ_DIR)/lp_data/sparse_column.$O -$(SRC_DIR)/lp_data/lp_data.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/util/fp_utils.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/lp_data/lp_data.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/util/fp_utils.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/lp_data/lp_decomposer.h: \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/base/mutex.h +$(SRC_DIR)/ortools/lp_data/lp_decomposer.h: \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/base/mutex.h -$(SRC_DIR)/lp_data/lp_print_utils.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/stringprintf.h +$(SRC_DIR)/ortools/lp_data/lp_print_utils.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/stringprintf.h -$(SRC_DIR)/lp_data/lp_types.h: \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h +$(SRC_DIR)/ortools/lp_data/lp_types.h: \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h -$(SRC_DIR)/lp_data/lp_utils.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/base/accurate_sum.h +$(SRC_DIR)/ortools/lp_data/lp_utils.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/base/accurate_sum.h -$(SRC_DIR)/lp_data/matrix_scaler.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/lp_data/matrix_scaler.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/lp_data/matrix_utils.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/lp_data/matrix_utils.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/lp_data/mps_reader.h: \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h +$(SRC_DIR)/ortools/lp_data/mps_reader.h: \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h -$(SRC_DIR)/lp_data/permutation.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/util/return_macros.h +$(SRC_DIR)/ortools/lp_data/permutation.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/util/return_macros.h -$(SRC_DIR)/lp_data/proto_utils.h: \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h +$(SRC_DIR)/ortools/lp_data/proto_utils.h: \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h -$(SRC_DIR)/lp_data/sparse_column.h: \ - $(SRC_DIR)/lp_data/sparse_vector.h +$(SRC_DIR)/ortools/lp_data/sparse_column.h: \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h -$(SRC_DIR)/lp_data/sparse.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/util/return_macros.h \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/lp_data/sparse.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/util/return_macros.h \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/lp_data/sparse_row.h: \ - $(SRC_DIR)/lp_data/sparse_vector.h +$(SRC_DIR)/ortools/lp_data/sparse_row.h: \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h -$(SRC_DIR)/lp_data/sparse_vector.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/util/return_macros.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h +$(SRC_DIR)/ortools/lp_data/sparse_vector.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/util/return_macros.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h $(OBJ_DIR)/lp_data/lp_data.$O: \ - $(SRC_DIR)/lp_data/lp_data.cc \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/matrix_utils.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/lp_data.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_data.$O + $(SRC_DIR)/ortools/lp_data/lp_data.cc \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/matrix_utils.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_data.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_data.$O $(OBJ_DIR)/lp_data/lp_decomposer.$O: \ - $(SRC_DIR)/lp_data/lp_decomposer.cc \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_decomposer.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/algorithms/dynamic_partition.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/lp_decomposer.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_decomposer.$O + $(SRC_DIR)/ortools/lp_data/lp_decomposer.cc \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_decomposer.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_decomposer.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_decomposer.$O $(OBJ_DIR)/lp_data/lp_print_utils.$O: \ - $(SRC_DIR)/lp_data/lp_print_utils.cc \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/util/rational_approximation.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/lp_print_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_print_utils.$O + $(SRC_DIR)/ortools/lp_data/lp_print_utils.cc \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/util/rational_approximation.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_print_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_print_utils.$O $(OBJ_DIR)/lp_data/lp_types.$O: \ - $(SRC_DIR)/lp_data/lp_types.cc \ - $(SRC_DIR)/lp_data/lp_types.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/lp_types.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_types.$O + $(SRC_DIR)/ortools/lp_data/lp_types.cc \ + $(SRC_DIR)/ortools/lp_data/lp_types.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_types.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_types.$O $(OBJ_DIR)/lp_data/lp_utils.$O: \ - $(SRC_DIR)/lp_data/lp_utils.cc \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/lp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_utils.$O + $(SRC_DIR)/ortools/lp_data/lp_utils.cc \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_utils.$O $(OBJ_DIR)/lp_data/matrix_scaler.$O: \ - $(SRC_DIR)/lp_data/matrix_scaler.cc \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/matrix_scaler.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_scaler.$O + $(SRC_DIR)/ortools/lp_data/matrix_scaler.cc \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smatrix_scaler.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_scaler.$O $(OBJ_DIR)/lp_data/matrix_utils.$O: \ - $(SRC_DIR)/lp_data/matrix_utils.cc \ - $(SRC_DIR)/lp_data/matrix_utils.h \ - $(SRC_DIR)/base/hash.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/matrix_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_utils.$O + $(SRC_DIR)/ortools/lp_data/matrix_utils.cc \ + $(SRC_DIR)/ortools/lp_data/matrix_utils.h \ + $(SRC_DIR)/ortools/base/hash.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smatrix_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_utils.$O $(OBJ_DIR)/lp_data/mps_reader.$O: \ - $(SRC_DIR)/lp_data/mps_reader.cc \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/lp_data/mps_reader.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/filelinereader.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/numbers.h \ - $(SRC_DIR)/base/split.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/strutil.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/mps_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smps_reader.$O + $(SRC_DIR)/ortools/lp_data/mps_reader.cc \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/lp_data/mps_reader.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/filelinereader.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/numbers.h \ + $(SRC_DIR)/ortools/base/split.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/strutil.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smps_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smps_reader.$O $(OBJ_DIR)/lp_data/proto_utils.$O: \ - $(SRC_DIR)/lp_data/proto_utils.cc \ - $(SRC_DIR)/lp_data/proto_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/proto_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Sproto_utils.$O + $(SRC_DIR)/ortools/lp_data/proto_utils.cc \ + $(SRC_DIR)/ortools/lp_data/proto_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Sproto_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Sproto_utils.$O $(OBJ_DIR)/lp_data/sparse.$O: \ - $(SRC_DIR)/lp_data/sparse.cc \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/sparse.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse.$O + $(SRC_DIR)/ortools/lp_data/sparse.cc \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Ssparse.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse.$O $(OBJ_DIR)/lp_data/sparse_column.$O: \ - $(SRC_DIR)/lp_data/sparse_column.cc \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/sparse_column.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse_column.$O + $(SRC_DIR)/ortools/lp_data/sparse_column.cc \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Ssparse_column.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse_column.$O GLOP_DEPS = \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/glop/entering_variable.h \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(SRC_DIR)/glop/markowitz.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/rank_one_update.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/lp_data/sparse_vector.h \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/rank_one_update.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h GLOP_LIB_OBJS = \ $(OBJ_DIR)/glop/basis_representation.$O \ @@ -786,298 +788,298 @@ GLOP_LIB_OBJS = \ $(OBJ_DIR)/glop/variable_values.$O \ $(OBJ_DIR)/glop/parameters.pb.$O -$(SRC_DIR)/glop/basis_representation.h: \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/rank_one_update.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/basis_representation.h: \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/rank_one_update.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/dual_edge_norms.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/dual_edge_norms.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/entering_variable.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/entering_variable.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/initial_basis.h: \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/initial_basis.h: \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/lp_solver.h: \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/lp_solver.h: \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/lu_factorization.h: \ - $(SRC_DIR)/glop/markowitz.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/lu_factorization.h: \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/markowitz.h: \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/markowitz.h: \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/preprocessor.h: \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h +$(SRC_DIR)/ortools/glop/preprocessor.h: \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h -$(SRC_DIR)/glop/primal_edge_norms.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/primal_edge_norms.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/rank_one_update.h: \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/rank_one_update.h: \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/reduced_costs.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/reduced_costs.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/revised_simplex.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/glop/entering_variable.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/sparse_row.h +$(SRC_DIR)/ortools/glop/revised_simplex.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/sparse_row.h -$(SRC_DIR)/glop/status.h: \ - $(SRC_DIR)/base/port.h +$(SRC_DIR)/ortools/glop/status.h: \ + $(SRC_DIR)/ortools/base/port.h -$(SRC_DIR)/glop/update_row.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/update_row.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/glop/variables_info.h: \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/sparse.h +$(SRC_DIR)/ortools/glop/variables_info.h: \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h -$(SRC_DIR)/glop/variable_values.h: \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/glop/variable_values.h: \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h $(OBJ_DIR)/glop/basis_representation.$O: \ - $(SRC_DIR)/glop/basis_representation.cc \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/basis_representation.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sbasis_representation.$O + $(SRC_DIR)/ortools/glop/basis_representation.cc \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sbasis_representation.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sbasis_representation.$O $(OBJ_DIR)/glop/dual_edge_norms.$O: \ - $(SRC_DIR)/glop/dual_edge_norms.cc \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/dual_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sdual_edge_norms.$O + $(SRC_DIR)/ortools/glop/dual_edge_norms.cc \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sdual_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sdual_edge_norms.$O $(OBJ_DIR)/glop/entering_variable.$O: \ - $(SRC_DIR)/glop/entering_variable.cc \ - $(SRC_DIR)/glop/entering_variable.h \ - $(SRC_DIR)/base/numbers.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/entering_variable.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sentering_variable.$O + $(SRC_DIR)/ortools/glop/entering_variable.cc \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(SRC_DIR)/ortools/base/numbers.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sentering_variable.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sentering_variable.$O $(OBJ_DIR)/glop/initial_basis.$O: \ - $(SRC_DIR)/glop/initial_basis.cc \ - $(SRC_DIR)/glop/initial_basis.h \ - $(SRC_DIR)/glop/markowitz.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/initial_basis.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sinitial_basis.$O + $(SRC_DIR)/ortools/glop/initial_basis.cc \ + $(SRC_DIR)/ortools/glop/initial_basis.h \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sinitial_basis.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sinitial_basis.$O $(OBJ_DIR)/glop/lp_solver.$O: \ - $(SRC_DIR)/glop/lp_solver.cc \ - $(SRC_DIR)/glop/lp_solver.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/util/fp_utils.h \ - $(SRC_DIR)/util/proto_tools.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/strutil.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/proto_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/lp_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slp_solver.$O + $(SRC_DIR)/ortools/glop/lp_solver.cc \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/util/fp_utils.h \ + $(SRC_DIR)/ortools/util/proto_tools.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/strutil.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/proto_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Slp_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slp_solver.$O $(OBJ_DIR)/glop/lu_factorization.$O: \ - $(SRC_DIR)/glop/lu_factorization.cc \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/lu_factorization.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slu_factorization.$O + $(SRC_DIR)/ortools/glop/lu_factorization.cc \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Slu_factorization.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slu_factorization.$O $(OBJ_DIR)/glop/markowitz.$O: \ - $(SRC_DIR)/glop/markowitz.cc \ - $(SRC_DIR)/glop/markowitz.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/markowitz.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Smarkowitz.$O + $(SRC_DIR)/ortools/glop/markowitz.cc \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Smarkowitz.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Smarkowitz.$O $(OBJ_DIR)/glop/preprocessor.$O: \ - $(SRC_DIR)/glop/preprocessor.cc \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/matrix_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/preprocessor.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Spreprocessor.$O + $(SRC_DIR)/ortools/glop/preprocessor.cc \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/matrix_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Spreprocessor.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Spreprocessor.$O $(OBJ_DIR)/glop/primal_edge_norms.$O: \ - $(SRC_DIR)/glop/primal_edge_norms.cc \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/primal_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sprimal_edge_norms.$O + $(SRC_DIR)/ortools/glop/primal_edge_norms.cc \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sprimal_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sprimal_edge_norms.$O $(OBJ_DIR)/glop/reduced_costs.$O: \ - $(SRC_DIR)/glop/reduced_costs.cc \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/reduced_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sreduced_costs.$O + $(SRC_DIR)/ortools/glop/reduced_costs.cc \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sreduced_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sreduced_costs.$O $(OBJ_DIR)/glop/revised_simplex.$O: \ - $(SRC_DIR)/glop/revised_simplex.cc \ - $(SRC_DIR)/glop/initial_basis.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/util/fp_utils.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/lp_data/lp_utils.h \ - $(SRC_DIR)/lp_data/matrix_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/revised_simplex.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Srevised_simplex.$O + $(SRC_DIR)/ortools/glop/revised_simplex.cc \ + $(SRC_DIR)/ortools/glop/initial_basis.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/util/fp_utils.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h \ + $(SRC_DIR)/ortools/lp_data/matrix_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Srevised_simplex.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Srevised_simplex.$O $(OBJ_DIR)/glop/status.$O: \ - $(SRC_DIR)/glop/status.cc \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/status.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sstatus.$O + $(SRC_DIR)/ortools/glop/status.cc \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sstatus.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sstatus.$O $(OBJ_DIR)/glop/update_row.$O: \ - $(SRC_DIR)/glop/update_row.cc \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/update_row.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Supdate_row.$O + $(SRC_DIR)/ortools/glop/update_row.cc \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Supdate_row.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Supdate_row.$O $(OBJ_DIR)/glop/variables_info.$O: \ - $(SRC_DIR)/glop/variables_info.cc \ - $(SRC_DIR)/glop/variables_info.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/variables_info.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariables_info.$O + $(SRC_DIR)/ortools/glop/variables_info.cc \ + $(SRC_DIR)/ortools/glop/variables_info.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Svariables_info.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariables_info.$O $(OBJ_DIR)/glop/variable_values.$O: \ - $(SRC_DIR)/glop/variable_values.cc \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/lp_data/lp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/variable_values.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariable_values.$O + $(SRC_DIR)/ortools/glop/variable_values.cc \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/lp_data/lp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Svariable_values.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariable_values.$O -$(GEN_DIR)/glop/parameters.pb.cc: $(SRC_DIR)/glop/parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/glop/parameters.proto +$(GEN_DIR)/ortools/glop/parameters.pb.cc: $(SRC_DIR)/ortools/glop/parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/glop/parameters.proto -$(GEN_DIR)/glop/parameters.pb.h: $(GEN_DIR)/glop/parameters.pb.cc +$(GEN_DIR)/ortools/glop/parameters.pb.h: $(GEN_DIR)/ortools/glop/parameters.pb.cc -$(OBJ_DIR)/glop/parameters.pb.$O: $(GEN_DIR)/glop/parameters.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/glop/parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sparameters.pb.$O +$(OBJ_DIR)/glop/parameters.pb.$O: $(GEN_DIR)/ortools/glop/parameters.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/glop/parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sparameters.pb.$O GRAPH_DEPS = \ - $(SRC_DIR)/graph/christofides.h \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/eulerian_path.h \ - $(GEN_DIR)/graph/flow_problem.pb.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h + $(SRC_DIR)/ortools/graph/christofides.h \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/eulerian_path.h \ + $(GEN_DIR)/ortools/graph/flow_problem.pb.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h GRAPH_LIB_OBJS = \ $(OBJ_DIR)/graph/assignment.$O \ @@ -1092,230 +1094,233 @@ GRAPH_LIB_OBJS = \ $(OBJ_DIR)/graph/util.$O \ $(OBJ_DIR)/graph/flow_problem.pb.$O -$(SRC_DIR)/graph/assignment.h: \ - $(SRC_DIR)/graph/ebert_graph.h +$(SRC_DIR)/ortools/graph/assignment.h: \ + $(SRC_DIR)/ortools/graph/ebert_graph.h -$(SRC_DIR)/graph/christofides.h: \ - $(SRC_DIR)/graph/eulerian_path.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/graph/christofides.h: \ + $(SRC_DIR)/ortools/graph/eulerian_path.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/graph/cliques.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/time_limit.h +$(SRC_DIR)/ortools/graph/cliques.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/util/time_limit.h -$(SRC_DIR)/graph/connectivity.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/graph/connectivity.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/graph/ebert_graph.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/permutation.h \ - $(SRC_DIR)/util/zvector.h +$(SRC_DIR)/ortools/graph/ebert_graph.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/permutation.h \ + $(SRC_DIR)/ortools/util/zvector.h -$(SRC_DIR)/graph/eulerian_path.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/graph/eulerian_path.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/graph/graph.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/port.h \ - $(SRC_DIR)/util/iterators.h +$(SRC_DIR)/ortools/graph/graph.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/port.h \ + $(SRC_DIR)/ortools/util/iterators.h -$(SRC_DIR)/graph/graphs.h: \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/graph.h +$(SRC_DIR)/ortools/graph/graphs.h: \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/graph.h -$(SRC_DIR)/graph/hamiltonian_path.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/vector_or_function.h +$(SRC_DIR)/ortools/graph/hamiltonian_path.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/vector_or_function.h -$(SRC_DIR)/graph/io.h: \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/numbers.h \ - $(SRC_DIR)/base/split.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/statusor.h \ - $(SRC_DIR)/util/filelineiter.h +$(SRC_DIR)/ortools/graph/io.h: \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/numbers.h \ + $(SRC_DIR)/ortools/base/split.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/statusor.h \ + $(SRC_DIR)/ortools/util/filelineiter.h -$(SRC_DIR)/graph/linear_assignment.h: \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/permutation.h \ - $(SRC_DIR)/util/zvector.h +$(SRC_DIR)/ortools/graph/linear_assignment.h: \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/permutation.h \ + $(SRC_DIR)/ortools/util/zvector.h -$(SRC_DIR)/graph/max_flow.h: \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(GEN_DIR)/graph/flow_problem.pb.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/zvector.h +$(SRC_DIR)/ortools/graph/max_flow.h: \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(GEN_DIR)/ortools/graph/flow_problem.pb.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/zvector.h -$(SRC_DIR)/graph/min_cost_flow.h: \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/zvector.h +$(SRC_DIR)/ortools/graph/min_cost_flow.h: \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/zvector.h -$(SRC_DIR)/graph/minimum_spanning_tree.h: \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/adjustable_priority_queue-inl.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/util/vector_or_function.h +$(SRC_DIR)/ortools/graph/minimum_spanning_tree.h: \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue-inl.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/util/vector_or_function.h -$(SRC_DIR)/graph/one_tree_lower_bound.h: \ - $(SRC_DIR)/graph/christofides.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/base/integral_types.h +$(SRC_DIR)/ortools/graph/one_tree_lower_bound.h: \ + $(SRC_DIR)/ortools/graph/christofides.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/base/integral_types.h -$(SRC_DIR)/graph/shortestpaths.h: \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/graph/shortestpaths.h: \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/graph/util.h: \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/map_util.h +$(SRC_DIR)/ortools/graph/util.h: \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/map_util.h $(OBJ_DIR)/graph/assignment.$O: \ - $(SRC_DIR)/graph/assignment.cc \ - $(SRC_DIR)/graph/assignment.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/linear_assignment.h \ - $(SRC_DIR)/base/commandlineflags.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/assignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sassignment.$O + $(SRC_DIR)/ortools/graph/assignment.cc \ + $(SRC_DIR)/ortools/graph/assignment.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/linear_assignment.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sassignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sassignment.$O $(OBJ_DIR)/graph/astar.$O: \ - $(SRC_DIR)/graph/astar.cc \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/astar.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sastar.$O + $(SRC_DIR)/ortools/graph/astar.cc \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sastar.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sastar.$O $(OBJ_DIR)/graph/bellman_ford.$O: \ - $(SRC_DIR)/graph/bellman_ford.cc \ - $(SRC_DIR)/base/integral_types.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/bellman_ford.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sbellman_ford.$O + $(SRC_DIR)/ortools/graph/bellman_ford.cc \ + $(SRC_DIR)/ortools/base/integral_types.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sbellman_ford.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sbellman_ford.$O $(OBJ_DIR)/graph/cliques.$O: \ - $(SRC_DIR)/graph/cliques.cc \ - $(SRC_DIR)/graph/cliques.h \ - $(SRC_DIR)/base/hash.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/cliques.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Scliques.$O + $(SRC_DIR)/ortools/graph/cliques.cc \ + $(SRC_DIR)/ortools/graph/cliques.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/hash.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Scliques.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Scliques.$O $(OBJ_DIR)/graph/dijkstra.$O: \ - $(SRC_DIR)/graph/dijkstra.cc \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/dijkstra.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sdijkstra.$O + $(SRC_DIR)/ortools/graph/dijkstra.cc \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sdijkstra.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sdijkstra.$O $(OBJ_DIR)/graph/linear_assignment.$O: \ - $(SRC_DIR)/graph/linear_assignment.cc \ - $(SRC_DIR)/graph/linear_assignment.h \ - $(SRC_DIR)/base/commandlineflags.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/linear_assignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Slinear_assignment.$O + $(SRC_DIR)/ortools/graph/linear_assignment.cc \ + $(SRC_DIR)/ortools/graph/linear_assignment.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Slinear_assignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Slinear_assignment.$O $(OBJ_DIR)/graph/max_flow.$O: \ - $(SRC_DIR)/graph/max_flow.cc \ - $(SRC_DIR)/graph/graphs.h \ - $(SRC_DIR)/graph/max_flow.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/max_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smax_flow.$O + $(SRC_DIR)/ortools/graph/max_flow.cc \ + $(SRC_DIR)/ortools/graph/graphs.h \ + $(SRC_DIR)/ortools/graph/max_flow.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Smax_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smax_flow.$O $(OBJ_DIR)/graph/min_cost_flow.$O: \ - $(SRC_DIR)/graph/min_cost_flow.cc \ - $(SRC_DIR)/graph/graphs.h \ - $(SRC_DIR)/graph/max_flow.h \ - $(SRC_DIR)/graph/min_cost_flow.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/mathutil.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/min_cost_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smin_cost_flow.$O + $(SRC_DIR)/ortools/graph/min_cost_flow.cc \ + $(SRC_DIR)/ortools/graph/graphs.h \ + $(SRC_DIR)/ortools/graph/max_flow.h \ + $(SRC_DIR)/ortools/graph/min_cost_flow.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/mathutil.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Smin_cost_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smin_cost_flow.$O $(OBJ_DIR)/graph/shortestpaths.$O: \ - $(SRC_DIR)/graph/shortestpaths.cc \ - $(SRC_DIR)/graph/shortestpaths.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/shortestpaths.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sshortestpaths.$O + $(SRC_DIR)/ortools/graph/shortestpaths.cc \ + $(SRC_DIR)/ortools/graph/shortestpaths.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sshortestpaths.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sshortestpaths.$O $(OBJ_DIR)/graph/util.$O: \ - $(SRC_DIR)/graph/util.cc \ - $(SRC_DIR)/graph/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/util.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sutil.$O + $(SRC_DIR)/ortools/graph/util.cc \ + $(SRC_DIR)/ortools/graph/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sutil.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sutil.$O -$(GEN_DIR)/graph/flow_problem.pb.cc: $(SRC_DIR)/graph/flow_problem.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/graph/flow_problem.proto +$(GEN_DIR)/ortools/graph/flow_problem.pb.cc: $(SRC_DIR)/ortools/graph/flow_problem.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/graph/flow_problem.proto -$(GEN_DIR)/graph/flow_problem.pb.h: $(GEN_DIR)/graph/flow_problem.pb.cc +$(GEN_DIR)/ortools/graph/flow_problem.pb.h: $(GEN_DIR)/ortools/graph/flow_problem.pb.cc -$(OBJ_DIR)/graph/flow_problem.pb.$O: $(GEN_DIR)/graph/flow_problem.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/graph/flow_problem.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sflow_problem.pb.$O +$(OBJ_DIR)/graph/flow_problem.pb.$O: $(GEN_DIR)/ortools/graph/flow_problem.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/graph/flow_problem.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sflow_problem.pb.$O ALGORITHMS_DEPS = \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/graph/christofides.h \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/eulerian_path.h \ - $(GEN_DIR)/graph/flow_problem.pb.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/graph/christofides.h \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/eulerian_path.h \ + $(GEN_DIR)/ortools/graph/flow_problem.pb.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h ALGORITHMS_LIB_OBJS = \ $(OBJ_DIR)/algorithms/dynamic_partition.$O \ @@ -1325,155 +1330,166 @@ ALGORITHMS_LIB_OBJS = \ $(OBJ_DIR)/algorithms/knapsack_solver.$O \ $(OBJ_DIR)/algorithms/sparse_permutation.$O -$(SRC_DIR)/algorithms/dense_doubly_linked_list.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/algorithms/dense_doubly_linked_list.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/algorithms/dynamic_partition.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/algorithms/dynamic_partition.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/algorithms/dynamic_permutation.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/algorithms/dynamic_permutation.h: \ + $(SRC_DIR)/ortools/base/logging.h -$(SRC_DIR)/algorithms/find_graph_symmetries.h: \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/graph/graph.h +$(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h: \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/graph/graph.h -$(SRC_DIR)/algorithms/hungarian.h: \ - $(SRC_DIR)/base/hash.h +$(SRC_DIR)/ortools/algorithms/hungarian.h: \ + $(SRC_DIR)/ortools/base/hash.h -$(SRC_DIR)/algorithms/knapsack_solver.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/time_limit.h +$(SRC_DIR)/ortools/algorithms/knapsack_solver.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/time_limit.h -$(SRC_DIR)/algorithms/sparse_permutation.h: \ - $(SRC_DIR)/base/logging.h +$(SRC_DIR)/ortools/algorithms/sparse_permutation.h: \ + $(SRC_DIR)/ortools/base/logging.h $(OBJ_DIR)/algorithms/dynamic_partition.$O: \ - $(SRC_DIR)/algorithms/dynamic_partition.cc \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/murmur.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/dynamic_partition.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_partition.$O + $(SRC_DIR)/ortools/algorithms/dynamic_partition.cc \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/murmur.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sdynamic_partition.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_partition.$O $(OBJ_DIR)/algorithms/dynamic_permutation.$O: \ - $(SRC_DIR)/algorithms/dynamic_permutation.cc \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/algorithms/sparse_permutation.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/dynamic_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_permutation.$O + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.cc \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/algorithms/sparse_permutation.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sdynamic_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_permutation.$O $(OBJ_DIR)/algorithms/find_graph_symmetries.$O: \ - $(SRC_DIR)/algorithms/find_graph_symmetries.cc \ - $(SRC_DIR)/algorithms/dense_doubly_linked_list.h \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/algorithms/find_graph_symmetries.h \ - $(SRC_DIR)/algorithms/sparse_permutation.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/graph/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/find_graph_symmetries.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sfind_graph_symmetries.$O + $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.cc \ + $(SRC_DIR)/ortools/algorithms/dense_doubly_linked_list.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h \ + $(SRC_DIR)/ortools/algorithms/sparse_permutation.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/graph/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sfind_graph_symmetries.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sfind_graph_symmetries.$O $(OBJ_DIR)/algorithms/hungarian.$O: \ - $(SRC_DIR)/algorithms/hungarian.cc \ - $(SRC_DIR)/algorithms/hungarian.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/hungarian.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Shungarian.$O + $(SRC_DIR)/ortools/algorithms/hungarian.cc \ + $(SRC_DIR)/ortools/algorithms/hungarian.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Shungarian.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Shungarian.$O + +$(OBJ_DIR)/algorithms/hungarian_test.$O: \ + $(SRC_DIR)/ortools/algorithms/hungarian_test.cc \ + $(SRC_DIR)/ortools/algorithms/hungarian.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Shungarian_test.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Shungarian_test.$O $(OBJ_DIR)/algorithms/knapsack_solver.$O: \ - $(SRC_DIR)/algorithms/knapsack_solver.cc \ - $(SRC_DIR)/algorithms/knapsack_solver.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/linear_solver/linear_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/knapsack_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sknapsack_solver.$O + $(SRC_DIR)/ortools/algorithms/knapsack_solver.cc \ + $(SRC_DIR)/ortools/algorithms/knapsack_solver.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sknapsack_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sknapsack_solver.$O $(OBJ_DIR)/algorithms/sparse_permutation.$O: \ - $(SRC_DIR)/algorithms/sparse_permutation.cc \ - $(SRC_DIR)/algorithms/sparse_permutation.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/algorithms/sparse_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Ssparse_permutation.$O + $(SRC_DIR)/ortools/algorithms/sparse_permutation.cc \ + $(SRC_DIR)/ortools/algorithms/sparse_permutation.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Ssparse_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Ssparse_permutation.$O SAT_DEPS = \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/sat/cp_constraints.h \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/sat/integer_expr.h \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/pb_constraint.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/simplification.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/algorithms/dynamic_partition.h \ - $(SRC_DIR)/algorithms/dynamic_permutation.h \ - $(SRC_DIR)/graph/christofides.h \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/eulerian_path.h \ - $(GEN_DIR)/graph/flow_problem.pb.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/lp_data/sparse_vector.h \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/glop/entering_variable.h \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(SRC_DIR)/glop/markowitz.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/rank_one_update.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/sat/cp_constraints.h \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/sat/integer_expr.h \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/pb_constraint.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/simplification.h \ + $(SRC_DIR)/ortools/sat/theta_tree.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \ + $(SRC_DIR)/ortools/graph/christofides.h \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/eulerian_path.h \ + $(GEN_DIR)/ortools/graph/flow_problem.pb.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/rank_one_update.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h SAT_LIB_OBJS = \ $(OBJ_DIR)/sat/boolean_problem.$O \ @@ -1498,468 +1514,479 @@ SAT_LIB_OBJS = \ $(OBJ_DIR)/sat/simplification.$O \ $(OBJ_DIR)/sat/symmetry.$O \ $(OBJ_DIR)/sat/table.$O \ + $(OBJ_DIR)/sat/theta_tree.$O \ $(OBJ_DIR)/sat/timetable.$O \ $(OBJ_DIR)/sat/timetable_edgefinding.$O \ $(OBJ_DIR)/sat/util.$O \ $(OBJ_DIR)/sat/boolean_problem.pb.$O \ $(OBJ_DIR)/sat/sat_parameters.pb.$O -$(SRC_DIR)/sat/boolean_problem.h: \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/simplification.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/algorithms/sparse_permutation.h +$(SRC_DIR)/ortools/sat/boolean_problem.h: \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/simplification.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/algorithms/sparse_permutation.h -$(SRC_DIR)/sat/clause.h: \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/stats.h +$(SRC_DIR)/ortools/sat/clause.h: \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/stats.h -$(SRC_DIR)/sat/cp_constraints.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/util/sorted_interval_list.h +$(SRC_DIR)/ortools/sat/cp_constraints.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h -$(SRC_DIR)/sat/cumulative.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/sat/cumulative.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h -$(SRC_DIR)/sat/disjunctive.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/util/stats.h +$(SRC_DIR)/ortools/sat/disjunctive.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/sat/theta_tree.h \ + $(SRC_DIR)/ortools/util/stats.h -$(SRC_DIR)/sat/drat.h: \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/base/file.h +$(SRC_DIR)/ortools/sat/drat.h: \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/base/file.h -$(SRC_DIR)/sat/encoding.h: \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/sat/encoding.h: \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/sat/flow_costs.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/linear_solver/linear_solver.h +$(SRC_DIR)/ortools/sat/flow_costs.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h -$(SRC_DIR)/sat/integer_expr.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/sat/integer_expr.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h -$(SRC_DIR)/sat/integer.h: \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/port.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/util/rev.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/sorted_interval_list.h +$(SRC_DIR)/ortools/sat/integer.h: \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/port.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/util/rev.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h -$(SRC_DIR)/sat/intervals.h: \ - $(SRC_DIR)/sat/cp_constraints.h \ - $(SRC_DIR)/sat/integer_expr.h \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/sat/intervals.h: \ + $(SRC_DIR)/ortools/sat/cp_constraints.h \ + $(SRC_DIR)/ortools/sat/integer_expr.h \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/sat/linear_programming_constraint.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/glop/revised_simplex.h +$(SRC_DIR)/ortools/sat/linear_programming_constraint.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h -$(SRC_DIR)/sat/lp_utils.h: \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h +$(SRC_DIR)/ortools/sat/lp_utils.h: \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h -$(SRC_DIR)/sat/model.h: \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/typeid.h +$(SRC_DIR)/ortools/sat/model.h: \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/typeid.h -$(SRC_DIR)/sat/no_cycle.h: \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/sat/no_cycle.h: \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/sat/optimization.h: \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/sat/optimization.h: \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/sat/overload_checker.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/sat/overload_checker.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h -$(SRC_DIR)/sat/pb_constraint.h: \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/util/stats.h +$(SRC_DIR)/ortools/sat/pb_constraint.h: \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/util/stats.h -$(SRC_DIR)/sat/precedences.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/util/bitset.h +$(SRC_DIR)/ortools/sat/precedences.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/util/bitset.h -$(SRC_DIR)/sat/sat_base.h: \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h +$(SRC_DIR)/ortools/sat/sat_base.h: \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h -$(SRC_DIR)/sat/sat_solver.h: \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/pb_constraint.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h +$(SRC_DIR)/ortools/sat/sat_solver.h: \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/pb_constraint.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h -$(SRC_DIR)/sat/simplification.h: \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h +$(SRC_DIR)/ortools/sat/simplification.h: \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h -$(SRC_DIR)/sat/symmetry.h: \ - $(SRC_DIR)/sat/sat_base.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/algorithms/sparse_permutation.h +$(SRC_DIR)/ortools/sat/symmetry.h: \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/algorithms/sparse_permutation.h -$(SRC_DIR)/sat/table.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/model.h +$(SRC_DIR)/ortools/sat/table.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/model.h -$(SRC_DIR)/sat/timetable_edgefinding.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/sat/theta_tree.h: \ + $(SRC_DIR)/ortools/sat/integer.h -$(SRC_DIR)/sat/timetable.h: \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/sat/timetable_edgefinding.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h -$(SRC_DIR)/sat/util.h: \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/base/random.h +$(SRC_DIR)/ortools/sat/timetable.h: \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/sat_base.h + +$(SRC_DIR)/ortools/sat/util.h: \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/base/random.h $(OBJ_DIR)/sat/boolean_problem.$O: \ - $(SRC_DIR)/sat/boolean_problem.cc \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/algorithms/find_graph_symmetries.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/graph/io.h \ - $(SRC_DIR)/graph/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/boolean_problem.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sboolean_problem.$O + $(SRC_DIR)/ortools/sat/boolean_problem.cc \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/graph/io.h \ + $(SRC_DIR)/ortools/graph/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sboolean_problem.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sboolean_problem.$O $(OBJ_DIR)/sat/clause.$O: \ - $(SRC_DIR)/sat/clause.cc \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/sysinfo.h \ - $(SRC_DIR)/util/time_limit.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/clause.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sclause.$O + $(SRC_DIR)/ortools/sat/clause.cc \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/sysinfo.h \ + $(SRC_DIR)/ortools/util/time_limit.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sclause.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sclause.$O $(OBJ_DIR)/sat/cp_constraints.$O: \ - $(SRC_DIR)/sat/cp_constraints.cc \ - $(SRC_DIR)/sat/cp_constraints.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/util/sort.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/cp_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_constraints.$O + $(SRC_DIR)/ortools/sat/cp_constraints.cc \ + $(SRC_DIR)/ortools/sat/cp_constraints.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/util/sort.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_constraints.$O $(OBJ_DIR)/sat/cumulative.$O: \ - $(SRC_DIR)/sat/cumulative.cc \ - $(SRC_DIR)/sat/cumulative.h \ - $(SRC_DIR)/sat/disjunctive.h \ - $(SRC_DIR)/sat/overload_checker.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/timetable_edgefinding.h \ - $(SRC_DIR)/sat/timetable.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/cumulative.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scumulative.$O + $(SRC_DIR)/ortools/sat/cumulative.cc \ + $(SRC_DIR)/ortools/sat/cumulative.h \ + $(SRC_DIR)/ortools/sat/disjunctive.h \ + $(SRC_DIR)/ortools/sat/overload_checker.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/timetable_edgefinding.h \ + $(SRC_DIR)/ortools/sat/timetable.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scumulative.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scumulative.$O $(OBJ_DIR)/sat/disjunctive.$O: \ - $(SRC_DIR)/sat/disjunctive.cc \ - $(SRC_DIR)/sat/disjunctive.h \ - $(SRC_DIR)/sat/sat_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/disjunctive.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdisjunctive.$O + $(SRC_DIR)/ortools/sat/disjunctive.cc \ + $(SRC_DIR)/ortools/sat/disjunctive.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdisjunctive.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdisjunctive.$O $(OBJ_DIR)/sat/drat.$O: \ - $(SRC_DIR)/sat/drat.cc \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/base/commandlineflags.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/drat.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat.$O + $(SRC_DIR)/ortools/sat/drat.cc \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdrat.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat.$O $(OBJ_DIR)/sat/encoding.$O: \ - $(SRC_DIR)/sat/encoding.cc \ - $(SRC_DIR)/sat/encoding.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/encoding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sencoding.$O + $(SRC_DIR)/ortools/sat/encoding.cc \ + $(SRC_DIR)/ortools/sat/encoding.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sencoding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sencoding.$O $(OBJ_DIR)/sat/flow_costs.$O: \ - $(SRC_DIR)/sat/flow_costs.cc \ - $(SRC_DIR)/sat/flow_costs.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/flow_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sflow_costs.$O + $(SRC_DIR)/ortools/sat/flow_costs.cc \ + $(SRC_DIR)/ortools/sat/flow_costs.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sflow_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sflow_costs.$O $(OBJ_DIR)/sat/integer.$O: \ - $(SRC_DIR)/sat/integer.cc \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/integer.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger.$O + $(SRC_DIR)/ortools/sat/integer.cc \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger.$O $(OBJ_DIR)/sat/integer_expr.$O: \ - $(SRC_DIR)/sat/integer_expr.cc \ - $(SRC_DIR)/sat/integer_expr.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/integer_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger_expr.$O + $(SRC_DIR)/ortools/sat/integer_expr.cc \ + $(SRC_DIR)/ortools/sat/integer_expr.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger_expr.$O $(OBJ_DIR)/sat/intervals.$O: \ - $(SRC_DIR)/sat/intervals.cc \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/util/sort.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/intervals.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sintervals.$O + $(SRC_DIR)/ortools/sat/intervals.cc \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/util/sort.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sintervals.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sintervals.$O $(OBJ_DIR)/sat/linear_programming_constraint.$O: \ - $(SRC_DIR)/sat/linear_programming_constraint.cc \ - $(SRC_DIR)/sat/linear_programming_constraint.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/util/time_limit.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/linear_programming_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_programming_constraint.$O + $(SRC_DIR)/ortools/sat/linear_programming_constraint.cc \ + $(SRC_DIR)/ortools/sat/linear_programming_constraint.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/util/time_limit.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_programming_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_programming_constraint.$O $(OBJ_DIR)/sat/lp_utils.$O: \ - $(SRC_DIR)/sat/lp_utils.cc \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/lp_utils.h \ - $(SRC_DIR)/util/fp_utils.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/glop/lp_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/lp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slp_utils.$O + $(SRC_DIR)/ortools/sat/lp_utils.cc \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/lp_utils.h \ + $(SRC_DIR)/ortools/util/fp_utils.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slp_utils.$O $(OBJ_DIR)/sat/no_cycle.$O: \ - $(SRC_DIR)/sat/no_cycle.cc \ - $(SRC_DIR)/sat/no_cycle.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/no_cycle.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sno_cycle.$O + $(SRC_DIR)/ortools/sat/no_cycle.cc \ + $(SRC_DIR)/ortools/sat/no_cycle.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sno_cycle.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sno_cycle.$O $(OBJ_DIR)/sat/optimization.$O: \ - $(SRC_DIR)/sat/optimization.cc \ - $(SRC_DIR)/sat/encoding.h \ - $(SRC_DIR)/sat/optimization.h \ - $(SRC_DIR)/sat/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/optimization.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soptimization.$O + $(SRC_DIR)/ortools/sat/optimization.cc \ + $(SRC_DIR)/ortools/sat/encoding.h \ + $(SRC_DIR)/ortools/sat/optimization.h \ + $(SRC_DIR)/ortools/sat/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Soptimization.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soptimization.$O $(OBJ_DIR)/sat/overload_checker.$O: \ - $(SRC_DIR)/sat/overload_checker.cc \ - $(SRC_DIR)/sat/overload_checker.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/util/sort.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/overload_checker.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soverload_checker.$O + $(SRC_DIR)/ortools/sat/overload_checker.cc \ + $(SRC_DIR)/ortools/sat/overload_checker.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/util/sort.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Soverload_checker.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soverload_checker.$O $(OBJ_DIR)/sat/pb_constraint.$O: \ - $(SRC_DIR)/sat/pb_constraint.cc \ - $(SRC_DIR)/sat/pb_constraint.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/util/saturated_arithmetic.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/pb_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spb_constraint.$O + $(SRC_DIR)/ortools/sat/pb_constraint.cc \ + $(SRC_DIR)/ortools/sat/pb_constraint.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spb_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spb_constraint.$O $(OBJ_DIR)/sat/precedences.$O: \ - $(SRC_DIR)/sat/precedences.cc \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/base/cleanup.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/precedences.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sprecedences.$O + $(SRC_DIR)/ortools/sat/precedences.cc \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/base/cleanup.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sprecedences.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sprecedences.$O $(OBJ_DIR)/sat/sat_solver.$O: \ - $(SRC_DIR)/sat/sat_solver.cc \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/split.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/sysinfo.h \ - $(SRC_DIR)/util/saturated_arithmetic.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/sat_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_solver.$O + $(SRC_DIR)/ortools/sat/sat_solver.cc \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/split.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/sysinfo.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssat_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_solver.$O $(OBJ_DIR)/sat/simplification.$O: \ - $(SRC_DIR)/sat/simplification.cc \ - $(SRC_DIR)/sat/simplification.h \ - $(SRC_DIR)/sat/util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/strongly_connected_components.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/algorithms/dynamic_partition.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/simplification.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssimplification.$O + $(SRC_DIR)/ortools/sat/simplification.cc \ + $(SRC_DIR)/ortools/sat/simplification.h \ + $(SRC_DIR)/ortools/sat/util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/strongly_connected_components.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/algorithms/dynamic_partition.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssimplification.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssimplification.$O $(OBJ_DIR)/sat/symmetry.$O: \ - $(SRC_DIR)/sat/symmetry.cc \ - $(SRC_DIR)/sat/symmetry.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/symmetry.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssymmetry.$O + $(SRC_DIR)/ortools/sat/symmetry.cc \ + $(SRC_DIR)/ortools/sat/symmetry.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssymmetry.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssymmetry.$O $(OBJ_DIR)/sat/table.$O: \ - $(SRC_DIR)/sat/table.cc \ - $(SRC_DIR)/sat/table.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/table.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stable.$O + $(SRC_DIR)/ortools/sat/table.cc \ + $(SRC_DIR)/ortools/sat/table.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stable.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stable.$O + +$(OBJ_DIR)/sat/theta_tree.$O: \ + $(SRC_DIR)/ortools/sat/theta_tree.cc \ + $(SRC_DIR)/ortools/sat/theta_tree.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stheta_tree.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stheta_tree.$O $(OBJ_DIR)/sat/timetable.$O: \ - $(SRC_DIR)/sat/timetable.cc \ - $(SRC_DIR)/sat/overload_checker.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/timetable.h \ - $(SRC_DIR)/util/sort.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/timetable.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable.$O + $(SRC_DIR)/ortools/sat/timetable.cc \ + $(SRC_DIR)/ortools/sat/overload_checker.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/timetable.h \ + $(SRC_DIR)/ortools/util/sort.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stimetable.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable.$O $(OBJ_DIR)/sat/timetable_edgefinding.$O: \ - $(SRC_DIR)/sat/timetable_edgefinding.cc \ - $(SRC_DIR)/sat/timetable_edgefinding.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/util/sort.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/timetable_edgefinding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable_edgefinding.$O + $(SRC_DIR)/ortools/sat/timetable_edgefinding.cc \ + $(SRC_DIR)/ortools/sat/timetable_edgefinding.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/util/sort.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stimetable_edgefinding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable_edgefinding.$O $(OBJ_DIR)/sat/util.$O: \ - $(SRC_DIR)/sat/util.cc \ - $(SRC_DIR)/sat/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/sat/util.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sutil.$O + $(SRC_DIR)/ortools/sat/util.cc \ + $(SRC_DIR)/ortools/sat/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sutil.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sutil.$O -$(GEN_DIR)/sat/boolean_problem.pb.cc: $(SRC_DIR)/sat/boolean_problem.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/sat/boolean_problem.proto +$(GEN_DIR)/ortools/sat/boolean_problem.pb.cc: $(SRC_DIR)/ortools/sat/boolean_problem.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/sat/boolean_problem.proto -$(GEN_DIR)/sat/boolean_problem.pb.h: $(GEN_DIR)/sat/boolean_problem.pb.cc +$(GEN_DIR)/ortools/sat/boolean_problem.pb.h: $(GEN_DIR)/ortools/sat/boolean_problem.pb.cc -$(OBJ_DIR)/sat/boolean_problem.pb.$O: $(GEN_DIR)/sat/boolean_problem.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/sat/boolean_problem.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sboolean_problem.pb.$O +$(OBJ_DIR)/sat/boolean_problem.pb.$O: $(GEN_DIR)/ortools/sat/boolean_problem.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/sat/boolean_problem.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sboolean_problem.pb.$O -$(GEN_DIR)/sat/sat_parameters.pb.cc: $(SRC_DIR)/sat/sat_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/sat/sat_parameters.proto +$(GEN_DIR)/ortools/sat/sat_parameters.pb.cc: $(SRC_DIR)/ortools/sat/sat_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/sat/sat_parameters.proto -$(GEN_DIR)/sat/sat_parameters.pb.h: $(GEN_DIR)/sat/sat_parameters.pb.cc +$(GEN_DIR)/ortools/sat/sat_parameters.pb.h: $(GEN_DIR)/ortools/sat/sat_parameters.pb.cc -$(OBJ_DIR)/sat/sat_parameters.pb.$O: $(GEN_DIR)/sat/sat_parameters.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/sat/sat_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_parameters.pb.$O +$(OBJ_DIR)/sat/sat_parameters.pb.$O: $(GEN_DIR)/ortools/sat/sat_parameters.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/sat/sat_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_parameters.pb.$O BOP_DEPS = \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_lns.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/lp_data/sparse_vector.h \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/glop/entering_variable.h \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(SRC_DIR)/glop/markowitz.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/rank_one_update.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/sat/cp_constraints.h \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/sat/integer_expr.h \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/pb_constraint.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/simplification.h + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/rank_one_update.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/sat/cp_constraints.h \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/sat/integer_expr.h \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/pb_constraint.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/simplification.h \ + $(SRC_DIR)/ortools/sat/theta_tree.h BOP_LIB_OBJS = \ $(OBJ_DIR)/bop/bop_base.$O \ @@ -1974,289 +2001,289 @@ BOP_LIB_OBJS = \ $(OBJ_DIR)/bop/integral_solver.$O \ $(OBJ_DIR)/bop/bop_parameters.pb.$O -$(SRC_DIR)/bop/bop_base.h: \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/sat/sat_base.h +$(SRC_DIR)/ortools/bop/bop_base.h: \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/sat/sat_base.h -$(SRC_DIR)/bop/bop_fs.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_fs.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/bop_lns.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_lns.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/bop_ls.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/random.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_ls.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/bop_portfolio.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_lns.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_portfolio.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/bop_solution.h: \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h +$(SRC_DIR)/ortools/bop/bop_solution.h: \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h -$(SRC_DIR)/bop/bop_solver.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/stats.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_solver.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/stats.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/bop_types.h: \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h +$(SRC_DIR)/ortools/bop/bop_types.h: \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h -$(SRC_DIR)/bop/bop_util.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/bop_util.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/complete_optimizer.h: \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/encoding.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/bop/complete_optimizer.h: \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/encoding.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h -$(SRC_DIR)/bop/integral_solver.h: \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/base/port.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/lp_data/lp_data.h +$(SRC_DIR)/ortools/bop/integral_solver.h: \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/base/port.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h $(OBJ_DIR)/bop/bop_base.$O: \ - $(SRC_DIR)/bop/bop_base.cc \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/sat/boolean_problem.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_base.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_base.$O + $(SRC_DIR)/ortools/bop/bop_base.cc \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_base.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_base.$O $(OBJ_DIR)/bop/bop_fs.$O: \ - $(SRC_DIR)/bop/bop_fs.cc \ - $(SRC_DIR)/bop/bop_fs.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/lp_utils.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/symmetry.h \ - $(SRC_DIR)/sat/util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_fs.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_fs.$O + $(SRC_DIR)/ortools/bop/bop_fs.cc \ + $(SRC_DIR)/ortools/bop/bop_fs.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/lp_utils.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/symmetry.h \ + $(SRC_DIR)/ortools/sat/util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_fs.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_fs.$O $(OBJ_DIR)/bop/bop_lns.$O: \ - $(SRC_DIR)/bop/bop_lns.cc \ - $(SRC_DIR)/bop/bop_lns.h \ - $(SRC_DIR)/base/cleanup.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/lp_utils.h \ - $(SRC_DIR)/sat/sat_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_lns.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_lns.$O + $(SRC_DIR)/ortools/bop/bop_lns.cc \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(SRC_DIR)/ortools/base/cleanup.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/lp_utils.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_lns.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_lns.$O $(OBJ_DIR)/bop/bop_ls.$O: \ - $(SRC_DIR)/bop/bop_ls.cc \ - $(SRC_DIR)/bop/bop_ls.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/sat/boolean_problem.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_ls.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_ls.$O + $(SRC_DIR)/ortools/bop/bop_ls.cc \ + $(SRC_DIR)/ortools/bop/bop_ls.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_ls.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_ls.$O $(OBJ_DIR)/bop/bop_portfolio.$O: \ - $(SRC_DIR)/bop/bop_portfolio.cc \ - $(SRC_DIR)/bop/bop_fs.h \ - $(SRC_DIR)/bop/bop_lns.h \ - $(SRC_DIR)/bop/bop_ls.h \ - $(SRC_DIR)/bop/bop_portfolio.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/bop/complete_optimizer.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/symmetry.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_portfolio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_portfolio.$O + $(SRC_DIR)/ortools/bop/bop_portfolio.cc \ + $(SRC_DIR)/ortools/bop/bop_fs.h \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(SRC_DIR)/ortools/bop/bop_ls.h \ + $(SRC_DIR)/ortools/bop/bop_portfolio.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/bop/complete_optimizer.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/symmetry.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_portfolio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_portfolio.$O $(OBJ_DIR)/bop/bop_solution.$O: \ - $(SRC_DIR)/bop/bop_solution.cc \ - $(SRC_DIR)/bop/bop_solution.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_solution.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solution.$O + $(SRC_DIR)/ortools/bop/bop_solution.cc \ + $(SRC_DIR)/ortools/bop/bop_solution.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_solution.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solution.$O $(OBJ_DIR)/bop/bop_solver.$O: \ - $(SRC_DIR)/bop/bop_solver.cc \ - $(SRC_DIR)/bop/bop_fs.h \ - $(SRC_DIR)/bop/bop_lns.h \ - $(SRC_DIR)/bop/bop_ls.h \ - $(SRC_DIR)/bop/bop_portfolio.h \ - $(SRC_DIR)/bop/bop_solver.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/bop/complete_optimizer.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/lp_data/lp_print_utils.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/lp_utils.h \ - $(SRC_DIR)/sat/sat_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solver.$O + $(SRC_DIR)/ortools/bop/bop_solver.cc \ + $(SRC_DIR)/ortools/bop/bop_fs.h \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(SRC_DIR)/ortools/bop/bop_ls.h \ + $(SRC_DIR)/ortools/bop/bop_portfolio.h \ + $(SRC_DIR)/ortools/bop/bop_solver.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/bop/complete_optimizer.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/lp_data/lp_print_utils.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/lp_utils.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solver.$O $(OBJ_DIR)/bop/bop_util.$O: \ - $(SRC_DIR)/bop/bop_util.cc \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/sat_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/bop_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_util.$O + $(SRC_DIR)/ortools/bop/bop_util.cc \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_util.$O $(OBJ_DIR)/bop/complete_optimizer.$O: \ - $(SRC_DIR)/bop/complete_optimizer.cc \ - $(SRC_DIR)/bop/bop_util.h \ - $(SRC_DIR)/bop/complete_optimizer.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(SRC_DIR)/sat/optimization.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/complete_optimizer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Scomplete_optimizer.$O + $(SRC_DIR)/ortools/bop/complete_optimizer.cc \ + $(SRC_DIR)/ortools/bop/bop_util.h \ + $(SRC_DIR)/ortools/bop/complete_optimizer.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(SRC_DIR)/ortools/sat/optimization.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Scomplete_optimizer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Scomplete_optimizer.$O $(OBJ_DIR)/bop/integral_solver.$O: \ - $(SRC_DIR)/bop/integral_solver.cc \ - $(SRC_DIR)/bop/bop_solver.h \ - $(SRC_DIR)/bop/integral_solver.h \ - $(SRC_DIR)/lp_data/lp_decomposer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/bop/integral_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sintegral_solver.$O + $(SRC_DIR)/ortools/bop/integral_solver.cc \ + $(SRC_DIR)/ortools/bop/bop_solver.h \ + $(SRC_DIR)/ortools/bop/integral_solver.h \ + $(SRC_DIR)/ortools/lp_data/lp_decomposer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sintegral_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sintegral_solver.$O -$(GEN_DIR)/bop/bop_parameters.pb.cc: $(SRC_DIR)/bop/bop_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/bop/bop_parameters.proto +$(GEN_DIR)/ortools/bop/bop_parameters.pb.cc: $(SRC_DIR)/ortools/bop/bop_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/bop/bop_parameters.proto -$(GEN_DIR)/bop/bop_parameters.pb.h: $(GEN_DIR)/bop/bop_parameters.pb.cc +$(GEN_DIR)/ortools/bop/bop_parameters.pb.h: $(GEN_DIR)/ortools/bop/bop_parameters.pb.cc -$(OBJ_DIR)/bop/bop_parameters.pb.$O: $(GEN_DIR)/bop/bop_parameters.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/bop/bop_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_parameters.pb.$O +$(OBJ_DIR)/bop/bop_parameters.pb.$O: $(GEN_DIR)/ortools/bop/bop_parameters.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/bop/bop_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_parameters.pb.$O LP_DEPS = \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/lp_data/matrix_scaler.h \ - $(SRC_DIR)/lp_data/permutation.h \ - $(SRC_DIR)/lp_data/sparse_column.h \ - $(SRC_DIR)/lp_data/sparse.h \ - $(SRC_DIR)/lp_data/sparse_vector.h \ - $(SRC_DIR)/glop/basis_representation.h \ - $(SRC_DIR)/glop/dual_edge_norms.h \ - $(SRC_DIR)/glop/entering_variable.h \ - $(SRC_DIR)/glop/lu_factorization.h \ - $(SRC_DIR)/glop/markowitz.h \ - $(GEN_DIR)/glop/parameters.pb.h \ - $(SRC_DIR)/glop/preprocessor.h \ - $(SRC_DIR)/glop/primal_edge_norms.h \ - $(SRC_DIR)/glop/rank_one_update.h \ - $(SRC_DIR)/glop/reduced_costs.h \ - $(SRC_DIR)/glop/revised_simplex.h \ - $(SRC_DIR)/glop/status.h \ - $(SRC_DIR)/glop/update_row.h \ - $(SRC_DIR)/glop/variables_info.h \ - $(SRC_DIR)/glop/variable_values.h \ - $(SRC_DIR)/bop/bop_base.h \ - $(SRC_DIR)/bop/bop_lns.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/bop_solution.h \ - $(SRC_DIR)/bop/bop_types.h \ - $(SRC_DIR)/bop/bop_util.h + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/lp_data/matrix_scaler.h \ + $(SRC_DIR)/ortools/lp_data/permutation.h \ + $(SRC_DIR)/ortools/lp_data/sparse_column.h \ + $(SRC_DIR)/ortools/lp_data/sparse.h \ + $(SRC_DIR)/ortools/lp_data/sparse_vector.h \ + $(SRC_DIR)/ortools/glop/basis_representation.h \ + $(SRC_DIR)/ortools/glop/dual_edge_norms.h \ + $(SRC_DIR)/ortools/glop/entering_variable.h \ + $(SRC_DIR)/ortools/glop/lu_factorization.h \ + $(SRC_DIR)/ortools/glop/markowitz.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h \ + $(SRC_DIR)/ortools/glop/preprocessor.h \ + $(SRC_DIR)/ortools/glop/primal_edge_norms.h \ + $(SRC_DIR)/ortools/glop/rank_one_update.h \ + $(SRC_DIR)/ortools/glop/reduced_costs.h \ + $(SRC_DIR)/ortools/glop/revised_simplex.h \ + $(SRC_DIR)/ortools/glop/status.h \ + $(SRC_DIR)/ortools/glop/update_row.h \ + $(SRC_DIR)/ortools/glop/variables_info.h \ + $(SRC_DIR)/ortools/glop/variable_values.h \ + $(SRC_DIR)/ortools/bop/bop_base.h \ + $(SRC_DIR)/ortools/bop/bop_lns.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/bop_solution.h \ + $(SRC_DIR)/ortools/bop/bop_types.h \ + $(SRC_DIR)/ortools/bop/bop_util.h LP_LIB_OBJS = \ $(OBJ_DIR)/linear_solver/bop_interface.$O \ @@ -2274,235 +2301,236 @@ LP_LIB_OBJS = \ $(OBJ_DIR)/linear_solver/scip_interface.$O \ $(OBJ_DIR)/linear_solver/linear_solver.pb.$O -$(SRC_DIR)/linear_solver/glop_utils.h: \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/lp_data/lp_types.h +$(SRC_DIR)/ortools/linear_solver/glop_utils.h: \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h -$(SRC_DIR)/linear_solver/linear_solver.h: \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/timer.h \ - $(GEN_DIR)/glop/parameters.pb.h +$(SRC_DIR)/ortools/linear_solver/linear_solver.h: \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h -$(SRC_DIR)/linear_solver/model_exporter.h: \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/macros.h +$(SRC_DIR)/ortools/linear_solver/model_exporter.h: \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/macros.h -$(SRC_DIR)/linear_solver/model_validator.h: \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h +$(SRC_DIR)/ortools/linear_solver/model_validator.h: \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h $(OBJ_DIR)/linear_solver/bop_interface.$O: \ - $(SRC_DIR)/linear_solver/bop_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(GEN_DIR)/bop/bop_parameters.pb.h \ - $(SRC_DIR)/bop/integral_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/bop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sbop_interface.$O + $(SRC_DIR)/ortools/linear_solver/bop_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(GEN_DIR)/ortools/bop/bop_parameters.pb.h \ + $(SRC_DIR)/ortools/bop/integral_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sbop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sbop_interface.$O $(OBJ_DIR)/linear_solver/cbc_interface.$O: \ - $(SRC_DIR)/linear_solver/cbc_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/cbc_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scbc_interface.$O + $(SRC_DIR)/ortools/linear_solver/cbc_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Scbc_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scbc_interface.$O $(OBJ_DIR)/linear_solver/clp_interface.$O: \ - $(SRC_DIR)/linear_solver/clp_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/strutil.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/clp_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sclp_interface.$O + $(SRC_DIR)/ortools/linear_solver/clp_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/strutil.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sclp_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sclp_interface.$O $(OBJ_DIR)/linear_solver/cplex_interface.$O: \ - $(SRC_DIR)/linear_solver/cplex_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/cplex_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scplex_interface.$O + $(SRC_DIR)/ortools/linear_solver/cplex_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Scplex_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scplex_interface.$O $(OBJ_DIR)/linear_solver/glop_interface.$O: \ - $(SRC_DIR)/linear_solver/glop_interface.cc \ - $(SRC_DIR)/linear_solver/glop_utils.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/time_limit.h \ - $(SRC_DIR)/lp_data/lp_data.h \ - $(SRC_DIR)/lp_data/lp_types.h \ - $(SRC_DIR)/glop/lp_solver.h \ - $(GEN_DIR)/glop/parameters.pb.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/glop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_interface.$O + $(SRC_DIR)/ortools/linear_solver/glop_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/glop_utils.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/time_limit.h \ + $(SRC_DIR)/ortools/lp_data/lp_data.h \ + $(SRC_DIR)/ortools/lp_data/lp_types.h \ + $(SRC_DIR)/ortools/glop/lp_solver.h \ + $(GEN_DIR)/ortools/glop/parameters.pb.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_interface.$O $(OBJ_DIR)/linear_solver/glop_utils.$O: \ - $(SRC_DIR)/linear_solver/glop_utils.cc \ - $(SRC_DIR)/linear_solver/glop_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/glop_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_utils.$O + $(SRC_DIR)/ortools/linear_solver/glop_utils.cc \ + $(SRC_DIR)/ortools/linear_solver/glop_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglop_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_utils.$O $(OBJ_DIR)/linear_solver/glpk_interface.$O: \ - $(SRC_DIR)/linear_solver/glpk_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/glpk_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglpk_interface.$O + $(SRC_DIR)/ortools/linear_solver/glpk_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglpk_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglpk_interface.$O $(OBJ_DIR)/linear_solver/gurobi_interface.$O: \ - $(SRC_DIR)/linear_solver/gurobi_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/gurobi_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sgurobi_interface.$O + $(SRC_DIR)/ortools/linear_solver/gurobi_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sgurobi_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sgurobi_interface.$O $(OBJ_DIR)/linear_solver/linear_expr.$O: \ - $(SRC_DIR)/linear_solver/linear_expr.cc \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/linear_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_expr.$O + $(SRC_DIR)/ortools/linear_solver/linear_expr.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Slinear_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_expr.$O $(OBJ_DIR)/linear_solver/linear_solver.$O: \ - $(SRC_DIR)/linear_solver/linear_solver.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ - $(SRC_DIR)/linear_solver/model_exporter.h \ - $(SRC_DIR)/linear_solver/model_validator.h \ - $(SRC_DIR)/base/accurate_sum.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/numbers.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/fp_utils.h \ - $(SRC_DIR)/util/proto_tools.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/linear_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver.$O + $(SRC_DIR)/ortools/linear_solver/linear_solver.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/linear_solver/model_exporter.h \ + $(SRC_DIR)/ortools/linear_solver/model_validator.h \ + $(SRC_DIR)/ortools/base/accurate_sum.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/numbers.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/fp_utils.h \ + $(SRC_DIR)/ortools/util/proto_tools.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Slinear_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver.$O $(OBJ_DIR)/linear_solver/model_exporter.$O: \ - $(SRC_DIR)/linear_solver/model_exporter.cc \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ - $(SRC_DIR)/linear_solver/model_exporter.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/strutil.h \ - $(SRC_DIR)/util/fp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/model_exporter.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_exporter.$O + $(SRC_DIR)/ortools/linear_solver/model_exporter.cc \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/linear_solver/model_exporter.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/strutil.h \ + $(SRC_DIR)/ortools/util/fp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Smodel_exporter.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_exporter.$O $(OBJ_DIR)/linear_solver/model_validator.$O: \ - $(SRC_DIR)/linear_solver/model_validator.cc \ - $(SRC_DIR)/linear_solver/model_validator.h \ - $(SRC_DIR)/base/accurate_sum.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/util/fp_utils.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/model_validator.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_validator.$O + $(SRC_DIR)/ortools/linear_solver/model_validator.cc \ + $(SRC_DIR)/ortools/linear_solver/model_validator.h \ + $(SRC_DIR)/ortools/base/accurate_sum.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/util/fp_utils.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Smodel_validator.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_validator.$O $(OBJ_DIR)/linear_solver/scip_interface.$O: \ - $(SRC_DIR)/linear_solver/scip_interface.cc \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/linear_solver/scip_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sscip_interface.$O + $(SRC_DIR)/ortools/linear_solver/scip_interface.cc \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sscip_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sscip_interface.$O -$(GEN_DIR)/linear_solver/linear_solver.pb.cc: $(SRC_DIR)/linear_solver/linear_solver.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/linear_solver/linear_solver.proto +$(GEN_DIR)/ortools/linear_solver/linear_solver.pb.cc: $(SRC_DIR)/ortools/linear_solver/linear_solver.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/linear_solver/linear_solver.proto -$(GEN_DIR)/linear_solver/linear_solver.pb.h: $(GEN_DIR)/linear_solver/linear_solver.pb.cc +$(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h: $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.cc -$(OBJ_DIR)/linear_solver/linear_solver.pb.$O: $(GEN_DIR)/linear_solver/linear_solver.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/linear_solver/linear_solver.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver.pb.$O +$(OBJ_DIR)/linear_solver/linear_solver.pb.$O: $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver.pb.$O CP_DEPS = \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ - $(SRC_DIR)/constraint_solver/routing_types.h \ - $(GEN_DIR)/constraint_solver/solver_parameters.pb.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/basictypes.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/base/time_support.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/running_stat.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/graph/christofides.h \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/eulerian_path.h \ - $(GEN_DIR)/graph/flow_problem.pb.h \ - $(SRC_DIR)/graph/graph.h \ - $(SRC_DIR)/graph/minimum_spanning_tree.h \ - $(SRC_DIR)/linear_solver/linear_expr.h \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ - $(SRC_DIR)/sat/boolean_problem.h \ - $(GEN_DIR)/sat/boolean_problem.pb.h \ - $(SRC_DIR)/sat/clause.h \ - $(SRC_DIR)/sat/cp_constraints.h \ - $(SRC_DIR)/sat/drat.h \ - $(SRC_DIR)/sat/integer_expr.h \ - $(SRC_DIR)/sat/integer.h \ - $(SRC_DIR)/sat/intervals.h \ - $(SRC_DIR)/sat/model.h \ - $(SRC_DIR)/sat/pb_constraint.h \ - $(SRC_DIR)/sat/precedences.h \ - $(SRC_DIR)/sat/sat_base.h \ - $(GEN_DIR)/sat/sat_parameters.pb.h \ - $(SRC_DIR)/sat/sat_solver.h \ - $(SRC_DIR)/sat/simplification.h + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.h \ + $(SRC_DIR)/ortools/constraint_solver/routing_types.h \ + $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/basictypes.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stringpiece.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/base/time_support.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/running_stat.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/graph/christofides.h \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/eulerian_path.h \ + $(GEN_DIR)/ortools/graph/flow_problem.pb.h \ + $(SRC_DIR)/ortools/graph/graph.h \ + $(SRC_DIR)/ortools/graph/minimum_spanning_tree.h \ + $(SRC_DIR)/ortools/linear_solver/linear_expr.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/sat/boolean_problem.h \ + $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \ + $(SRC_DIR)/ortools/sat/clause.h \ + $(SRC_DIR)/ortools/sat/cp_constraints.h \ + $(SRC_DIR)/ortools/sat/drat.h \ + $(SRC_DIR)/ortools/sat/integer_expr.h \ + $(SRC_DIR)/ortools/sat/integer.h \ + $(SRC_DIR)/ortools/sat/intervals.h \ + $(SRC_DIR)/ortools/sat/model.h \ + $(SRC_DIR)/ortools/sat/pb_constraint.h \ + $(SRC_DIR)/ortools/sat/precedences.h \ + $(SRC_DIR)/ortools/sat/sat_base.h \ + $(GEN_DIR)/ortools/sat/sat_parameters.pb.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h \ + $(SRC_DIR)/ortools/sat/simplification.h \ + $(SRC_DIR)/ortools/sat/theta_tree.h CP_LIB_OBJS = \ $(OBJ_DIR)/constraint_solver/ac4_mdd_reset_table.$O \ @@ -2556,675 +2584,679 @@ CP_LIB_OBJS = \ $(OBJ_DIR)/constraint_solver/search_limit.pb.$O \ $(OBJ_DIR)/constraint_solver/solver_parameters.pb.$O -$(SRC_DIR)/constraint_solver/constraint_solver.h: \ - $(GEN_DIR)/constraint_solver/solver_parameters.pb.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/sysinfo.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/sorted_interval_list.h \ - $(SRC_DIR)/util/tuple_set.h +$(SRC_DIR)/ortools/constraint_solver/constraint_solver.h: \ + $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/sysinfo.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/piecewise_linear_function.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h \ + $(SRC_DIR)/ortools/util/tuple_set.h -$(SRC_DIR)/constraint_solver/constraint_solveri.h: \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/sysinfo.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/tuple_set.h \ - $(SRC_DIR)/util/vector_map.h +$(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/sysinfo.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/tuple_set.h \ + $(SRC_DIR)/ortools/util/vector_map.h -$(SRC_DIR)/constraint_solver/hybrid.h: \ - $(SRC_DIR)/constraint_solver/constraint_solver.h +$(SRC_DIR)/ortools/constraint_solver/hybrid.h: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h -$(SRC_DIR)/constraint_solver/routing.h: \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ - $(SRC_DIR)/constraint_solver/routing_types.h \ - $(SRC_DIR)/base/adjustable_priority_queue-inl.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/util/range_query_function.h \ - $(SRC_DIR)/util/sorted_interval_list.h \ - $(SRC_DIR)/graph/graph.h +$(SRC_DIR)/ortools/constraint_solver/routing_flags.h: \ + $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h -$(SRC_DIR)/constraint_solver/routing_flags.h: \ - $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ - $(SRC_DIR)/base/commandlineflags.h +$(SRC_DIR)/ortools/constraint_solver/routing.h: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.h \ + $(SRC_DIR)/ortools/constraint_solver/routing_types.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \ + $(SRC_DIR)/ortools/base/adjustable_priority_queue-inl.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/util/range_query_function.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h \ + $(SRC_DIR)/ortools/graph/graph.h -$(SRC_DIR)/constraint_solver/routing_neighborhoods.h: \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/constraint_solver/routing_types.h +$(SRC_DIR)/ortools/constraint_solver/routing_neighborhoods.h: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/constraint_solver/routing_types.h -$(SRC_DIR)/constraint_solver/routing_types.h: \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h +$(SRC_DIR)/ortools/constraint_solver/routing_types.h: \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h -$(SRC_DIR)/constraint_solver/sat_constraint.h: \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/util/tuple_set.h \ - $(SRC_DIR)/sat/sat_solver.h +$(SRC_DIR)/ortools/constraint_solver/sat_constraint.h: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/util/tuple_set.h \ + $(SRC_DIR)/ortools/sat/sat_solver.h $(OBJ_DIR)/constraint_solver/ac4_mdd_reset_table.$O: \ - $(SRC_DIR)/constraint_solver/ac4_mdd_reset_table.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/vector_map.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/ac4_mdd_reset_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4_mdd_reset_table.$O + $(SRC_DIR)/ortools/constraint_solver/ac4_mdd_reset_table.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/vector_map.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sac4_mdd_reset_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4_mdd_reset_table.$O $(OBJ_DIR)/constraint_solver/ac4r_table.$O: \ - $(SRC_DIR)/constraint_solver/ac4r_table.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/vector_map.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/ac4r_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4r_table.$O + $(SRC_DIR)/ortools/constraint_solver/ac4r_table.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/vector_map.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sac4r_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4r_table.$O $(OBJ_DIR)/constraint_solver/alldiff_cst.$O: \ - $(SRC_DIR)/constraint_solver/alldiff_cst.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/alldiff_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Salldiff_cst.$O + $(SRC_DIR)/ortools/constraint_solver/alldiff_cst.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Salldiff_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Salldiff_cst.$O $(OBJ_DIR)/constraint_solver/assignment.$O: \ - $(SRC_DIR)/constraint_solver/assignment.cc \ - $(GEN_DIR)/constraint_solver/assignment.pb.h \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/recordio.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/assignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.$O + $(SRC_DIR)/ortools/constraint_solver/assignment.cc \ + $(GEN_DIR)/ortools/constraint_solver/assignment.pb.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/recordio.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sassignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.$O $(OBJ_DIR)/constraint_solver/collect_variables.$O: \ - $(SRC_DIR)/constraint_solver/collect_variables.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/collect_variables.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scollect_variables.$O - -$(OBJ_DIR)/constraint_solver/constraint_solver.$O: \ - $(SRC_DIR)/constraint_solver/constraint_solver.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/recordio.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringpiece.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/tuple_set.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/constraint_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraint_solver.$O + $(SRC_DIR)/ortools/constraint_solver/collect_variables.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Scollect_variables.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scollect_variables.$O $(OBJ_DIR)/constraint_solver/constraints.$O: \ - $(SRC_DIR)/constraint_solver/constraints.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O + $(SRC_DIR)/ortools/constraint_solver/constraints.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sconstraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O + +$(OBJ_DIR)/constraint_solver/constraint_solver.$O: \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/recordio.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/tuple_set.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraint_solver.$O $(OBJ_DIR)/constraint_solver/count_cst.$O: \ - $(SRC_DIR)/constraint_solver/count_cst.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/count_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scount_cst.$O + $(SRC_DIR)/ortools/constraint_solver/count_cst.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Scount_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scount_cst.$O $(OBJ_DIR)/constraint_solver/default_search.$O: \ - $(SRC_DIR)/constraint_solver/default_search.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/cached_log.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/default_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdefault_search.$O + $(SRC_DIR)/ortools/constraint_solver/default_search.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/cached_log.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdefault_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdefault_search.$O $(OBJ_DIR)/constraint_solver/demon_profiler.$O: \ - $(SRC_DIR)/constraint_solver/demon_profiler.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/demon_profiler.pb.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/status.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/demon_profiler.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdemon_profiler.$O + $(SRC_DIR)/ortools/constraint_solver/demon_profiler.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/status.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdemon_profiler.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdemon_profiler.$O $(OBJ_DIR)/constraint_solver/deviation.$O: \ - $(SRC_DIR)/constraint_solver/deviation.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/mathutil.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/deviation.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdeviation.$O + $(SRC_DIR)/ortools/constraint_solver/deviation.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/mathutil.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdeviation.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdeviation.$O $(OBJ_DIR)/constraint_solver/diffn.$O: \ - $(SRC_DIR)/constraint_solver/diffn.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/diffn.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdiffn.$O + $(SRC_DIR)/ortools/constraint_solver/diffn.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdiffn.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdiffn.$O $(OBJ_DIR)/constraint_solver/element.$O: \ - $(SRC_DIR)/constraint_solver/element.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/iterators.h \ - $(SRC_DIR)/util/range_minimum_query.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/element.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Selement.$O + $(SRC_DIR)/ortools/constraint_solver/element.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/iterators.h \ + $(SRC_DIR)/ortools/util/range_minimum_query.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Selement.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Selement.$O $(OBJ_DIR)/constraint_solver/expr_array.$O: \ - $(SRC_DIR)/constraint_solver/expr_array.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/mathutil.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/expr_array.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_array.$O + $(SRC_DIR)/ortools/constraint_solver/expr_array.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/mathutil.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpr_array.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_array.$O $(OBJ_DIR)/constraint_solver/expr_cst.$O: \ - $(SRC_DIR)/constraint_solver/expr_cst.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/sorted_interval_list.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/expr_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_cst.$O + $(SRC_DIR)/ortools/constraint_solver/expr_cst.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/sorted_interval_list.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpr_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_cst.$O $(OBJ_DIR)/constraint_solver/expressions.$O: \ - $(SRC_DIR)/constraint_solver/expressions.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/mathutil.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/expressions.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpressions.$O + $(SRC_DIR)/ortools/constraint_solver/expressions.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/mathutil.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpressions.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpressions.$O $(OBJ_DIR)/constraint_solver/gcc.$O: \ - $(SRC_DIR)/constraint_solver/gcc.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ - $(SRC_DIR)/base/int_type_indexed_vector.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/vector_map.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/gcc.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgcc.$O + $(SRC_DIR)/ortools/constraint_solver/gcc.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/int_type.h \ + $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/vector_map.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sgcc.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgcc.$O $(OBJ_DIR)/constraint_solver/graph_constraints.$O: \ - $(SRC_DIR)/constraint_solver/graph_constraints.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/graph_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgraph_constraints.$O + $(SRC_DIR)/ortools/constraint_solver/graph_constraints.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sgraph_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgraph_constraints.$O $(OBJ_DIR)/constraint_solver/hybrid.$O: \ - $(SRC_DIR)/constraint_solver/hybrid.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/constraint_solver/hybrid.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/string_array.h \ - $(SRC_DIR)/linear_solver/linear_solver.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/hybrid.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Shybrid.$O + $(SRC_DIR)/ortools/constraint_solver/hybrid.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/constraint_solver/hybrid.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/string_array.h \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Shybrid.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Shybrid.$O $(OBJ_DIR)/constraint_solver/interval.$O: \ - $(SRC_DIR)/constraint_solver/interval.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/saturated_arithmetic.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/interval.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sinterval.$O + $(SRC_DIR)/ortools/constraint_solver/interval.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sinterval.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sinterval.$O $(OBJ_DIR)/constraint_solver/io.$O: \ - $(SRC_DIR)/constraint_solver/io.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(GEN_DIR)/constraint_solver/search_limit.pb.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/util/tuple_set.h \ - $(SRC_DIR)/util/vector_map.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/io.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sio.$O + $(SRC_DIR)/ortools/constraint_solver/io.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/util/tuple_set.h \ + $(SRC_DIR)/ortools/util/vector_map.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sio.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sio.$O $(OBJ_DIR)/constraint_solver/local_search.$O: \ - $(SRC_DIR)/constraint_solver/local_search.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/graph/hamiltonian_path.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/local_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Slocal_search.$O + $(SRC_DIR)/ortools/constraint_solver/local_search.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/graph/hamiltonian_path.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Slocal_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Slocal_search.$O $(OBJ_DIR)/constraint_solver/model_cache.$O: \ - $(SRC_DIR)/constraint_solver/model_cache.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/model_cache.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Smodel_cache.$O + $(SRC_DIR)/ortools/constraint_solver/model_cache.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Smodel_cache.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Smodel_cache.$O $(OBJ_DIR)/constraint_solver/nogoods.$O: \ - $(SRC_DIR)/constraint_solver/nogoods.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/nogoods.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Snogoods.$O + $(SRC_DIR)/ortools/constraint_solver/nogoods.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Snogoods.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Snogoods.$O $(OBJ_DIR)/constraint_solver/pack.$O: \ - $(SRC_DIR)/constraint_solver/pack.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/pack.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Spack.$O + $(SRC_DIR)/ortools/constraint_solver/pack.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Spack.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Spack.$O $(OBJ_DIR)/constraint_solver/range_cst.$O: \ - $(SRC_DIR)/constraint_solver/range_cst.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/logging.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/range_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srange_cst.$O + $(SRC_DIR)/ortools/constraint_solver/range_cst.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/logging.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srange_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srange_cst.$O $(OBJ_DIR)/constraint_solver/resource.$O: \ - $(SRC_DIR)/constraint_solver/resource.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/mathutil.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/monoid_operation_tree.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/resource.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sresource.$O + $(SRC_DIR)/ortools/constraint_solver/resource.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/mathutil.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/monoid_operation_tree.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sresource.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sresource.$O $(OBJ_DIR)/constraint_solver/routing.$O: \ - $(SRC_DIR)/constraint_solver/routing.cc \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(SRC_DIR)/constraint_solver/routing.h \ - $(SRC_DIR)/constraint_solver/routing_neighborhoods.h \ - $(SRC_DIR)/base/callback.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/thorough_hash.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/graph/connectivity.h \ - $(SRC_DIR)/graph/linear_assignment.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/routing.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting.$O + $(SRC_DIR)/ortools/constraint_solver/routing.cc \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.h \ + $(SRC_DIR)/ortools/constraint_solver/routing.h \ + $(SRC_DIR)/ortools/constraint_solver/routing_neighborhoods.h \ + $(SRC_DIR)/ortools/base/callback.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/thorough_hash.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/graph/connectivity.h \ + $(SRC_DIR)/ortools/graph/linear_assignment.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting.$O $(OBJ_DIR)/constraint_solver/routing_flags.$O: \ - $(SRC_DIR)/constraint_solver/routing_flags.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/routing_flags.h \ - $(SRC_DIR)/base/map_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/routing_flags.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_flags.$O + $(SRC_DIR)/ortools/constraint_solver/routing_flags.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.h \ + $(SRC_DIR)/ortools/constraint_solver/routing_flags.h \ + $(SRC_DIR)/ortools/base/map_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_flags.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_flags.$O $(OBJ_DIR)/constraint_solver/routing_neighborhoods.$O: \ - $(SRC_DIR)/constraint_solver/routing_neighborhoods.cc \ - $(SRC_DIR)/constraint_solver/routing_neighborhoods.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/routing_neighborhoods.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_neighborhoods.$O + $(SRC_DIR)/ortools/constraint_solver/routing_neighborhoods.cc \ + $(SRC_DIR)/ortools/constraint_solver/routing_neighborhoods.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_neighborhoods.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_neighborhoods.$O $(OBJ_DIR)/constraint_solver/routing_search.$O: \ - $(SRC_DIR)/constraint_solver/routing_search.cc \ - $(SRC_DIR)/constraint_solver/routing.h \ - $(SRC_DIR)/base/small_map.h \ - $(SRC_DIR)/base/small_ordered_set.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/graph/christofides.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/routing_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_search.$O + $(SRC_DIR)/ortools/constraint_solver/routing_search.cc \ + $(SRC_DIR)/ortools/constraint_solver/routing.h \ + $(SRC_DIR)/ortools/base/small_map.h \ + $(SRC_DIR)/ortools/base/small_ordered_set.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/saturated_arithmetic.h \ + $(SRC_DIR)/ortools/graph/christofides.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_search.$O $(OBJ_DIR)/constraint_solver/sat_constraint.$O: \ - $(SRC_DIR)/constraint_solver/sat_constraint.cc \ - $(SRC_DIR)/constraint_solver/sat_constraint.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/sat_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssat_constraint.$O + $(SRC_DIR)/ortools/constraint_solver/sat_constraint.cc \ + $(SRC_DIR)/ortools/constraint_solver/sat_constraint.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssat_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssat_constraint.$O $(OBJ_DIR)/constraint_solver/sched_constraints.$O: \ - $(SRC_DIR)/constraint_solver/sched_constraints.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/sched_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_constraints.$O + $(SRC_DIR)/ortools/constraint_solver/sched_constraints.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_constraints.$O $(OBJ_DIR)/constraint_solver/sched_expr.$O: \ - $(SRC_DIR)/constraint_solver/sched_expr.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/sched_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_expr.$O + $(SRC_DIR)/ortools/constraint_solver/sched_expr.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_expr.$O $(OBJ_DIR)/constraint_solver/sched_search.$O: \ - $(SRC_DIR)/constraint_solver/sched_search.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/sched_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_search.$O + $(SRC_DIR)/ortools/constraint_solver/sched_search.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_search.$O $(OBJ_DIR)/constraint_solver/search.$O: \ - $(SRC_DIR)/constraint_solver/search.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(GEN_DIR)/constraint_solver/search_limit.pb.h \ - $(SRC_DIR)/base/bitmap.h \ - $(SRC_DIR)/base/casts.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/random.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/base/timer.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssearch.$O + $(SRC_DIR)/ortools/constraint_solver/search.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h \ + $(SRC_DIR)/ortools/base/bitmap.h \ + $(SRC_DIR)/ortools/base/casts.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/random.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/base/timer.h \ + $(SRC_DIR)/ortools/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssearch.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssearch.$O $(OBJ_DIR)/constraint_solver/softgcc.$O: \ - $(SRC_DIR)/constraint_solver/softgcc.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/string_array.h \ - $(SRC_DIR)/util/vector_map.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/softgcc.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssoftgcc.$O + $(SRC_DIR)/ortools/constraint_solver/softgcc.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/string_array.h \ + $(SRC_DIR)/ortools/util/vector_map.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssoftgcc.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssoftgcc.$O $(OBJ_DIR)/constraint_solver/table.$O: \ - $(SRC_DIR)/constraint_solver/table.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/constraint_solver/sat_constraint.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h \ - $(SRC_DIR)/util/string_array.h \ - $(SRC_DIR)/util/tuple_set.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stable.$O + $(SRC_DIR)/ortools/constraint_solver/table.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/constraint_solver/sat_constraint.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h \ + $(SRC_DIR)/ortools/util/string_array.h \ + $(SRC_DIR)/ortools/util/tuple_set.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Stable.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stable.$O $(OBJ_DIR)/constraint_solver/timetabling.$O: \ - $(SRC_DIR)/constraint_solver/timetabling.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/timetabling.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stimetabling.$O + $(SRC_DIR)/ortools/constraint_solver/timetabling.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Stimetabling.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stimetabling.$O $(OBJ_DIR)/constraint_solver/trace.$O: \ - $(SRC_DIR)/constraint_solver/trace.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/trace.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Strace.$O + $(SRC_DIR)/ortools/constraint_solver/trace.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/commandlineflags.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Strace.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Strace.$O $(OBJ_DIR)/constraint_solver/tree_monitor.$O: \ - $(SRC_DIR)/constraint_solver/tree_monitor.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/base/file.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/xml_helper.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/tree_monitor.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stree_monitor.$O + $(SRC_DIR)/ortools/constraint_solver/tree_monitor.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/base/file.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/xml_helper.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Stree_monitor.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stree_monitor.$O $(OBJ_DIR)/constraint_solver/utilities.$O: \ - $(SRC_DIR)/constraint_solver/utilities.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/join.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stringprintf.h \ - $(SRC_DIR)/util/bitset.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/utilities.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sutilities.$O + $(SRC_DIR)/ortools/constraint_solver/utilities.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/join.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stringprintf.h \ + $(SRC_DIR)/ortools/util/bitset.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sutilities.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sutilities.$O $(OBJ_DIR)/constraint_solver/visitor.$O: \ - $(SRC_DIR)/constraint_solver/visitor.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/map_util.h \ - $(SRC_DIR)/base/stl_util.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/visitor.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Svisitor.$O + $(SRC_DIR)/ortools/constraint_solver/visitor.cc \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/hash.h \ + $(SRC_DIR)/ortools/base/integral_types.h \ + $(SRC_DIR)/ortools/base/logging.h \ + $(SRC_DIR)/ortools/base/macros.h \ + $(SRC_DIR)/ortools/base/map_util.h \ + $(SRC_DIR)/ortools/base/stl_util.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Svisitor.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Svisitor.$O -$(GEN_DIR)/constraint_solver/assignment.pb.cc: $(SRC_DIR)/constraint_solver/assignment.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/assignment.proto +$(GEN_DIR)/ortools/constraint_solver/assignment.pb.cc: $(SRC_DIR)/ortools/constraint_solver/assignment.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/assignment.proto -$(GEN_DIR)/constraint_solver/assignment.pb.h: $(GEN_DIR)/constraint_solver/assignment.pb.cc +$(GEN_DIR)/ortools/constraint_solver/assignment.pb.h: $(GEN_DIR)/ortools/constraint_solver/assignment.pb.cc -$(OBJ_DIR)/constraint_solver/assignment.pb.$O: $(GEN_DIR)/constraint_solver/assignment.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/assignment.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.pb.$O +$(OBJ_DIR)/constraint_solver/assignment.pb.$O: $(GEN_DIR)/ortools/constraint_solver/assignment.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/assignment.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.pb.$O -$(GEN_DIR)/constraint_solver/demon_profiler.pb.cc: $(SRC_DIR)/constraint_solver/demon_profiler.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/demon_profiler.proto +$(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.cc: $(SRC_DIR)/ortools/constraint_solver/demon_profiler.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/demon_profiler.proto -$(GEN_DIR)/constraint_solver/demon_profiler.pb.h: $(GEN_DIR)/constraint_solver/demon_profiler.pb.cc +$(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.h: $(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.cc -$(OBJ_DIR)/constraint_solver/demon_profiler.pb.$O: $(GEN_DIR)/constraint_solver/demon_profiler.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/demon_profiler.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdemon_profiler.pb.$O +$(OBJ_DIR)/constraint_solver/demon_profiler.pb.$O: $(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/demon_profiler.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdemon_profiler.pb.$O -$(GEN_DIR)/constraint_solver/model.pb.cc: $(SRC_DIR)/constraint_solver/model.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/model.proto +$(GEN_DIR)/ortools/constraint_solver/model.pb.cc: $(SRC_DIR)/ortools/constraint_solver/model.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/model.proto -$(GEN_DIR)/constraint_solver/model.pb.h: $(GEN_DIR)/constraint_solver/model.pb.cc \ - $(GEN_DIR)/constraint_solver/search_limit.pb.h +$(GEN_DIR)/ortools/constraint_solver/model.pb.h: $(GEN_DIR)/ortools/constraint_solver/model.pb.cc \ + $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h -$(OBJ_DIR)/constraint_solver/model.pb.$O: $(GEN_DIR)/constraint_solver/model.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/model.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Smodel.pb.$O +$(OBJ_DIR)/constraint_solver/model.pb.$O: $(GEN_DIR)/ortools/constraint_solver/model.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/model.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Smodel.pb.$O -$(GEN_DIR)/constraint_solver/routing_enums.pb.cc: $(SRC_DIR)/constraint_solver/routing_enums.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/routing_enums.proto +$(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.cc: $(SRC_DIR)/ortools/constraint_solver/routing_enums.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/routing_enums.proto -$(GEN_DIR)/constraint_solver/routing_enums.pb.h: $(GEN_DIR)/constraint_solver/routing_enums.pb.cc +$(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.h: $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.cc -$(OBJ_DIR)/constraint_solver/routing_enums.pb.$O: $(GEN_DIR)/constraint_solver/routing_enums.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/routing_enums.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_enums.pb.$O +$(OBJ_DIR)/constraint_solver/routing_enums.pb.$O: $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_enums.pb.$O -$(GEN_DIR)/constraint_solver/routing_parameters.pb.cc: $(SRC_DIR)/constraint_solver/routing_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/routing_parameters.proto +$(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.cc: $(SRC_DIR)/ortools/constraint_solver/routing_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/routing_parameters.proto -$(GEN_DIR)/constraint_solver/routing_parameters.pb.h: $(GEN_DIR)/constraint_solver/routing_parameters.pb.cc \ - $(GEN_DIR)/constraint_solver/routing_enums.pb.h \ - $(GEN_DIR)/constraint_solver/solver_parameters.pb.h +$(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.h: $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.cc \ + $(GEN_DIR)/ortools/constraint_solver/routing_enums.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.h -$(OBJ_DIR)/constraint_solver/routing_parameters.pb.$O: $(GEN_DIR)/constraint_solver/routing_parameters.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/routing_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_parameters.pb.$O +$(OBJ_DIR)/constraint_solver/routing_parameters.pb.$O: $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/routing_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_parameters.pb.$O -$(GEN_DIR)/constraint_solver/search_limit.pb.cc: $(SRC_DIR)/constraint_solver/search_limit.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/search_limit.proto +$(GEN_DIR)/ortools/constraint_solver/search_limit.pb.cc: $(SRC_DIR)/ortools/constraint_solver/search_limit.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/search_limit.proto -$(GEN_DIR)/constraint_solver/search_limit.pb.h: $(GEN_DIR)/constraint_solver/search_limit.pb.cc +$(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h: $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.cc -$(OBJ_DIR)/constraint_solver/search_limit.pb.$O: $(GEN_DIR)/constraint_solver/search_limit.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/search_limit.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssearch_limit.pb.$O +$(OBJ_DIR)/constraint_solver/search_limit.pb.$O: $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssearch_limit.pb.$O -$(GEN_DIR)/constraint_solver/solver_parameters.pb.cc: $(SRC_DIR)/constraint_solver/solver_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/solver_parameters.proto +$(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc: $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto -$(GEN_DIR)/constraint_solver/solver_parameters.pb.h: $(GEN_DIR)/constraint_solver/solver_parameters.pb.cc +$(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.h: $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc -$(OBJ_DIR)/constraint_solver/solver_parameters.pb.$O: $(GEN_DIR)/constraint_solver/solver_parameters.pb.cc - $(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/solver_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssolver_parameters.pb.$O +$(OBJ_DIR)/constraint_solver/solver_parameters.pb.$O: $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc + $(CCC) $(CFLAGS) -c $(GEN_DIR)/ortools/constraint_solver/solver_parameters.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssolver_parameters.pb.$O diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index 3fcab392c2..84d8cd3312 100755 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -4,56 +4,56 @@ JAVA_ORTOOLS_LIBS= $(LIB_DIR)/com.google.ortools.jar $(LIB_DIR)/$(LIB_PREFIX)jniortools.$(JNI_LIB_EXT) -$(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc: $(SRC_DIR)/constraint_solver/java/constraint_solver.swig $(SRC_DIR)/constraint_solver/java/routing.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/proto.swig $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h - $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_java_wrap.cc -package com.google.ortools.constraintsolver -module operations_research_constraint_solver -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver $(SRC_DIR)$Sconstraint_solver$Sjava$Srouting.swig +$(GEN_DIR)/ortools/constraint_solver/constraint_solver_java_wrap.cc: $(SRC_DIR)/ortools/constraint_solver/java/constraint_solver.i $(SRC_DIR)/ortools/constraint_solver/java/routing.i $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/java/vector.i $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/java/proto.i $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h + $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_java_wrap.cc -package com.google.ortools.constraintsolver -module operations_research_constraint_solver -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver $(SRC_DIR)$Sortools$Sconstraint_solver$Sjava$Srouting.i -$(OBJ_DIR)/swig/constraint_solver_java_wrap.$O: $(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h - $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sconstraint_solver_java_wrap.$O +$(OBJ_DIR)/swig/constraint_solver_java_wrap.$O: $(GEN_DIR)/ortools/constraint_solver/constraint_solver_java_wrap.cc $(CP_DEPS) $(SRC_DIR)/ortools/constraint_solver/routing.h + $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sconstraint_solver_java_wrap.$O -$(GEN_DIR)/algorithms/knapsack_solver_java_wrap.cc: $(SRC_DIR)/algorithms/java/knapsack_solver.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(SRC_DIR)/algorithms/knapsack_solver.h - $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Salgorithms$Sknapsack_solver_java_wrap.cc -package com.google.ortools.algorithms -module operations_research_algorithms -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms $(SRC_DIR)$Salgorithms$Sjava$Sknapsack_solver.swig +$(GEN_DIR)/ortools/algorithms/knapsack_solver_java_wrap.cc: $(SRC_DIR)/ortools/algorithms/java/knapsack_solver.i $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/java/vector.i $(SRC_DIR)/ortools/algorithms/knapsack_solver.h + $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sortools$Salgorithms$Sknapsack_solver_java_wrap.cc -package com.google.ortools.algorithms -module operations_research_algorithms -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms $(SRC_DIR)$Sortools$Salgorithms$Sjava$Sknapsack_solver.i -$(OBJ_DIR)/swig/knapsack_solver_java_wrap.$O: $(GEN_DIR)/algorithms/knapsack_solver_java_wrap.cc - $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Salgorithms$Sknapsack_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sknapsack_solver_java_wrap.$O +$(OBJ_DIR)/swig/knapsack_solver_java_wrap.$O: $(GEN_DIR)/ortools/algorithms/knapsack_solver_java_wrap.cc + $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sortools$Salgorithms$Sknapsack_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sknapsack_solver_java_wrap.$O -$(GEN_DIR)/graph/graph_java_wrap.cc: $(SRC_DIR)/graph/java/graph.swig $(SRC_DIR)/base/base.swig $(GRAPH_DEPS) - $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sgraph$Sgraph_java_wrap.cc -package com.google.ortools.graph -module operations_research_graph -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph $(SRC_DIR)$Sgraph$Sjava$Sgraph.swig +$(GEN_DIR)/ortools/graph/graph_java_wrap.cc: $(SRC_DIR)/ortools/graph/java/graph.i $(SRC_DIR)/ortools/base/base.i $(GRAPH_DEPS) + $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sortools$Sgraph$Sgraph_java_wrap.cc -package com.google.ortools.graph -module operations_research_graph -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph $(SRC_DIR)$Sortools$Sgraph$Sjava$Sgraph.i -$(GEN_DIR)/linear_solver/linear_solver_java_wrap.cc: $(SRC_DIR)/linear_solver/java/linear_solver.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(LP_DEPS) - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Slinear_solver$Slinear_solver_java_wrap.cc -package com.google.ortools.linearsolver -module operations_research_linear_solver -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver $(SRC_DIR)$Slinear_solver$Sjava$Slinear_solver.swig +$(GEN_DIR)/ortools/linear_solver/linear_solver_java_wrap.cc: $(SRC_DIR)/ortools/linear_solver/java/linear_solver.i $(SRC_DIR)/ortools/base/base.i $(SRC_DIR)/ortools/util/java/vector.i $(LP_DEPS) + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver_java_wrap.cc -package com.google.ortools.linearsolver -module operations_research_linear_solver -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver $(SRC_DIR)$Sortools$Slinear_solver$Sjava$Slinear_solver.i -$(OBJ_DIR)/swig/linear_solver_java_wrap.$O: $(GEN_DIR)/linear_solver/linear_solver_java_wrap.cc $(LP_DEPS) - $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Slinear_solver$Slinear_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Slinear_solver_java_wrap.$O +$(OBJ_DIR)/swig/linear_solver_java_wrap.$O: $(GEN_DIR)/ortools/linear_solver/linear_solver_java_wrap.cc $(LP_DEPS) + $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Slinear_solver_java_wrap.$O -$(OBJ_DIR)/swig/graph_java_wrap.$O: $(GEN_DIR)/graph/graph_java_wrap.cc $(GRAPH_DEPS) - $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sgraph$Sgraph_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sgraph_java_wrap.$O +$(OBJ_DIR)/swig/graph_java_wrap.$O: $(GEN_DIR)/ortools/graph/graph_java_wrap.cc $(GRAPH_DEPS) + $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sortools$Sgraph$Sgraph_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sgraph_java_wrap.$O -$(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimitProtobuf.java: $(SRC_DIR)/constraint_solver/search_limit.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sconstraint_solver$Ssearch_limit.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimitProtobuf.java: $(SRC_DIR)/ortools/constraint_solver/search_limit.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Ssearch_limit.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.java: $(SRC_DIR)/constraint_solver/solver_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sconstraint_solver$Ssolver_parameters.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.java: $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Ssolver_parameters.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.java: $(SRC_DIR)/constraint_solver/routing_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sconstraint_solver$Srouting_parameters.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.java: $(SRC_DIR)/ortools/constraint_solver/routing_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.proto -$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.java: $(SRC_DIR)/constraint_solver/routing_enums.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sconstraint_solver$Srouting_enums.proto +$(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.java: $(SRC_DIR)/ortools/constraint_solver/routing_enums.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_enums.proto $(LIB_DIR)/protobuf.jar: dependencies/install/lib/protobuf.jar $(COPY) dependencies$Sinstall$Slib$Sprotobuf.jar $(LIB_DIR) $(LIB_DIR)/com.google.ortools.jar: \ $(LIB_DIR)/protobuf.jar \ - $(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc \ - $(GEN_DIR)/algorithms/knapsack_solver_java_wrap.cc \ - $(GEN_DIR)/graph/graph_java_wrap.cc \ - $(GEN_DIR)/linear_solver/linear_solver_java_wrap.cc \ + $(GEN_DIR)/ortools/constraint_solver/constraint_solver_java_wrap.cc \ + $(GEN_DIR)/ortools/algorithms/knapsack_solver_java_wrap.cc \ + $(GEN_DIR)/ortools/graph/graph_java_wrap.cc \ + $(GEN_DIR)/ortools/linear_solver/linear_solver_java_wrap.cc \ $(GEN_DIR)/com/google/ortools/constraintsolver/SolverParameters.java \ $(GEN_DIR)/com/google/ortools/constraintsolver/SearchLimitProtobuf.java \ $(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.java \ $(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.java - $(JAVAC_BIN) -d $(OBJ_DIR) -cp lib$Sprotobuf.jar $(SRC_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver$S*.java + $(JAVAC_BIN) -d $(OBJ_DIR) -cp lib$Sprotobuf.jar $(SRC_DIR)$Sortools$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph$S*.java $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver$S*.java $(JAR_BIN) cf $(LIB_DIR)$Scom.google.ortools.jar -C $(OBJ_DIR) com$Sgoogle$Sortools$S $(LIB_DIR)/$(LIB_PREFIX)jniortools.$(JNI_LIB_EXT): \ @@ -394,10 +394,10 @@ clean_java: -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Sgraph$S*.java -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.java -$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$Slinearsolver$S*.java - -$(DEL) $(GEN_DIR)$Salgorithms$S*java_wrap* - -$(DEL) $(GEN_DIR)$Sconstraint_solver$S*java_wrap* - -$(DEL) $(GEN_DIR)$Sgraph$S*java_wrap* - -$(DEL) $(GEN_DIR)$Slinear_solver$S*java_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Salgorithms$S*java_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Sconstraint_solver$S*java_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Sgraph$S*java_wrap* + -$(DEL) $(GEN_DIR)$Sortools$Slinear_solver$S*java_wrap* -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.class -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Sgraph$S*.class -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.class diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index aeaa6e56f7..6240d310f6 100755 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -4,7 +4,7 @@ # Detect python3 -OR_TOOLS_PYTHONPATH = $(OR_ROOT_FULL)$Ssrc$(CPSEP)$(OR_ROOT_FULL)$Sdependencies$Ssources$Sprotobuf-$(PROTOBUF_TAG)$Spython +OR_TOOLS_PYTHONPATH = $(OR_ROOT_FULL)$(CPSEP)$(OR_ROOT_FULL)$Sdependencies$Ssources$Sprotobuf-$(PROTOBUF_TAG)$Spython ifeq ($(SYSTEM),win) PYTHON_EXECUTABLE = $(WINDOWS_PATH_TO_PYTHON)$Spython.exe @@ -72,11 +72,11 @@ $(GEN_DIR)$Sortools$S__init__.py: pyalgorithms: $(LIB_DIR)/_pywrapknapsack_solver.$(SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/algorithms/pywrapknapsack_solver.py $(GEN_DIR)/ortools/algorithms/pywrapknapsack_solver.py: \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/python/vector.swig \ - $(SRC_DIR)/algorithms/python/knapsack_solver.swig \ - $(SRC_DIR)/algorithms/knapsack_solver.h - $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Salgorithms$Sknapsack_solver_python_wrap.cc -module pywrapknapsack_solver $(SRC_DIR)/algorithms$Spython$Sknapsack_solver.swig + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/python/vector.i \ + $(SRC_DIR)/ortools/algorithms/python/knapsack_solver.i \ + $(SRC_DIR)/ortools/algorithms/knapsack_solver.h + $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Salgorithms$Sknapsack_solver_python_wrap.cc -module pywrapknapsack_solver $(SRC_DIR)/ortools/algorithms$Spython$Sknapsack_solver.i $(GEN_DIR)/ortools/algorithms/knapsack_solver_python_wrap.cc: $(GEN_DIR)/ortools/algorithms/pywrapknapsack_solver.py @@ -95,14 +95,14 @@ endif pygraph: $(LIB_DIR)/_pywrapgraph.$(SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/graph/pywrapgraph.py $(GEN_DIR)/ortools/graph/pywrapgraph.py: \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/python/vector.swig \ - $(SRC_DIR)/graph/python/graph.swig \ - $(SRC_DIR)/graph/min_cost_flow.h \ - $(SRC_DIR)/graph/max_flow.h \ - $(SRC_DIR)/graph/ebert_graph.h \ - $(SRC_DIR)/graph/shortestpaths.h - $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Sgraph$Sgraph_python_wrap.cc -module pywrapgraph $(SRC_DIR)/graph$Spython$Sgraph.swig + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/python/vector.i \ + $(SRC_DIR)/ortools/graph/python/graph.i \ + $(SRC_DIR)/ortools/graph/min_cost_flow.h \ + $(SRC_DIR)/ortools/graph/max_flow.h \ + $(SRC_DIR)/ortools/graph/ebert_graph.h \ + $(SRC_DIR)/ortools/graph/shortestpaths.h + $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Sgraph$Sgraph_python_wrap.cc -module pywrapgraph $(SRC_DIR)/ortools/graph$Spython$Sgraph.i $(GEN_DIR)/ortools/graph/graph_python_wrap.cc: $(GEN_DIR)/ortools/graph/pywrapgraph.py @@ -121,50 +121,42 @@ endif pycp: $(GEN_DIR)/ortools/constraint_solver/pywrapcp.py $(LIB_DIR)/_pywrapcp.$(SWIG_LIB_SUFFIX) -$(GEN_DIR)/ortools/constraint_solver/search_limit_pb2.py: $(SRC_DIR)/constraint_solver/search_limit.proto - $(COPY) $(SRC_DIR)$Sconstraint_solver$Ssearch_limit.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Ssearch_limit.proto +$(GEN_DIR)/ortools/constraint_solver/search_limit_pb2.py: $(SRC_DIR)/ortools/constraint_solver/search_limit.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Ssearch_limit.proto -$(GEN_DIR)/ortools/constraint_solver/model_pb2.py: $(SRC_DIR)/constraint_solver/model.proto $(GEN_DIR)/ortools/constraint_solver/search_limit_pb2.py - $(COPY) $(SRC_DIR)$Sconstraint_solver$Smodel.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(SED) -i -e "s/constraint_solver/ortools\/constraint_solver/g" $(GEN_DIR)$Sortools$Sconstraint_solver$Smodel.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Smodel.proto +$(GEN_DIR)/ortools/constraint_solver/model_pb2.py: $(SRC_DIR)/ortools/constraint_solver/model.proto $(GEN_DIR)/ortools/constraint_solver/search_limit_pb2.py + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Smodel.proto -$(GEN_DIR)/ortools/constraint_solver/assignment_pb2.py: $(SRC_DIR)/constraint_solver/assignment.proto - $(COPY) $(SRC_DIR)$Sconstraint_solver$Sassignment.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Sassignment.proto +$(GEN_DIR)/ortools/constraint_solver/assignment_pb2.py: $(SRC_DIR)/ortools/constraint_solver/assignment.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Sassignment.proto -$(GEN_DIR)/ortools/constraint_solver/solver_parameters_pb2.py: $(SRC_DIR)/constraint_solver/solver_parameters.proto - $(COPY) $(SRC_DIR)$Sconstraint_solver$Ssolver_parameters.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Ssolver_parameters.proto +$(GEN_DIR)/ortools/constraint_solver/solver_parameters_pb2.py: $(SRC_DIR)/ortools/constraint_solver/solver_parameters.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Ssolver_parameters.proto -$(GEN_DIR)/ortools/constraint_solver/routing_enums_pb2.py: $(SRC_DIR)/constraint_solver/routing_enums.proto - $(COPY) $(SRC_DIR)$Sconstraint_solver$Srouting_enums.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Srouting_enums.proto +$(GEN_DIR)/ortools/constraint_solver/routing_enums_pb2.py: $(SRC_DIR)/ortools/constraint_solver/routing_enums.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_enums.proto -$(GEN_DIR)/ortools/constraint_solver/routing_parameters_pb2.py: $(SRC_DIR)/constraint_solver/routing_parameters.proto $(GEN_DIR)/ortools/constraint_solver/solver_parameters_pb2.py $(GEN_DIR)/ortools/constraint_solver/routing_enums_pb2.py - $(COPY) $(SRC_DIR)$Sconstraint_solver$Srouting_parameters.proto $(GEN_DIR)$Sortools$Sconstraint_solver - $(SED) -i -e "s/constraint_solver/ortools\/constraint_solver/g" $(GEN_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(GEN_DIR) --python_out=$(GEN_DIR) $(GEN_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.proto +$(GEN_DIR)/ortools/constraint_solver/routing_parameters_pb2.py: $(SRC_DIR)/ortools/constraint_solver/routing_parameters.proto $(GEN_DIR)/ortools/constraint_solver/solver_parameters_pb2.py $(GEN_DIR)/ortools/constraint_solver/routing_enums_pb2.py + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.proto $(GEN_DIR)/ortools/constraint_solver/pywrapcp.py: \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/python/vector.swig \ - $(SRC_DIR)/constraint_solver/python/constraint_solver.swig \ - $(SRC_DIR)/constraint_solver/python/routing.swig \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/python/vector.i \ + $(SRC_DIR)/ortools/constraint_solver/python/constraint_solver.i \ + $(SRC_DIR)/ortools/constraint_solver/python/routing.i \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \ $(GEN_DIR)/ortools/constraint_solver/assignment_pb2.py \ $(GEN_DIR)/ortools/constraint_solver/model_pb2.py \ $(GEN_DIR)/ortools/constraint_solver/routing_enums_pb2.py \ $(GEN_DIR)/ortools/constraint_solver/routing_parameters_pb2.py \ $(GEN_DIR)/ortools/constraint_solver/search_limit_pb2.py \ $(GEN_DIR)/ortools/constraint_solver/solver_parameters_pb2.py \ - $(GEN_DIR)/constraint_solver/assignment.pb.h \ - $(GEN_DIR)/constraint_solver/model.pb.h \ - $(GEN_DIR)/constraint_solver/search_limit.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/assignment.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/model.pb.h \ + $(GEN_DIR)/ortools/constraint_solver/search_limit.pb.h \ $(CP_LIB_OBJS) - $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc -module pywrapcp $(SRC_DIR)/constraint_solver$Spython$Srouting.swig + $(SWIG_BINARY) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc -module pywrapcp $(SRC_DIR)/ortools/constraint_solver$Spython$Srouting.i # TODO(user): Support pywraprouting as well. @@ -187,17 +179,17 @@ endif pylp: $(LIB_DIR)/_pywraplp.$(SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/linear_solver/pywraplp.py -$(GEN_DIR)/ortools/linear_solver/linear_solver_pb2.py: $(SRC_DIR)/linear_solver/linear_solver.proto - $(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --python_out=$(GEN_DIR)$Sortools $(SRC_DIR)/linear_solver/linear_solver.proto +$(GEN_DIR)/ortools/linear_solver/linear_solver_pb2.py: $(SRC_DIR)/ortools/linear_solver/linear_solver.proto + $(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --python_out=$(GEN_DIR) $(SRC_DIR)/ortools/linear_solver/linear_solver.proto $(GEN_DIR)/ortools/linear_solver/pywraplp.py: \ - $(SRC_DIR)/base/base.swig \ - $(SRC_DIR)/util/python/vector.swig \ - $(SRC_DIR)/linear_solver/python/linear_solver.swig \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(GEN_DIR)/linear_solver/linear_solver.pb.h \ + $(SRC_DIR)/ortools/base/base.i \ + $(SRC_DIR)/ortools/util/python/vector.i \ + $(SRC_DIR)/ortools/linear_solver/python/linear_solver.i \ + $(SRC_DIR)/ortools/linear_solver/linear_solver.h \ + $(GEN_DIR)/ortools/linear_solver/linear_solver.pb.h \ $(GEN_DIR)/ortools/linear_solver/linear_solver_pb2.py - $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver_python_wrap.cc -module pywraplp $(SRC_DIR)/linear_solver$Spython$Slinear_solver.swig + $(SWIG_BINARY) $(SWIG_INC) -I$(INC_DIR) -c++ -python $(SWIG_PYTHON3_FLAG) -o $(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver_python_wrap.cc -module pywraplp $(SRC_DIR)/ortools/linear_solver$Spython$Slinear_solver.i $(GEN_DIR)/ortools/linear_solver/linear_solver_python_wrap.cc: $(GEN_DIR)/ortools/linear_solver/pywraplp.py @@ -321,7 +313,7 @@ else ifeq ($(PLATFORM),MACOSX) cd $(PYPI_ARCHIVE_TEMP_DIR)/ortools && $(PYTHON_EXECUTABLE) setup.py bdist_egg bdist_wheel else - cd $(PYPI_ARCHIVE_TEMP_DIR)/ortools && $(PYTHON_EXECUTABLE) setup.py bdist_egg + cd $(PYPI_ARCHIVE_TEMP_DIR)/ortools && $(PYTHON_EXECUTABLE) setup.py bdist_egg endif endif cd $(PYPI_ARCHIVE_TEMP_DIR)/ortools && twine upload dist/* @@ -330,4 +322,4 @@ pypi_upload: $(PYPI_UPLOAD) detect_python: @echo PYTHON3 = $(PYTHON3) - @echo SWIG_PYTHON3_FLAG = $(SWIG_PYTHON3_FLAG) \ No newline at end of file + @echo SWIG_PYTHON3_FLAG = $(SWIG_PYTHON3_FLAG) diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk index 58e53199d3..6286bcba06 100644 --- a/makefiles/Makefile.third_party.unix.mk +++ b/makefiles/Makefile.third_party.unix.mk @@ -49,24 +49,20 @@ MISSING_DIRECTORIES = \ objs/sat \ objs/swig \ objs/util \ - src/gen/algorithms \ - src/gen/bop \ - src/gen/com/google/ortools/algorithms \ - src/gen/com/google/ortools/constraintsolver \ - src/gen/com/google/ortools/flatzinc \ - src/gen/com/google/ortools/graph \ - src/gen/com/google/ortools/linearsolver \ - src/gen/com/google/ortools/properties \ - src/gen/constraint_solver \ - src/gen/flatzinc \ - src/gen/glop \ - src/gen/graph \ - src/gen/linear_solver \ - src/gen/ortools/algorithms \ - src/gen/ortools/constraint_solver \ - src/gen/ortools/graph \ - src/gen/ortools/linear_solver \ - src/gen/sat + ortools/gen/com/google/ortools/algorithms \ + ortools/gen/com/google/ortools/constraintsolver \ + ortools/gen/com/google/ortools/flatzinc \ + ortools/gen/com/google/ortools/graph \ + ortools/gen/com/google/ortools/linearsolver \ + ortools/gen/com/google/ortools/properties \ + ortools/gen/ortools/algorithms \ + ortools/gen/ortools/bop \ + ortools/gen/ortools/constraint_solver \ + ortools/gen/ortools/flatzinc \ + ortools/gen/ortools/glop \ + ortools/gen/ortools/graph \ + ortools/gen/ortools/linear_solver \ + ortools/gen/ortools/sat missing_directories: $(MISSING_DIRECTORIES) @@ -123,59 +119,47 @@ objs/swig: objs/util: $(MKDIR_P) objs$Sutil -src/gen/algorithms: - $(MKDIR_P) src$Sgen$Salgorithms +ortools/gen/com/google/ortools/algorithms: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Salgorithms -src/gen/bop: - $(MKDIR_P) src$Sgen$Sbop +ortools/gen/com/google/ortools/constraintsolver: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver -src/gen/com/google/ortools/algorithms: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Salgorithms +ortools/gen/com/google/ortools/graph: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Sgraph -src/gen/com/google/ortools/constraintsolver: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Sconstraintsolver +ortools/gen/com/google/ortools/linearsolver: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Slinearsolver -src/gen/com/google/ortools/graph: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Sgraph +ortools/gen/com/google/ortools/flatzinc: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Sflatzinc -src/gen/com/google/ortools/linearsolver: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Slinearsolver +ortools/gen/com/google/ortools/properties: + $(MKDIR_P) ortools$Sgen$Scom$Sgoogle$Sortools$Sproperties -src/gen/com/google/ortools/flatzinc: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Sflatzinc +ortools/gen/ortools/algorithms: + $(MKDIR_P) ortools$Sgen$Sortools$Salgorithms -src/gen/com/google/ortools/properties: - $(MKDIR_P) src$Sgen$Scom$Sgoogle$Sortools$Sproperties +ortools/gen/ortools/bop: + $(MKDIR_P) ortools$Sgen$Sortools$Sbop -src/gen/constraint_solver: - $(MKDIR_P) src$Sgen$Sconstraint_solver +ortools/gen/ortools/constraint_solver: + $(MKDIR_P) ortools$Sgen$Sortools$Sconstraint_solver -src/gen/flatzinc: - $(MKDIR_P) src$Sgen$Sflatzinc +ortools/gen/ortools/flatzinc: + $(MKDIR_P) ortools$Sgen$Sortools$Sflatzinc -src/gen/glop: - $(MKDIR_P) src$Sgen$Sglop +ortools/gen/ortools/glop: + $(MKDIR_P) ortools$Sgen$Sortools$Sglop -src/gen/graph: - $(MKDIR_P) src$Sgen$Sgraph +ortools/gen/ortools/graph: + $(MKDIR_P) ortools$Sgen$Sortools$Sgraph -src/gen/linear_solver: - $(MKDIR_P) src$Sgen$Slinear_solver +ortools/gen/ortools/linear_solver: + $(MKDIR_P) ortools$Sgen$Sortools$Slinear_solver -src/gen/ortools/algorithms: - $(MKDIR_P) src$Sgen$Sortools$Salgorithms - -src/gen/ortools/constraint_solver: - $(MKDIR_P) src$Sgen$Sortools$Sconstraint_solver - -src/gen/ortools/graph: - $(MKDIR_P) src$Sgen$Sortools$Sgraph - -src/gen/ortools/linear_solver: - $(MKDIR_P) src$Sgen$Sortools$Slinear_solver - -src/gen/sat: - $(MKDIR_P) src$Sgen$Ssat +ortools/gen/ortools/sat: + $(MKDIR_P) ortools$Sgen$Sortools$Ssat # Install gflags. This uses cmake. install_gflags: dependencies/install/bin/gflags_completions.sh diff --git a/makefiles/Makefile.unix.mk b/makefiles/Makefile.unix.mk index f6af898673..dc9bb73deb 100644 --- a/makefiles/Makefile.unix.mk +++ b/makefiles/Makefile.unix.mk @@ -17,11 +17,11 @@ else # No need to keep the path in the lib, it is not stored there on linux. LIB_DIR = $(OR_ROOT)lib endif BIN_DIR = $(OR_ROOT)bin -GEN_DIR = $(OR_ROOT)src/gen +GEN_DIR = $(OR_ROOT)ortools/gen OBJ_DIR = $(OR_ROOT)objs -SRC_DIR = $(OR_ROOT)src +SRC_DIR = $(OR_ROOT). EX_DIR = $(OR_ROOT)examples -INC_DIR = $(OR_ROOT)src +INC_DIR = $(OR_ROOT). DEP_BIN_DIR = $(OR_ROOT)dependencies/install/bin diff --git a/makefiles/Makefile.win.mk b/makefiles/Makefile.win.mk index c9e58dbf80..589fcb8b6c 100644 --- a/makefiles/Makefile.win.mk +++ b/makefiles/Makefile.win.mk @@ -8,9 +8,9 @@ LIB_SUFFIX = lib BIN_DIR = $(OR_ROOT)bin GEN_DIR = $(OR_ROOT)src\\gen OBJ_DIR = $(OR_ROOT)objs -SRC_DIR = $(OR_ROOT)src +SRC_DIR = $(OR_ROOT). EX_DIR = $(OR_ROOT)examples -INC_DIR = $(OR_ROOT)src +INC_DIR = $(OR_ROOT_FULL) LINK_CMD = lib LINK_PREFIX = /OUT: STATIC_LINK_CMD = lib @@ -126,7 +126,7 @@ JAVAC_BIN="$(JDK_DIRECTORY)/bin/javac" JAVA_BIN="$(JDK_DIRECTORY)/bin/java" JAR_BIN="$(JDK_DIRECTORY)/bin/jar" -CFLAGS= -nologo $(SYSCFLAGS) $(DEBUG) /I$(INC_DIR) /I$(EX_DIR) /I$(GEN_DIR) \ +CFLAGS= -nologo $(SYSCFLAGS) $(DEBUG) /I$(INC_DIR) /I$(GEN_DIR) \ $(GFLAGS_INC) $(ZLIB_INC) $(MINISAT_INC) $(PROTOBUF_INC) $(CBC_INC) \ $(CLP_INC) $(GLPK_INC) $(SCIP_INC) $(GUROBI_INC) /DUSE_GLOP /DUSE_BOP \ /D__WIN32__ $(SPARSEHASH_INC) /DPSAPI_VERSION=1 $(ARCH) diff --git a/src/WORKSPACE b/ortools/WORKSPACE similarity index 100% rename from src/WORKSPACE rename to ortools/WORKSPACE diff --git a/src/algorithms/BUILD b/ortools/algorithms/BUILD similarity index 100% rename from src/algorithms/BUILD rename to ortools/algorithms/BUILD diff --git a/src/ortools/graph/__init__.py b/ortools/algorithms/__init__.py similarity index 79% rename from src/ortools/graph/__init__.py rename to ortools/algorithms/__init__.py index 8f2def565f..f733bc1722 100644 --- a/src/ortools/graph/__init__.py +++ b/ortools/algorithms/__init__.py @@ -11,5 +11,5 @@ # See the License for the specific language governing permissions and # limitations under the License. import os as _os -__path__.append(_os.path.join(__path__[0], '..', '..', 'gen', 'ortools', 'graph')) -__path__.append(_os.path.join(__path__[0], '..', '..', '..', 'lib')) +__path__.append(_os.path.join(__path__[0], '..', 'gen', 'ortools', 'algorithms')) +__path__.append(_os.path.join(__path__[0], '..', '..', 'lib')) diff --git a/src/algorithms/csharp/knapsack_solver.swig b/ortools/algorithms/csharp/knapsack_solver.i similarity index 85% rename from src/algorithms/csharp/knapsack_solver.swig rename to ortools/algorithms/csharp/knapsack_solver.i index 3ffa7ed0c1..e171ec2cb2 100644 --- a/src/algorithms/csharp/knapsack_solver.swig +++ b/ortools/algorithms/csharp/knapsack_solver.i @@ -13,20 +13,20 @@ // TODO(user): Refactor this file to adhere to the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" /* allow partial c# classes */ %typemap(csclassmodifiers) SWIGTYPE "public partial class" // Include the file we want to wrap a first time. %{ -#include "algorithms/knapsack_solver.h" +#include "ortools/algorithms/knapsack_solver.h" %} %include "std_vector.i" // See the comment in -// ../../constraint_solver/csharp/constraint_solver.swig about naming +// ../../constraint_solver/csharp/constraint_solver.i about naming // the template instantiation of std::vector<> differently. %template(KInt64Vector) std::vector; %template(KInt64VectorVector) std::vector >; @@ -34,4 +34,4 @@ %rename (UseReduction) operations_research::KnapsackSolver::use_reduction; %rename (SetUseReduction) operations_research::KnapsackSolver::set_use_reduction; -%include "algorithms/knapsack_solver.h" +%include "ortools/algorithms/knapsack_solver.h" diff --git a/src/algorithms/dense_doubly_linked_list.h b/ortools/algorithms/dense_doubly_linked_list.h similarity index 98% rename from src/algorithms/dense_doubly_linked_list.h rename to ortools/algorithms/dense_doubly_linked_list.h index 68b254ac45..9610624531 100644 --- a/src/algorithms/dense_doubly_linked_list.h +++ b/ortools/algorithms/dense_doubly_linked_list.h @@ -15,7 +15,7 @@ #define OR_TOOLS_ALGORITHMS_DENSE_DOUBLY_LINKED_LIST_H_ #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/algorithms/dynamic_partition.cc b/ortools/algorithms/dynamic_partition.cc similarity index 98% rename from src/algorithms/dynamic_partition.cc rename to ortools/algorithms/dynamic_partition.cc index 3cc514fe91..78b7ff794c 100644 --- a/src/algorithms/dynamic_partition.cc +++ b/ortools/algorithms/dynamic_partition.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "algorithms/dynamic_partition.h" +#include "ortools/algorithms/dynamic_partition.h" #include -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/murmur.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/murmur.h" namespace operations_research { diff --git a/src/algorithms/dynamic_partition.h b/ortools/algorithms/dynamic_partition.h similarity index 99% rename from src/algorithms/dynamic_partition.h rename to ortools/algorithms/dynamic_partition.h index 13480fef52..fe79fca23e 100644 --- a/src/algorithms/dynamic_partition.h +++ b/ortools/algorithms/dynamic_partition.h @@ -32,7 +32,7 @@ #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/algorithms/dynamic_permutation.cc b/ortools/algorithms/dynamic_permutation.cc similarity index 97% rename from src/algorithms/dynamic_permutation.cc rename to ortools/algorithms/dynamic_permutation.cc index 048f134731..7e4cd4be01 100644 --- a/src/algorithms/dynamic_permutation.cc +++ b/ortools/algorithms/dynamic_permutation.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "algorithms/dynamic_permutation.h" +#include "ortools/algorithms/dynamic_permutation.h" #include -#include "algorithms/sparse_permutation.h" +#include "ortools/algorithms/sparse_permutation.h" namespace operations_research { diff --git a/src/algorithms/dynamic_permutation.h b/ortools/algorithms/dynamic_permutation.h similarity index 99% rename from src/algorithms/dynamic_permutation.h rename to ortools/algorithms/dynamic_permutation.h index b69bd5e998..d8dac7f257 100644 --- a/src/algorithms/dynamic_permutation.h +++ b/ortools/algorithms/dynamic_permutation.h @@ -18,7 +18,7 @@ #include // TODO(user): remove when no longer used. #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/algorithms/find_graph_symmetries.cc b/ortools/algorithms/find_graph_symmetries.cc similarity index 99% rename from src/algorithms/find_graph_symmetries.cc rename to ortools/algorithms/find_graph_symmetries.cc index 1c59477f28..42ffabd3f3 100644 --- a/src/algorithms/find_graph_symmetries.cc +++ b/ortools/algorithms/find_graph_symmetries.cc @@ -11,21 +11,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "algorithms/find_graph_symmetries.h" +#include "ortools/algorithms/find_graph_symmetries.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "algorithms/dense_doubly_linked_list.h" -#include "algorithms/dynamic_partition.h" -#include "algorithms/dynamic_permutation.h" -#include "algorithms/sparse_permutation.h" -#include "graph/util.h" -#include "util/iterators.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/algorithms/dense_doubly_linked_list.h" +#include "ortools/algorithms/dynamic_partition.h" +#include "ortools/algorithms/dynamic_permutation.h" +#include "ortools/algorithms/sparse_permutation.h" +#include "ortools/graph/util.h" +#include "ortools/util/iterators.h" DEFINE_bool(minimize_permutation_support_size, false, "Tweak the algorithm to try and minimize the support size" diff --git a/src/algorithms/find_graph_symmetries.h b/ortools/algorithms/find_graph_symmetries.h similarity index 98% rename from src/algorithms/find_graph_symmetries.h rename to ortools/algorithms/find_graph_symmetries.h index 5297520e73..e5e1fe9119 100644 --- a/src/algorithms/find_graph_symmetries.h +++ b/ortools/algorithms/find_graph_symmetries.h @@ -27,13 +27,13 @@ #include #include -#include "algorithms/dynamic_partition.h" -#include "algorithms/dynamic_permutation.h" -#include "graph/graph.h" -#include "util/iterators.h" -#include "util/stats.h" -#include "util/time_limit.h" -#include "base/status.h" +#include "ortools/algorithms/dynamic_partition.h" +#include "ortools/algorithms/dynamic_permutation.h" +#include "ortools/graph/graph.h" +#include "ortools/util/iterators.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" +#include "ortools/base/status.h" namespace operations_research { @@ -50,7 +50,7 @@ class GraphSymmetryFinder { // and bypass the need for reverse adjacency lists. // // If you don't know this in advance, you may use GraphIsSymmetric() from - // graph/util.h. + // ortools/graph/util.h. // // "graph" must not have multi-arcs. // TODO(user): support multi-arcs. diff --git a/src/algorithms/hungarian.cc b/ortools/algorithms/hungarian.cc similarity index 99% rename from src/algorithms/hungarian.cc rename to ortools/algorithms/hungarian.cc index 56d32c001b..c1173e419f 100644 --- a/src/algorithms/hungarian.cc +++ b/ortools/algorithms/hungarian.cc @@ -14,7 +14,7 @@ // See: //depot/google3/java/com/google/wireless/genie/frontend // /mixer/matching/HungarianOptimizer.java -#include "algorithms/hungarian.h" +#include "ortools/algorithms/hungarian.h" #include #include diff --git a/src/algorithms/hungarian.h b/ortools/algorithms/hungarian.h similarity index 98% rename from src/algorithms/hungarian.h rename to ortools/algorithms/hungarian.h index 16e31a114e..b6be803713 100644 --- a/src/algorithms/hungarian.h +++ b/ortools/algorithms/hungarian.h @@ -35,7 +35,7 @@ #ifndef OR_TOOLS_ALGORITHMS_HUNGARIAN_H_ #define OR_TOOLS_ALGORITHMS_HUNGARIAN_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include namespace operations_research { diff --git a/src/algorithms/hungarian_test.cc b/ortools/algorithms/hungarian_test.cc similarity index 95% rename from src/algorithms/hungarian_test.cc rename to ortools/algorithms/hungarian_test.cc index 66110d1c96..bc742e0be1 100644 --- a/src/algorithms/hungarian_test.cc +++ b/ortools/algorithms/hungarian_test.cc @@ -1,13 +1,13 @@ // Test file for hungarian.h -#include "algorithms/hungarian.h" +#include "ortools/algorithms/hungarian.h" -#include "base/hash.h" -#include "base/integral_types.h" -#include "base/macros.h" -#include "base/map_util.h" -#include "base/random.h" -#include "gtest/gtest.h" +#include "ortools/base/hash.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" +#include "ortools/base/map_util.h" +#include "ortools/base/random.h" +#include "ortools/gtest/gtest.h" namespace operations_research { diff --git a/src/algorithms/java/knapsack_solver.swig b/ortools/algorithms/java/knapsack_solver.i similarity index 92% rename from src/algorithms/java/knapsack_solver.swig rename to ortools/algorithms/java/knapsack_solver.i index 674cfc81fd..8bcb240f73 100644 --- a/src/algorithms/java/knapsack_solver.swig +++ b/ortools/algorithms/java/knapsack_solver.i @@ -18,13 +18,13 @@ // // TODO(user): test all lines marked "untested". -%include "base/base.swig" +%include "ortools/base/base.i" %include "enums.swg" -%import "util/java/vector.swig" +%import "ortools/util/java/vector.i" %{ -#include "algorithms/knapsack_solver.h" +#include "ortools/algorithms/knapsack_solver.h" %} %ignoreall @@ -45,6 +45,6 @@ %unignore operations_research::KnapsackSolver::KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER; // untested %unignore operations_research::KnapsackSolver::KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER; -%include "algorithms/knapsack_solver.h" +%include "ortools/algorithms/knapsack_solver.h" %unignoreall diff --git a/src/algorithms/knapsack_solver.cc b/ortools/algorithms/knapsack_solver.cc similarity index 99% rename from src/algorithms/knapsack_solver.cc rename to ortools/algorithms/knapsack_solver.cc index 9b4a15365c..15bddfb1f2 100644 --- a/src/algorithms/knapsack_solver.cc +++ b/ortools/algorithms/knapsack_solver.cc @@ -12,17 +12,17 @@ // limitations under the License. -#include "algorithms/knapsack_solver.h" +#include "ortools/algorithms/knapsack_solver.h" #include #include #include #include -#include "base/stl_util.h" -#include "linear_solver/linear_solver.h" -#include "util/bitset.h" -#include "util/time_limit.h" +#include "ortools/base/stl_util.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/util/bitset.h" +#include "ortools/util/time_limit.h" namespace operations_research { diff --git a/src/algorithms/knapsack_solver.h b/ortools/algorithms/knapsack_solver.h similarity index 99% rename from src/algorithms/knapsack_solver.h rename to ortools/algorithms/knapsack_solver.h index 9ac9acc54e..194cbc53c5 100644 --- a/src/algorithms/knapsack_solver.h +++ b/ortools/algorithms/knapsack_solver.h @@ -62,11 +62,11 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "util/time_limit.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/util/time_limit.h" namespace operations_research { diff --git a/src/algorithms/python/knapsack_solver.swig b/ortools/algorithms/python/knapsack_solver.i similarity index 90% rename from src/algorithms/python/knapsack_solver.swig rename to ortools/algorithms/python/knapsack_solver.i index 73d82574f4..1c89c268d2 100644 --- a/src/algorithms/python/knapsack_solver.swig +++ b/ortools/algorithms/python/knapsack_solver.i @@ -14,15 +14,15 @@ // Python wrapping of ../knapsack_solver.h. See that file. // // USAGE EXAMPLES: -// - python/knapsack.py +// - examples/python/knapsack.py // - ./pywrapknapsack_solver_test.py -%include "base/base.swig" +%include "ortools/base/base.i" -%import "util/python/vector.swig" +%import "ortools/util/python/vector.i" %{ -#include "algorithms/knapsack_solver.h" +#include "ortools/algorithms/knapsack_solver.h" %} %ignoreall @@ -48,6 +48,6 @@ %unignore operations_research::KnapsackSolver:: KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER; -%include "algorithms/knapsack_solver.h" +%include "ortools/algorithms/knapsack_solver.h" %unignoreall diff --git a/src/algorithms/sparse_permutation.cc b/ortools/algorithms/sparse_permutation.cc similarity index 95% rename from src/algorithms/sparse_permutation.cc rename to ortools/algorithms/sparse_permutation.cc index a3e0813f63..44a72e1598 100644 --- a/src/algorithms/sparse_permutation.cc +++ b/ortools/algorithms/sparse_permutation.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "algorithms/sparse_permutation.h" +#include "ortools/algorithms/sparse_permutation.h" #include -#include "base/logging.h" -#include "base/join.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" namespace operations_research { diff --git a/src/algorithms/sparse_permutation.h b/ortools/algorithms/sparse_permutation.h similarity index 99% rename from src/algorithms/sparse_permutation.h rename to ortools/algorithms/sparse_permutation.h index 64c271fec9..8db013822f 100644 --- a/src/algorithms/sparse_permutation.h +++ b/ortools/algorithms/sparse_permutation.h @@ -17,7 +17,7 @@ #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/base/BUILD b/ortools/base/BUILD similarity index 100% rename from src/base/BUILD rename to ortools/base/BUILD diff --git a/src/base/accurate_sum.h b/ortools/base/accurate_sum.h similarity index 100% rename from src/base/accurate_sum.h rename to ortools/base/accurate_sum.h diff --git a/src/base/adjustable_priority_queue-inl.h b/ortools/base/adjustable_priority_queue-inl.h similarity index 93% rename from src/base/adjustable_priority_queue-inl.h rename to ortools/base/adjustable_priority_queue-inl.h index 7586f94af4..a89dbc901c 100644 --- a/src/base/adjustable_priority_queue-inl.h +++ b/ortools/base/adjustable_priority_queue-inl.h @@ -14,6 +14,6 @@ #ifndef OR_TOOLS_BASE_ADJUSTABLE_PRIORITY_QUEUE_INL_H_ #define OR_TOOLS_BASE_ADJUSTABLE_PRIORITY_QUEUE_INL_H_ -#include "base/adjustable_priority_queue.h" +#include "ortools/base/adjustable_priority_queue.h" #endif // OR_TOOLS_BASE_ADJUSTABLE_PRIORITY_QUEUE_INL_H_ diff --git a/src/base/adjustable_priority_queue.h b/ortools/base/adjustable_priority_queue.h similarity index 97% rename from src/base/adjustable_priority_queue.h rename to ortools/base/adjustable_priority_queue.h index 1a71dbf24f..8c432c414f 100644 --- a/src/base/adjustable_priority_queue.h +++ b/ortools/base/adjustable_priority_queue.h @@ -14,9 +14,9 @@ #include #include #include -#include "base/basictypes.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" #ifndef OR_TOOLS_BASE_ADJUSTABLE_PRIORITY_QUEUE_H_ #define OR_TOOLS_BASE_ADJUSTABLE_PRIORITY_QUEUE_H_ diff --git a/src/base/base.swig b/ortools/base/base.i similarity index 98% rename from src/base/base.swig rename to ortools/base/base.i index f0733a7168..e376bc468f 100644 --- a/src/base/base.swig +++ b/ortools/base/base.i @@ -54,8 +54,8 @@ #include #include #include -#include "base/basictypes.h" -#include +#include "ortools/base/basictypes.h" +#include "ortools/base/python-swig.h" %} // Typedefs and typemaps do not interact the way one would expect. @@ -259,7 +259,7 @@ COPY_TYPEMAPS(uint64, Fprint); #include #include #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" %} %include @@ -389,7 +389,7 @@ COPY_TYPEMAPS(unsigned long long, uint64); #include #include #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" %} %include diff --git a/src/base/basictypes.h b/ortools/base/basictypes.h similarity index 90% rename from src/base/basictypes.h rename to ortools/base/basictypes.h index 55f72b4a85..133f318136 100644 --- a/src/base/basictypes.h +++ b/ortools/base/basictypes.h @@ -16,7 +16,7 @@ #ifndef OR_TOOLS_BASE_BASICTYPES_H_ #define OR_TOOLS_BASE_BASICTYPES_H_ -#include "base/integral_types.h" -#include "base/logging.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" #endif // OR_TOOLS_BASE_BASICTYPES_H_ diff --git a/src/base/bitmap.cc b/ortools/base/bitmap.cc similarity index 94% rename from src/base/bitmap.cc rename to ortools/base/bitmap.cc index 3724ed7967..25d9fa02d5 100644 --- a/src/base/bitmap.cc +++ b/ortools/base/bitmap.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/bitmap.h" +#include "ortools/base/bitmap.h" #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" namespace operations_research { diff --git a/src/base/bitmap.h b/ortools/base/bitmap.h similarity index 98% rename from src/base/bitmap.h rename to ortools/base/bitmap.h index 4989785814..1035fc20cf 100644 --- a/src/base/bitmap.h +++ b/ortools/base/bitmap.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_BITMAP_H_ #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" namespace operations_research { namespace internal { diff --git a/src/base/callback.cc b/ortools/base/callback.cc similarity index 96% rename from src/base/callback.cc rename to ortools/base/callback.cc index 1fef8d99f0..c429f486b0 100644 --- a/src/base/callback.cc +++ b/ortools/base/callback.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/callback.h" +#include "ortools/base/callback.h" namespace operations_research { diff --git a/src/base/callback.h b/ortools/base/callback.h similarity index 99% rename from src/base/callback.h rename to ortools/base/callback.h index 42e9383f4e..12cfe8786e 100644 --- a/src/base/callback.h +++ b/ortools/base/callback.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_BASE_CALLBACK_H_ #define OR_TOOLS_BASE_CALLBACK_H_ -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/base/casts.h b/ortools/base/casts.h similarity index 100% rename from src/base/casts.h rename to ortools/base/casts.h diff --git a/src/base/cleanup.h b/ortools/base/cleanup.h similarity index 100% rename from src/base/cleanup.h rename to ortools/base/cleanup.h diff --git a/src/base/commandlineflags.h b/ortools/base/commandlineflags.h similarity index 100% rename from src/base/commandlineflags.h rename to ortools/base/commandlineflags.h diff --git a/src/base/encodingutils.h b/ortools/base/encodingutils.h similarity index 94% rename from src/base/encodingutils.h rename to ortools/base/encodingutils.h index 0c840ce943..3606d527cb 100644 --- a/src/base/encodingutils.h +++ b/ortools/base/encodingutils.h @@ -16,7 +16,6 @@ #include -namespace operations_research { namespace EncodingUtils { // Returns the number of characters of a UTF8-encoded std::string. @@ -34,6 +33,5 @@ inline int UTF8StrLen(const std::string& utf8_str) { } } // namespace EncodingUtils -} // namespace operations_research #endif // OR_TOOLS_BASE_ENCODINGUTILS_H_ diff --git a/src/base/file.cc b/ortools/base/file.cc similarity index 98% rename from src/base/file.cc rename to ortools/base/file.cc index e6cde87981..21ef945174 100644 --- a/src/base/file.cc +++ b/ortools/base/file.cc @@ -25,11 +25,9 @@ #include #include -#include "base/file.h" -#include "base/logging.h" -#include "base/join.h" - -namespace operations_research { +#include "ortools/base/file.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" File::File(FILE* const f_des, const std::string& name) : f_(f_des), name_(name) {} @@ -271,6 +269,5 @@ util::Status Delete(const std::string& path, int flags) { return util::Status(util::error::INVALID_ARGUMENT, StrCat("Could not delete '", path, "'.")); } -} // namespace file -} // namespace operations_research +} // namespace file diff --git a/src/base/file.h b/ortools/base/file.h similarity index 97% rename from src/base/file.h rename to ortools/base/file.h index d4b23230a6..14e9df62a6 100644 --- a/src/base/file.h +++ b/ortools/base/file.h @@ -18,18 +18,16 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" #include "google/protobuf/text_format.h" #include "google/protobuf/io/tokenizer.h" -#include "base/status.h" +#include "ortools/base/status.h" // This file defines some IO interfaces for compatibility with Google // IO specifications. -namespace operations_research { - class File { public: // Opens file "name" with flags specified by "flag". @@ -144,7 +142,4 @@ void WriteProtoToFileOrDie(const google::protobuf::Message& proto, util::Status Delete(const std::string& path, int flags); } // namespace file - -} // namespace operations_research - #endif // OR_TOOLS_BASE_FILE_H_ diff --git a/src/base/filelinereader.cc b/ortools/base/filelinereader.cc similarity index 94% rename from src/base/filelinereader.cc rename to ortools/base/filelinereader.cc index e503a2e350..b53945146a 100644 --- a/src/base/filelinereader.cc +++ b/ortools/base/filelinereader.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/filelinereader.h" +#include "ortools/base/filelinereader.h" #include #include #include -#include "base/file.h" -#include "base/logging.h" +#include "ortools/base/file.h" +#include "ortools/base/logging.h" namespace operations_research { FileLineReader::FileLineReader(const char* const filename) diff --git a/src/base/filelinereader.h b/ortools/base/filelinereader.h similarity index 93% rename from src/base/filelinereader.h rename to ortools/base/filelinereader.h index 76a6bb26c5..a9292b9071 100644 --- a/src/base/filelinereader.h +++ b/ortools/base/filelinereader.h @@ -19,9 +19,9 @@ #include #include -#include "base/callback.h" -#include "base/integral_types.h" -#include "base/file.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/file.h" namespace operations_research { // The FileLineReader class will read a text file specified by diff --git a/src/base/hash.h b/ortools/base/hash.h similarity index 99% rename from src/base/hash.h rename to ortools/base/hash.h index de773a8500..05ed7e9202 100644 --- a/src/base/hash.h +++ b/ortools/base/hash.h @@ -30,7 +30,7 @@ using namespace __gnu_cxx; // NOLINT #include #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" // In SWIG mode, we don't want anything besides these top-level includes. #if !defined(SWIG) diff --git a/src/base/int_type.h b/ortools/base/int_type.h similarity index 99% rename from src/base/int_type.h rename to ortools/base/int_type.h index 0409bedcd0..899eed1850 100755 --- a/src/base/int_type.h +++ b/ortools/base/int_type.h @@ -145,11 +145,11 @@ #define OR_TOOLS_BASE_INT_TYPE_H_ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include // NOLINT -#include "base/macros.h" +#include "ortools/base/macros.h" template class IntType; diff --git a/src/base/int_type_indexed_vector.h b/ortools/base/int_type_indexed_vector.h similarity index 99% rename from src/base/int_type_indexed_vector.h rename to ortools/base/int_type_indexed_vector.h index 9c0e5d1404..a9ca0c26c1 100755 --- a/src/base/int_type_indexed_vector.h +++ b/ortools/base/int_type_indexed_vector.h @@ -64,8 +64,8 @@ #include #include -#include "base/macros.h" -#include "base/int_type.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type.h" // STL std::vector // ------------------------------------------------------------------ diff --git a/src/base/integral_types.h b/ortools/base/integral_types.h similarity index 100% rename from src/base/integral_types.h rename to ortools/base/integral_types.h diff --git a/src/base/jniutil.h b/ortools/base/jniutil.h similarity index 98% rename from src/base/jniutil.h rename to ortools/base/jniutil.h index 630c935be8..320b46b758 100644 --- a/src/base/jniutil.h +++ b/ortools/base/jniutil.h @@ -16,7 +16,7 @@ #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" class JNIUtil { public: diff --git a/src/base/join.cc b/ortools/base/join.cc similarity index 97% rename from src/base/join.cc rename to ortools/base/join.cc index 6aee85d154..68394804ed 100644 --- a/src/base/join.cc +++ b/ortools/base/join.cc @@ -12,12 +12,12 @@ // limitations under the License. #include -#include "base/basictypes.h" -#include "base/join.h" -#include "base/stringpiece.h" -#include "base/stringprintf.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/join.h" +#include "ortools/base/stringpiece.h" +#include "ortools/base/stringprintf.h" -namespace operations_research { +namespace { // ----- StrCat ----- static char* Append1(char* out, const AlphaNum& x) { @@ -47,6 +47,7 @@ static char* Append4(char* out, const AlphaNum& x1, const AlphaNum& x2, memcpy(out, x4.data(), x4.size()); return out + x4.size(); } +} // namespace void StrAppend(std::string* s, const AlphaNum& a) { s->append(a.data(), a.size()); } void StrAppend(std::string* s, const AlphaNum& a, const AlphaNum& b) { @@ -183,5 +184,3 @@ std::string StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c, StrAppend(&out, a, b, c, d, e, f, g, h, i, j, k); return out; } - -} // namespace operations_research diff --git a/src/base/join.h b/ortools/base/join.h similarity index 96% rename from src/base/join.h rename to ortools/base/join.h index 98bec35524..e6e1a5681c 100644 --- a/src/base/join.h +++ b/ortools/base/join.h @@ -17,11 +17,9 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/stringpiece.h" - -namespace operations_research { +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/stringpiece.h" // A buffer size large enough for all FastToBuffer functions. const int kFastToBufferSize = 32; @@ -131,7 +129,6 @@ void StrAppend(std::string* s, const AlphaNum& a, const AlphaNum& b, const AlphaNum& c, const AlphaNum& d, const AlphaNum& e, const AlphaNum& f, const AlphaNum& g, const AlphaNum& h, const AlphaNum& i, const AlphaNum& j, const AlphaNum& k); -} // namespace operations_research namespace strings { template @@ -139,7 +136,7 @@ std::string Join(const Iterable& elements, const std::string& separator) { std::string out; for (const auto& e : elements) { if (!out.empty()) out += separator; - ::operations_research::StrAppend(&out, e); + StrAppend(&out, e); } return out; } diff --git a/src/base/logging.cc b/ortools/base/logging.cc similarity index 97% rename from src/base/logging.cc rename to ortools/base/logging.cc index cc97d2d4d0..4396bff436 100644 --- a/src/base/logging.cc +++ b/ortools/base/logging.cc @@ -14,7 +14,7 @@ #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" DEFINE_int32(log_level, 0, "Log level (0 is the default)."); DEFINE_bool(log_prefix, true, diff --git a/src/base/logging.h b/ortools/base/logging.h similarity index 97% rename from src/base/logging.h rename to ortools/base/logging.h index 2fdd6f613f..f6076beff1 100644 --- a/src/base/logging.h +++ b/ortools/base/logging.h @@ -17,9 +17,9 @@ #include #include #include // NOLINT -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/macros.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" DECLARE_int32(log_level); DECLARE_bool(log_prefix); diff --git a/src/base/macros.h b/ortools/base/macros.h similarity index 100% rename from src/base/macros.h rename to ortools/base/macros.h diff --git a/src/base/map_util.h b/ortools/base/map_util.h similarity index 99% rename from src/base/map_util.h rename to ortools/base/map_util.h index d297edcaad..2c3efa5dc8 100644 --- a/src/base/map_util.h +++ b/ortools/base/map_util.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_MAP_UTIL_H_ #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/base/mathutil.h b/ortools/base/mathutil.h similarity index 95% rename from src/base/mathutil.h rename to ortools/base/mathutil.h index 4a087865db..318271f2f1 100644 --- a/src/base/mathutil.h +++ b/ortools/base/mathutil.h @@ -18,11 +18,11 @@ #include #include -#include "base/basictypes.h" -#include "base/casts.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/casts.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" namespace operations_research { class MathUtil { diff --git a/src/base/murmur.h b/ortools/base/murmur.h similarity index 96% rename from src/base/murmur.h rename to ortools/base/murmur.h index 9716990de4..7cfc1cee90 100644 --- a/src/base/murmur.h +++ b/ortools/base/murmur.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_BASE_MURMUR_H_ #define OR_TOOLS_BASE_MURMUR_H_ -#include "base/thorough_hash.h" +#include "ortools/base/thorough_hash.h" namespace util_hash { // In the or-tools project, MurmurHash64 is just a redirection towards diff --git a/src/base/mutex.cc b/ortools/base/mutex.cc similarity index 97% rename from src/base/mutex.cc rename to ortools/base/mutex.cc index d312125e38..acda00c562 100644 --- a/src/base/mutex.cc +++ b/ortools/base/mutex.cc @@ -13,7 +13,7 @@ #include // NOLINT -#include "base/mutex.h" +#include "ortools/base/mutex.h" namespace operations_research { Mutex::Mutex() {} diff --git a/src/base/mutex.h b/ortools/base/mutex.h similarity index 98% rename from src/base/mutex.h rename to ortools/base/mutex.h index 171ce689ed..ca4a073945 100644 --- a/src/base/mutex.h +++ b/ortools/base/mutex.h @@ -17,7 +17,7 @@ #include // NOLINT #include // NOLINT -#include "base/macros.h" +#include "ortools/base/macros.h" namespace operations_research { class Mutex { diff --git a/src/base/numbers.cc b/ortools/base/numbers.cc similarity index 98% rename from src/base/numbers.cc rename to ortools/base/numbers.cc index 6c57fce003..2134a1f816 100644 --- a/src/base/numbers.cc +++ b/ortools/base/numbers.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/numbers.h" +#include "ortools/base/numbers.h" #include #include diff --git a/src/base/numbers.h b/ortools/base/numbers.h similarity index 94% rename from src/base/numbers.h rename to ortools/base/numbers.h index e8941eb7eb..eb476e594e 100644 --- a/src/base/numbers.h +++ b/ortools/base/numbers.h @@ -15,8 +15,8 @@ #define OR_TOOLS_BASE_NUMBERS_H_ #include -#include "base/integral_types.h" -#include "base/join.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/join.h" namespace operations_research { // Convert strings to numerical values. diff --git a/src/base/port.h b/ortools/base/port.h similarity index 100% rename from src/base/port.h rename to ortools/base/port.h diff --git a/src/base/python-swig.h b/ortools/base/python-swig.h similarity index 98% rename from src/base/python-swig.h rename to ortools/base/python-swig.h index 665dfb55d6..06431b033d 100644 --- a/src/base/python-swig.h +++ b/ortools/base/python-swig.h @@ -13,10 +13,10 @@ // Static part of SWIG-generated C++ wrapper for Python (_module_name.cc). // -// This file should only be included in base.swig inside Python-specific part: +// This file should only be included in base.i inside Python-specific part: // #ifdef SWIGPYTHON // %{ -// #include "base/swig/python-swig.cc" +// #include "ortools/base/swig/python-swig.cc" // %} // #endif // It has no XXX_H_ guard because SWIG protects all %include'd files to be used diff --git a/src/base/python/callbacks.swig b/ortools/base/python/callbacks.i similarity index 96% rename from src/base/python/callbacks.swig rename to ortools/base/python/callbacks.i index 78632532bf..6b9c783c07 100644 --- a/src/base/python/callbacks.swig +++ b/ortools/base/python/callbacks.i @@ -13,15 +13,15 @@ // SWIG wrapping of some Callbacks in python. // This doesn't directly expose a C++ API; rather it provides typemaps that can -// be used by other .swig files to easily expose APIs that use callbacks. -// See its usage in ../../constraint_solver/python/constraint_solver.swig. +// be used by other .i files to easily expose APIs that use callbacks. +// See its usage in ../../constraint_solver/python/constraint_solver.i. // // TODO(user): Nuke this file and use the callback wrapping code in // base/swig/python/... when it is available. -%include "base/base.swig" +%include "ortools/base/base.i" -%import "base/callback.h" +%import "ortools/base/callback.h" %{ static std::string PyCallbackString(PyObject* pyfunc) { diff --git a/src/base/random.cc b/ortools/base/random.cc similarity index 97% rename from src/base/random.cc rename to ortools/base/random.cc index e93c3034c1..cb5ed0f91f 100644 --- a/src/base/random.cc +++ b/ortools/base/random.cc @@ -27,8 +27,8 @@ #include #include -#include "base/hash.h" -#include "base/random.h" +#include "ortools/base/hash.h" +#include "ortools/base/random.h" namespace operations_research { diff --git a/src/base/random.h b/ortools/base/random.h similarity index 98% rename from src/base/random.h rename to ortools/base/random.h index d8ac324321..bd10a9f9e3 100644 --- a/src/base/random.h +++ b/ortools/base/random.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_RANDOM_H_ #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" namespace operations_research { diff --git a/src/base/recordio.cc b/ortools/base/recordio.cc similarity index 87% rename from src/base/recordio.cc rename to ortools/base/recordio.cc index a34ea3b0d0..e6f2b9a94c 100644 --- a/src/base/recordio.cc +++ b/ortools/base/recordio.cc @@ -14,10 +14,10 @@ #include #include #include -#include "base/logging.h" -#include "base/recordio.h" +#include "ortools/base/logging.h" +#include "ortools/base/recordio.h" -namespace operations_research { +namespace recordio { const int RecordWriter::kMagicNumber = 0x3ed7230a; RecordWriter::RecordWriter(File* const file) @@ -34,14 +34,14 @@ std::string RecordWriter::Compress(std::string const& s) const { const char* source = s.c_str(); unsigned long dsize = source_size + (source_size * 0.1f) + 16; // NOLINT - std::unique_ptr destination(new char[dsize]); + std::unique_ptr destination(new char[dsize]); // Use compress() from zlib.h. const int result = compress(reinterpret_cast(destination.get()), &dsize, reinterpret_cast(source), source_size); if (result != Z_OK) { - LOG(FATAL) << "Compress error occured! Error code: " << result; + LOG(FATAL) << "Compress error occurred! Error code: " << result; } return std::string(destination.get(), dsize); } @@ -59,8 +59,8 @@ void RecordReader::Uncompress(const char* const source, uint64 source_size, uncompress(reinterpret_cast(output_buffer), &result_size, reinterpret_cast(source), source_size); if (result != Z_OK) { - LOG(FATAL) << "Uncompress error occured! Error code: " << result; + LOG(FATAL) << "Uncompress error occurred! Error code: " << result; } CHECK_LE(result_size, static_cast(output_size)); // NOLINT } -} // namespace operations_research +} // namespace recordio diff --git a/src/base/recordio.h b/ortools/base/recordio.h similarity index 97% rename from src/base/recordio.h rename to ortools/base/recordio.h index 0404e7cdca..ae94349ceb 100644 --- a/src/base/recordio.h +++ b/ortools/base/recordio.h @@ -16,11 +16,11 @@ #include #include -#include "base/file.h" +#include "ortools/base/file.h" // This file defines some IO interfaces to compatible with Google // IO specifications. -namespace operations_research { +namespace recordio { // This class appends a protocol buffer to a file in a binary format. // The data written in the file follows the following format (sequentially): // - MagicNumber (32 bits) to recognize this format. @@ -130,6 +130,6 @@ class RecordReader { File* const file_; }; -} // namespace operations_research +} // namespace recordio #endif // OR_TOOLS_BASE_RECORDIO_H_ diff --git a/src/base/small_map.h b/ortools/base/small_map.h similarity index 100% rename from src/base/small_map.h rename to ortools/base/small_map.h diff --git a/src/base/small_ordered_set.h b/ortools/base/small_ordered_set.h similarity index 100% rename from src/base/small_ordered_set.h rename to ortools/base/small_ordered_set.h diff --git a/src/base/sparsetable.h b/ortools/base/sparsetable.h similarity index 98% rename from src/base/sparsetable.h rename to ortools/base/sparsetable.h index f011a8785d..64a20e5643 100644 --- a/src/base/sparsetable.h +++ b/ortools/base/sparsetable.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_SPARSETABLE_H_ #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { // This class implements a simple block-based sparse std::vector. diff --git a/src/base/split.cc b/ortools/base/split.cc similarity index 94% rename from src/base/split.cc rename to ortools/base/split.cc index 4aef51a865..369302e23f 100644 --- a/src/base/split.cc +++ b/ortools/base/split.cc @@ -11,12 +11,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/split.h" +#include "ortools/base/split.h" #if defined(_MSC_VER) #include #endif // _MSC_VER -#include "base/logging.h" +#include "ortools/base/logging.h" namespace strings { namespace { @@ -87,11 +87,11 @@ std::vector Split(const std::string& full, const char* delim, int f return out; } -std::vector<::operations_research::StringPiece> Split(const std::string& full, +std::vector Split(const std::string& full, const char* delim, int64 flags) { CHECK_EQ(SkipEmpty(), flags); - std::vector<::operations_research::StringPiece> out; + std::vector out; InternalSplitStringUsing(full, delim, &out); return out; } diff --git a/src/base/split.h b/ortools/base/split.h similarity index 90% rename from src/base/split.h rename to ortools/base/split.h index 708e234625..96b208df2c 100644 --- a/src/base/split.h +++ b/ortools/base/split.h @@ -19,9 +19,9 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringpiece.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringpiece.h" namespace strings { std::vector Split(const std::string& full, const char* delim, int flags); @@ -34,9 +34,9 @@ std::vector Split(const std::string& full, char delim, int flags); // // Hack: the int64 allow the C++ compiler to distinguish the two functions. It // is possible to implement this more cleanly at the cost of more complexity. -std::vector<::operations_research::StringPiece> Split(const std::string& full, - const char* delim, - int64 flags); +std::vector Split(const std::string& full, + const char* delim, + int64 flags); namespace delimiter { inline const char* AnyOf(const char* x) { return x; } @@ -46,7 +46,6 @@ inline int SkipEmpty() { return 0xDEADBEEF; } } // namespace strings -namespace operations_research { // Split a std::string using a nul-terminated list of character // delimiters. For each component, parse using the provided // parsing function and if successful, append it to 'result'. @@ -89,6 +88,5 @@ bool SplitStringAndParse(const std::string& source, const std::string& delim, return true; } -} // namespace operations_research #endif // OR_TOOLS_BASE_SPLIT_H_ diff --git a/src/base/status.h b/ortools/base/status.h similarity index 93% rename from src/base/status.h rename to ortools/base/status.h index aab852927a..8980bc973c 100644 --- a/src/base/status.h +++ b/ortools/base/status.h @@ -15,10 +15,9 @@ #define OR_TOOLS_BASE_STATUS_H_ #include -#include "base/logging.h" -#include "base/join.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" -namespace operations_research { namespace util { namespace error { @@ -63,6 +62,4 @@ inline std::ostream& operator<<(std::ostream& out, const Status& status) { #define CHECK_OK(status) CHECK_EQ("OK", (status).ToString()) -} // namespace operations_research - #endif // OR_TOOLS_BASE_STATUS_H_ diff --git a/src/base/statusor.h b/ortools/base/statusor.h similarity index 94% rename from src/base/statusor.h rename to ortools/base/statusor.h index 96ea091f3b..3dcdf104a7 100644 --- a/src/base/statusor.h +++ b/ortools/base/statusor.h @@ -14,9 +14,8 @@ #ifndef OR_TOOLS_BASE_STATUSOR_H_ #define OR_TOOLS_BASE_STATUSOR_H_ -#include "base/status.h" +#include "ortools/base/status.h" -namespace operations_research { namespace util { // T should be a pointer type. Eg. StatusOr. @@ -50,6 +49,5 @@ struct StatusOr { }; } // namespace util -} // namespace operations_research #endif // OR_TOOLS_BASE_STATUSOR_H_ diff --git a/src/base/stl_util.h b/ortools/base/stl_util.h similarity index 100% rename from src/base/stl_util.h rename to ortools/base/stl_util.h diff --git a/src/base/stringpiece.cc b/ortools/base/stringpiece.cc similarity index 94% rename from src/base/stringpiece.cc rename to ortools/base/stringpiece.cc index 87f898a96e..a5432128fa 100644 --- a/src/base/stringpiece.cc +++ b/ortools/base/stringpiece.cc @@ -13,9 +13,7 @@ #include // NOLINT #include -#include "base/stringpiece.h" - -using operations_research::StringPiece; +#include "ortools/base/stringpiece.h" std::ostream& operator<<(std::ostream& o, const StringPiece& piece) { o.write(piece.data(), piece.size()); @@ -38,8 +36,7 @@ bool operator==(const StringPiece& x, const StringPiece& y) { return true; } -bool operator<(const operations_research::StringPiece& x, - const operations_research::StringPiece& y) { +bool operator<(const StringPiece& x, const StringPiece& y) { const int r = memcmp(x.data(), y.data(), std::min(x.size(), y.size())); return ((r < 0) || ((r == 0) && (x.size() < y.size()))); } diff --git a/src/base/stringpiece.h b/ortools/base/stringpiece.h similarity index 84% rename from src/base/stringpiece.h rename to ortools/base/stringpiece.h index 01ac6d943a..0de3c76b2b 100644 --- a/src/base/stringpiece.h +++ b/ortools/base/stringpiece.h @@ -32,8 +32,6 @@ #include #include -namespace operations_research { - class StringPiece { private: const char* ptr_; @@ -146,36 +144,27 @@ class StringPiece { StringPiece substr(size_type pos, size_type n = npos) const; }; -} // namespace operations_research +bool operator==(const StringPiece& x, const StringPiece& y); -bool operator==(const operations_research::StringPiece& x, - const operations_research::StringPiece& y); - -inline bool operator!=(const operations_research::StringPiece& x, - const operations_research::StringPiece& y) { +inline bool operator!=(const StringPiece& x, const StringPiece& y) { return !(x == y); } -bool operator<(const operations_research::StringPiece& x, - const operations_research::StringPiece& y); +bool operator<(const StringPiece& x, const StringPiece& y); -inline bool operator>(const operations_research::StringPiece& x, - const operations_research::StringPiece& y) { +inline bool operator>(const StringPiece& x, const StringPiece& y) { return y < x; } -inline bool operator<=(const operations_research::StringPiece& x, - const operations_research::StringPiece& y) { +inline bool operator<=(const StringPiece& x, const StringPiece& y) { return !(x > y); } -inline bool operator>=(const operations_research::StringPiece& x, - const operations_research::StringPiece& y) { +inline bool operator>=(const StringPiece& x, const StringPiece& y) { return !(x < y); } // Allow StringPiece to be logged. -extern std::ostream& operator<<(std::ostream& o, - const operations_research::StringPiece& piece); +extern std::ostream& operator<<(std::ostream& o, const StringPiece& piece); #endif // OR_TOOLS_BASE_STRINGPIECE_H_ diff --git a/src/base/stringpiece_utils.h b/ortools/base/stringpiece_utils.h similarity index 79% rename from src/base/stringpiece_utils.h rename to ortools/base/stringpiece_utils.h index 7f6919d1f3..6378e189b1 100644 --- a/src/base/stringpiece_utils.h +++ b/ortools/base/stringpiece_utils.h @@ -16,18 +16,16 @@ #include -#include "base/stringpiece.h" +#include "ortools/base/stringpiece.h" namespace strings { // Returns whether s begins with x. -inline bool StartsWith(operations_research::StringPiece s, - operations_research::StringPiece x) { +inline bool StartsWith(StringPiece s, StringPiece x) { return s.size() >= x.size() && memcmp(s.data(), x.data(), x.size()) == 0; } // Returns whether s ends with x. -inline bool EndsWith(operations_research::StringPiece s, - operations_research::StringPiece x) { +inline bool EndsWith(StringPiece s, StringPiece x) { return s.size() >= x.size() && memcmp(s.data() + (s.size() - x.size()), x.data(), x.size()) == 0; } diff --git a/src/base/stringprintf.cc b/ortools/base/stringprintf.cc similarity index 98% rename from src/base/stringprintf.cc rename to ortools/base/stringprintf.cc index a9a9e1022c..2bd6ba1a45 100644 --- a/src/base/stringprintf.cc +++ b/ortools/base/stringprintf.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/stringprintf.h" +#include "ortools/base/stringprintf.h" #include #include diff --git a/src/base/stringprintf.h b/ortools/base/stringprintf.h similarity index 96% rename from src/base/stringprintf.h rename to ortools/base/stringprintf.h index ea25bf9889..ef1feb88cc 100644 --- a/src/base/stringprintf.h +++ b/ortools/base/stringprintf.h @@ -16,7 +16,7 @@ #include -#include "base/stringpiece.h" +#include "ortools/base/stringpiece.h" namespace operations_research { std::string StringPrintf(const char* const format, ...); diff --git a/src/base/strongly_connected_components.h b/ortools/base/strongly_connected_components.h similarity index 98% rename from src/base/strongly_connected_components.h rename to ortools/base/strongly_connected_components.h index 1c0e30ba05..5a069f0e25 100644 --- a/src/base/strongly_connected_components.h +++ b/ortools/base/strongly_connected_components.h @@ -48,8 +48,8 @@ #include #include -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" // Finds the strongly connected components of a directed graph. It is templated // so it can be used in many contexts. See the simple example above for the @@ -82,7 +82,7 @@ void FindStronglyConnectedComponents(const NodeIndex num_nodes, // // Note: If this matters, you probably don't want to use // std::vector> as -// an input either. See StaticGraph in graph/graph.h +// an input either. See StaticGraph in ortools/graph/graph.h // for an efficient graph data structure compatible with this algorithm. template struct SccCounterOutput { diff --git a/src/base/strtoint.h b/ortools/base/strtoint.h similarity index 98% rename from src/base/strtoint.h rename to ortools/base/strtoint.h index 6c8b5c621e..0c3549daaf 100644 --- a/src/base/strtoint.h +++ b/ortools/base/strtoint.h @@ -16,7 +16,7 @@ #include // For strtol* functions. #include -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" namespace operations_research { // Conversions to a 32-bit integer can pass the call to strto[u]l on 32-bit diff --git a/src/base/strutil.h b/ortools/base/strutil.h similarity index 96% rename from src/base/strutil.h rename to ortools/base/strutil.h index 9928da261f..d0dfab9fd9 100644 --- a/src/base/strutil.h +++ b/ortools/base/strutil.h @@ -15,7 +15,7 @@ #define OR_TOOLS_BASE_STRUTIL_H_ #include -#include "base/stringpiece.h" +#include "ortools/base/stringpiece.h" using std::string; diff --git a/src/base/synchronization.h b/ortools/base/synchronization.h similarity index 97% rename from src/base/synchronization.h rename to ortools/base/synchronization.h index 92fd83e4e3..1ca6d1ea84 100644 --- a/src/base/synchronization.h +++ b/ortools/base/synchronization.h @@ -17,7 +17,7 @@ #include // NOLINT #include // NOLINT -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { class Barrier { diff --git a/src/base/sysinfo.cc b/ortools/base/sysinfo.cc similarity index 96% rename from src/base/sysinfo.cc rename to ortools/base/sysinfo.cc index deee911694..78221d2aee 100644 --- a/src/base/sysinfo.cc +++ b/ortools/base/sysinfo.cc @@ -24,8 +24,8 @@ #include -#include "base/sysinfo.h" -#include "base/stringpiece.h" +#include "ortools/base/sysinfo.h" +#include "ortools/base/stringpiece.h" namespace operations_research { // GetProcessMemoryUsage diff --git a/src/base/sysinfo.h b/ortools/base/sysinfo.h similarity index 95% rename from src/base/sysinfo.h rename to ortools/base/sysinfo.h index bc7808c892..807a138052 100644 --- a/src/base/sysinfo.h +++ b/ortools/base/sysinfo.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_BASE_SYSINFO_H_ #define OR_TOOLS_BASE_SYSINFO_H_ -#include "base/basictypes.h" +#include "ortools/base/basictypes.h" namespace operations_research { // Returns the memory usage of the process. diff --git a/src/base/thorough_hash.h b/ortools/base/thorough_hash.h similarity index 97% rename from src/base/thorough_hash.h rename to ortools/base/thorough_hash.h index 8be2069219..5acd36bad8 100644 --- a/src/base/thorough_hash.h +++ b/ortools/base/thorough_hash.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_BASE_THOROUGH_HASH_H_ #define OR_TOOLS_BASE_THOROUGH_HASH_H_ -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { inline uint64 MixTwoUInt64(uint64 fp1, uint64 fp2) { diff --git a/src/base/threadpool.cc b/ortools/base/threadpool.cc similarity index 98% rename from src/base/threadpool.cc rename to ortools/base/threadpool.cc index d053bc23a2..976d39b50c 100644 --- a/src/base/threadpool.cc +++ b/ortools/base/threadpool.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/threadpool.h" +#include "ortools/base/threadpool.h" namespace operations_research { void RunWorker(void* data) { diff --git a/src/base/threadpool.h b/ortools/base/threadpool.h similarity index 100% rename from src/base/threadpool.h rename to ortools/base/threadpool.h diff --git a/src/base/time_support.cc b/ortools/base/time_support.cc similarity index 94% rename from src/base/time_support.cc rename to ortools/base/time_support.cc index 878ebc9d73..f07fe66206 100644 --- a/src/base/time_support.cc +++ b/ortools/base/time_support.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/time_support.h" +#include "ortools/base/time_support.h" #if !defined(_MSC_VER) #include @@ -23,7 +23,6 @@ #endif #include -namespace operations_research { namespace base { int64 GetCurrentTimeNanos() { @@ -51,4 +50,3 @@ int64 GetCurrentTimeNanos() { } } // namespace base -} // namespace operations_research diff --git a/src/base/time_support.h b/ortools/base/time_support.h similarity index 94% rename from src/base/time_support.h rename to ortools/base/time_support.h index b3157c8fab..4c089277d9 100644 --- a/src/base/time_support.h +++ b/ortools/base/time_support.h @@ -14,9 +14,8 @@ #ifndef OR_TOOLS_BASE_TIME_SUPPORT_H_ #define OR_TOOLS_BASE_TIME_SUPPORT_H_ -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" -namespace operations_research { namespace base { // Ideally, this should be a super-fast implementation that isn't too @@ -43,6 +42,4 @@ inline double WallTime_Now() { return base::GetCurrentTimeNanos() * 1e-9; } inline double ToWallTime(int64 nanos) { return 1e-9 * nanos; } -} // namespace operations_research - #endif // OR_TOOLS_BASE_TIME_SUPPORT_H_ diff --git a/src/base/timer.cc b/ortools/base/timer.cc similarity index 89% rename from src/base/timer.cc rename to ortools/base/timer.cc index eab86c9dfa..5a20cd37bb 100644 --- a/src/base/timer.cc +++ b/ortools/base/timer.cc @@ -11,9 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/timer.h" - -namespace operations_research { +#include "ortools/base/timer.h" ScopedWallTime::ScopedWallTime(double* aggregate_time) : aggregate_time_(aggregate_time), timer_() { @@ -25,5 +23,3 @@ ScopedWallTime::~ScopedWallTime() { timer_.Stop(); *aggregate_time_ += timer_.Get(); } - -} // namespace operations_research diff --git a/src/base/timer.h b/ortools/base/timer.h similarity index 94% rename from src/base/timer.h rename to ortools/base/timer.h index 3765643408..f620b763ff 100644 --- a/src/base/timer.h +++ b/ortools/base/timer.h @@ -14,12 +14,10 @@ #ifndef OR_TOOLS_BASE_TIMER_H_ #define OR_TOOLS_BASE_TIMER_H_ -#include "base/basictypes.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/time_support.h" - -namespace operations_research { +#include "ortools/base/basictypes.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/time_support.h" class WallTimer { public: @@ -105,5 +103,4 @@ class ScopedWallTime { DISALLOW_COPY_AND_ASSIGN(ScopedWallTime); }; -} // namespace operations_research #endif // OR_TOOLS_BASE_TIMER_H_ diff --git a/src/base/typeid.h b/ortools/base/typeid.h similarity index 100% rename from src/base/typeid.h rename to ortools/base/typeid.h diff --git a/src/bazel/BUILD b/ortools/bazel/BUILD similarity index 100% rename from src/bazel/BUILD rename to ortools/bazel/BUILD diff --git a/src/bazel/glpk.BUILD b/ortools/bazel/glpk.BUILD similarity index 100% rename from src/bazel/glpk.BUILD rename to ortools/bazel/glpk.BUILD diff --git a/src/bazel/gtest.BUILD b/ortools/bazel/gtest.BUILD similarity index 100% rename from src/bazel/gtest.BUILD rename to ortools/bazel/gtest.BUILD diff --git a/src/bazel/swig.BUILD b/ortools/bazel/swig.BUILD similarity index 100% rename from src/bazel/swig.BUILD rename to ortools/bazel/swig.BUILD diff --git a/src/bazel/swig.bzl b/ortools/bazel/swig.bzl similarity index 100% rename from src/bazel/swig.bzl rename to ortools/bazel/swig.bzl diff --git a/src/bop/BUILD b/ortools/bop/BUILD similarity index 100% rename from src/bop/BUILD rename to ortools/bop/BUILD diff --git a/src/bop/bop_base.cc b/ortools/bop/bop_base.cc similarity index 99% rename from src/bop/bop_base.cc rename to ortools/bop/bop_base.cc index 8bae08b4ae..0562e8e374 100644 --- a/src/bop/bop_base.cc +++ b/ortools/bop/bop_base.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_base.h" +#include "ortools/bop/bop_base.h" #include #include #include -#include "sat/boolean_problem.h" +#include "ortools/sat/boolean_problem.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_base.h b/ortools/bop/bop_base.h similarity index 96% rename from src/bop/bop_base.h rename to ortools/bop/bop_base.h index 2edeebf1f5..99884a95ec 100644 --- a/src/bop/bop_base.h +++ b/ortools/bop/bop_base.h @@ -16,15 +16,15 @@ #include -#include "base/basictypes.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_solution.h" -#include "lp_data/lp_types.h" -#include "sat/boolean_problem.pb.h" -#include "sat/clause.h" -#include "sat/sat_base.h" -#include "util/stats.h" -#include "util/time_limit.h" +#include "ortools/base/basictypes.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/clause.h" +#include "ortools/sat/sat_base.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_fs.cc b/ortools/bop/bop_fs.cc similarity index 98% rename from src/bop/bop_fs.cc rename to ortools/bop/bop_fs.cc index 7b2abe3d4a..97a24276fa 100644 --- a/src/bop/bop_fs.cc +++ b/ortools/bop/bop_fs.cc @@ -11,24 +11,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_fs.h" +#include "ortools/bop/bop_fs.h" #include #include -#include "base/commandlineflags.h" -#include "base/stringprintf.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/stringprintf.h" #include "google/protobuf/text_format.h" -#include "base/stl_util.h" -#include "algorithms/sparse_permutation.h" -#include "glop/lp_solver.h" -#include "lp_data/lp_print_utils.h" -#include "sat/boolean_problem.h" -#include "sat/lp_utils.h" -#include "sat/sat_solver.h" -#include "sat/symmetry.h" -#include "sat/util.h" -#include "util/bitset.h" +#include "ortools/base/stl_util.h" +#include "ortools/algorithms/sparse_permutation.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/lp_utils.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/sat/symmetry.h" +#include "ortools/sat/util.h" +#include "ortools/util/bitset.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_fs.h b/ortools/bop/bop_fs.h similarity index 90% rename from src/bop/bop_fs.h rename to ortools/bop/bop_fs.h index d02d0d6651..bfbb37e9fa 100644 --- a/src/bop/bop_fs.h +++ b/ortools/bop/bop_fs.h @@ -16,21 +16,21 @@ #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "bop/bop_base.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "bop/bop_util.h" -#include "glop/lp_solver.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "util/time_limit.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/bop/bop_util.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_lns.cc b/ortools/bop/bop_lns.cc similarity index 98% rename from src/bop/bop_lns.cc rename to ortools/bop/bop_lns.cc index 7d3f9934ab..37e22ae1e0 100644 --- a/src/bop/bop_lns.cc +++ b/ortools/bop/bop_lns.cc @@ -11,23 +11,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_lns.h" +#include "ortools/bop/bop_lns.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/stringprintf.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/stringprintf.h" #include "google/protobuf/text_format.h" -#include "base/cleanup.h" -#include "base/stl_util.h" -#include "glop/lp_solver.h" -#include "lp_data/lp_print_utils.h" -#include "sat/boolean_problem.h" -#include "sat/lp_utils.h" -#include "sat/sat_solver.h" -#include "util/bitset.h" +#include "ortools/base/cleanup.h" +#include "ortools/base/stl_util.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/lp_utils.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/bitset.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_lns.h b/ortools/bop/bop_lns.h similarity index 92% rename from src/bop/bop_lns.h rename to ortools/bop/bop_lns.h index eab4a48afb..654d8a0a8f 100644 --- a/src/bop/bop_lns.h +++ b/ortools/bop/bop_lns.h @@ -17,22 +17,22 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "bop/bop_base.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "bop/bop_util.h" -#include "glop/lp_solver.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "util/stats.h" -#include "util/time_limit.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/bop/bop_util.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_ls.cc b/ortools/bop/bop_ls.cc similarity index 99% rename from src/bop/bop_ls.cc rename to ortools/bop/bop_ls.cc index 2cf22aa978..62f67032fb 100644 --- a/src/bop/bop_ls.cc +++ b/ortools/bop/bop_ls.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_ls.h" +#include "ortools/bop/bop_ls.h" -#include "bop/bop_util.h" -#include "sat/boolean_problem.h" +#include "ortools/bop/bop_util.h" +#include "ortools/sat/boolean_problem.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_ls.h b/ortools/bop/bop_ls.h similarity index 98% rename from src/bop/bop_ls.h rename to ortools/bop/bop_ls.h index 4dbf1011a2..49809515e7 100644 --- a/src/bop/bop_ls.h +++ b/ortools/bop/bop_ls.h @@ -28,15 +28,15 @@ #define OR_TOOLS_BOP_BOP_LS_H_ #include -#include "base/hash.h" +#include "ortools/base/hash.h" -#include "base/hash.h" -#include "bop/bop_base.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "base/random.h" +#include "ortools/base/hash.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/base/random.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_parameters.proto b/ortools/bop/bop_parameters.proto similarity index 100% rename from src/bop/bop_parameters.proto rename to ortools/bop/bop_parameters.proto diff --git a/src/bop/bop_portfolio.cc b/ortools/bop/bop_portfolio.cc similarity index 98% rename from src/bop/bop_portfolio.cc rename to ortools/bop/bop_portfolio.cc index 425816dcf7..2ddead222f 100644 --- a/src/bop/bop_portfolio.cc +++ b/ortools/bop/bop_portfolio.cc @@ -11,16 +11,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_portfolio.h" +#include "ortools/bop/bop_portfolio.h" -#include "base/stl_util.h" -#include "bop/bop_fs.h" -#include "bop/bop_lns.h" -#include "bop/bop_ls.h" -#include "bop/bop_util.h" -#include "bop/complete_optimizer.h" -#include "sat/boolean_problem.h" -#include "sat/symmetry.h" +#include "ortools/base/stl_util.h" +#include "ortools/bop/bop_fs.h" +#include "ortools/bop/bop_lns.h" +#include "ortools/bop/bop_ls.h" +#include "ortools/bop/bop_util.h" +#include "ortools/bop/complete_optimizer.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/symmetry.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_portfolio.h b/ortools/bop/bop_portfolio.h similarity index 95% rename from src/bop/bop_portfolio.h rename to ortools/bop/bop_portfolio.h index ec66442b89..557af1d47a 100644 --- a/src/bop/bop_portfolio.h +++ b/ortools/bop/bop_portfolio.h @@ -14,16 +14,16 @@ #ifndef OR_TOOLS_BOP_BOP_PORTFOLIO_H_ #define OR_TOOLS_BOP_BOP_PORTFOLIO_H_ -#include "bop/bop_base.h" -#include "bop/bop_lns.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "glop/lp_solver.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "util/stats.h" -#include "util/time_limit.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_lns.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_solution.cc b/ortools/bop/bop_solution.cc similarity index 98% rename from src/bop/bop_solution.cc rename to ortools/bop/bop_solution.cc index 7fc931ee5e..46f0f80363 100644 --- a/src/bop/bop_solution.cc +++ b/ortools/bop/bop_solution.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_solution.h" +#include "ortools/bop/bop_solution.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_solution.h b/ortools/bop/bop_solution.h similarity index 97% rename from src/bop/bop_solution.h rename to ortools/bop/bop_solution.h index 8293659f12..dc8a884702 100644 --- a/src/bop/bop_solution.h +++ b/ortools/bop/bop_solution.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_BOP_BOP_SOLUTION_H_ #define OR_TOOLS_BOP_BOP_SOLUTION_H_ -#include "bop/bop_types.h" -#include "sat/boolean_problem.h" -#include "sat/boolean_problem.pb.h" +#include "ortools/bop/bop_types.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/boolean_problem.pb.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_solver.cc b/ortools/bop/bop_solver.cc similarity index 91% rename from src/bop/bop_solver.cc rename to ortools/bop/bop_solver.cc index 1e110c860c..d77aa4b7ea 100644 --- a/src/bop/bop_solver.cc +++ b/ortools/bop/bop_solver.cc @@ -11,27 +11,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_solver.h" +#include "ortools/bop/bop_solver.h" #include #include -#include "base/commandlineflags.h" -#include "base/stringprintf.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/stringprintf.h" #include "google/protobuf/text_format.h" -#include "base/stl_util.h" -#include "bop/bop_fs.h" -#include "bop/bop_lns.h" -#include "bop/bop_ls.h" -#include "bop/bop_portfolio.h" -#include "bop/bop_util.h" -#include "bop/complete_optimizer.h" -#include "glop/lp_solver.h" -#include "lp_data/lp_print_utils.h" -#include "sat/boolean_problem.h" -#include "sat/lp_utils.h" -#include "sat/sat_solver.h" -#include "util/bitset.h" +#include "ortools/base/stl_util.h" +#include "ortools/bop/bop_fs.h" +#include "ortools/bop/bop_lns.h" +#include "ortools/bop/bop_ls.h" +#include "ortools/bop/bop_portfolio.h" +#include "ortools/bop/bop_util.h" +#include "ortools/bop/complete_optimizer.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/lp_utils.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/bitset.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_solver.h b/ortools/bop/bop_solver.h similarity index 85% rename from src/bop/bop_solver.h rename to ortools/bop/bop_solver.h index 96fbc3c162..00fab91d79 100644 --- a/src/bop/bop_solver.h +++ b/ortools/bop/bop_solver.h @@ -39,21 +39,21 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "bop/bop_base.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "glop/lp_solver.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "util/stats.h" -#include "util/time_limit.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_types.h b/ortools/bop/bop_types.h similarity index 95% rename from src/bop/bop_types.h rename to ortools/bop/bop_types.h index a69af28aaf..fa82a7686a 100644 --- a/src/bop/bop_types.h +++ b/ortools/bop/bop_types.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_BOP_BOP_TYPES_H_ #define OR_TOOLS_BOP_BOP_TYPES_H_ -#include "base/basictypes.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_util.cc b/ortools/bop/bop_util.cc similarity index 96% rename from src/bop/bop_util.cc rename to ortools/bop/bop_util.cc index 83ce35412a..60f01d1f22 100644 --- a/src/bop/bop_util.cc +++ b/ortools/bop/bop_util.cc @@ -11,16 +11,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/bop_util.h" +#include "ortools/bop/bop_util.h" #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "bop/bop_base.h" -#include "bop/bop_solution.h" -#include "sat/boolean_problem.h" -#include "sat/sat_solver.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace bop { diff --git a/src/bop/bop_util.h b/ortools/bop/bop_util.h similarity index 93% rename from src/bop/bop_util.h rename to ortools/bop/bop_util.h index c4921dc62d..bc774e1c51 100644 --- a/src/bop/bop_util.h +++ b/ortools/bop/bop_util.h @@ -16,11 +16,11 @@ #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "bop/bop_base.h" -#include "bop/bop_solution.h" -#include "sat/sat_solver.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace bop { diff --git a/src/bop/complete_optimizer.cc b/ortools/bop/complete_optimizer.cc similarity index 97% rename from src/bop/complete_optimizer.cc rename to ortools/bop/complete_optimizer.cc index 5fe63bc7ad..ed7c2e00f6 100644 --- a/src/bop/complete_optimizer.cc +++ b/ortools/bop/complete_optimizer.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/complete_optimizer.h" +#include "ortools/bop/complete_optimizer.h" -#include "bop/bop_util.h" -#include "sat/boolean_problem.h" -#include "sat/optimization.h" +#include "ortools/bop/bop_util.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/optimization.h" namespace operations_research { namespace bop { diff --git a/src/bop/complete_optimizer.h b/ortools/bop/complete_optimizer.h similarity index 92% rename from src/bop/complete_optimizer.h rename to ortools/bop/complete_optimizer.h index 96ed354e4a..83cf663464 100644 --- a/src/bop/complete_optimizer.h +++ b/ortools/bop/complete_optimizer.h @@ -29,12 +29,12 @@ #include -#include "bop/bop_base.h" -#include "bop/bop_solution.h" -#include "bop/bop_types.h" -#include "sat/boolean_problem.pb.h" -#include "sat/encoding.h" -#include "sat/sat_solver.h" +#include "ortools/bop/bop_base.h" +#include "ortools/bop/bop_solution.h" +#include "ortools/bop/bop_types.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/encoding.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace bop { diff --git a/src/bop/integral_solver.cc b/ortools/bop/integral_solver.cc similarity index 99% rename from src/bop/integral_solver.cc rename to ortools/bop/integral_solver.cc index 0ed690a178..39f6bda5da 100644 --- a/src/bop/integral_solver.cc +++ b/ortools/bop/integral_solver.cc @@ -11,12 +11,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bop/integral_solver.h" +#include "ortools/bop/integral_solver.h" #include #include -#include "bop/bop_solver.h" -#include "lp_data/lp_decomposer.h" +#include "ortools/bop/bop_solver.h" +#include "ortools/lp_data/lp_decomposer.h" namespace operations_research { namespace bop { diff --git a/src/bop/integral_solver.h b/ortools/bop/integral_solver.h similarity index 93% rename from src/bop/integral_solver.h rename to ortools/bop/integral_solver.h index 643f01fa91..2aedd46066 100644 --- a/src/bop/integral_solver.h +++ b/ortools/bop/integral_solver.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_BOP_INTEGRAL_SOLVER_H_ #define OR_TOOLS_BOP_INTEGRAL_SOLVER_H_ -#include "base/port.h" -#include "bop/bop_parameters.pb.h" -#include "bop/bop_types.h" -#include "lp_data/lp_data.h" -#include "util/time_limit.h" +#include "ortools/base/port.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/bop_types.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace bop { diff --git a/src/com/google/ortools/algorithms/IntArrayHelper.cs b/ortools/com/google/ortools/algorithms/IntArrayHelper.cs similarity index 100% rename from src/com/google/ortools/algorithms/IntArrayHelper.cs rename to ortools/com/google/ortools/algorithms/IntArrayHelper.cs diff --git a/src/com/google/ortools/constraintsolver/IntArrayHelper.cs b/ortools/com/google/ortools/constraintsolver/IntArrayHelper.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/IntArrayHelper.cs rename to ortools/com/google/ortools/constraintsolver/IntArrayHelper.cs diff --git a/src/com/google/ortools/constraintsolver/IntVarArrayHelper.cs b/ortools/com/google/ortools/constraintsolver/IntVarArrayHelper.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/IntVarArrayHelper.cs rename to ortools/com/google/ortools/constraintsolver/IntVarArrayHelper.cs diff --git a/src/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs b/ortools/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs rename to ortools/com/google/ortools/constraintsolver/IntervalVarArrayHelper.cs diff --git a/src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java b/ortools/com/google/ortools/constraintsolver/JavaDecisionBuilder.java similarity index 100% rename from src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java rename to ortools/com/google/ortools/constraintsolver/JavaDecisionBuilder.java diff --git a/src/com/google/ortools/constraintsolver/NetDecisionBuilder.cs b/ortools/com/google/ortools/constraintsolver/NetDecisionBuilder.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/NetDecisionBuilder.cs rename to ortools/com/google/ortools/constraintsolver/NetDecisionBuilder.cs diff --git a/src/com/google/ortools/constraintsolver/RoutingModelHelper.cs b/ortools/com/google/ortools/constraintsolver/RoutingModelHelper.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/RoutingModelHelper.cs rename to ortools/com/google/ortools/constraintsolver/RoutingModelHelper.cs diff --git a/src/com/google/ortools/constraintsolver/SolverHelper.cs b/ortools/com/google/ortools/constraintsolver/SolverHelper.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/SolverHelper.cs rename to ortools/com/google/ortools/constraintsolver/SolverHelper.cs diff --git a/src/com/google/ortools/constraintsolver/ValCstPair.cs b/ortools/com/google/ortools/constraintsolver/ValCstPair.cs similarity index 100% rename from src/com/google/ortools/constraintsolver/ValCstPair.cs rename to ortools/com/google/ortools/constraintsolver/ValCstPair.cs diff --git a/src/com/google/ortools/linearsolver/DoubleArrayHelper.cs b/ortools/com/google/ortools/linearsolver/DoubleArrayHelper.cs similarity index 100% rename from src/com/google/ortools/linearsolver/DoubleArrayHelper.cs rename to ortools/com/google/ortools/linearsolver/DoubleArrayHelper.cs diff --git a/src/com/google/ortools/linearsolver/LinearConstraint.cs b/ortools/com/google/ortools/linearsolver/LinearConstraint.cs similarity index 100% rename from src/com/google/ortools/linearsolver/LinearConstraint.cs rename to ortools/com/google/ortools/linearsolver/LinearConstraint.cs diff --git a/src/com/google/ortools/linearsolver/LinearExpr.cs b/ortools/com/google/ortools/linearsolver/LinearExpr.cs similarity index 100% rename from src/com/google/ortools/linearsolver/LinearExpr.cs rename to ortools/com/google/ortools/linearsolver/LinearExpr.cs diff --git a/src/com/google/ortools/linearsolver/SolverHelper.cs b/ortools/com/google/ortools/linearsolver/SolverHelper.cs similarity index 100% rename from src/com/google/ortools/linearsolver/SolverHelper.cs rename to ortools/com/google/ortools/linearsolver/SolverHelper.cs diff --git a/src/com/google/ortools/linearsolver/VariableHelper.cs b/ortools/com/google/ortools/linearsolver/VariableHelper.cs similarity index 100% rename from src/com/google/ortools/linearsolver/VariableHelper.cs rename to ortools/com/google/ortools/linearsolver/VariableHelper.cs diff --git a/src/com/google/ortools/util/NestedArrayHelper.cs b/ortools/com/google/ortools/util/NestedArrayHelper.cs similarity index 100% rename from src/com/google/ortools/util/NestedArrayHelper.cs rename to ortools/com/google/ortools/util/NestedArrayHelper.cs diff --git a/src/com/google/ortools/util/ProtoHelper.cs b/ortools/com/google/ortools/util/ProtoHelper.cs similarity index 100% rename from src/com/google/ortools/util/ProtoHelper.cs rename to ortools/com/google/ortools/util/ProtoHelper.cs diff --git a/src/constraint_solver/BUILD b/ortools/constraint_solver/BUILD similarity index 100% rename from src/constraint_solver/BUILD rename to ortools/constraint_solver/BUILD diff --git a/src/constraint_solver/README b/ortools/constraint_solver/README similarity index 100% rename from src/constraint_solver/README rename to ortools/constraint_solver/README diff --git a/src/ortools/algorithms/__init__.py b/ortools/constraint_solver/__init__.py similarity index 78% rename from src/ortools/algorithms/__init__.py rename to ortools/constraint_solver/__init__.py index fd06bdbd52..73b2136f0c 100644 --- a/src/ortools/algorithms/__init__.py +++ b/ortools/constraint_solver/__init__.py @@ -11,5 +11,5 @@ # See the License for the specific language governing permissions and # limitations under the License. import os as _os -__path__.append(_os.path.join(__path__[0], '..', '..', 'gen', 'ortools', 'algorithms')) -__path__.append(_os.path.join(__path__[0], '..', '..', '..', 'lib')) +__path__.append(_os.path.join(__path__[0], '..', 'gen', 'ortools', 'constraint_solver')) +__path__.append(_os.path.join(__path__[0], '..', '..', 'lib')) diff --git a/src/constraint_solver/ac4_mdd_reset_table.cc b/ortools/constraint_solver/ac4_mdd_reset_table.cc similarity index 99% rename from src/constraint_solver/ac4_mdd_reset_table.cc rename to ortools/constraint_solver/ac4_mdd_reset_table.cc index 6c1f4e4c31..bc14a3fef0 100644 --- a/src/constraint_solver/ac4_mdd_reset_table.cc +++ b/ortools/constraint_solver/ac4_mdd_reset_table.cc @@ -14,16 +14,16 @@ #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/vector_map.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/vector_map.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/ac4r_table.cc b/ortools/constraint_solver/ac4r_table.cc similarity index 97% rename from src/constraint_solver/ac4r_table.cc rename to ortools/constraint_solver/ac4r_table.cc index 78834cf6d6..fbf3e6c002 100644 --- a/src/constraint_solver/ac4r_table.cc +++ b/ortools/constraint_solver/ac4r_table.cc @@ -11,16 +11,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type_indexed_vector.h" -#include "base/int_type.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/vector_map.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/int_type.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/vector_map.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/alldiff_cst.cc b/ortools/constraint_solver/alldiff_cst.cc similarity index 99% rename from src/constraint_solver/alldiff_cst.cc rename to ortools/constraint_solver/alldiff_cst.cc index 49167e15b6..15b9c3439e 100644 --- a/src/constraint_solver/alldiff_cst.cc +++ b/ortools/constraint_solver/alldiff_cst.cc @@ -20,11 +20,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/assignment.cc b/ortools/constraint_solver/assignment.cc similarity index 98% rename from src/constraint_solver/assignment.cc rename to ortools/constraint_solver/assignment.cc index 0df0a520e0..47cdb0c049 100644 --- a/src/constraint_solver/assignment.cc +++ b/ortools/constraint_solver/assignment.cc @@ -13,20 +13,20 @@ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/recordio.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/assignment.pb.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/recordio.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/assignment.pb.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { @@ -491,7 +491,7 @@ bool Assignment::Load(const std::string& filename) { bool Assignment::Load(File* file) { CHECK(file != nullptr); AssignmentProto assignment_proto; - RecordReader reader(file); + recordio::RecordReader reader(file); if (!reader.ReadProtocolMessage(&assignment_proto)) { LOG(INFO) << "No assignment found in " << file->filename(); return false; @@ -568,7 +568,7 @@ bool Assignment::Save(File* file) const { CHECK(file != nullptr); AssignmentProto assignment_proto; Save(&assignment_proto); - RecordWriter writer(file); + recordio::RecordWriter writer(file); return writer.WriteProtocolMessage(assignment_proto) && writer.Close(); } diff --git a/src/constraint_solver/assignment.proto b/ortools/constraint_solver/assignment.proto similarity index 100% rename from src/constraint_solver/assignment.proto rename to ortools/constraint_solver/assignment.proto diff --git a/src/constraint_solver/collect_variables.cc b/ortools/constraint_solver/collect_variables.cc similarity index 96% rename from src/constraint_solver/collect_variables.cc rename to ortools/constraint_solver/collect_variables.cc index 1b181a99d7..7e12f050a3 100644 --- a/src/constraint_solver/collect_variables.cc +++ b/ortools/constraint_solver/collect_variables.cc @@ -13,16 +13,16 @@ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/constraint_solver.cc b/ortools/constraint_solver/constraint_solver.cc similarity index 99% rename from src/constraint_solver/constraint_solver.cc rename to ortools/constraint_solver/constraint_solver.cc index 984633d04c..b28bb9a1a2 100644 --- a/src/constraint_solver/constraint_solver.cc +++ b/ortools/constraint_solver/constraint_solver.cc @@ -15,7 +15,7 @@ // This file implements the core objects of the constraint solver: // Solver, Search, Queue, ... along with the main resolution loop. -#include "constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solver.h" #include #include @@ -23,22 +23,21 @@ #include #include #include -#include "base/random.h" +#include "ortools/base/random.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/recordio.h" -#include "base/stringpiece.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/recordio.h" #include "zlib.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/model.pb.h" -#include "util/tuple_set.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/model.pb.h" +#include "ortools/util/tuple_set.h" // These flags are used to set the fields in the DefaultSolverParameters proto. DEFINE_bool(cp_trace_propagation, false, @@ -1679,7 +1678,7 @@ void Solver::ProcessConstraints() { } else { CpModel export_proto = ExportModel(); VLOG(1) << export_proto.DebugString(); - RecordWriter writer(file); + recordio::RecordWriter writer(file); writer.WriteProtocolMessage(export_proto); writer.Close(); } diff --git a/src/constraint_solver/constraint_solver.h b/ortools/constraint_solver/constraint_solver.h similarity index 99% rename from src/constraint_solver/constraint_solver.h rename to ortools/constraint_solver/constraint_solver.h index 93020fe7eb..824a4a538c 100644 --- a/src/constraint_solver/constraint_solver.h +++ b/ortools/constraint_solver/constraint_solver.h @@ -65,28 +65,28 @@ #define OR_TOOLS_CONSTRAINT_SOLVER_CONSTRAINT_SOLVER_H_ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/sysinfo.h" -#include "base/timer.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/solver_parameters.pb.h" -#include "util/piecewise_linear_function.h" -#include "util/sorted_interval_list.h" -#include "util/tuple_set.h" -#include "base/random.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/sysinfo.h" +#include "ortools/base/timer.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/solver_parameters.pb.h" +#include "ortools/util/piecewise_linear_function.h" +#include "ortools/util/sorted_interval_list.h" +#include "ortools/util/tuple_set.h" +#include "ortools/base/random.h" class File; @@ -770,7 +770,7 @@ class Solver { typedef std::function Action; typedef std::function Closure; -// TODO(user): Remove all these SWIG protected code, move to .swig. +// TODO(user): Remove all these SWIG protected code, move to .i. #ifndef SWIG typedef std::function IntegerExpressionBuilder; diff --git a/src/constraint_solver/constraint_solveri.h b/ortools/constraint_solver/constraint_solveri.h similarity index 99% rename from src/constraint_solver/constraint_solveri.h rename to ortools/constraint_solver/constraint_solveri.h index a674ce07a0..852bac5192 100644 --- a/src/constraint_solver/constraint_solveri.h +++ b/ortools/constraint_solver/constraint_solveri.h @@ -54,25 +54,24 @@ #include #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/sysinfo.h" -#include "base/casts.h" -#include "base/timer.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/model.pb.h" -#include "util/bitset.h" -#include "util/tuple_set.h" -#include "util/vector_map.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/sysinfo.h" +#include "ortools/base/timer.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/model.pb.h" +#include "ortools/util/bitset.h" +#include "ortools/util/tuple_set.h" +#include "ortools/util/vector_map.h" class WallTimer; @@ -967,9 +966,9 @@ class IntVarLocalSearchHandler { #ifdef SWIG // Unfortunately, we must put this code here and not in -// */constraint_solver.swig, because it must be parsed by SWIG before the +// */constraint_solver.i, because it must be parsed by SWIG before the // derived C++ class. -// TODO(user): find a way to move this code back to the .swig file, where it +// TODO(user): find a way to move this code back to the .i file, where it // belongs. // In python, we use a whitelist to expose the API. This whitelist must also // be extended here. @@ -1050,9 +1049,9 @@ class SequenceVarLocalSearchHandler { #ifdef SWIG // Unfortunately, we must put this code here and not in -// */constraint_solver.swig, because it must be parsed by SWIG before the +// */constraint_solver.i, because it must be parsed by SWIG before the // derived C++ class. -// TODO(user): find a way to move this code back to the .swig file, where it +// TODO(user): find a way to move this code back to the .i file, where it // belongs. // clang-format off %rename(SequenceVarLocalSearchOperatorTemplate) VarLocalSearchOperator< diff --git a/src/constraint_solver/constraints.cc b/ortools/constraint_solver/constraints.cc similarity index 98% rename from src/constraint_solver/constraints.cc rename to ortools/constraint_solver/constraints.cc index 7564423588..dd7d31492b 100644 --- a/src/constraint_solver/constraints.cc +++ b/ortools/constraint_solver/constraints.cc @@ -19,13 +19,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/saturated_arithmetic.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/string_array.h" namespace operations_research { diff --git a/src/constraint_solver/count_cst.cc b/ortools/constraint_solver/count_cst.cc similarity index 99% rename from src/constraint_solver/count_cst.cc rename to ortools/constraint_solver/count_cst.cc index 57a7238b97..11644ebb22 100644 --- a/src/constraint_solver/count_cst.cc +++ b/ortools/constraint_solver/count_cst.cc @@ -18,13 +18,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" namespace operations_research { Constraint* Solver::MakeCount(const std::vector& vars, int64 v, diff --git a/src/constraint_solver/csharp/constraint_solver.swig b/ortools/constraint_solver/csharp/constraint_solver.i similarity index 98% rename from src/constraint_solver/csharp/constraint_solver.swig rename to ortools/constraint_solver/csharp/constraint_solver.i index 1022638a36..ee8bf47693 100644 --- a/src/constraint_solver/csharp/constraint_solver.swig +++ b/ortools/constraint_solver/csharp/constraint_solver.i @@ -21,9 +21,9 @@ using System.Collections; %include "exception.i" %include "std_vector.i" -%include "util/csharp/tuple_set.swig" -%include "util/csharp/functions.swig" -%include "util/csharp/proto.swig" +%include "ortools/util/csharp/tuple_set.i" +%include "ortools/util/csharp/functions.i" +%include "ortools/util/csharp/proto.i" // We need to forward-declare the proto here, so that PROTO_INPUT involving it // works correctly. The order matters very much: this declaration needs to be @@ -53,13 +53,13 @@ class SearchLimitParameters; #include #include -#include "base/callback.h" -#include "base/integral_types.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/functions_swig_helpers.h" -#include "constraint_solver/search_limit.pb.h" -#include "constraint_solver/solver_parameters.pb.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/functions_swig_helpers.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/constraint_solver/solver_parameters.pb.h" namespace operations_research { class LocalSearchPhaseParameters { @@ -83,7 +83,7 @@ struct FailureProtect { // TODO(user): Try to allow this per class (difficult with CpIntVector). // ############ BEGIN DUPLICATED CODE BLOCK ############ -// IMPORTANT: keep this code block in sync with the .swig +// IMPORTANT: keep this code block in sync with the .i // files in ../python and ../csharp. // Protect from failure. @@ -131,7 +131,7 @@ PROTECT_FROM_FAILURE(Solver::Fail(), arg1); // ############ END DUPLICATED CODE BLOCK ############ -// Since knapsack_solver.swig and constraint_solver.swig both need to +// Since knapsack_solver.i and constraint_solver.i both need to // instantiate the vector template, but their csharp_wrap.cc // files end up being compiled into the same .dll, we must name the // vector template differently. @@ -880,8 +880,8 @@ PROTO2_RETURN(operations_research::CpModel, Google.OrTools.ConstraintSolver.CpModel) // Wrap cp includes -%include "constraint_solver/constraint_solver.h" -%include "constraint_solver/constraint_solveri.h" +%include "ortools/constraint_solver/constraint_solver.h" +%include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { %template(RevInteger) Rev; diff --git a/src/constraint_solver/csharp/routing.swig b/ortools/constraint_solver/csharp/routing.i similarity index 97% rename from src/constraint_solver/csharp/routing.swig rename to ortools/constraint_solver/csharp/routing.i index b6e3934419..e09ed11b5d 100644 --- a/src/constraint_solver/csharp/routing.swig +++ b/ortools/constraint_solver/csharp/routing.i @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -// TODO(user): Refactor this file to adhere to the SWIG style guide. -%include "constraint_solver/csharp/constraint_solver.swig" +// TODO(user): Refactor this file to adhere to the SWIG style guide. +%include "ortools/constraint_solver/csharp/constraint_solver.i" // We need to forward-declare the proto here, so that PROTO_INPUT involving it // works correctly. The order matters very much: this declaration needs to be @@ -25,8 +25,7 @@ class RoutingSearchParameters; // Include the file we want to wrap a first time. %{ -#include "base/callback.h" -#include "constraint_solver/routing.h" +#include "ortools/constraint_solver/routing.h" %} %module(directors="1") operations_research; @@ -229,5 +228,5 @@ PROTO2_RETURN(operations_research::RoutingModelParameters, Google.OrTools.ConstraintSolver.RoutingModelParameters) -%include "constraint_solver/routing_types.h" -%include "constraint_solver/routing.h" +%include "ortools/constraint_solver/routing_types.h" +%include "ortools/constraint_solver/routing.h" diff --git a/src/constraint_solver/default_search.cc b/ortools/constraint_solver/default_search.cc similarity index 99% rename from src/constraint_solver/default_search.cc rename to ortools/constraint_solver/default_search.cc index f76c6d34e3..5433726f38 100644 --- a/src/constraint_solver/default_search.cc +++ b/ortools/constraint_solver/default_search.cc @@ -14,24 +14,24 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/cached_log.h" -#include "util/string_array.h" -#include "base/random.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/cached_log.h" +#include "ortools/util/string_array.h" +#include "ortools/base/random.h" DEFINE_int32(cp_impact_divider, 10, "Divider for continuous update."); diff --git a/src/constraint_solver/demon_profiler.cc b/ortools/constraint_solver/demon_profiler.cc similarity index 97% rename from src/constraint_solver/demon_profiler.cc rename to ortools/constraint_solver/demon_profiler.cc index 2a7cf56846..e09e2327e8 100644 --- a/src/constraint_solver/demon_profiler.cc +++ b/ortools/constraint_solver/demon_profiler.cc @@ -15,21 +15,21 @@ #include #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/demon_profiler.pb.h" -#include "base/status.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/demon_profiler.pb.h" +#include "ortools/base/status.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/demon_profiler.proto b/ortools/constraint_solver/demon_profiler.proto similarity index 100% rename from src/constraint_solver/demon_profiler.proto rename to ortools/constraint_solver/demon_profiler.proto diff --git a/src/constraint_solver/deviation.cc b/ortools/constraint_solver/deviation.cc similarity index 98% rename from src/constraint_solver/deviation.cc rename to ortools/constraint_solver/deviation.cc index 3ea047bb33..030642d729 100644 --- a/src/constraint_solver/deviation.cc +++ b/ortools/constraint_solver/deviation.cc @@ -18,12 +18,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/mathutil.h" -#include "constraint_solver/constraint_solver.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/mathutil.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/util/string_array.h" namespace operations_research { // Deviation Constraint, a constraint for the average absolute diff --git a/src/constraint_solver/diffn.cc b/ortools/constraint_solver/diffn.cc similarity index 97% rename from src/constraint_solver/diffn.cc rename to ortools/constraint_solver/diffn.cc index c0de064a1b..0a393df067 100644 --- a/src/constraint_solver/diffn.cc +++ b/ortools/constraint_solver/diffn.cc @@ -15,15 +15,15 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" namespace operations_research { diff --git a/src/constraint_solver/element.cc b/ortools/constraint_solver/element.cc similarity index 99% rename from src/constraint_solver/element.cc rename to ortools/constraint_solver/element.cc index 8908250b53..bf57bef8d6 100644 --- a/src/constraint_solver/element.cc +++ b/ortools/constraint_solver/element.cc @@ -19,15 +19,15 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/iterators.h" -#include "util/range_minimum_query.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/iterators.h" +#include "ortools/util/range_minimum_query.h" +#include "ortools/util/string_array.h" DEFINE_bool(cp_disable_element_cache, true, "If true, caching for IntElement is disabled."); diff --git a/src/constraint_solver/expr_array.cc b/ortools/constraint_solver/expr_array.cc similarity index 99% rename from src/constraint_solver/expr_array.cc rename to ortools/constraint_solver/expr_array.cc index 0004859e44..dbd196fdde 100644 --- a/src/constraint_solver/expr_array.cc +++ b/ortools/constraint_solver/expr_array.cc @@ -19,16 +19,16 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/mathutil.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/mathutil.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" -#include "util/saturated_arithmetic.h" -#include "util/string_array.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/expr_cst.cc b/ortools/constraint_solver/expr_cst.cc similarity index 99% rename from src/constraint_solver/expr_cst.cc rename to ortools/constraint_solver/expr_cst.cc index cc0fdf70cb..f5bf30572c 100644 --- a/src/constraint_solver/expr_cst.cc +++ b/ortools/constraint_solver/expr_cst.cc @@ -19,16 +19,16 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/saturated_arithmetic.h" -#include "util/sorted_interval_list.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/sorted_interval_list.h" DEFINE_int32(cache_initial_size, 1024, "Initial size of the array of the hash " diff --git a/src/constraint_solver/expressions.cc b/ortools/constraint_solver/expressions.cc similarity index 99% rename from src/constraint_solver/expressions.cc rename to ortools/constraint_solver/expressions.cc index d952b4dfcc..848b0cd71a 100644 --- a/src/constraint_solver/expressions.cc +++ b/ortools/constraint_solver/expressions.cc @@ -14,25 +14,25 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/mathutil.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/bitset.h" -#include "util/saturated_arithmetic.h" -#include "util/string_array.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/mathutil.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/bitset.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/string_array.h" DEFINE_bool(cp_disable_expression_optimization, false, "Disable special optimization when creating expressions."); @@ -7384,7 +7384,7 @@ void IntVar::SetValues(const std::vector& values) { // TODO(user): use a clean and safe SortedUniqueCopy() class // that uses a global, static shared (and locked) storage. // TODO(user): [optional] consider porting - // STLSortAndRemoveDuplicates from base/stl_util.h to the + // STLSortAndRemoveDuplicates from ortools/base/stl_util.h to the // existing open_source/base/stl_util.h and using it here. // TODO(user): We could filter out values not in the var. std::vector& tmp = solver()->tmp_vector_; diff --git a/src/constraint_solver/gcc.cc b/ortools/constraint_solver/gcc.cc similarity index 97% rename from src/constraint_solver/gcc.cc rename to ortools/constraint_solver/gcc.cc index fec6d6edbc..ba06acbae8 100644 --- a/src/constraint_solver/gcc.cc +++ b/ortools/constraint_solver/gcc.cc @@ -19,18 +19,18 @@ // Mexico, pages 245-250, 2003. -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/join.h" -#include "base/int_type_indexed_vector.h" -#include "base/int_type.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/vector_map.h" -#include "base/stringprintf.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/join.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/int_type.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/vector_map.h" +#include "ortools/base/stringprintf.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/graph_constraints.cc b/ortools/constraint_solver/graph_constraints.cc similarity index 99% rename from src/constraint_solver/graph_constraints.cc rename to ortools/constraint_solver/graph_constraints.cc index 63ace7dc3a..27abad5641 100644 --- a/src/constraint_solver/graph_constraints.cc +++ b/ortools/constraint_solver/graph_constraints.cc @@ -18,14 +18,14 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/saturated_arithmetic.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/string_array.h" namespace operations_research { // ---------- No cycle ---------- diff --git a/src/constraint_solver/hybrid.cc b/ortools/constraint_solver/hybrid.cc similarity index 97% rename from src/constraint_solver/hybrid.cc rename to ortools/constraint_solver/hybrid.cc index 206f849f67..521ed9c3f6 100644 --- a/src/constraint_solver/hybrid.cc +++ b/ortools/constraint_solver/hybrid.cc @@ -12,21 +12,21 @@ // limitations under the License. -#include "constraint_solver/hybrid.h" +#include "ortools/constraint_solver/hybrid.h" #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/macros.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "linear_solver/linear_solver.h" -#include "util/string_array.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/util/string_array.h" DEFINE_int32(simplex_cleanup_frequency, 0, "frequency to cleanup the simplex after each call, 0: no cleanup"); diff --git a/src/constraint_solver/hybrid.h b/ortools/constraint_solver/hybrid.h similarity index 96% rename from src/constraint_solver/hybrid.h rename to ortools/constraint_solver/hybrid.h index 94d87f2cf3..5647a8a855 100644 --- a/src/constraint_solver/hybrid.h +++ b/ortools/constraint_solver/hybrid.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_CONSTRAINT_SOLVER_HYBRID_H_ #define OR_TOOLS_CONSTRAINT_SOLVER_HYBRID_H_ -#include "constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { class MPSolver; diff --git a/src/constraint_solver/interval.cc b/ortools/constraint_solver/interval.cc similarity index 99% rename from src/constraint_solver/interval.cc rename to ortools/constraint_solver/interval.cc index 06aa28cfd9..99bf6aa53e 100644 --- a/src/constraint_solver/interval.cc +++ b/ortools/constraint_solver/interval.cc @@ -15,14 +15,14 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/saturated_arithmetic.h" #if defined(_MSC_VER) #pragma warning(disable : 4351 4355 4804 4805) diff --git a/src/constraint_solver/io.cc b/ortools/constraint_solver/io.cc similarity index 99% rename from src/constraint_solver/io.cc rename to ortools/constraint_solver/io.cc index 651a7e38cc..f14564e563 100644 --- a/src/constraint_solver/io.cc +++ b/ortools/constraint_solver/io.cc @@ -15,24 +15,24 @@ #include #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include -#include "base/callback.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/model.pb.h" -#include "constraint_solver/search_limit.pb.h" -#include "util/tuple_set.h" -#include "util/vector_map.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/model.pb.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/util/tuple_set.h" +#include "ortools/util/vector_map.h" namespace operations_research { diff --git a/src/constraint_solver/java/constraint_solver.swig b/ortools/constraint_solver/java/constraint_solver.i similarity index 97% rename from src/constraint_solver/java/constraint_solver.swig rename to ortools/constraint_solver/java/constraint_solver.i index 258b39ed7f..e88dbd33ac 100644 --- a/src/constraint_solver/java/constraint_solver.swig +++ b/ortools/constraint_solver/java/constraint_solver.i @@ -16,12 +16,12 @@ %include "enumsimple.swg" %include "exception.i" -%include "base/base.swig" -%include "util/java/tuple_set.swig" -%include "util/java/vector.swig" -%include "util/java/functions.swig" +%include "ortools/base/base.i" +%include "ortools/util/java/tuple_set.i" +%include "ortools/util/java/vector.i" +%include "ortools/util/java/functions.i" -%include "util/java/proto.swig" +%include "ortools/util/java/proto.i" // Remove swig warnings %warnfilter(473) operations_research::DecisionBuilder; @@ -38,11 +38,11 @@ class SearchLimitParameters; // Include the files we want to wrap a first time. %{ -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/java/javawrapcp_util.h" -#include "constraint_solver/search_limit.pb.h" -#include "constraint_solver/solver_parameters.pb.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/java/javawrapcp_util.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/constraint_solver/solver_parameters.pb.h" // Supporting structure for the PROTECT_FROM_FAILURE macro. #include "setjmp.h" @@ -53,7 +53,7 @@ struct FailureProtect { %} // ############ BEGIN DUPLICATED CODE BLOCK ############ -// IMPORTANT: keep this code block in sync with the .swig +// IMPORTANT: keep this code block in sync with the .i // files in ../python and ../csharp. // Protect from failure. @@ -122,9 +122,9 @@ import com.google.ortools.constraintsolver.SearchLimitParameters; #include -#include "base/integral_types.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { namespace swig_util { @@ -572,7 +572,7 @@ namespace operations_research { // Typemaps to represent const std::vector& arguments as arrays of // JavaType, where CType is not a primitive type. // TODO(user): See if it makes sense to move this -// util/vector.swig. +// ortools/util/vector.i. // CastOp defines how to cast the output of CallStaticLongMethod to CType*; // its first argument is CType, its second is the output of @@ -780,9 +780,9 @@ PROTO2_RETURN(operations_research::SearchLimitParameters, com.google.ortools.constraintsolver.SearchLimitParameters) // Wrap cp includes -%include "constraint_solver/constraint_solver.h" -%include "constraint_solver/constraint_solveri.h" -%include "constraint_solver/java/javawrapcp_util.h" +%include "ortools/constraint_solver/constraint_solver.h" +%include "ortools/constraint_solver/constraint_solveri.h" +%include "ortools/constraint_solver/java/javawrapcp_util.h" namespace operations_research { namespace swig_util { diff --git a/src/constraint_solver/java/javawrapcp_util.h b/ortools/constraint_solver/java/javawrapcp_util.h similarity index 100% rename from src/constraint_solver/java/javawrapcp_util.h rename to ortools/constraint_solver/java/javawrapcp_util.h diff --git a/src/constraint_solver/java/routing.swig b/ortools/constraint_solver/java/routing.i similarity index 96% rename from src/constraint_solver/java/routing.swig rename to ortools/constraint_solver/java/routing.i index e2d85387a9..310aa01101 100644 --- a/src/constraint_solver/java/routing.swig +++ b/ortools/constraint_solver/java/routing.i @@ -13,7 +13,7 @@ // TODO(user): Refactor this file to adhere to the SWIG style guide. -%include "constraint_solver/java/constraint_solver.swig" +%include "ortools/constraint_solver/java/constraint_solver.i" // We need to forward-declare the proto here, so that PROTO_INPUT involving it // works correctly. The order matters very much: this declaration needs to be @@ -25,7 +25,7 @@ class RoutingSearchParameters; // Include the file we want to wrap a first time. %{ -#include "constraint_solver/routing.h" +#include "ortools/constraint_solver/routing.h" %} // Convert RoutingModel::NodeIndex to (32-bit signed) integers. @@ -46,7 +46,7 @@ class RoutingSearchParameters; // Convert std::vector to/from int arrays. VECTOR_AS_JAVA_ARRAY(operations_research::RoutingModel::NodeIndex, int, Int); -// TODO(user): define a macro in util/java/vector.swig for std::vector> and +// TODO(user): define a macro in util/java/vector.i for std::vector> and // reuse it here. %typemap(jni) const std::vector >& "jobjectArray" %typemap(jtype) const std::vector >& "int[][]" @@ -58,8 +58,8 @@ VECTOR_AS_JAVA_ARRAY(operations_research::RoutingModel::NodeIndex, int, Int); %{ #include -#include "base/callback.h" -#include "base/integral_types.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" // When a director is created for a class with SWIG, the C++ part of the // director keeps a JNI global reference to the Java part. This global reference @@ -257,8 +257,8 @@ PROTO2_RETURN(operations_research::RoutingModelParameters, %unignore RoutingTransitEvaluator2; %unignore RoutingNodePair; %unignore RoutingNodePairs; -%include "constraint_solver/routing_types.h" +%include "ortools/constraint_solver/routing_types.h" %unignoreall // TODO(user): Use ignoreall/unignoreall for this one. A lot of work. -%include "constraint_solver/routing.h" +%include "ortools/constraint_solver/routing.h" diff --git a/src/constraint_solver/local_search.cc b/ortools/constraint_solver/local_search.cc similarity index 99% rename from src/constraint_solver/local_search.cc rename to ortools/constraint_solver/local_search.cc index 58e3ada111..bf6221efd0 100644 --- a/src/constraint_solver/local_search.cc +++ b/ortools/constraint_solver/local_search.cc @@ -13,8 +13,8 @@ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include #include @@ -24,19 +24,19 @@ #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "graph/hamiltonian_path.h" -#include "util/saturated_arithmetic.h" -#include "base/random.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/graph/hamiltonian_path.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/base/random.h" DEFINE_int32(cp_local_search_sync_frequency, 16, "Frequency of checks for better solutions in the solution pool."); diff --git a/src/constraint_solver/model.proto b/ortools/constraint_solver/model.proto similarity index 98% rename from src/constraint_solver/model.proto rename to ortools/constraint_solver/model.proto index 854c951e14..cc5cabb66e 100644 --- a/src/constraint_solver/model.proto +++ b/ortools/constraint_solver/model.proto @@ -13,7 +13,7 @@ syntax = "proto3"; -import "constraint_solver/search_limit.proto"; +import "ortools/constraint_solver/search_limit.proto"; option java_package = "com.google.ortools.constraintsolver"; option java_multiple_files = true; diff --git a/src/constraint_solver/model_cache.cc b/ortools/constraint_solver/model_cache.cc similarity index 99% rename from src/constraint_solver/model_cache.cc rename to ortools/constraint_solver/model_cache.cc index 9741f0a37e..b623fccc49 100644 --- a/src/constraint_solver/model_cache.cc +++ b/ortools/constraint_solver/model_cache.cc @@ -15,12 +15,12 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" DECLARE_int32(cache_initial_size); DEFINE_bool(cp_disable_cache, false, "Disable caching of model objects"); diff --git a/src/constraint_solver/nogoods.cc b/ortools/constraint_solver/nogoods.cc similarity index 94% rename from src/constraint_solver/nogoods.cc rename to ortools/constraint_solver/nogoods.cc index 510309749d..931adec2dd 100644 --- a/src/constraint_solver/nogoods.cc +++ b/ortools/constraint_solver/nogoods.cc @@ -15,13 +15,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/util/string_array.h" namespace operations_research { diff --git a/src/constraint_solver/pack.cc b/ortools/constraint_solver/pack.cc similarity index 99% rename from src/constraint_solver/pack.cc rename to ortools/constraint_solver/pack.cc index 6a61b2d87e..37a28a2952 100644 --- a/src/constraint_solver/pack.cc +++ b/ortools/constraint_solver/pack.cc @@ -21,12 +21,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { diff --git a/src/constraint_solver/python/constraint_solver.swig b/ortools/constraint_solver/python/constraint_solver.i similarity index 98% rename from src/constraint_solver/python/constraint_solver.swig rename to ortools/constraint_solver/python/constraint_solver.i index b41d7325f9..cb75b7d840 100644 --- a/src/constraint_solver/python/constraint_solver.swig +++ b/ortools/constraint_solver/python/constraint_solver.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig file exposes the code declared in ../constraint_solver.h and +// This .i file exposes the code declared in ../constraint_solver.h and // ../constraint_solveri.h. // // It is particularly complex for a swig file, mostly because it contains a @@ -21,27 +21,27 @@ // // USAGE EXAMPLES (most of which are also unit tests): // - ./pywrapcp_test.py -// - python/appointments.py -// - python/golomb8.py -// - python/hidato_table.py -// - python/jobshop_ft06.py -// - python/magic_sequence_distribute.py -// - python/rabbit_pheasant.py -// - python/simple_meeting.py -// - python/sudoku.py -// - python/zebra.py +// - examples/python/appointments.py +// - examples/python/golomb8.py +// - examples/python/hidato_table.py +// - examples/python/jobshop_ft06.py +// - examples/python/magic_sequence_distribute.py +// - examples/python/rabbit_pheasant.py +// - examples/python/simple_meeting.py +// - examples/python/sudoku.py +// - examples/python/zebra.py -%include "base/base.swig" +%include "ortools/base/base.i" -%include "util/python/proto.swig" +%include "ortools/util/python/proto.i" // PY_CONVERT_HELPER_* macros. -%include "constraint_solver/python/constraint_solver_helpers.swig" +%include "ortools/constraint_solver/python/constraint_solver_helpers.i" // std::function utilities. -%include "util/python/functions.swig" +%include "ortools/util/python/functions.i" -%import "util/python/vector.swig" +%import "ortools/util/python/vector.i" // We *do* need to use SWIGTYPE_... type names directly, because the // (recommended replacement) $descriptor macro fails, as of 2014-06, with @@ -68,10 +68,10 @@ struct FailureProtect { }; // This #includes constraint_solver.h, and inlines some C++ helpers. -#include "constraint_solver/python/pywrapcp_util.h" -#include "constraint_solver/assignment.pb.h" -#include "constraint_solver/search_limit.pb.h" -#include "constraint_solver/solver_parameters.pb.h" +#include "ortools/constraint_solver/python/pywrapcp_util.h" +#include "ortools/constraint_solver/assignment.pb.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/constraint_solver/solver_parameters.pb.h" %} // We need to fully support C++ inheritance, because it is heavily used by the @@ -91,7 +91,7 @@ struct FailureProtect { %module(directors="1") operations_research // The %feature and %exception below let python exceptions that occur within // director method propagate to the user as they were originally. See -// http://www.swig.org/Doc1.3/Python.html#Python_nn36 for example. +// http://www.i.org/Doc1.3/Python.html#Python_nn36 for example. %feature("director:except") { if ($error != NULL) { throw Swig::DirectorMethodException(); @@ -105,7 +105,7 @@ struct FailureProtect { // ============= Type conversions ============== -// See ./constraint_solver_helpers.swig +// See ./constraint_solver_helpers.i PY_CONVERT_HELPER_PTR(Decision); PY_CONVERT_HELPER_PTR(DecisionBuilder); PY_CONVERT_HELPER_PTR(SearchMonitor); @@ -147,7 +147,7 @@ PY_CONVERT(LocalSearchFilter); #undef PY_CONVERT // Support passing std::function as argument. -// See ../utils/python/functions.swig, from which this was copied and adapted. +// See ../utils/python/functions.i, from which this was copied and adapted. %{ static void PyFunctionSolverToVoid(PyObject* pyfunc, @@ -669,10 +669,10 @@ PY_STRINGIFY_DEBUGSTRING(Decision); // ############ BEGIN DUPLICATED CODE BLOCK ############ -// IMPORTANT: keep this code block in sync with the .swig +// IMPORTANT: keep this code block in sync with the .i // files in ../java and ../csharp. // TODO(user): extract this duplicated code into a common, multi-language -// .swig file with SWIG_exception. +// .i file with SWIG_exception. // Protect from failure. // TODO(user): document this further. @@ -1891,7 +1891,7 @@ PY_PROTO_TYPEMAP(ortools.constraint_solver_search_limit_pb2, SearchLimitParameters, operations_research::SearchLimitParameters) -%include "constraint_solver/constraint_solver.h" +%include "ortools/constraint_solver/constraint_solver.h" // Define templates instantiation after wrapping. @@ -2125,7 +2125,7 @@ namespace operations_research { } // namespace operations_research -%include "constraint_solver/constraint_solveri.h" +%include "ortools/constraint_solver/constraint_solveri.h" %unignoreall diff --git a/src/constraint_solver/python/constraint_solver_helpers.swig b/ortools/constraint_solver/python/constraint_solver_helpers.i similarity index 100% rename from src/constraint_solver/python/constraint_solver_helpers.swig rename to ortools/constraint_solver/python/constraint_solver_helpers.i diff --git a/src/constraint_solver/python/pywrapcp_util.h b/ortools/constraint_solver/python/pywrapcp_util.h similarity index 95% rename from src/constraint_solver/python/pywrapcp_util.h rename to ortools/constraint_solver/python/pywrapcp_util.h index f0d12bb945..966cd07cbc 100644 --- a/src/constraint_solver/python/pywrapcp_util.h +++ b/ortools/constraint_solver/python/pywrapcp_util.h @@ -12,18 +12,18 @@ // limitations under the License. // This .h file cannot be used in isolation! -// It represents some of the inlined C++ content of ./constraint_solver.swig, +// It represents some of the inlined C++ content of ./constraint_solver.i, // and was split out because it's a large enough chunk of C++ code. // -// It can only be interpreted in the context of ./constraint_solver.swig, where +// It can only be interpreted in the context of ./constraint_solver.i, where // it is included. #ifndef OR_TOOLS_CONSTRAINT_SOLVER_PYTHON_PYWRAPCP_UTIL_H_ #define OR_TOOLS_CONSTRAINT_SOLVER_PYTHON_PYWRAPCP_UTIL_H_ #include -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" using std::string; diff --git a/src/constraint_solver/python/routing.swig b/ortools/constraint_solver/python/routing.i similarity index 95% rename from src/constraint_solver/python/routing.swig rename to ortools/constraint_solver/python/routing.i index a953237410..f8d955655e 100644 --- a/src/constraint_solver/python/routing.swig +++ b/ortools/constraint_solver/python/routing.i @@ -13,12 +13,12 @@ // TODO(user): Refactor this file to adhere to the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" -%include "constraint_solver/python/constraint_solver.swig" +%include "ortools/constraint_solver/python/constraint_solver.i" // TODO(user): remove this when we no longer use callbacks in the routing. #define FATAL_CALLBACK_EXCEPTION -%include "base/python/callbacks.swig" +%include "ortools/base/python/callbacks.i" // We need to forward-declare the proto here, so that PROTO_INPUT involving it // works correctly. The order matters very much: this declaration needs to be @@ -30,7 +30,7 @@ class RoutingSearchParameters; // Include the file we want to wrap a first time. %{ -#include "constraint_solver/routing.h" +#include "ortools/constraint_solver/routing.h" %} @@ -175,8 +175,8 @@ PY_PROTO_TYPEMAP(ortools.constraint_solver.routing_parameters_pb2, %unignore RoutingTransitEvaluator2; %unignore RoutingNodePair; %unignore RoutingNodePairs; -%include "constraint_solver/routing_types.h" +%include "ortools/constraint_solver/routing_types.h" %unignoreall // TODO(user): Use ignoreall/unignoreall for this one. A lot of work. -%include "constraint_solver/routing.h" +%include "ortools/constraint_solver/routing.h" diff --git a/src/constraint_solver/range_cst.cc b/ortools/constraint_solver/range_cst.cc similarity index 99% rename from src/constraint_solver/range_cst.cc rename to ortools/constraint_solver/range_cst.cc index 35f5682de0..bc6545a8c4 100644 --- a/src/constraint_solver/range_cst.cc +++ b/ortools/constraint_solver/range_cst.cc @@ -17,9 +17,9 @@ #include #include -#include "base/logging.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/logging.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { diff --git a/src/constraint_solver/resource.cc b/ortools/constraint_solver/resource.cc similarity index 99% rename from src/constraint_solver/resource.cc rename to ortools/constraint_solver/resource.cc index 764eee1aee..c157cae73e 100644 --- a/src/constraint_solver/resource.cc +++ b/ortools/constraint_solver/resource.cc @@ -22,27 +22,27 @@ // on a set of interval variables. #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/join.h" -#include "base/stl_util.h" -#include "base/mathutil.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/bitset.h" -#include "util/monoid_operation_tree.h" -#include "util/saturated_arithmetic.h" -#include "util/string_array.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/join.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/mathutil.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/bitset.h" +#include "ortools/util/monoid_operation_tree.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/routing.cc b/ortools/constraint_solver/routing.cc similarity index 99% rename from src/constraint_solver/routing.cc rename to ortools/constraint_solver/routing.cc index 846a2097c7..36459b2bc3 100644 --- a/src/constraint_solver/routing.cc +++ b/ortools/constraint_solver/routing.cc @@ -12,7 +12,7 @@ // limitations under the License. -#include "constraint_solver/routing.h" +#include "ortools/constraint_solver/routing.h" #include #include @@ -22,23 +22,23 @@ #include #include -#include "base/callback.h" -#include "base/casts.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" +#include "ortools/base/callback.h" +#include "ortools/base/casts.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" #include "google/protobuf/text_format.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/thorough_hash.h" -#include "base/hash.h" -#include "constraint_solver/routing_neighborhoods.h" -#include "constraint_solver/model.pb.h" -#include "base/join.h" -#include "constraint_solver/routing_enums.pb.h" -#include "graph/connectivity.h" -#include "graph/linear_assignment.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/thorough_hash.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/routing_neighborhoods.h" +#include "ortools/constraint_solver/model.pb.h" +#include "ortools/base/join.h" +#include "ortools/constraint_solver/routing_enums.pb.h" +#include "ortools/graph/connectivity.h" +#include "ortools/graph/linear_assignment.h" +#include "ortools/util/saturated_arithmetic.h" namespace operations_research { class LocalSearchPhaseParameters; diff --git a/src/constraint_solver/routing.h b/ortools/constraint_solver/routing.h similarity index 99% rename from src/constraint_solver/routing.h rename to ortools/constraint_solver/routing.h index 0f24dc950d..d1ce0be04b 100644 --- a/src/constraint_solver/routing.h +++ b/ortools/constraint_solver/routing.h @@ -34,7 +34,7 @@ // - http://en.wikipedia.org/wiki/Vehicle_routing_problem // // The vehicle routing library is a vertical layer above the constraint -// programming library (constraint_programming:cp). +// programming library (ortools/constraint_programming:cp). // One has access to all underlying constrained variables of the vehicle // routing model which can therefore be enriched by adding any constraint // available in the constraint programming library. @@ -44,7 +44,7 @@ // * "next(i)" variables representing the immediate successor of the node // corresponding to i; use IndexToNode() to get the node corresponding to // a "next" variable value; note that node indices are strongly typed -// integers (cf. base/int_type.h); +// integers (cf. ortools/base/int_type.h); // * "vehicle(i)" variables representing the vehicle route to which the // node corresponding to i belongs; // * "active(i)" boolean variables, true if the node corresponding to i is @@ -167,21 +167,21 @@ #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/int_type_indexed_vector.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/routing_parameters.pb.h" -#include "constraint_solver/routing_types.h" -#include "graph/graph.h" -#include "util/range_query_function.h" -#include "util/sorted_interval_list.h" -#include "base/adjustable_priority_queue-inl.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/routing_parameters.pb.h" +#include "ortools/constraint_solver/routing_types.h" +#include "ortools/graph/graph.h" +#include "ortools/util/range_query_function.h" +#include "ortools/util/sorted_interval_list.h" +#include "ortools/base/adjustable_priority_queue-inl.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { @@ -218,7 +218,7 @@ class RoutingModel { typedef RoutingNodeEvaluator2 NodeEvaluator2; typedef RoutingTransitEvaluator2 TransitEvaluator2; -// TODO(user): Remove all SWIG guards by adding the @ignore in .swig. +// TODO(user): Remove all SWIG guards by adding the @ignore in .i. #if !defined(SWIG) typedef RoutingNodePair NodePair; typedef RoutingNodePairs NodePairs; diff --git a/src/constraint_solver/routing_enums.proto b/ortools/constraint_solver/routing_enums.proto similarity index 100% rename from src/constraint_solver/routing_enums.proto rename to ortools/constraint_solver/routing_enums.proto diff --git a/src/constraint_solver/routing_flags.cc b/ortools/constraint_solver/routing_flags.cc similarity index 98% rename from src/constraint_solver/routing_flags.cc rename to ortools/constraint_solver/routing_flags.cc index 78ded24a00..759366d033 100644 --- a/src/constraint_solver/routing_flags.cc +++ b/ortools/constraint_solver/routing_flags.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "constraint_solver/routing_flags.h" +#include "ortools/constraint_solver/routing_flags.h" #include #include -#include "base/map_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/routing_enums.pb.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/routing_enums.pb.h" // --- Routing search flags --- diff --git a/src/constraint_solver/routing_flags.h b/ortools/constraint_solver/routing_flags.h similarity index 96% rename from src/constraint_solver/routing_flags.h rename to ortools/constraint_solver/routing_flags.h index e0f5a8438e..4ec623eb11 100644 --- a/src/constraint_solver/routing_flags.h +++ b/ortools/constraint_solver/routing_flags.h @@ -16,8 +16,8 @@ #include -#include "base/commandlineflags.h" -#include "constraint_solver/routing_parameters.pb.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/constraint_solver/routing_parameters.pb.h" // --- Routing search flags --- diff --git a/src/constraint_solver/routing_neighborhoods.cc b/ortools/constraint_solver/routing_neighborhoods.cc similarity index 99% rename from src/constraint_solver/routing_neighborhoods.cc rename to ortools/constraint_solver/routing_neighborhoods.cc index 5e572b58ef..00f2181a59 100644 --- a/src/constraint_solver/routing_neighborhoods.cc +++ b/ortools/constraint_solver/routing_neighborhoods.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "constraint_solver/routing_neighborhoods.h" +#include "ortools/constraint_solver/routing_neighborhoods.h" namespace operations_research { diff --git a/src/constraint_solver/routing_neighborhoods.h b/ortools/constraint_solver/routing_neighborhoods.h similarity index 98% rename from src/constraint_solver/routing_neighborhoods.h rename to ortools/constraint_solver/routing_neighborhoods.h index 58712b73fb..b4a5a8e645 100644 --- a/src/constraint_solver/routing_neighborhoods.h +++ b/ortools/constraint_solver/routing_neighborhoods.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_CONSTRAINT_SOLVER_ROUTING_NEIGHBORHOODS_H_ #define OR_TOOLS_CONSTRAINT_SOLVER_ROUTING_NEIGHBORHOODS_H_ -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/routing_types.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/routing_types.h" namespace operations_research { diff --git a/src/constraint_solver/routing_parameters.proto b/ortools/constraint_solver/routing_parameters.proto similarity index 99% rename from src/constraint_solver/routing_parameters.proto rename to ortools/constraint_solver/routing_parameters.proto index 2ab49f3d5f..6414688427 100644 --- a/src/constraint_solver/routing_parameters.proto +++ b/ortools/constraint_solver/routing_parameters.proto @@ -20,8 +20,8 @@ option java_package = "com.google.ortools.constraintsolver"; option java_multiple_files = true; option csharp_namespace = "Google.OrTools.ConstraintSolver"; -import "constraint_solver/routing_enums.proto"; -import "constraint_solver/solver_parameters.proto"; +import "ortools/constraint_solver/routing_enums.proto"; +import "ortools/constraint_solver/solver_parameters.proto"; package operations_research; diff --git a/src/constraint_solver/routing_search.cc b/ortools/constraint_solver/routing_search.cc similarity index 99% rename from src/constraint_solver/routing_search.cc rename to ortools/constraint_solver/routing_search.cc index 92acf677a3..66769168eb 100644 --- a/src/constraint_solver/routing_search.cc +++ b/ortools/constraint_solver/routing_search.cc @@ -22,12 +22,12 @@ #include #include #include -#include "base/small_map.h" -#include "base/small_ordered_set.h" -#include "constraint_solver/routing.h" -#include "graph/christofides.h" -#include "util/bitset.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/small_map.h" +#include "ortools/base/small_ordered_set.h" +#include "ortools/constraint_solver/routing.h" +#include "ortools/graph/christofides.h" +#include "ortools/util/bitset.h" +#include "ortools/util/saturated_arithmetic.h" DEFINE_bool(routing_strong_debug_checks, false, "Run stronger checks in debug; these stronger tests might change " diff --git a/src/constraint_solver/routing_types.h b/ortools/constraint_solver/routing_types.h similarity index 94% rename from src/constraint_solver/routing_types.h rename to ortools/constraint_solver/routing_types.h index e4599d7609..cbace25526 100644 --- a/src/constraint_solver/routing_types.h +++ b/ortools/constraint_solver/routing_types.h @@ -16,9 +16,9 @@ #include #include -#include "base/callback.h" -#include "base/integral_types.h" -#include "base/int_type.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/int_type.h" namespace operations_research { diff --git a/src/constraint_solver/sat_constraint.cc b/ortools/constraint_solver/sat_constraint.cc similarity index 98% rename from src/constraint_solver/sat_constraint.cc rename to ortools/constraint_solver/sat_constraint.cc index 769e217ec2..0cd629640c 100644 --- a/src/constraint_solver/sat_constraint.cc +++ b/ortools/constraint_solver/sat_constraint.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "constraint_solver/sat_constraint.h" +#include "ortools/constraint_solver/sat_constraint.h" namespace operations_research { diff --git a/src/constraint_solver/sat_constraint.h b/ortools/constraint_solver/sat_constraint.h similarity index 97% rename from src/constraint_solver/sat_constraint.h rename to ortools/constraint_solver/sat_constraint.h index bbe4078731..0492c8633c 100644 --- a/src/constraint_solver/sat_constraint.h +++ b/ortools/constraint_solver/sat_constraint.h @@ -28,15 +28,15 @@ #ifndef OR_TOOLS_CONSTRAINT_SOLVER_SAT_CONSTRAINT_H_ #define OR_TOOLS_CONSTRAINT_SOLVER_SAT_CONSTRAINT_H_ -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "sat/sat_solver.h" -#include "util/tuple_set.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/tuple_set.h" namespace operations_research { diff --git a/src/constraint_solver/sched_constraints.cc b/ortools/constraint_solver/sched_constraints.cc similarity index 98% rename from src/constraint_solver/sched_constraints.cc rename to ortools/constraint_solver/sched_constraints.cc index a7cd85858d..253f1cf43a 100644 --- a/src/constraint_solver/sched_constraints.cc +++ b/ortools/constraint_solver/sched_constraints.cc @@ -24,13 +24,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/sched_expr.cc b/ortools/constraint_solver/sched_expr.cc similarity index 95% rename from src/constraint_solver/sched_expr.cc rename to ortools/constraint_solver/sched_expr.cc index 3dab15abc4..5ed2060b0c 100644 --- a/src/constraint_solver/sched_expr.cc +++ b/ortools/constraint_solver/sched_expr.cc @@ -14,12 +14,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" #if defined(_MSC_VER) #pragma warning(disable : 4351 4355 4804 4805) diff --git a/src/constraint_solver/sched_search.cc b/ortools/constraint_solver/sched_search.cc similarity index 99% rename from src/constraint_solver/sched_search.cc rename to ortools/constraint_solver/sched_search.cc index c77a6ca51b..d84a4b06ef 100644 --- a/src/constraint_solver/sched_search.cc +++ b/ortools/constraint_solver/sched_search.cc @@ -16,12 +16,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/search.cc b/ortools/constraint_solver/search.cc similarity index 99% rename from src/constraint_solver/search.cc rename to ortools/constraint_solver/search.cc index 8b3b1eb980..4ea8a827a5 100644 --- a/src/constraint_solver/search.cc +++ b/ortools/constraint_solver/search.cc @@ -14,30 +14,30 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/casts.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/join.h" -#include "base/bitmap.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/search_limit.pb.h" -#include "util/string_array.h" -#include "base/random.h" +#include "ortools/base/casts.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/join.h" +#include "ortools/base/bitmap.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/search_limit.pb.h" +#include "ortools/util/string_array.h" +#include "ortools/base/random.h" DEFINE_bool(cp_use_sparse_gls_penalties, false, "Use sparse implementation to store Guided Local Search penalties"); diff --git a/src/constraint_solver/search_limit.proto b/ortools/constraint_solver/search_limit.proto similarity index 100% rename from src/constraint_solver/search_limit.proto rename to ortools/constraint_solver/search_limit.proto diff --git a/src/constraint_solver/softgcc.cc b/ortools/constraint_solver/softgcc.cc similarity index 99% rename from src/constraint_solver/softgcc.cc rename to ortools/constraint_solver/softgcc.cc index 8977ea4e38..679ec09339 100644 --- a/src/constraint_solver/softgcc.cc +++ b/ortools/constraint_solver/softgcc.cc @@ -13,11 +13,11 @@ #include -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/constraint_solver.h" -#include "util/string_array.h" -#include "util/vector_map.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/util/string_array.h" +#include "ortools/util/vector_map.h" namespace operations_research { namespace { diff --git a/src/constraint_solver/solver_parameters.proto b/ortools/constraint_solver/solver_parameters.proto similarity index 100% rename from src/constraint_solver/solver_parameters.proto rename to ortools/constraint_solver/solver_parameters.proto diff --git a/src/constraint_solver/table.cc b/ortools/constraint_solver/table.cc similarity index 98% rename from src/constraint_solver/table.cc rename to ortools/constraint_solver/table.cc index 261c692f46..e708f526f3 100644 --- a/src/constraint_solver/table.cc +++ b/ortools/constraint_solver/table.cc @@ -15,23 +15,23 @@ // This file implements the table constraints. #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/map_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "constraint_solver/sat_constraint.h" -#include "util/bitset.h" -#include "util/string_array.h" -#include "util/tuple_set.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/constraint_solver/sat_constraint.h" +#include "ortools/util/bitset.h" +#include "ortools/util/string_array.h" +#include "ortools/util/tuple_set.h" namespace operations_research { // External table code. diff --git a/src/constraint_solver/timetabling.cc b/ortools/constraint_solver/timetabling.cc similarity index 97% rename from src/constraint_solver/timetabling.cc rename to ortools/constraint_solver/timetabling.cc index 9b0697424a..53e3b8309f 100644 --- a/src/constraint_solver/timetabling.cc +++ b/ortools/constraint_solver/timetabling.cc @@ -14,12 +14,12 @@ #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { diff --git a/src/constraint_solver/trace.cc b/ortools/constraint_solver/trace.cc similarity index 98% rename from src/constraint_solver/trace.cc rename to ortools/constraint_solver/trace.cc index 71abd10ac6..20679135bb 100644 --- a/src/constraint_solver/trace.cc +++ b/ortools/constraint_solver/trace.cc @@ -14,19 +14,19 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/map_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" DEFINE_bool( cp_full_trace, false, diff --git a/src/constraint_solver/tree_monitor.cc b/ortools/constraint_solver/tree_monitor.cc similarity index 98% rename from src/constraint_solver/tree_monitor.cc rename to ortools/constraint_solver/tree_monitor.cc index 47ca62ac96..43aae2d8c3 100644 --- a/src/constraint_solver/tree_monitor.cc +++ b/ortools/constraint_solver/tree_monitor.cc @@ -13,7 +13,7 @@ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include @@ -22,18 +22,18 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" #include #include -#include "util/xml_helper.h" +#include "ortools/util/xml_helper.h" namespace operations_research { // String comparator that compares strings naturally, even those diff --git a/src/constraint_solver/utilities.cc b/ortools/constraint_solver/utilities.cc similarity index 98% rename from src/constraint_solver/utilities.cc rename to ortools/constraint_solver/utilities.cc index 2173bcb0c1..5afff79c5f 100644 --- a/src/constraint_solver/utilities.cc +++ b/ortools/constraint_solver/utilities.cc @@ -12,19 +12,19 @@ // limitations under the License. -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "util/bitset.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/util/bitset.h" namespace operations_research { diff --git a/src/constraint_solver/visitor.cc b/ortools/constraint_solver/visitor.cc similarity index 95% rename from src/constraint_solver/visitor.cc rename to ortools/constraint_solver/visitor.cc index 2cd6f8472e..7432ae5863 100644 --- a/src/constraint_solver/visitor.cc +++ b/ortools/constraint_solver/visitor.cc @@ -13,18 +13,18 @@ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" namespace operations_research { // ---------- ArgumentHolder ---------- diff --git a/src/flatzinc/BUILD b/ortools/flatzinc/BUILD similarity index 100% rename from src/flatzinc/BUILD rename to ortools/flatzinc/BUILD diff --git a/src/flatzinc/checker.cc b/ortools/flatzinc/checker.cc similarity index 99% rename from src/flatzinc/checker.cc rename to ortools/flatzinc/checker.cc index 031b4066d6..eaf1c117a9 100644 --- a/src/flatzinc/checker.cc +++ b/ortools/flatzinc/checker.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/checker.h" +#include "ortools/flatzinc/checker.h" #include #include -#include "base/map_util.h" -#include "flatzinc/logging.h" -#include "flatzinc/model.h" +#include "ortools/base/map_util.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/flatzinc/model.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/checker.h b/ortools/flatzinc/checker.h similarity index 96% rename from src/flatzinc/checker.h rename to ortools/flatzinc/checker.h index 5620e36c94..b121da87d8 100644 --- a/src/flatzinc/checker.h +++ b/ortools/flatzinc/checker.h @@ -16,7 +16,7 @@ #include -#include "flatzinc/model.h" +#include "ortools/flatzinc/model.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/constraints.cc b/ortools/flatzinc/constraints.cc similarity index 99% rename from src/flatzinc/constraints.cc rename to ortools/flatzinc/constraints.cc index f7803a1888..3305840d1c 100644 --- a/src/flatzinc/constraints.cc +++ b/ortools/flatzinc/constraints.cc @@ -11,22 +11,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/constraints.h" +#include "ortools/flatzinc/constraints.h" #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "flatzinc/flatzinc_constraints.h" -#include "flatzinc/logging.h" -#include "flatzinc/model.h" -#include "flatzinc/sat_constraint.h" -#include "flatzinc/solver_data.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/flatzinc/flatzinc_constraints.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/sat_constraint.h" +#include "ortools/flatzinc/solver_data.h" +#include "ortools/util/string_array.h" DECLARE_bool(fz_use_sat); diff --git a/src/flatzinc/constraints.h b/ortools/flatzinc/constraints.h similarity index 92% rename from src/flatzinc/constraints.h rename to ortools/flatzinc/constraints.h index 6bcef34f3b..015d93d546 100644 --- a/src/flatzinc/constraints.h +++ b/ortools/flatzinc/constraints.h @@ -17,8 +17,8 @@ // This files provides all the extraction methods to transform flatzinc // constraints into CP constraints. -#include "flatzinc/model.h" -#include "flatzinc/solver_data.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/solver_data.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/csharp/flatzinc.swig b/ortools/flatzinc/csharp/flatzinc.i similarity index 100% rename from src/flatzinc/csharp/flatzinc.swig rename to ortools/flatzinc/csharp/flatzinc.i diff --git a/src/flatzinc/flatzinc_constraints.cc b/ortools/flatzinc/flatzinc_constraints.cc similarity index 99% rename from src/flatzinc/flatzinc_constraints.cc rename to ortools/flatzinc/flatzinc_constraints.cc index 1e671f3eaf..ac623da4db 100644 --- a/src/flatzinc/flatzinc_constraints.cc +++ b/ortools/flatzinc/flatzinc_constraints.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/flatzinc_constraints.h" +#include "ortools/flatzinc/flatzinc_constraints.h" #include -#include "base/commandlineflags.h" -#include "constraint_solver/constraint_solveri.h" -#include "flatzinc/logging.h" -#include "util/string_array.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/util/string_array.h" DECLARE_bool(cp_trace_search); DECLARE_bool(cp_trace_propagation); diff --git a/src/flatzinc/flatzinc_constraints.h b/ortools/flatzinc/flatzinc_constraints.h similarity index 98% rename from src/flatzinc/flatzinc_constraints.h rename to ortools/flatzinc/flatzinc_constraints.h index 2deabc4b88..d50a06ec7a 100644 --- a/src/flatzinc/flatzinc_constraints.h +++ b/ortools/flatzinc/flatzinc_constraints.h @@ -17,7 +17,7 @@ // Additional constraints included in the minizinc specifications, but not // general enough to be in the CP library. -#include "constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { diff --git a/src/flatzinc/fz.cc b/ortools/flatzinc/fz.cc similarity index 94% rename from src/flatzinc/fz.cc rename to ortools/flatzinc/fz.cc index a01c77490d..53b1873fbb 100644 --- a/src/flatzinc/fz.cc +++ b/ortools/flatzinc/fz.cc @@ -23,21 +23,21 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/threadpool.h" -#include "base/commandlineflags.h" -#include "flatzinc/logging.h" -#include "flatzinc/model.h" -#include "flatzinc/parser.h" -#include "flatzinc/presolve.h" -#include "flatzinc/reporting.h" -#include "flatzinc/sat_fz_solver.h" -#include "flatzinc/solver.h" -#include "flatzinc/solver_util.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/threadpool.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/parser.h" +#include "ortools/flatzinc/presolve.h" +#include "ortools/flatzinc/reporting.h" +#include "ortools/flatzinc/sat_fz_solver.h" +#include "ortools/flatzinc/solver.h" +#include "ortools/flatzinc/solver_util.h" DEFINE_int32(time_limit, 0, "time limit in ms."); DEFINE_bool(all_solutions, false, "Search for all solutions."); diff --git a/src/flatzinc/logging.cc b/ortools/flatzinc/logging.cc similarity index 96% rename from src/flatzinc/logging.cc rename to ortools/flatzinc/logging.cc index 2666063c9a..068396e8db 100644 --- a/src/flatzinc/logging.cc +++ b/ortools/flatzinc/logging.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/logging.h" +#include "ortools/flatzinc/logging.h" DEFINE_bool(fz_logging, false, "Print logging information from the flatzinc interpreter."); diff --git a/src/flatzinc/logging.h b/ortools/flatzinc/logging.h similarity index 94% rename from src/flatzinc/logging.h rename to ortools/flatzinc/logging.h index bec8313fc4..53264139de 100644 --- a/src/flatzinc/logging.h +++ b/ortools/flatzinc/logging.h @@ -17,8 +17,8 @@ #include #include -#include "base/commandlineflags.h" -#include "base/logging.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" // This file offers logging tool for the flatzinc interpreter. // It supports internal logging mechanisms as well as official mechanism from diff --git a/src/flatzinc/model.cc b/ortools/flatzinc/model.cc similarity index 99% rename from src/flatzinc/model.cc rename to ortools/flatzinc/model.cc index c3d44e7a9b..18c128fd9c 100644 --- a/src/flatzinc/model.cc +++ b/ortools/flatzinc/model.cc @@ -11,17 +11,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/model.h" +#include "ortools/flatzinc/model.h" #include #include #include -#include "base/join.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/stl_util.h" -#include "flatzinc/logging.h" +#include "ortools/base/join.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/flatzinc/logging.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/model.h b/ortools/flatzinc/model.h similarity index 98% rename from src/flatzinc/model.h rename to ortools/flatzinc/model.h index b845bee6b2..df0e5dab39 100644 --- a/src/flatzinc/model.h +++ b/ortools/flatzinc/model.h @@ -18,11 +18,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "util/iterators.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/util/iterators.h" +#include "ortools/util/string_array.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/mznlib_cp/all_different_int.mzn b/ortools/flatzinc/mznlib_cp/all_different_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/all_different_int.mzn rename to ortools/flatzinc/mznlib_cp/all_different_int.mzn diff --git a/src/flatzinc/mznlib_cp/alldifferent_except_0.mzn b/ortools/flatzinc/mznlib_cp/alldifferent_except_0.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/alldifferent_except_0.mzn rename to ortools/flatzinc/mznlib_cp/alldifferent_except_0.mzn diff --git a/src/flatzinc/mznlib_cp/among.mzn b/ortools/flatzinc/mznlib_cp/among.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/among.mzn rename to ortools/flatzinc/mznlib_cp/among.mzn diff --git a/src/flatzinc/mznlib_cp/arg_max_int.mzn b/ortools/flatzinc/mznlib_cp/arg_max_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/arg_max_int.mzn rename to ortools/flatzinc/mznlib_cp/arg_max_int.mzn diff --git a/src/flatzinc/mznlib_cp/arg_min_int.mzn b/ortools/flatzinc/mznlib_cp/arg_min_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/arg_min_int.mzn rename to ortools/flatzinc/mznlib_cp/arg_min_int.mzn diff --git a/src/flatzinc/mznlib_cp/at_most_int.mzn b/ortools/flatzinc/mznlib_cp/at_most_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/at_most_int.mzn rename to ortools/flatzinc/mznlib_cp/at_most_int.mzn diff --git a/src/flatzinc/mznlib_cp/circuit.mzn b/ortools/flatzinc/mznlib_cp/circuit.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/circuit.mzn rename to ortools/flatzinc/mznlib_cp/circuit.mzn diff --git a/src/flatzinc/mznlib_cp/count.mzn b/ortools/flatzinc/mznlib_cp/count.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count.mzn rename to ortools/flatzinc/mznlib_cp/count.mzn diff --git a/src/flatzinc/mznlib_cp/count_eq.mzn b/ortools/flatzinc/mznlib_cp/count_eq.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_eq.mzn rename to ortools/flatzinc/mznlib_cp/count_eq.mzn diff --git a/src/flatzinc/mznlib_cp/count_geq.mzn b/ortools/flatzinc/mznlib_cp/count_geq.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_geq.mzn rename to ortools/flatzinc/mznlib_cp/count_geq.mzn diff --git a/src/flatzinc/mznlib_cp/count_gt.mzn b/ortools/flatzinc/mznlib_cp/count_gt.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_gt.mzn rename to ortools/flatzinc/mznlib_cp/count_gt.mzn diff --git a/src/flatzinc/mznlib_cp/count_leq.mzn b/ortools/flatzinc/mznlib_cp/count_leq.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_leq.mzn rename to ortools/flatzinc/mznlib_cp/count_leq.mzn diff --git a/src/flatzinc/mznlib_cp/count_lt.mzn b/ortools/flatzinc/mznlib_cp/count_lt.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_lt.mzn rename to ortools/flatzinc/mznlib_cp/count_lt.mzn diff --git a/src/flatzinc/mznlib_cp/count_neq.mzn b/ortools/flatzinc/mznlib_cp/count_neq.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_neq.mzn rename to ortools/flatzinc/mznlib_cp/count_neq.mzn diff --git a/src/flatzinc/mznlib_cp/count_reif.mzn b/ortools/flatzinc/mznlib_cp/count_reif.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/count_reif.mzn rename to ortools/flatzinc/mznlib_cp/count_reif.mzn diff --git a/src/flatzinc/mznlib_cp/cumulative.mzn b/ortools/flatzinc/mznlib_cp/cumulative.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/cumulative.mzn rename to ortools/flatzinc/mznlib_cp/cumulative.mzn diff --git a/src/flatzinc/mznlib_cp/diffn.mzn b/ortools/flatzinc/mznlib_cp/diffn.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/diffn.mzn rename to ortools/flatzinc/mznlib_cp/diffn.mzn diff --git a/src/flatzinc/mznlib_cp/diffn_k.mzn b/ortools/flatzinc/mznlib_cp/diffn_k.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/diffn_k.mzn rename to ortools/flatzinc/mznlib_cp/diffn_k.mzn diff --git a/src/flatzinc/mznlib_cp/diffn_nonstrict.mzn b/ortools/flatzinc/mznlib_cp/diffn_nonstrict.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/diffn_nonstrict.mzn rename to ortools/flatzinc/mznlib_cp/diffn_nonstrict.mzn diff --git a/src/flatzinc/mznlib_cp/diffn_nonstrict_k.mzn b/ortools/flatzinc/mznlib_cp/diffn_nonstrict_k.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/diffn_nonstrict_k.mzn rename to ortools/flatzinc/mznlib_cp/diffn_nonstrict_k.mzn diff --git a/src/flatzinc/mznlib_cp/disjunctive.mzn b/ortools/flatzinc/mznlib_cp/disjunctive.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/disjunctive.mzn rename to ortools/flatzinc/mznlib_cp/disjunctive.mzn diff --git a/src/flatzinc/mznlib_cp/disjunctive_opt.mzn b/ortools/flatzinc/mznlib_cp/disjunctive_opt.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/disjunctive_opt.mzn rename to ortools/flatzinc/mznlib_cp/disjunctive_opt.mzn diff --git a/src/flatzinc/mznlib_cp/disjunctive_strict.mzn b/ortools/flatzinc/mznlib_cp/disjunctive_strict.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/disjunctive_strict.mzn rename to ortools/flatzinc/mznlib_cp/disjunctive_strict.mzn diff --git a/src/flatzinc/mznlib_cp/global_cardinality.mzn b/ortools/flatzinc/mznlib_cp/global_cardinality.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/global_cardinality.mzn rename to ortools/flatzinc/mznlib_cp/global_cardinality.mzn diff --git a/src/flatzinc/mznlib_cp/global_cardinality_closed.mzn b/ortools/flatzinc/mznlib_cp/global_cardinality_closed.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/global_cardinality_closed.mzn rename to ortools/flatzinc/mznlib_cp/global_cardinality_closed.mzn diff --git a/src/flatzinc/mznlib_cp/global_cardinality_low_up.mzn b/ortools/flatzinc/mznlib_cp/global_cardinality_low_up.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/global_cardinality_low_up.mzn rename to ortools/flatzinc/mznlib_cp/global_cardinality_low_up.mzn diff --git a/src/flatzinc/mznlib_cp/global_cardinality_low_up_closed.mzn b/ortools/flatzinc/mznlib_cp/global_cardinality_low_up_closed.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/global_cardinality_low_up_closed.mzn rename to ortools/flatzinc/mznlib_cp/global_cardinality_low_up_closed.mzn diff --git a/src/flatzinc/mznlib_cp/int_mod.mzn b/ortools/flatzinc/mznlib_cp/int_mod.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/int_mod.mzn rename to ortools/flatzinc/mznlib_cp/int_mod.mzn diff --git a/src/flatzinc/mznlib_cp/inverse.mzn b/ortools/flatzinc/mznlib_cp/inverse.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/inverse.mzn rename to ortools/flatzinc/mznlib_cp/inverse.mzn diff --git a/src/flatzinc/mznlib_cp/lex_less_bool.mzn b/ortools/flatzinc/mznlib_cp/lex_less_bool.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/lex_less_bool.mzn rename to ortools/flatzinc/mznlib_cp/lex_less_bool.mzn diff --git a/src/flatzinc/mznlib_cp/lex_less_int.mzn b/ortools/flatzinc/mznlib_cp/lex_less_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/lex_less_int.mzn rename to ortools/flatzinc/mznlib_cp/lex_less_int.mzn diff --git a/src/flatzinc/mznlib_cp/lex_lesseq_bool.mzn b/ortools/flatzinc/mznlib_cp/lex_lesseq_bool.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/lex_lesseq_bool.mzn rename to ortools/flatzinc/mznlib_cp/lex_lesseq_bool.mzn diff --git a/src/flatzinc/mznlib_cp/lex_lesseq_int.mzn b/ortools/flatzinc/mznlib_cp/lex_lesseq_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/lex_lesseq_int.mzn rename to ortools/flatzinc/mznlib_cp/lex_lesseq_int.mzn diff --git a/src/flatzinc/mznlib_cp/maximum.mzn b/ortools/flatzinc/mznlib_cp/maximum.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/maximum.mzn rename to ortools/flatzinc/mznlib_cp/maximum.mzn diff --git a/src/flatzinc/mznlib_cp/maximum_int.mzn b/ortools/flatzinc/mznlib_cp/maximum_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/maximum_int.mzn rename to ortools/flatzinc/mznlib_cp/maximum_int.mzn diff --git a/src/flatzinc/mznlib_cp/minimum.mzn b/ortools/flatzinc/mznlib_cp/minimum.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/minimum.mzn rename to ortools/flatzinc/mznlib_cp/minimum.mzn diff --git a/src/flatzinc/mznlib_cp/minimum_int.mzn b/ortools/flatzinc/mznlib_cp/minimum_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/minimum_int.mzn rename to ortools/flatzinc/mznlib_cp/minimum_int.mzn diff --git a/src/flatzinc/mznlib_cp/nvalue.mzn b/ortools/flatzinc/mznlib_cp/nvalue.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/nvalue.mzn rename to ortools/flatzinc/mznlib_cp/nvalue.mzn diff --git a/src/flatzinc/mznlib_cp/redefinitions-2.0.mzn b/ortools/flatzinc/mznlib_cp/redefinitions-2.0.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/redefinitions-2.0.mzn rename to ortools/flatzinc/mznlib_cp/redefinitions-2.0.mzn diff --git a/src/flatzinc/mznlib_cp/regular.mzn b/ortools/flatzinc/mznlib_cp/regular.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/regular.mzn rename to ortools/flatzinc/mznlib_cp/regular.mzn diff --git a/src/flatzinc/mznlib_cp/regular_nfa.mzn b/ortools/flatzinc/mznlib_cp/regular_nfa.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/regular_nfa.mzn rename to ortools/flatzinc/mznlib_cp/regular_nfa.mzn diff --git a/src/flatzinc/mznlib_cp/sequence.mzn b/ortools/flatzinc/mznlib_cp/sequence.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/sequence.mzn rename to ortools/flatzinc/mznlib_cp/sequence.mzn diff --git a/src/flatzinc/mznlib_cp/sliding_sum.mzn b/ortools/flatzinc/mznlib_cp/sliding_sum.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/sliding_sum.mzn rename to ortools/flatzinc/mznlib_cp/sliding_sum.mzn diff --git a/src/flatzinc/mznlib_cp/sort.mzn b/ortools/flatzinc/mznlib_cp/sort.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/sort.mzn rename to ortools/flatzinc/mznlib_cp/sort.mzn diff --git a/src/flatzinc/mznlib_cp/subcircuit.mzn b/ortools/flatzinc/mznlib_cp/subcircuit.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/subcircuit.mzn rename to ortools/flatzinc/mznlib_cp/subcircuit.mzn diff --git a/src/flatzinc/mznlib_cp/symmetric_all_different.mzn b/ortools/flatzinc/mznlib_cp/symmetric_all_different.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/symmetric_all_different.mzn rename to ortools/flatzinc/mznlib_cp/symmetric_all_different.mzn diff --git a/src/flatzinc/mznlib_cp/table.mzn b/ortools/flatzinc/mznlib_cp/table.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/table.mzn rename to ortools/flatzinc/mznlib_cp/table.mzn diff --git a/src/flatzinc/mznlib_cp/table_bool.mzn b/ortools/flatzinc/mznlib_cp/table_bool.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/table_bool.mzn rename to ortools/flatzinc/mznlib_cp/table_bool.mzn diff --git a/src/flatzinc/mznlib_cp/table_int.mzn b/ortools/flatzinc/mznlib_cp/table_int.mzn similarity index 100% rename from src/flatzinc/mznlib_cp/table_int.mzn rename to ortools/flatzinc/mznlib_cp/table_int.mzn diff --git a/src/flatzinc/mznlib_sat/BUILD b/ortools/flatzinc/mznlib_sat/BUILD similarity index 100% rename from src/flatzinc/mznlib_sat/BUILD rename to ortools/flatzinc/mznlib_sat/BUILD diff --git a/src/flatzinc/mznlib_sat/all_different_int.mzn b/ortools/flatzinc/mznlib_sat/all_different_int.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/all_different_int.mzn rename to ortools/flatzinc/mznlib_sat/all_different_int.mzn diff --git a/src/flatzinc/mznlib_sat/circuit.mzn b/ortools/flatzinc/mznlib_sat/circuit.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/circuit.mzn rename to ortools/flatzinc/mznlib_sat/circuit.mzn diff --git a/src/flatzinc/mznlib_sat/cumulative.mzn b/ortools/flatzinc/mznlib_sat/cumulative.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/cumulative.mzn rename to ortools/flatzinc/mznlib_sat/cumulative.mzn diff --git a/src/flatzinc/mznlib_sat/diffn.mzn b/ortools/flatzinc/mznlib_sat/diffn.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/diffn.mzn rename to ortools/flatzinc/mznlib_sat/diffn.mzn diff --git a/src/flatzinc/mznlib_sat/diffn_nonstrict.mzn b/ortools/flatzinc/mznlib_sat/diffn_nonstrict.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/diffn_nonstrict.mzn rename to ortools/flatzinc/mznlib_sat/diffn_nonstrict.mzn diff --git a/src/flatzinc/mznlib_sat/maximum.mzn b/ortools/flatzinc/mznlib_sat/maximum.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/maximum.mzn rename to ortools/flatzinc/mznlib_sat/maximum.mzn diff --git a/src/flatzinc/mznlib_sat/maximum_int.mzn b/ortools/flatzinc/mznlib_sat/maximum_int.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/maximum_int.mzn rename to ortools/flatzinc/mznlib_sat/maximum_int.mzn diff --git a/src/flatzinc/mznlib_sat/minimum.mzn b/ortools/flatzinc/mznlib_sat/minimum.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/minimum.mzn rename to ortools/flatzinc/mznlib_sat/minimum.mzn diff --git a/src/flatzinc/mznlib_sat/minimum_int.mzn b/ortools/flatzinc/mznlib_sat/minimum_int.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/minimum_int.mzn rename to ortools/flatzinc/mznlib_sat/minimum_int.mzn diff --git a/src/flatzinc/mznlib_sat/network_flow.mzn b/ortools/flatzinc/mznlib_sat/network_flow.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/network_flow.mzn rename to ortools/flatzinc/mznlib_sat/network_flow.mzn diff --git a/src/flatzinc/mznlib_sat/redefinitions-2.0.mzn b/ortools/flatzinc/mznlib_sat/redefinitions-2.0.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/redefinitions-2.0.mzn rename to ortools/flatzinc/mznlib_sat/redefinitions-2.0.mzn diff --git a/src/flatzinc/mznlib_sat/regular.mzn b/ortools/flatzinc/mznlib_sat/regular.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/regular.mzn rename to ortools/flatzinc/mznlib_sat/regular.mzn diff --git a/src/flatzinc/mznlib_sat/subcircuit.mzn b/ortools/flatzinc/mznlib_sat/subcircuit.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/subcircuit.mzn rename to ortools/flatzinc/mznlib_sat/subcircuit.mzn diff --git a/src/flatzinc/mznlib_sat/table.mzn b/ortools/flatzinc/mznlib_sat/table.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/table.mzn rename to ortools/flatzinc/mznlib_sat/table.mzn diff --git a/src/flatzinc/mznlib_sat/table_bool.mzn b/ortools/flatzinc/mznlib_sat/table_bool.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/table_bool.mzn rename to ortools/flatzinc/mznlib_sat/table_bool.mzn diff --git a/src/flatzinc/mznlib_sat/table_int.mzn b/ortools/flatzinc/mznlib_sat/table_int.mzn similarity index 100% rename from src/flatzinc/mznlib_sat/table_int.mzn rename to ortools/flatzinc/mznlib_sat/table_int.mzn diff --git a/src/flatzinc/parser.cc b/ortools/flatzinc/parser.cc similarity index 96% rename from src/flatzinc/parser.cc rename to ortools/flatzinc/parser.cc index c0e2ce93ab..4e91532424 100644 --- a/src/flatzinc/parser.cc +++ b/ortools/flatzinc/parser.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/parser.h" +#include "ortools/flatzinc/parser.h" #include -#include "flatzinc/parser.tab.hh" +#include "ortools/flatzinc/parser.tab.hh" // Declare external functions in the flatzinc.tab.cc generated file. extern int orfz_parse(operations_research::fz::ParserContext* parser, diff --git a/src/flatzinc/parser.h b/ortools/flatzinc/parser.h similarity index 96% rename from src/flatzinc/parser.h rename to ortools/flatzinc/parser.h index 5d310687a9..efe996f887 100644 --- a/src/flatzinc/parser.h +++ b/ortools/flatzinc/parser.h @@ -16,7 +16,7 @@ #include -#include "flatzinc/model.h" +#include "ortools/flatzinc/model.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/parser.lex b/ortools/flatzinc/parser.lex similarity index 94% rename from src/flatzinc/parser.lex rename to ortools/flatzinc/parser.lex index 5b7df3f2a6..6e797cc6c0 100644 --- a/src/flatzinc/parser.lex +++ b/ortools/flatzinc/parser.lex @@ -9,9 +9,9 @@ %{ #include -#include "base/integral_types.h" -#include "base/strtoint.h" -#include "flatzinc/parser.tab.hh" +#include "ortools/base/integral_types.h" +#include "ortools/base/strtoint.h" +#include "ortools/flatzinc/parser.tab.hh" using operations_research::atoi64; #if defined(_MSC_VER) #define YY_NO_UNISTD_H diff --git a/src/flatzinc/parser.tab.cc b/ortools/flatzinc/parser.tab.cc similarity index 89% rename from src/flatzinc/parser.tab.cc rename to ortools/flatzinc/parser.tab.cc index 42ec954833..92fa51946b 100644 --- a/src/flatzinc/parser.tab.cc +++ b/ortools/flatzinc/parser.tab.cc @@ -69,7 +69,7 @@ /* Copy the first part of user declarations. */ -#line 73 "src/flatzinc/parser.tab.cc" /* yacc.c:339 */ +#line 73 "ortools/flatzinc/parser.tab.cc" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -99,13 +99,13 @@ extern int orfz_debug; #endif /* "%code requires" blocks. */ -#line 21 "src/flatzinc/parser.yy" /* yacc.c:355 */ +#line 21 "ortools/flatzinc/parser.yy" /* yacc.c:355 */ #if !defined(OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_) #define OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_ -#include "base/strutil.h" -#include "base/stringpiece_utils.h" -#include "flatzinc/parser_util.h" +#include "ortools/base/strutil.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/flatzinc/parser_util.h" // Tells flex to use the LexerInfo class to communicate with the bison parser. typedef operations_research::fz::LexerInfo YYSTYPE; @@ -115,7 +115,7 @@ typedef operations_research::fz::LexerInfo YYSTYPE; #endif // OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_ -#line 119 "src/flatzinc/parser.tab.cc" /* yacc.c:355 */ +#line 119 "ortools/flatzinc/parser.tab.cc" /* yacc.c:355 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -154,11 +154,11 @@ int orfz_parse (operations_research::fz::ParserContext* context, operations_rese /* Copy the second part of user declarations. */ -#line 158 "src/flatzinc/parser.tab.cc" /* yacc.c:358 */ +#line 158 "ortools/flatzinc/parser.tab.cc" /* yacc.c:358 */ /* Unqualified %code blocks. */ -#line 38 "src/flatzinc/parser.yy" /* yacc.c:359 */ +#line 38 "ortools/flatzinc/parser.yy" /* yacc.c:359 */ -#include "flatzinc/parser_util.cc" +#include "ortools/flatzinc/parser_util.cc" using operations_research::fz::Annotation; using operations_research::fz::Argument; @@ -172,7 +172,7 @@ using operations_research::fz::ParserContext; using operations_research::fz::VariableRefOrValue; using operations_research::fz::VariableRefOrValueArray; -#line 176 "src/flatzinc/parser.tab.cc" /* yacc.c:359 */ +#line 176 "ortools/flatzinc/parser.tab.cc" /* yacc.c:359 */ #ifdef short # undef short @@ -1401,13 +1401,13 @@ yyreduce: switch (yyn) { case 4: -#line 111 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 111 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { yyerrok; } -#line 1407 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1407 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 19: -#line 146 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 146 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // Declaration of a (named) constant: we simply register it in the // parser's context, and don't store it in the model. @@ -1427,11 +1427,11 @@ yyreduce: } delete annotations; } -#line 1431 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1431 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 20: -#line 166 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 166 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { std::vector* const annotations = (yyvsp[-4].annotations); // Declaration of a (named) constant array. See rule right above. @@ -1446,11 +1446,11 @@ yyreduce: delete assignments; delete annotations; } -#line 1450 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1450 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 21: -#line 181 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 181 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { std::vector* const annotations = (yyvsp[-3].annotations); // Declaration of a (named) constant array. See rule right above. @@ -1461,11 +1461,11 @@ yyreduce: context->integer_array_map[identifier] = std::vector(); delete annotations; } -#line 1465 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1465 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 22: -#line 191 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 191 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // Declaration of a (named) constant array: See rule above. CHECK_EQ((yyvsp[-12].integer_value), 1) << "Only [1..n] array are supported here."; @@ -1491,11 +1491,11 @@ yyreduce: delete assignments; delete annotations; } -#line 1495 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1495 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 23: -#line 216 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 216 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // Declaration of a variable. If it's unassigned or assigned to a // constant, we'll create a new var stored in the model. If it's @@ -1529,11 +1529,11 @@ yyreduce: } delete annotations; } -#line 1533 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1533 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 24: -#line 250 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 250 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // Declaration of a "variable array": these is exactly like N simple // variable declarations, where the identifier for declaration #i is @@ -1601,65 +1601,65 @@ yyreduce: delete annotations; } } -#line 1605 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1605 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 25: -#line 319 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 319 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value) = (yyvsp[0].var_or_value); } -#line 1611 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1611 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 26: -#line 320 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 320 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value) = VariableRefOrValue::Undefined(); } -#line 1617 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1617 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 27: -#line 323 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 323 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value_array) = (yyvsp[-1].var_or_value_array); } -#line 1623 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1623 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 28: -#line 324 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 324 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value_array) = nullptr; } -#line 1629 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1629 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 29: -#line 325 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 325 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value_array) = nullptr; } -#line 1635 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1635 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 30: -#line 328 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 328 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value_array) = (yyvsp[-2].var_or_value_array); (yyval.var_or_value_array)->PushBack((yyvsp[0].var_or_value)); } -#line 1644 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1644 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 31: -#line 332 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 332 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value_array) = new VariableRefOrValueArray(); (yyval.var_or_value_array)->PushBack((yyvsp[0].var_or_value)); } -#line 1653 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1653 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 32: -#line 338 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 338 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.var_or_value) = VariableRefOrValue::Value((yyvsp[0].integer_value)); } -#line 1659 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1659 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 33: -#line 339 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 339 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // A reference to an existing integer constant or variable. const std::string& id = (yyvsp[0].string_value); @@ -1673,11 +1673,11 @@ yyreduce: *ok = false; } } -#line 1677 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1677 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 34: -#line 352 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 352 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { // A given element of an existing constant array or variable array. const std::string& id = (yyvsp[-3].string_value); @@ -1694,193 +1694,193 @@ yyreduce: *ok = false; } } -#line 1698 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1698 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 35: -#line 370 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 370 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::Boolean(); } -#line 1704 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1704 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 36: -#line 371 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 371 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::AllInt64(); } -#line 1710 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1710 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 37: -#line 372 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 372 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::Interval((yyvsp[-2].integer_value), (yyvsp[0].integer_value)); } -#line 1716 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1716 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 38: -#line 373 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 373 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK((yyvsp[-1].integers) != nullptr); (yyval.domain) = Domain::IntegerList(std::move(*(yyvsp[-1].integers))); delete (yyvsp[-1].integers); } -#line 1726 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1726 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 39: -#line 380 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 380 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::Boolean(); } -#line 1732 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1732 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 40: -#line 381 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 381 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::AllInt64(); } -#line 1738 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1738 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 41: -#line 382 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 382 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::Interval((yyvsp[-2].integer_value), (yyvsp[0].integer_value)); } -#line 1744 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1744 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 42: -#line 383 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 383 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK((yyvsp[-1].integers) != nullptr); (yyval.domain) = Domain::IntegerList(std::move(*(yyvsp[-1].integers))); delete (yyvsp[-1].integers); } -#line 1754 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1754 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 43: -#line 390 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 390 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::AllInt64(); } -#line 1760 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1760 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 44: -#line 391 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 391 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::AllInt64(); } -#line 1766 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1766 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 45: -#line 395 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 395 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = (yyvsp[0].domain); } -#line 1772 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1772 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 46: -#line 396 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 396 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = (yyvsp[0].domain); } -#line 1778 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1778 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 47: -#line 397 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 397 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = (yyvsp[0].domain); } -#line 1784 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1784 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 48: -#line 400 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 400 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.integers) = (yyvsp[-2].integers); (yyval.integers)->emplace_back((yyvsp[0].integer_value)); } -#line 1790 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1790 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 49: -#line 401 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 401 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.integers) = new std::vector(); (yyval.integers)->emplace_back((yyvsp[0].integer_value)); } -#line 1796 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1796 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 50: -#line 404 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 404 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.integer_value) = (yyvsp[0].integer_value); } -#line 1802 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1802 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 51: -#line 405 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 405 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.integer_value) = FindOrDie(context->integer_map, (yyvsp[0].string_value)); } -#line 1808 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1808 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 52: -#line 406 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 406 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.integer_value) = Lookup(FindOrDie(context->integer_array_map, (yyvsp[-3].string_value)), (yyvsp[-1].integer_value)); } -#line 1816 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1816 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 53: -#line 411 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 411 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::IntegerValue((yyvsp[0].integer_value)); } -#line 1822 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1822 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 54: -#line 412 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 412 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::Interval((yyvsp[-2].integer_value), (yyvsp[0].integer_value)); } -#line 1828 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1828 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 55: -#line 413 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 413 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK((yyvsp[-1].integers) != nullptr); (yyval.domain) = Domain::IntegerList(std::move(*(yyvsp[-1].integers))); delete (yyvsp[-1].integers); } -#line 1838 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1838 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 56: -#line 418 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 418 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::EmptyDomain(); } -#line 1844 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1844 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 57: -#line 419 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 419 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::AllInt64(); } -#line 1850 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1850 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 58: -#line 420 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 420 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::IntegerValue(FindOrDie(context->integer_map, (yyvsp[0].string_value))); } -#line 1856 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1856 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 59: -#line 421 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 421 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domain) = Domain::IntegerValue( Lookup(FindOrDie(context->integer_array_map, (yyvsp[-3].string_value)), (yyvsp[-1].integer_value))); } -#line 1865 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1865 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 60: -#line 427 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 427 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domains) = (yyvsp[-2].domains); (yyval.domains)->emplace_back((yyvsp[0].domain)); } -#line 1874 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1874 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 61: -#line 431 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 431 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.domains) = new std::vector(); (yyval.domains)->emplace_back((yyvsp[0].domain)); } -#line 1880 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1880 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 64: -#line 441 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 441 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { const std::string& identifier = (yyvsp[-4].string_value); CHECK((yyvsp[-2].args) != nullptr) << "Missing argument in constraint"; @@ -1906,57 +1906,57 @@ yyreduce: delete annotations; delete (yyvsp[-2].args); } -#line 1910 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1910 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 65: -#line 468 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 468 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.args) = (yyvsp[-2].args); (yyval.args)->emplace_back((yyvsp[0].arg)); } -#line 1916 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1916 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 66: -#line 469 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 469 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.args) = new std::vector(); (yyval.args)->emplace_back((yyvsp[0].arg)); } -#line 1922 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1922 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 67: -#line 472 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 472 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.arg) = Argument::IntegerValue((yyvsp[0].integer_value)); } -#line 1928 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1928 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 68: -#line 473 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 473 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.arg) = Argument::VoidArgument(); } -#line 1934 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1934 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 69: -#line 474 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 474 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.arg) = Argument::VoidArgument(); } -#line 1940 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1940 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 70: -#line 475 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 475 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.arg) = Argument::Interval((yyvsp[-2].integer_value), (yyvsp[0].integer_value)); } -#line 1946 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1946 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 71: -#line 476 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 476 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK((yyvsp[-1].integers) != nullptr); (yyval.arg) = Argument::IntegerList(std::move(*(yyvsp[-1].integers))); delete (yyvsp[-1].integers); } -#line 1956 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1956 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 72: -#line 481 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 481 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { const std::string& id = (yyvsp[0].string_value); if (ContainsKey(context->integer_map, id)) { @@ -1977,11 +1977,11 @@ yyreduce: (yyval.arg) = Argument::DomainList(d); } } -#line 1981 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 1981 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 73: -#line 501 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 501 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { const std::string& id = (yyvsp[-3].string_value); const int64 index = (yyvsp[-1].integer_value); @@ -1999,11 +1999,11 @@ yyreduce: (yyval.arg) = Argument::FromDomain(d); } } -#line 2003 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2003 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 74: -#line 518 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 518 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { VariableRefOrValueArray* const arguments = (yyvsp[-1].var_or_value_array); CHECK(arguments != nullptr); @@ -2029,64 +2029,64 @@ yyreduce: } delete arguments; } -#line 2033 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2033 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 75: -#line 543 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 543 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.arg) = Argument::VoidArgument(); } -#line 2041 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2041 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 76: -#line 552 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 552 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotations) = (yyvsp[-2].annotations) != nullptr ? (yyvsp[-2].annotations) : new std::vector(); (yyval.annotations)->emplace_back((yyvsp[0].annotation)); } -#line 2050 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2050 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 77: -#line 556 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 556 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotations) = nullptr; } -#line 2056 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2056 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 78: -#line 559 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 559 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotations) = (yyvsp[-2].annotations); (yyval.annotations)->emplace_back((yyvsp[0].annotation)); } -#line 2062 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2062 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 79: -#line 560 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 560 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotations) = new std::vector(); (yyval.annotations)->emplace_back((yyvsp[0].annotation)); } -#line 2068 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2068 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 80: -#line 563 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 563 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotation) = Annotation::Interval((yyvsp[-2].integer_value), (yyvsp[0].integer_value)); } -#line 2074 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2074 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 81: -#line 564 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 564 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotation) = Annotation::IntegerValue((yyvsp[0].integer_value)); } -#line 2080 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2080 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 82: -#line 565 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 565 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { (yyval.annotation) = Annotation::String((yyvsp[0].string_value)); } -#line 2086 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2086 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 83: -#line 566 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 566 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { const std::string& id = (yyvsp[0].string_value); if (ContainsKey(context->variable_map, id)) { @@ -2097,11 +2097,11 @@ yyreduce: (yyval.annotation) = Annotation::Identifier(id); } } -#line 2101 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2101 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 84: -#line 576 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 576 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { std::vector* const annotations = (yyvsp[-1].annotations); if (annotations != nullptr) { @@ -2111,22 +2111,22 @@ yyreduce: (yyval.annotation) = Annotation::FunctionCall((yyvsp[-3].string_value)); } } -#line 2115 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2115 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 85: -#line 585 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 585 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK(ContainsKey(context->variable_array_map, (yyvsp[-3].string_value))) << "Unknown identifier: " << (yyvsp[-3].string_value); (yyval.annotation) = Annotation::Variable( Lookup(FindOrDie(context->variable_array_map, (yyvsp[-3].string_value)), (yyvsp[-1].integer_value))); } -#line 2126 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2126 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 86: -#line 591 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 591 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { std::vector* const annotations = (yyvsp[-1].annotations); if (annotations != nullptr) { @@ -2136,11 +2136,11 @@ yyreduce: (yyval.annotation) = Annotation::Empty(); } } -#line 2140 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2140 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 87: -#line 606 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 606 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { if ((yyvsp[-1].annotations) != nullptr) { model->Satisfy(std::move(*(yyvsp[-1].annotations))); @@ -2149,11 +2149,11 @@ yyreduce: model->Satisfy(std::vector()); } } -#line 2153 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2153 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 88: -#line 614 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 614 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK_EQ(Argument::INT_VAR_REF, (yyvsp[0].arg).type); if ((yyvsp[-2].annotations) != nullptr) { @@ -2163,11 +2163,11 @@ yyreduce: model->Minimize((yyvsp[0].arg).Var(), std::vector()); } } -#line 2167 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2167 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; case 89: -#line 623 "src/flatzinc/parser.yy" /* yacc.c:1646 */ +#line 623 "ortools/flatzinc/parser.yy" /* yacc.c:1646 */ { CHECK_EQ(Argument::INT_VAR_REF, (yyvsp[0].arg).type); if ((yyvsp[-2].annotations) != nullptr) { @@ -2177,11 +2177,11 @@ yyreduce: model->Maximize((yyvsp[0].arg).Var(), std::vector()); } } -#line 2181 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2181 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ break; -#line 2185 "src/flatzinc/parser.tab.cc" /* yacc.c:1646 */ +#line 2185 "ortools/flatzinc/parser.tab.cc" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2409,5 +2409,4 @@ yyreturn: #endif return yyresult; } -#line 633 "src/flatzinc/parser.yy" /* yacc.c:1906 */ - +#line 633 "ortools/flatzinc/parser.yy" /* yacc.c:1906 */ diff --git a/src/flatzinc/parser.tab.hh b/ortools/flatzinc/parser.tab.hh similarity index 92% rename from src/flatzinc/parser.tab.hh rename to ortools/flatzinc/parser.tab.hh index bcbbf4b801..5cd1bd18ca 100644 --- a/src/flatzinc/parser.tab.hh +++ b/ortools/flatzinc/parser.tab.hh @@ -40,13 +40,13 @@ extern int orfz_debug; #endif /* "%code requires" blocks. */ -#line 21 "src/flatzinc/parser.yy" /* yacc.c:1909 */ +#line 21 "ortools/flatzinc/parser.yy" /* yacc.c:1909 */ #if !defined(OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_) #define OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_ -#include "base/strutil.h" -#include "base/stringpiece_utils.h" -#include "flatzinc/parser_util.h" +#include "ortools/base/strutil.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/flatzinc/parser_util.h" // Tells flex to use the LexerInfo class to communicate with the bison parser. typedef operations_research::fz::LexerInfo YYSTYPE; @@ -56,7 +56,7 @@ typedef operations_research::fz::LexerInfo YYSTYPE; #endif // OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_ -#line 60 "src/flatzinc/parser.tab.hh" /* yacc.c:1909 */ +#line 60 "ortools/flatzinc/parser.tab.hh" /* yacc.c:1909 */ /* Token type. */ #ifndef YYTOKENTYPE diff --git a/src/flatzinc/parser.yy b/ortools/flatzinc/parser.yy similarity index 99% rename from src/flatzinc/parser.yy rename to ortools/flatzinc/parser.yy index 375afdcd61..0ff3644ad1 100644 --- a/src/flatzinc/parser.yy +++ b/ortools/flatzinc/parser.yy @@ -21,9 +21,8 @@ %code requires { #if !defined(OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_) #define OR_TOOLS_FLATZINC_FLATZINC_TAB_HH_ -#include "base/strutil.h" -#include "base/stringpiece_utils.h" -#include "flatzinc/parser_util.h" +#include "ortools/base/strutil.h" +#include "ortools/flatzinc/parser_util.h" // Tells flex to use the LexerInfo class to communicate with the bison parser. typedef operations_research::fz::LexerInfo YYSTYPE; @@ -36,7 +35,10 @@ typedef operations_research::fz::LexerInfo YYSTYPE; // Code in the implementation file. %code { -#include "flatzinc/parser_util.cc" +// MOE:begin_strip +#include "absl/ortools/base/string_view_utils.h" +// MOE:end_strip +#include "ortools/flatzinc/parser_util.cc" using operations_research::fz::Annotation; using operations_research::fz::Argument; diff --git a/src/flatzinc/parser.yy.cc b/ortools/flatzinc/parser.yy.cc similarity index 97% rename from src/flatzinc/parser.yy.cc rename to ortools/flatzinc/parser.yy.cc index f40c79976c..f248fe997a 100644 --- a/src/flatzinc/parser.yy.cc +++ b/ortools/flatzinc/parser.yy.cc @@ -1,6 +1,6 @@ -#line 2 "src/flatzinc/parser.yy.cc" +#line 2 "ortools/flatzinc/parser.yy.cc" -#line 4 "src/flatzinc/parser.yy.cc" +#line 4 "ortools/flatzinc/parser.yy.cc" #define YY_INT_ALIGNED short int @@ -34,7 +34,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -51,7 +51,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -190,7 +190,7 @@ typedef size_t yy_size_t; /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE orfz_lex. + * existing scanners that call yyless() from OUTSIDE orfz_lex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -209,7 +209,7 @@ typedef size_t yy_size_t; if ( *p == '\n' )\ --yylineno;\ }while(0) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -266,7 +266,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -539,7 +539,7 @@ static yyconst flex_int16_t yy_chk[212] = /* Table of booleans, true if rule could match eol. */ static yyconst flex_int32_t yy_rule_can_match_eol[32] = { 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, }; /* The intent behind this definition is that it'll catch @@ -549,15 +549,15 @@ static yyconst flex_int32_t yy_rule_can_match_eol[32] = #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "src/flatzinc/parser.lex" +#line 1 "ortools/flatzinc/parser.lex" /* Create a reentrant parser. */ /* Allow parameter passing to and from the bison parser. */ /* Rename yy to orfz_ in public functions. */ -#line 11 "src/flatzinc/parser.lex" +#line 11 "ortools/flatzinc/parser.lex" #include -#include "base/integral_types.h" -#include "base/strtoint.h" -#include "flatzinc/parser.tab.hh" +#include "ortools/base/integral_types.h" +#include "ortools/base/strtoint.h" +#include "ortools/flatzinc/parser.tab.hh" using operations_research::atoi64; #if defined(_MSC_VER) #define YY_NO_UNISTD_H @@ -567,7 +567,7 @@ using operations_research::atoi64; /* Rules that parse the bottom-line std::string tokens of a .fz file and convert them into YACC tokens, which may carry a value. See the LexerInfo struct and the %token declarations in ./parser.yy. */ -#line 571 "src/flatzinc/parser.yy.cc" +#line 571 "ortools/flatzinc/parser.yy.cc" #define INITIAL 0 @@ -624,7 +624,7 @@ static int yy_init_globals (yyscan_t yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ # define yylval yyg->yylval_r - + int orfz_lex_init (yyscan_t* scanner); int orfz_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); @@ -679,7 +679,7 @@ extern int orfz_wrap (yyscan_t yyscanner ); #endif static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner); - + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); #endif @@ -838,9 +838,9 @@ YY_DECL } { -#line 27 "src/flatzinc/parser.lex" +#line 27 "ortools/flatzinc/parser.lex" -#line 844 "src/flatzinc/parser.yy.cc" +#line 844 "ortools/flatzinc/parser.yy.cc" while ( 1 ) /* loops until end-of-file is reached */ { @@ -891,7 +891,7 @@ yy_find_action: yy_size_t yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + do{ yylineno++; yycolumn=0; }while(0) @@ -911,82 +911,82 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 28 "src/flatzinc/parser.lex" +#line 28 "ortools/flatzinc/parser.lex" { return ARRAY; } YY_BREAK case 2: YY_RULE_SETUP -#line 29 "src/flatzinc/parser.lex" +#line 29 "ortools/flatzinc/parser.lex" { return BOOL; } YY_BREAK case 3: YY_RULE_SETUP -#line 30 "src/flatzinc/parser.lex" +#line 30 "ortools/flatzinc/parser.lex" { return CONSTRAINT;} YY_BREAK case 4: YY_RULE_SETUP -#line 31 "src/flatzinc/parser.lex" +#line 31 "ortools/flatzinc/parser.lex" { return FLOAT; } YY_BREAK case 5: YY_RULE_SETUP -#line 32 "src/flatzinc/parser.lex" +#line 32 "ortools/flatzinc/parser.lex" { return INT; } YY_BREAK case 6: YY_RULE_SETUP -#line 33 "src/flatzinc/parser.lex" +#line 33 "ortools/flatzinc/parser.lex" { return MAXIMIZE; } YY_BREAK case 7: YY_RULE_SETUP -#line 34 "src/flatzinc/parser.lex" +#line 34 "ortools/flatzinc/parser.lex" { return MINIMIZE; } YY_BREAK case 8: YY_RULE_SETUP -#line 35 "src/flatzinc/parser.lex" +#line 35 "ortools/flatzinc/parser.lex" { return OF; } YY_BREAK case 9: YY_RULE_SETUP -#line 36 "src/flatzinc/parser.lex" +#line 36 "ortools/flatzinc/parser.lex" { return PREDICATE; } YY_BREAK case 10: YY_RULE_SETUP -#line 37 "src/flatzinc/parser.lex" +#line 37 "ortools/flatzinc/parser.lex" { return SATISFY; } YY_BREAK case 11: YY_RULE_SETUP -#line 38 "src/flatzinc/parser.lex" +#line 38 "ortools/flatzinc/parser.lex" { return SET; } YY_BREAK case 12: YY_RULE_SETUP -#line 39 "src/flatzinc/parser.lex" +#line 39 "ortools/flatzinc/parser.lex" { return SOLVE; } YY_BREAK case 13: YY_RULE_SETUP -#line 40 "src/flatzinc/parser.lex" +#line 40 "ortools/flatzinc/parser.lex" { return VAR; } YY_BREAK case 14: YY_RULE_SETUP -#line 41 "src/flatzinc/parser.lex" +#line 41 "ortools/flatzinc/parser.lex" { return DOTDOT; } YY_BREAK case 15: YY_RULE_SETUP -#line 42 "src/flatzinc/parser.lex" +#line 42 "ortools/flatzinc/parser.lex" { return COLONCOLON;} YY_BREAK case 16: YY_RULE_SETUP -#line 44 "src/flatzinc/parser.lex" +#line 44 "ortools/flatzinc/parser.lex" { yylval->integer_value = 1; return IVALUE; @@ -994,7 +994,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 48 "src/flatzinc/parser.lex" +#line 48 "ortools/flatzinc/parser.lex" { yylval->integer_value = 0; return IVALUE; @@ -1002,7 +1002,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 52 "src/flatzinc/parser.lex" +#line 52 "ortools/flatzinc/parser.lex" { yylval->integer_value = atoi64(yytext); return IVALUE; @@ -1010,7 +1010,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 56 "src/flatzinc/parser.lex" +#line 56 "ortools/flatzinc/parser.lex" { yylval->integer_value = atoi64(yytext); return IVALUE; @@ -1018,7 +1018,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 60 "src/flatzinc/parser.lex" +#line 60 "ortools/flatzinc/parser.lex" { yylval->integer_value = atoi64(yytext); return IVALUE; @@ -1026,7 +1026,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 64 "src/flatzinc/parser.lex" +#line 64 "ortools/flatzinc/parser.lex" { yylval->double_value = strtod(yytext,nullptr); return DVALUE; @@ -1034,7 +1034,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 68 "src/flatzinc/parser.lex" +#line 68 "ortools/flatzinc/parser.lex" { yylval->double_value = strtod(yytext,nullptr); return DVALUE; @@ -1042,7 +1042,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 72 "src/flatzinc/parser.lex" +#line 72 "ortools/flatzinc/parser.lex" { yylval->double_value = strtod(yytext,nullptr); return DVALUE; @@ -1051,7 +1051,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 77 "src/flatzinc/parser.lex" +#line 77 "ortools/flatzinc/parser.lex" { yylval->string_value = yytext; return IDENTIFIER; @@ -1059,7 +1059,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 81 "src/flatzinc/parser.lex" +#line 81 "ortools/flatzinc/parser.lex" { yylval->string_value = yytext; return IDENTIFIER; @@ -1067,36 +1067,36 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 85 "src/flatzinc/parser.lex" +#line 85 "ortools/flatzinc/parser.lex" { yylval->string_value = yytext; return SVALUE; } YY_BREAK case 27: /* rule 27 can match eol */ YY_RULE_SETUP -#line 86 "src/flatzinc/parser.lex" +#line 86 "ortools/flatzinc/parser.lex" ; YY_BREAK case 28: YY_RULE_SETUP -#line 87 "src/flatzinc/parser.lex" +#line 87 "ortools/flatzinc/parser.lex" ; YY_BREAK case 29: YY_RULE_SETUP -#line 88 "src/flatzinc/parser.lex" +#line 88 "ortools/flatzinc/parser.lex" ; YY_BREAK case 30: YY_RULE_SETUP -#line 89 "src/flatzinc/parser.lex" +#line 89 "ortools/flatzinc/parser.lex" { return yytext[0]; } YY_BREAK case 31: YY_RULE_SETUP -#line 90 "src/flatzinc/parser.lex" +#line 90 "ortools/flatzinc/parser.lex" ECHO; YY_BREAK -#line 1100 "src/flatzinc/parser.yy.cc" +#line 1100 "ortools/flatzinc/parser.yy.cc" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1544,7 +1544,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) yyg->yy_hold_char = *++yyg->yy_c_buf_p; if ( c == '\n' ) - + do{ yylineno++; yycolumn=0; }while(0) @@ -1627,7 +1627,7 @@ static void orfz__load_buffer_state (yyscan_t yyscanner) YY_BUFFER_STATE orfz__create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) orfz_alloc(sizeof( struct yy_buffer_state ) ,yyscanner ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in orfz__create_buffer()" ); @@ -1693,7 +1693,7 @@ static void orfz__load_buffer_state (yyscan_t yyscanner) } b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } @@ -1799,9 +1799,9 @@ static void orfz_ensure_buffer_stack (yyscan_t yyscanner) , yyscanner); if ( ! yyg->yy_buffer_stack ) YY_FATAL_ERROR( "out of dynamic memory in orfz_ensure_buffer_stack()" ); - + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -1830,12 +1830,12 @@ static void orfz_ensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE orfz__scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -1871,7 +1871,7 @@ YY_BUFFER_STATE orfz__scan_buffer (char * base, yy_size_t size , yyscan_t yysc */ YY_BUFFER_STATE orfz__scan_string (yyconst char * yystr , yyscan_t yyscanner) { - + return orfz__scan_bytes(yystr,strlen(yystr) ,yyscanner); } @@ -1888,7 +1888,7 @@ YY_BUFFER_STATE orfz__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l char *buf; yy_size_t n; yy_size_t i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) orfz_alloc(n ,yyscanner ); @@ -1956,10 +1956,10 @@ YY_EXTRA_TYPE orfz_get_extra (yyscan_t yyscanner) int orfz_get_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yylineno; } @@ -1969,10 +1969,10 @@ int orfz_get_lineno (yyscan_t yyscanner) int orfz_get_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yycolumn; } @@ -2034,7 +2034,7 @@ void orfz_set_lineno (int line_number , yyscan_t yyscanner) /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "orfz_set_lineno called with no buffer" ); - + yylineno = line_number; } @@ -2049,7 +2049,7 @@ void orfz_set_column (int column_no , yyscan_t yyscanner) /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "orfz_set_column called with no buffer" ); - + yycolumn = column_no; } @@ -2144,20 +2144,20 @@ int orfz_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) errno = EINVAL; return 1; } - + *ptr_yy_globals = (yyscan_t) orfz_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - + orfz_set_extra (yy_user_defined, *ptr_yy_globals); - + return yy_init_globals ( *ptr_yy_globals ); } @@ -2272,7 +2272,4 @@ void orfz_free (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 89 "src/flatzinc/parser.lex" - - - +#line 89 "ortools/flatzinc/parser.lex" diff --git a/src/flatzinc/parser_main.cc b/ortools/flatzinc/parser_main.cc similarity index 90% rename from src/flatzinc/parser_main.cc rename to ortools/flatzinc/parser_main.cc index 116d1c4114..dacb194bf5 100644 --- a/src/flatzinc/parser_main.cc +++ b/ortools/flatzinc/parser_main.cc @@ -17,12 +17,12 @@ #include -#include "base/commandlineflags.h" -#include "base/commandlineflags.h" -#include "flatzinc/logging.h" -#include "flatzinc/model.h" -#include "flatzinc/parser.h" -#include "flatzinc/presolve.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/parser.h" +#include "ortools/flatzinc/presolve.h" DEFINE_string(file, "", "Input file in the flatzinc format."); DEFINE_bool(print, false, "Print model."); diff --git a/src/flatzinc/parser_util.cc b/ortools/flatzinc/parser_util.cc similarity index 88% rename from src/flatzinc/parser_util.cc rename to ortools/flatzinc/parser_util.cc index de1447d469..498fa9d765 100644 --- a/src/flatzinc/parser_util.cc +++ b/ortools/flatzinc/parser_util.cc @@ -13,16 +13,16 @@ // Utility functions used by the code in parser.yy // Included in parser.tab.cc. -#include "flatzinc/parser_util.h" +#include "ortools/flatzinc/parser_util.h" #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stl_util.h" -#include "flatzinc/model.h" -#include "flatzinc/parser.tab.hh" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stl_util.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/parser.tab.hh" +#include "ortools/util/string_array.h" extern int orfz_lex(YYSTYPE*, void* scanner); extern int orfz_get_lineno(void* scanner); diff --git a/src/flatzinc/parser_util.h b/ortools/flatzinc/parser_util.h similarity index 97% rename from src/flatzinc/parser_util.h rename to ortools/flatzinc/parser_util.h index 6787c3ba1d..6d3bccdfd7 100644 --- a/src/flatzinc/parser_util.h +++ b/ortools/flatzinc/parser_util.h @@ -19,8 +19,8 @@ #include -#include "base/map_util.h" -#include "flatzinc/model.h" +#include "ortools/base/map_util.h" +#include "ortools/flatzinc/model.h" using operations_research::HasPrefixString; using operations_research::HasSuffixString; diff --git a/src/flatzinc/presolve.cc b/ortools/flatzinc/presolve.cc similarity index 99% rename from src/flatzinc/presolve.cc rename to ortools/flatzinc/presolve.cc index 60f77fb589..42099ef993 100644 --- a/src/flatzinc/presolve.cc +++ b/ortools/flatzinc/presolve.cc @@ -11,20 +11,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/presolve.h" +#include "ortools/flatzinc/presolve.h" #include #include #include -#include "base/join.h" -#include "base/stringpiece_utils.h" -#include "base/strutil.h" -#include "base/map_util.h" -#include "flatzinc/logging.h" -#include "graph/cliques.h" -#include "util/saturated_arithmetic.h" -#include "util/vector_map.h" +#include "ortools/base/join.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/strutil.h" +#include "ortools/base/map_util.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/graph/cliques.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/vector_map.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/presolve.h b/ortools/flatzinc/presolve.h similarity index 97% rename from src/flatzinc/presolve.h rename to ortools/flatzinc/presolve.h index 9be1b41bfb..bf67463594 100644 --- a/src/flatzinc/presolve.h +++ b/ortools/flatzinc/presolve.h @@ -19,11 +19,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringpiece_utils.h" -#include "base/hash.h" -#include "flatzinc/model.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/hash.h" +#include "ortools/flatzinc/model.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/reporting.cc b/ortools/flatzinc/reporting.cc similarity index 94% rename from src/flatzinc/reporting.cc rename to ortools/flatzinc/reporting.cc index a34d2edd29..d9c03779b4 100644 --- a/src/flatzinc/reporting.cc +++ b/ortools/flatzinc/reporting.cc @@ -11,17 +11,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/reporting.h" +#include "ortools/flatzinc/reporting.h" #include // NOLINT #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "flatzinc/logging.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/flatzinc/logging.h" namespace operations_research { namespace fz { @@ -96,14 +96,14 @@ SearchLimit* MonoThreadReporting::CreateLimit(Solver* s, int thread_id) const { bool MonoThreadReporting::Interrupted() const { return interrupted_; } // Silent subclass. -SilentMonoThreadReporting::SilentMonoThreadReporting( - bool print_all, int max_num_solutions) +SilentMonoThreadReporting::SilentMonoThreadReporting(bool print_all, + int max_num_solutions) : MonoThreadReporting(print_all, max_num_solutions) {} SilentMonoThreadReporting::~SilentMonoThreadReporting() {} -void SilentMonoThreadReporting::Init(int thread_id, - const std::string& init_string) {} +void SilentMonoThreadReporting::Init(int thread_id, const std::string& init_string) { +} void SilentMonoThreadReporting::Log(int thread_id, const std::string& final_output) const {} diff --git a/src/flatzinc/reporting.h b/ortools/flatzinc/reporting.h similarity index 97% rename from src/flatzinc/reporting.h rename to ortools/flatzinc/reporting.h index d1c2a62eae..48e05bc455 100644 --- a/src/flatzinc/reporting.h +++ b/ortools/flatzinc/reporting.h @@ -15,10 +15,10 @@ #define OR_TOOLS_FLATZINC_REPORTING_H_ #include -#include "base/integral_types.h" -#include "base/mutex.h" -#include "base/stringprintf.h" -#include "constraint_solver/constraint_solver.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/mutex.h" +#include "ortools/base/stringprintf.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { namespace fz { @@ -110,7 +110,7 @@ class SearchReportingInterface { // Creates a dedicated search limit. // Each solver thread will get a different one. virtual SearchLimit* CreateLimit(Solver* s, int thread_id) const = 0; -#endif +#endif // SWIG protected: // Increments the number of solutions found. @@ -141,7 +141,7 @@ class MonoThreadReporting : public SearchReportingInterface { OptimizeVar* CreateObjective(Solver* s, bool maximize, IntVar* var, int64 step, int thread_id) const override; SearchLimit* CreateLimit(Solver* s, int thread_id) const override; -#endif +#endif // SWIG bool Interrupted() const override; private: @@ -192,7 +192,7 @@ class MultiThreadReporting : public SearchReportingInterface { bool should_finish_ GUARDED_BY(mutex_); bool interrupted_ GUARDED_BY(mutex_); }; -#endif +#endif // SWIG } // namespace fz } // namespace operations_research #endif // OR_TOOLS_FLATZINC_REPORTING_H_ diff --git a/src/flatzinc/sat_constraint.cc b/ortools/flatzinc/sat_constraint.cc similarity index 96% rename from src/flatzinc/sat_constraint.cc rename to ortools/flatzinc/sat_constraint.cc index e742b81fca..22d84a1f97 100644 --- a/src/flatzinc/sat_constraint.cc +++ b/ortools/flatzinc/sat_constraint.cc @@ -11,26 +11,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/sat_constraint.h" +#include "ortools/flatzinc/sat_constraint.h" #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "flatzinc/logging.h" -#include "sat/pb_constraint.h" -#include "sat/sat_base.h" -#include "sat/sat_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/sat/pb_constraint.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_solver.h" // #define SAT_DEBUG #if defined(SAT_DEBUG) diff --git a/src/flatzinc/sat_constraint.h b/ortools/flatzinc/sat_constraint.h similarity index 98% rename from src/flatzinc/sat_constraint.h rename to ortools/flatzinc/sat_constraint.h index 88949d2f0e..49c9be7271 100644 --- a/src/flatzinc/sat_constraint.h +++ b/ortools/flatzinc/sat_constraint.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_FLATZINC_SAT_CONSTRAINT_H_ #define OR_TOOLS_FLATZINC_SAT_CONSTRAINT_H_ -#include "constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { class SatPropagator; diff --git a/src/flatzinc/sat_fz_solver.cc b/ortools/flatzinc/sat_fz_solver.cc similarity index 98% rename from src/flatzinc/sat_fz_solver.cc rename to ortools/flatzinc/sat_fz_solver.cc index 335f0cf76f..40f3d153e2 100644 --- a/src/flatzinc/sat_fz_solver.cc +++ b/ortools/flatzinc/sat_fz_solver.cc @@ -11,28 +11,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/sat_fz_solver.h" +#include "ortools/flatzinc/sat_fz_solver.h" -#include "base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/timer.h" -#include "base/join.h" -#include "base/map_util.h" -#include "flatzinc/checker.h" -#include "flatzinc/logging.h" -#include "sat/cp_constraints.h" -#include "sat/cumulative.h" -#include "sat/disjunctive.h" -#include "sat/flow_costs.h" -#include "sat/integer.h" -#include "sat/integer_expr.h" -#include "sat/intervals.h" -#include "sat/linear_programming_constraint.h" -#include "sat/model.h" -#include "sat/optimization.h" -#include "sat/sat_solver.h" -#include "sat/table.h" -#include "util/sorted_interval_list.h" +#include "ortools/base/timer.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/flatzinc/checker.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/sat/cp_constraints.h" +#include "ortools/sat/cumulative.h" +#include "ortools/sat/disjunctive.h" +#include "ortools/sat/flow_costs.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/integer_expr.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/linear_programming_constraint.h" +#include "ortools/sat/model.h" +#include "ortools/sat/optimization.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/sat/table.h" +#include "ortools/util/sorted_interval_list.h" DEFINE_bool(fz_use_lp_constraint, true, "Use LP solver glop to enforce all linear inequalities at once."); diff --git a/src/flatzinc/sat_fz_solver.h b/ortools/flatzinc/sat_fz_solver.h similarity index 92% rename from src/flatzinc/sat_fz_solver.h rename to ortools/flatzinc/sat_fz_solver.h index d835cb88ea..2a5ed40db7 100644 --- a/src/flatzinc/sat_fz_solver.h +++ b/ortools/flatzinc/sat_fz_solver.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_FLATZINC_SAT_FZ_SOLVER_H_ #define OR_TOOLS_FLATZINC_SAT_FZ_SOLVER_H_ -#include "flatzinc/model.h" -#include "flatzinc/solver.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/solver.h" namespace operations_research { namespace sat { diff --git a/src/flatzinc/solver.cc b/ortools/flatzinc/solver.cc similarity index 98% rename from src/flatzinc/solver.cc rename to ortools/flatzinc/solver.cc index 43df475d67..7a35140360 100644 --- a/src/flatzinc/solver.cc +++ b/ortools/flatzinc/solver.cc @@ -11,23 +11,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/solver.h" +#include "ortools/flatzinc/solver.h" #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "constraint_solver/constraint_solver.h" -#include "flatzinc/checker.h" -#include "flatzinc/constraints.h" -#include "flatzinc/logging.h" -#include "flatzinc/model.h" -#include "flatzinc/sat_constraint.h" -#include "util/string_array.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/flatzinc/checker.h" +#include "ortools/flatzinc/constraints.h" +#include "ortools/flatzinc/logging.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/sat_constraint.h" +#include "ortools/util/string_array.h" DEFINE_bool(fz_use_sat, true, "Use a sat solver for propagating on Booleans."); DEFINE_bool(fz_check_solutions, true, "Check solutions"); diff --git a/src/flatzinc/solver.h b/ortools/flatzinc/solver.h similarity index 95% rename from src/flatzinc/solver.h rename to ortools/flatzinc/solver.h index 6bf79a2c60..bc4db8ec1e 100644 --- a/src/flatzinc/solver.h +++ b/ortools/flatzinc/solver.h @@ -17,11 +17,11 @@ #include #include -#include "constraint_solver/constraint_solver.h" -#include "flatzinc/model.h" -#include "flatzinc/reporting.h" -#include "flatzinc/solver_data.h" -#include "flatzinc/solver_util.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/reporting.h" +#include "ortools/flatzinc/solver_data.h" +#include "ortools/flatzinc/solver_util.h" namespace operations_research { class SatPropagator; diff --git a/src/flatzinc/solver_data.cc b/ortools/flatzinc/solver_data.cc similarity index 97% rename from src/flatzinc/solver_data.cc rename to ortools/flatzinc/solver_data.cc index 8441729ce9..f61fb36be4 100644 --- a/src/flatzinc/solver_data.cc +++ b/ortools/flatzinc/solver_data.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/solver_data.h" +#include "ortools/flatzinc/solver_data.h" -#include "flatzinc/logging.h" +#include "ortools/flatzinc/logging.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/solver_data.h b/ortools/flatzinc/solver_data.h similarity index 95% rename from src/flatzinc/solver_data.h rename to ortools/flatzinc/solver_data.h index d8ff4cf3f6..22b757e678 100644 --- a/src/flatzinc/solver_data.h +++ b/ortools/flatzinc/solver_data.h @@ -18,9 +18,9 @@ #include #include -#include "constraint_solver/constraint_solver.h" -#include "flatzinc/model.h" -#include "flatzinc/sat_constraint.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/flatzinc/model.h" +#include "ortools/flatzinc/sat_constraint.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/solver_util.cc b/ortools/flatzinc/solver_util.cc similarity index 98% rename from src/flatzinc/solver_util.cc rename to ortools/flatzinc/solver_util.cc index c0f68536a2..e62da7c116 100644 --- a/src/flatzinc/solver_util.cc +++ b/ortools/flatzinc/solver_util.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "flatzinc/solver_util.h" +#include "ortools/flatzinc/solver_util.h" -#include "base/join.h" -#include "flatzinc/logging.h" +#include "ortools/base/join.h" +#include "ortools/flatzinc/logging.h" namespace operations_research { namespace fz { diff --git a/src/flatzinc/solver_util.h b/ortools/flatzinc/solver_util.h similarity index 94% rename from src/flatzinc/solver_util.h rename to ortools/flatzinc/solver_util.h index ad14069baf..8fc79e6bdb 100644 --- a/src/flatzinc/solver_util.h +++ b/ortools/flatzinc/solver_util.h @@ -16,9 +16,9 @@ #include -#include "constraint_solver/constraint_solver.h" -#include "constraint_solver/constraint_solveri.h" -#include "flatzinc/model.h" +#include "ortools/constraint_solver/constraint_solver.h" +#include "ortools/constraint_solver/constraint_solveri.h" +#include "ortools/flatzinc/model.h" namespace operations_research { namespace fz { diff --git a/src/glop/BUILD b/ortools/glop/BUILD similarity index 100% rename from src/glop/BUILD rename to ortools/glop/BUILD diff --git a/src/glop/basis_representation.cc b/ortools/glop/basis_representation.cc similarity index 98% rename from src/glop/basis_representation.cc rename to ortools/glop/basis_representation.cc index 8b67ba0490..1edd2cd5de 100644 --- a/src/glop/basis_representation.cc +++ b/ortools/glop/basis_representation.cc @@ -12,11 +12,11 @@ // limitations under the License. -#include "glop/basis_representation.h" +#include "ortools/glop/basis_representation.h" -#include "base/stl_util.h" -#include "glop/status.h" -#include "lp_data/lp_utils.h" +#include "ortools/base/stl_util.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { @@ -280,7 +280,7 @@ Status BasisFactorization::MiddleProductFormUpdate( RankOneUpdateElementaryMatrix elementary_update_matrix( &storage_, u_index, left_index, scalar_product); if (elementary_update_matrix.IsSingular()) { - RETURN_AND_LOG_ERROR(Status::ERROR_LU, "Degenerate rank-one update."); + GLOP_RETURN_AND_LOG_ERROR(Status::ERROR_LU, "Degenerate rank-one update."); } rank_one_factorization_.Update(elementary_update_matrix); return Status::OK; @@ -293,7 +293,7 @@ Status BasisFactorization::Update(ColIndex entering_col, if (num_updates_ < max_num_updates_) { SCOPED_TIME_STAT(&stats_); if (use_middle_product_form_update_) { - RETURN_IF_ERROR( + GLOP_RETURN_IF_ERROR( MiddleProductFormUpdate(entering_col, leaving_variable_row)); } else { eta_factorization_.Update(entering_col, leaving_variable_row, diff --git a/src/glop/basis_representation.h b/ortools/glop/basis_representation.h similarity index 98% rename from src/glop/basis_representation.h rename to ortools/glop/basis_representation.h index 76829a5ad6..3259bda1af 100644 --- a/src/glop/basis_representation.h +++ b/ortools/glop/basis_representation.h @@ -15,14 +15,14 @@ #ifndef OR_TOOLS_GLOP_BASIS_REPRESENTATION_H_ #define OR_TOOLS_GLOP_BASIS_REPRESENTATION_H_ -#include "base/logging.h" -#include "glop/lu_factorization.h" -#include "glop/parameters.pb.h" -#include "glop/rank_one_update.h" -#include "glop/status.h" -#include "lp_data/lp_types.h" -#include "lp_data/sparse.h" -#include "util/stats.h" +#include "ortools/base/logging.h" +#include "ortools/glop/lu_factorization.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/rank_one_update.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/dual_edge_norms.cc b/ortools/glop/dual_edge_norms.cc similarity index 98% rename from src/glop/dual_edge_norms.cc rename to ortools/glop/dual_edge_norms.cc index 947691cdf0..8cea9dbb68 100644 --- a/src/glop/dual_edge_norms.cc +++ b/ortools/glop/dual_edge_norms.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/dual_edge_norms.h" +#include "ortools/glop/dual_edge_norms.h" -#include "lp_data/lp_utils.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/dual_edge_norms.h b/ortools/glop/dual_edge_norms.h similarity index 96% rename from src/glop/dual_edge_norms.h rename to ortools/glop/dual_edge_norms.h index 281547a853..abe67ca7d0 100644 --- a/src/glop/dual_edge_norms.h +++ b/ortools/glop/dual_edge_norms.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_GLOP_DUAL_EDGE_NORMS_H_ #define OR_TOOLS_GLOP_DUAL_EDGE_NORMS_H_ -#include "glop/basis_representation.h" -#include "glop/parameters.pb.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/stats.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/entering_variable.cc b/ortools/glop/entering_variable.cc similarity index 98% rename from src/glop/entering_variable.cc rename to ortools/glop/entering_variable.cc index 200973e903..0dda0e9192 100644 --- a/src/glop/entering_variable.cc +++ b/ortools/glop/entering_variable.cc @@ -12,13 +12,13 @@ // limitations under the License. -#include "glop/entering_variable.h" +#include "ortools/glop/entering_variable.h" #include -#include "base/timer.h" -#include "base/numbers.h" -#include "lp_data/lp_utils.h" +#include "ortools/base/timer.h" +#include "ortools/base/numbers.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { @@ -45,7 +45,7 @@ EnteringVariable::EnteringVariable(const VariablesInfo& variables_info, Status EnteringVariable::PrimalChooseEnteringColumn(ColIndex* entering_col) { SCOPED_TIME_STAT(&stats_); - RETURN_ERROR_IF_NULL(entering_col); + GLOP_RETURN_ERROR_IF_NULL(entering_col); // For better redability of the templated function calls below. const bool kNormalize = true; @@ -125,8 +125,8 @@ Status EnteringVariable::DualChooseEnteringColumn( const UpdateRow& update_row, Fractional cost_variation, std::vector* bound_flip_candidates, ColIndex* entering_col, Fractional* pivot, Fractional* step) { - RETURN_ERROR_IF_NULL(entering_col); - RETURN_ERROR_IF_NULL(pivot); + GLOP_RETURN_ERROR_IF_NULL(entering_col); + GLOP_RETURN_ERROR_IF_NULL(pivot); const DenseRow& update_coefficient = update_row.GetCoefficients(); const DenseRow& reduced_costs = reduced_costs_->GetReducedCosts(); SCOPED_TIME_STAT(&stats_); @@ -300,8 +300,8 @@ Status EnteringVariable::DualChooseEnteringColumn( Status EnteringVariable::DualPhaseIChooseEnteringColumn( const UpdateRow& update_row, Fractional cost_variation, ColIndex* entering_col, Fractional* pivot, Fractional* step) { - RETURN_ERROR_IF_NULL(entering_col); - RETURN_ERROR_IF_NULL(pivot); + GLOP_RETURN_ERROR_IF_NULL(entering_col); + GLOP_RETURN_ERROR_IF_NULL(pivot); const DenseRow& update_coefficient = update_row.GetCoefficients(); const DenseRow& reduced_costs = reduced_costs_->GetReducedCosts(); SCOPED_TIME_STAT(&stats_); diff --git a/src/glop/entering_variable.h b/ortools/glop/entering_variable.h similarity index 92% rename from src/glop/entering_variable.h rename to ortools/glop/entering_variable.h index 2fb745e694..57d72fb1fe 100644 --- a/src/glop/entering_variable.h +++ b/ortools/glop/entering_variable.h @@ -14,18 +14,18 @@ #ifndef OR_TOOLS_GLOP_ENTERING_VARIABLE_H_ #define OR_TOOLS_GLOP_ENTERING_VARIABLE_H_ -#include "glop/basis_representation.h" -#include "glop/parameters.pb.h" -#include "glop/primal_edge_norms.h" -#include "glop/reduced_costs.h" -#include "glop/status.h" -#include "glop/update_row.h" -#include "glop/variables_info.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/bitset.h" -#include "base/random.h" -#include "util/stats.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/primal_edge_norms.h" +#include "ortools/glop/reduced_costs.h" +#include "ortools/glop/status.h" +#include "ortools/glop/update_row.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/bitset.h" +#include "ortools/base/random.h" +#include "ortools/util/stats.h" #if !SWIG diff --git a/src/glop/initial_basis.cc b/ortools/glop/initial_basis.cc similarity index 99% rename from src/glop/initial_basis.cc rename to ortools/glop/initial_basis.cc index 8e5ac26260..bfdc8e1d90 100644 --- a/src/glop/initial_basis.cc +++ b/ortools/glop/initial_basis.cc @@ -12,11 +12,11 @@ // limitations under the License. -#include "glop/initial_basis.h" +#include "ortools/glop/initial_basis.h" #include -#include "glop/markowitz.h" -#include "lp_data/lp_utils.h" +#include "ortools/glop/markowitz.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/initial_basis.h b/ortools/glop/initial_basis.h similarity index 97% rename from src/glop/initial_basis.h rename to ortools/glop/initial_basis.h index 02ca8c5b71..a3c2a9ada0 100644 --- a/src/glop/initial_basis.h +++ b/ortools/glop/initial_basis.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_GLOP_INITIAL_BASIS_H_ #define OR_TOOLS_GLOP_INITIAL_BASIS_H_ -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "lp_data/sparse.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse.h" namespace operations_research { namespace glop { diff --git a/src/glop/lp_solver.cc b/ortools/glop/lp_solver.cc similarity index 98% rename from src/glop/lp_solver.cc rename to ortools/glop/lp_solver.cc index f2bf2b8d42..b77d78dd3d 100644 --- a/src/glop/lp_solver.cc +++ b/ortools/glop/lp_solver.cc @@ -12,27 +12,27 @@ // limitations under the License. -#include "glop/lp_solver.h" +#include "ortools/glop/lp_solver.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/timer.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/timer.h" -#include "base/join.h" -#include "base/strutil.h" -#include "glop/preprocessor.h" -#include "glop/status.h" -#include "lp_data/lp_types.h" -#include "lp_data/lp_utils.h" -#include "lp_data/proto_utils.h" -#include "util/fp_utils.h" +#include "ortools/base/join.h" +#include "ortools/base/strutil.h" +#include "ortools/glop/preprocessor.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/proto_utils.h" +#include "ortools/util/fp_utils.h" #ifndef ANDROID_JNI -#include "util/proto_tools.h" +#include "ortools/util/proto_tools.h" #endif DEFINE_bool(lp_solver_enable_fp_exceptions, false, diff --git a/src/glop/lp_solver.h b/ortools/glop/lp_solver.h similarity index 98% rename from src/glop/lp_solver.h rename to ortools/glop/lp_solver.h index 946b897963..19cf8c9acb 100644 --- a/src/glop/lp_solver.h +++ b/ortools/glop/lp_solver.h @@ -16,11 +16,11 @@ #include -#include "glop/parameters.pb.h" -#include "glop/preprocessor.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/time_limit.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/preprocessor.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace glop { diff --git a/src/glop/lu_factorization.cc b/ortools/glop/lu_factorization.cc similarity index 99% rename from src/glop/lu_factorization.cc rename to ortools/glop/lu_factorization.cc index 7d35d37d47..77586fd64c 100644 --- a/src/glop/lu_factorization.cc +++ b/ortools/glop/lu_factorization.cc @@ -12,8 +12,8 @@ // limitations under the License. -#include "glop/lu_factorization.h" -#include "lp_data/lp_utils.h" +#include "ortools/glop/lu_factorization.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { @@ -42,10 +42,10 @@ Status LuFactorization::ComputeFactorization(const MatrixView& matrix) { SCOPED_TIME_STAT(&stats_); Clear(); if (matrix.num_rows().value() != matrix.num_cols().value()) { - RETURN_AND_LOG_ERROR(Status::ERROR_LU, "Not a square matrix!!"); + GLOP_RETURN_AND_LOG_ERROR(Status::ERROR_LU, "Not a square matrix!!"); } - RETURN_IF_ERROR( + GLOP_RETURN_IF_ERROR( markowitz_.ComputeLU(matrix, &row_perm_, &col_perm_, &lower_, &upper_)); inverse_col_perm_.PopulateFromInverse(col_perm_); inverse_row_perm_.PopulateFromInverse(row_perm_); diff --git a/src/glop/lu_factorization.h b/ortools/glop/lu_factorization.h similarity index 98% rename from src/glop/lu_factorization.h rename to ortools/glop/lu_factorization.h index ab57c57190..99ca95a230 100644 --- a/src/glop/lu_factorization.h +++ b/ortools/glop/lu_factorization.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_GLOP_LU_FACTORIZATION_H_ #define OR_TOOLS_GLOP_LU_FACTORIZATION_H_ -#include "glop/markowitz.h" -#include "glop/parameters.pb.h" -#include "glop/status.h" -#include "lp_data/sparse.h" -#include "util/stats.h" +#include "ortools/glop/markowitz.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/sparse.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/markowitz.cc b/ortools/glop/markowitz.cc similarity index 99% rename from src/glop/markowitz.cc rename to ortools/glop/markowitz.cc index 0e82ab33ca..f0581eee48 100644 --- a/src/glop/markowitz.cc +++ b/ortools/glop/markowitz.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/markowitz.h" +#include "ortools/glop/markowitz.h" #include -#include "base/stringprintf.h" -#include "lp_data/lp_utils.h" +#include "ortools/base/stringprintf.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { @@ -77,9 +77,9 @@ Status Markowitz::ComputeRowAndColumnPermutation(const MatrixView& basis_matrix, // report the singularity of the matrix. if (pivot_row == kInvalidRow || pivot_col == kInvalidCol || std::abs(pivot_coefficient) <= singularity_threshold) { - RETURN_AND_LOG_ERROR(Status::ERROR_LU, - StringPrintf("The matrix is singular! pivot = %E", - pivot_coefficient)); + GLOP_RETURN_AND_LOG_ERROR( + Status::ERROR_LU, StringPrintf("The matrix is singular! pivot = %E", + pivot_coefficient)); } DCHECK_EQ((*row_perm)[pivot_row], kInvalidRow); DCHECK_EQ((*col_perm)[pivot_col], kInvalidCol); @@ -143,7 +143,7 @@ Status Markowitz::ComputeLU(const MatrixView& basis_matrix, // and lower_ will always stay empty at the end of this function. lower_.Swap(lower); upper_.Swap(upper); - RETURN_IF_ERROR( + GLOP_RETURN_IF_ERROR( ComputeRowAndColumnPermutation(basis_matrix, row_perm, col_perm)); SCOPED_TIME_STAT(&stats_); lower_.ApplyRowPermutationToNonDiagonalEntries(*row_perm); diff --git a/src/glop/markowitz.h b/ortools/glop/markowitz.h similarity index 98% rename from src/glop/markowitz.h rename to ortools/glop/markowitz.h index 014dd31369..e3186b4fc5 100644 --- a/src/glop/markowitz.h +++ b/ortools/glop/markowitz.h @@ -75,12 +75,12 @@ #include -#include "base/logging.h" -#include "glop/parameters.pb.h" -#include "glop/status.h" -#include "lp_data/lp_types.h" -#include "lp_data/sparse.h" -#include "util/stats.h" +#include "ortools/base/logging.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/parameters.proto b/ortools/glop/parameters.proto similarity index 100% rename from src/glop/parameters.proto rename to ortools/glop/parameters.proto diff --git a/src/glop/preprocessor.cc b/ortools/glop/preprocessor.cc similarity index 99% rename from src/glop/preprocessor.cc rename to ortools/glop/preprocessor.cc index 5c5987c84b..67f75f4287 100644 --- a/src/glop/preprocessor.cc +++ b/ortools/glop/preprocessor.cc @@ -12,13 +12,13 @@ // limitations under the License. -#include "glop/preprocessor.h" +#include "ortools/glop/preprocessor.h" -#include "base/stringprintf.h" -#include "glop/revised_simplex.h" -#include "glop/status.h" -#include "lp_data/lp_utils.h" -#include "lp_data/matrix_utils.h" +#include "ortools/base/stringprintf.h" +#include "ortools/glop/revised_simplex.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/matrix_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/preprocessor.h b/ortools/glop/preprocessor.h similarity index 99% rename from src/glop/preprocessor.h rename to ortools/glop/preprocessor.h index 9b90dc20ba..5a43d3372a 100644 --- a/src/glop/preprocessor.h +++ b/ortools/glop/preprocessor.h @@ -23,11 +23,11 @@ #include -#include "glop/parameters.pb.h" -#include "glop/revised_simplex.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "lp_data/matrix_scaler.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/revised_simplex.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/matrix_scaler.h" namespace operations_research { namespace glop { @@ -594,7 +594,9 @@ class DoubletonFreeColumnPreprocessor : public Preprocessor { ~DoubletonFreeColumnPreprocessor() final {} bool Run(LinearProgram* linear_program, TimeLimit* time_limit) final; void RecoverSolution(ProblemSolution* solution) const final; - void UseInMipContext() final { LOG(FATAL) << "Not implemented."; } + void UseInMipContext() final { + LOG(FATAL) << "Not implemented."; + } private: enum RowChoice { diff --git a/src/glop/primal_edge_norms.cc b/ortools/glop/primal_edge_norms.cc similarity index 99% rename from src/glop/primal_edge_norms.cc rename to ortools/glop/primal_edge_norms.cc index 64bb18d91f..63a487f9af 100644 --- a/src/glop/primal_edge_norms.cc +++ b/ortools/glop/primal_edge_norms.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/primal_edge_norms.h" +#include "ortools/glop/primal_edge_norms.h" #ifdef OMP #include #endif -#include "base/timer.h" -#include "lp_data/lp_utils.h" +#include "ortools/base/timer.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/primal_edge_norms.h b/ortools/glop/primal_edge_norms.h similarity index 96% rename from src/glop/primal_edge_norms.h rename to ortools/glop/primal_edge_norms.h index 000cd5d4d6..c6b51e12fc 100644 --- a/src/glop/primal_edge_norms.h +++ b/ortools/glop/primal_edge_norms.h @@ -14,13 +14,13 @@ #ifndef OR_TOOLS_GLOP_PRIMAL_EDGE_NORMS_H_ #define OR_TOOLS_GLOP_PRIMAL_EDGE_NORMS_H_ -#include "glop/basis_representation.h" -#include "glop/parameters.pb.h" -#include "glop/update_row.h" -#include "glop/variables_info.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/stats.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/update_row.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/rank_one_update.h b/ortools/glop/rank_one_update.h similarity index 98% rename from src/glop/rank_one_update.h rename to ortools/glop/rank_one_update.h index a483d76458..f6e2adbd06 100644 --- a/src/glop/rank_one_update.h +++ b/ortools/glop/rank_one_update.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_GLOP_RANK_ONE_UPDATE_H_ #define OR_TOOLS_GLOP_RANK_ONE_UPDATE_H_ -#include "base/logging.h" -#include "glop/status.h" -#include "lp_data/lp_types.h" -#include "lp_data/lp_utils.h" -#include "lp_data/sparse.h" +#include "ortools/base/logging.h" +#include "ortools/glop/status.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/sparse.h" namespace operations_research { namespace glop { diff --git a/src/glop/reduced_costs.cc b/ortools/glop/reduced_costs.cc similarity index 99% rename from src/glop/reduced_costs.cc rename to ortools/glop/reduced_costs.cc index d2930ee078..6c6dba0243 100644 --- a/src/glop/reduced_costs.cc +++ b/ortools/glop/reduced_costs.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/reduced_costs.h" +#include "ortools/glop/reduced_costs.h" #ifdef OMP #include #endif -#include "lp_data/lp_utils.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/reduced_costs.h b/ortools/glop/reduced_costs.h similarity index 97% rename from src/glop/reduced_costs.h rename to ortools/glop/reduced_costs.h index 5c64c00170..f36bdc69aa 100644 --- a/src/glop/reduced_costs.h +++ b/ortools/glop/reduced_costs.h @@ -14,16 +14,16 @@ #ifndef OR_TOOLS_GLOP_REDUCED_COSTS_H_ #define OR_TOOLS_GLOP_REDUCED_COSTS_H_ -#include "glop/basis_representation.h" -#include "glop/parameters.pb.h" -#include "glop/primal_edge_norms.h" -#include "glop/status.h" -#include "glop/update_row.h" -#include "glop/variables_info.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/stats.h" -#include "base/random.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/primal_edge_norms.h" +#include "ortools/glop/status.h" +#include "ortools/glop/update_row.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/stats.h" +#include "ortools/base/random.h" namespace operations_research { namespace glop { diff --git a/src/glop/revised_simplex.cc b/ortools/glop/revised_simplex.cc similarity index 98% rename from src/glop/revised_simplex.cc rename to ortools/glop/revised_simplex.cc index 02c00a4d5c..bf6f200fd3 100644 --- a/src/glop/revised_simplex.cc +++ b/ortools/glop/revised_simplex.cc @@ -12,7 +12,7 @@ // limitations under the License. -#include "glop/revised_simplex.h" +#include "ortools/glop/revised_simplex.h" #include #include @@ -22,18 +22,18 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "glop/initial_basis.h" -#include "glop/parameters.pb.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_print_utils.h" -#include "lp_data/lp_utils.h" -#include "lp_data/matrix_utils.h" -#include "util/fp_utils.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/glop/initial_basis.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/matrix_utils.h" +#include "ortools/util/fp_utils.h" DEFINE_bool(simplex_display_numbers_as_fractions, false, "Display numbers as fractions."); @@ -131,7 +131,7 @@ void RevisedSimplex::LoadStateForNextSolve(const BasisState& state) { Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { SCOPED_TIME_STAT(&function_stats_); DCHECK(lp.IsCleanedUp()); - RETURN_ERROR_IF_NULL(time_limit); + GLOP_RETURN_ERROR_IF_NULL(time_limit); if (!lp.IsInEquationForm()) { return Status(Status::ERROR_INVALID_PROBLEM, "The problem is not in the equations form."); @@ -142,7 +142,7 @@ Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { // Initialization. Note That Initialize() must be called first since it // analyzes the current solver state. const double start_time = time_limit->GetElapsedTime(); - RETURN_IF_ERROR(Initialize(lp)); + GLOP_RETURN_IF_ERROR(Initialize(lp)); dual_infeasibility_improvement_direction_.clear(); update_row_.Invalidate(); test_lu_.Clear(); @@ -184,7 +184,7 @@ Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { } variables_info_.MakeBoxedVariableRelevant(false); - RETURN_IF_ERROR(DualMinimize(time_limit)); + GLOP_RETURN_IF_ERROR(DualMinimize(time_limit)); DisplayIterationInfo(); variables_info_.MakeBoxedVariableRelevant(true); reduced_costs_.MakeReducedCostsPrecise(); @@ -196,7 +196,7 @@ Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { variable_values_.ResetPrimalInfeasibilityInformation(); } else { reduced_costs_.MaintainDualInfeasiblePositions(true); - RETURN_IF_ERROR(Minimize(time_limit)); + GLOP_RETURN_IF_ERROR(Minimize(time_limit)); DisplayIterationInfo(); // After the primal phase I, we need to restore the objective. @@ -243,11 +243,11 @@ Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { if (problem_status_ == ProblemStatus::PRIMAL_FEASIBLE) { // Run the primal simplex. reduced_costs_.MaintainDualInfeasiblePositions(true); - RETURN_IF_ERROR(Minimize(time_limit)); + GLOP_RETURN_IF_ERROR(Minimize(time_limit)); } else { // Run the dual simplex. reduced_costs_.MaintainDualInfeasiblePositions(false); - RETURN_IF_ERROR(DualMinimize(time_limit)); + GLOP_RETURN_IF_ERROR(DualMinimize(time_limit)); } // Minimize() or DualMinimize() always double check the result with maximum @@ -267,7 +267,7 @@ Status RevisedSimplex::Solve(const LinearProgram& lp, TimeLimit* time_limit) { SetNonBasicVariableStatusAndDeriveValue(col, statuses[col]); } } - RETURN_IF_ERROR(basis_factorization_.Refactorize()); + GLOP_RETURN_IF_ERROR(basis_factorization_.Refactorize()); variable_values_.RecomputeBasicVariableValues(); reduced_costs_.ClearAndRemoveCostShifts(); @@ -1032,7 +1032,7 @@ Status RevisedSimplex::InitializeFirstBasis(const RowToColMapping& basis) { } variables_info_.Update(basis_[row], VariableStatus::BASIC); } - RETURN_IF_ERROR(basis_factorization_.Initialize()); + GLOP_RETURN_IF_ERROR(basis_factorization_.Initialize()); PermuteBasis(); DCHECK(BasisIsConsistent()); @@ -1171,7 +1171,7 @@ Status RevisedSimplex::Initialize(const LinearProgram& lp) { dual_pricing_vector_.clear(); // Note that this needs to be done after the Clear() calls above. - RETURN_IF_ERROR(InitializeFirstBasis(basis_)); + GLOP_RETURN_IF_ERROR(InitializeFirstBasis(basis_)); solve_from_scratch = false; } } @@ -1185,7 +1185,7 @@ Status RevisedSimplex::Initialize(const LinearProgram& lp) { primal_edge_norms_.Clear(); dual_edge_norms_.Clear(); dual_pricing_vector_.clear(); - RETURN_IF_ERROR(CreateInitialBasis()); + GLOP_RETURN_IF_ERROR(CreateInitialBasis()); } else { VLOG(1) << "Incremental solve."; } @@ -1451,9 +1451,9 @@ Status RevisedSimplex::ChooseLeavingVariableRow( ColIndex entering_col, Fractional reduced_cost, bool* refactorize, RowIndex* leaving_row, Fractional* step_length, Fractional* target_bound) { SCOPED_TIME_STAT(&function_stats_); - RETURN_ERROR_IF_NULL(refactorize); - RETURN_ERROR_IF_NULL(leaving_row); - RETURN_ERROR_IF_NULL(step_length); + GLOP_RETURN_ERROR_IF_NULL(refactorize); + GLOP_RETURN_ERROR_IF_NULL(leaving_row); + GLOP_RETURN_ERROR_IF_NULL(step_length); DCHECK_COL_BOUNDS(entering_col); DCHECK_NE(0.0, reduced_cost); @@ -1808,8 +1808,8 @@ void RevisedSimplex::PrimalPhaseIChooseLeavingVariableRow( Status RevisedSimplex::DualChooseLeavingVariableRow(RowIndex* leaving_row, Fractional* cost_variation, Fractional* target_bound) { - RETURN_ERROR_IF_NULL(leaving_row); - RETURN_ERROR_IF_NULL(cost_variation); + GLOP_RETURN_ERROR_IF_NULL(leaving_row); + GLOP_RETURN_ERROR_IF_NULL(cost_variation); // TODO(user): Reuse parameters_.optimization_rule() to decide if we use // steepest edge or the normal Dantzig pricing. @@ -1966,8 +1966,8 @@ Status RevisedSimplex::DualPhaseIChooseLeavingVariableRow( RowIndex* leaving_row, Fractional* cost_variation, Fractional* target_bound) { SCOPED_TIME_STAT(&function_stats_); - RETURN_ERROR_IF_NULL(leaving_row); - RETURN_ERROR_IF_NULL(cost_variation); + GLOP_RETURN_ERROR_IF_NULL(leaving_row); + GLOP_RETURN_ERROR_IF_NULL(cost_variation); // dual_infeasibility_improvement_direction_ is zero for dual-feasible // positions and contains the sign in which the reduced cost of this column @@ -2166,7 +2166,7 @@ Status RevisedSimplex::UpdateAndPivot(ColIndex entering_col, target_bound); } UpdateBasis(entering_col, leaving_row, leaving_variable_status); - RETURN_IF_ERROR(basis_factorization_.Update( + GLOP_RETURN_IF_ERROR(basis_factorization_.Update( entering_col, leaving_row, direction_non_zero_, &direction_)); if (basis_factorization_.IsRefactorized()) { PermuteBasis(); @@ -2196,7 +2196,7 @@ bool RevisedSimplex::NeedsBasisRefactorization(bool refactorize) { Status RevisedSimplex::RefactorizeBasisIfNeeded(bool* refactorize) { SCOPED_TIME_STAT(&function_stats_); if (NeedsBasisRefactorization(*refactorize)) { - RETURN_IF_ERROR(basis_factorization_.Refactorize()); + GLOP_RETURN_IF_ERROR(basis_factorization_.Refactorize()); update_row_.Invalidate(); PermuteBasis(); } @@ -2220,7 +2220,7 @@ Status RevisedSimplex::RefactorizeBasisIfNeeded(bool* refactorize) { // To avoid explicit inversion of B, the algorithm solves two sub-systems: // y.B = c_B and B.d = a (a being the entering column). Status RevisedSimplex::Minimize(TimeLimit* time_limit) { - RETURN_ERROR_IF_NULL(time_limit); + GLOP_RETURN_ERROR_IF_NULL(time_limit); Cleanup update_deterministic_time_on_return( [this, time_limit]() { AdvanceDeterministicTime(time_limit); }); num_consecutive_degenerate_iterations_ = 0; @@ -2238,7 +2238,7 @@ Status RevisedSimplex::Minimize(TimeLimit* time_limit) { // fix. IF_STATS_ENABLED( ScopedTimeDistributionUpdater timer(&iteration_stats_.total)); - RETURN_IF_ERROR(RefactorizeBasisIfNeeded(&refactorize)); + GLOP_RETURN_IF_ERROR(RefactorizeBasisIfNeeded(&refactorize)); if (basis_factorization_.IsRefactorized()) { CorrectErrorsOnVariableValues(); DisplayIterationInfo(); @@ -2268,7 +2268,7 @@ Status RevisedSimplex::Minimize(TimeLimit* time_limit) { Fractional reduced_cost = 0.0; ColIndex entering_col = kInvalidCol; - RETURN_IF_ERROR( + GLOP_RETURN_IF_ERROR( entering_variable_.PrimalChooseEnteringColumn(&entering_col)); if (entering_col == kInvalidCol) { if (reduced_costs_.AreReducedCostsPrecise() && @@ -2331,9 +2331,9 @@ Status RevisedSimplex::Minimize(TimeLimit* time_limit) { &refactorize, &leaving_row, &step_length, &target_bound); } else { - RETURN_IF_ERROR(ChooseLeavingVariableRow(entering_col, reduced_cost, - &refactorize, &leaving_row, - &step_length, &target_bound)); + GLOP_RETURN_IF_ERROR( + ChooseLeavingVariableRow(entering_col, reduced_cost, &refactorize, + &leaving_row, &step_length, &target_bound)); } if (refactorize) continue; @@ -2420,7 +2420,8 @@ Status RevisedSimplex::Minimize(TimeLimit* time_limit) { // may be slighlty different from target_bound. variable_values_.Set(leaving_col, target_bound); } - RETURN_IF_ERROR(UpdateAndPivot(entering_col, leaving_row, target_bound)); + GLOP_RETURN_IF_ERROR( + UpdateAndPivot(entering_col, leaving_row, target_bound)); IF_STATS_ENABLED({ if (is_degenerate) { timer.AlsoUpdate(&iteration_stats_.degenerate); @@ -2504,7 +2505,7 @@ Status RevisedSimplex::DualMinimize(TimeLimit* time_limit) { ScopedTimeDistributionUpdater timer(&iteration_stats_.total)); const bool old_refactorize_value = refactorize; - RETURN_IF_ERROR(RefactorizeBasisIfNeeded(&refactorize)); + GLOP_RETURN_IF_ERROR(RefactorizeBasisIfNeeded(&refactorize)); // If the basis is refactorized, we recompute all the values in order to // have a good precision. @@ -2580,10 +2581,10 @@ Status RevisedSimplex::DualMinimize(TimeLimit* time_limit) { } if (feasibility_phase_) { - RETURN_IF_ERROR(DualPhaseIChooseLeavingVariableRow( + GLOP_RETURN_IF_ERROR(DualPhaseIChooseLeavingVariableRow( &leaving_row, &cost_variation, &target_bound)); } else { - RETURN_IF_ERROR(DualChooseLeavingVariableRow( + GLOP_RETURN_IF_ERROR(DualChooseLeavingVariableRow( &leaving_row, &cost_variation, &target_bound)); } if (leaving_row == kInvalidRow) { @@ -2610,10 +2611,10 @@ Status RevisedSimplex::DualMinimize(TimeLimit* time_limit) { update_row_.ComputeUpdateRow(leaving_row); if (feasibility_phase_) { - RETURN_IF_ERROR(entering_variable_.DualPhaseIChooseEnteringColumn( + GLOP_RETURN_IF_ERROR(entering_variable_.DualPhaseIChooseEnteringColumn( update_row_, cost_variation, &entering_col, &entering_coeff, &ratio)); } else { - RETURN_IF_ERROR(entering_variable_.DualChooseEnteringColumn( + GLOP_RETURN_IF_ERROR(entering_variable_.DualChooseEnteringColumn( update_row_, cost_variation, &bound_flip_candidates, &entering_col, &entering_coeff, &ratio)); } @@ -2714,7 +2715,8 @@ Status RevisedSimplex::DualMinimize(TimeLimit* time_limit) { // It is important to do the actual pivot after the update above! const ColIndex leaving_col = basis_[leaving_row]; - RETURN_IF_ERROR(UpdateAndPivot(entering_col, leaving_row, target_bound)); + GLOP_RETURN_IF_ERROR( + UpdateAndPivot(entering_col, leaving_row, target_bound)); // This makes sure the leaving variable is at its exact bound. Tests // indicate that this makes everything more stable. Note also that during diff --git a/src/glop/revised_simplex.h b/ortools/glop/revised_simplex.h similarity index 97% rename from src/glop/revised_simplex.h rename to ortools/glop/revised_simplex.h index 424601d77d..9d23354c9c 100644 --- a/src/glop/revised_simplex.h +++ b/ortools/glop/revised_simplex.h @@ -98,25 +98,25 @@ #include #include -#include "base/integral_types.h" -#include "base/macros.h" -#include "glop/basis_representation.h" -#include "glop/dual_edge_norms.h" -#include "glop/entering_variable.h" -#include "glop/parameters.pb.h" -#include "glop/primal_edge_norms.h" -#include "glop/reduced_costs.h" -#include "glop/status.h" -#include "glop/update_row.h" -#include "glop/variable_values.h" -#include "glop/variables_info.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_print_utils.h" -#include "lp_data/lp_types.h" -#include "lp_data/matrix_scaler.h" -#include "lp_data/sparse_row.h" -#include "base/random.h" -#include "util/time_limit.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/dual_edge_norms.h" +#include "ortools/glop/entering_variable.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/primal_edge_norms.h" +#include "ortools/glop/reduced_costs.h" +#include "ortools/glop/status.h" +#include "ortools/glop/update_row.h" +#include "ortools/glop/variable_values.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/matrix_scaler.h" +#include "ortools/lp_data/sparse_row.h" +#include "ortools/base/random.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace glop { diff --git a/src/glop/status.cc b/ortools/glop/status.cc similarity index 95% rename from src/glop/status.cc rename to ortools/glop/status.cc index 155ef77265..eb94e2cc0e 100644 --- a/src/glop/status.cc +++ b/ortools/glop/status.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/status.h" +#include "ortools/glop/status.h" #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { namespace glop { diff --git a/src/glop/status.h b/ortools/glop/status.h similarity index 93% rename from src/glop/status.h rename to ortools/glop/status.h index 6761f11480..b4802bd1a8 100644 --- a/src/glop/status.h +++ b/ortools/glop/status.h @@ -15,7 +15,7 @@ #define OR_TOOLS_GLOP_STATUS_H_ #include -#include "base/port.h" +#include "ortools/base/port.h" namespace operations_research { namespace glop { @@ -68,14 +68,14 @@ class Status { std::string GetErrorCodeString(Status::ErrorCode error_code); // Macro to simplify error propagation between function returning Status. -#define RETURN_IF_ERROR(function_call) \ +#define GLOP_RETURN_IF_ERROR(function_call) \ do { \ const Status return_status = function_call; \ if (!return_status.ok()) return return_status; \ } while (false) // Macro to simplify the creation of an error. -#define RETURN_AND_LOG_ERROR(error_code, message) \ +#define GLOP_RETURN_AND_LOG_ERROR(error_code, message) \ do { \ const std::string error_message = message; \ LOG(ERROR) << GetErrorCodeString(error_code) << ": " << error_message; \ @@ -83,7 +83,7 @@ std::string GetErrorCodeString(Status::ErrorCode error_code); } while (false) // Macro to check that a pointer argument is not null. -#define RETURN_ERROR_IF_NULL(arg) \ +#define GLOP_RETURN_ERROR_IF_NULL(arg) \ if (arg == nullptr) { \ const std::string variable_name = #arg; \ const std::string error_message = variable_name + " must not be null."; \ diff --git a/src/glop/update_row.cc b/ortools/glop/update_row.cc similarity index 99% rename from src/glop/update_row.cc rename to ortools/glop/update_row.cc index 3c8266e516..72c3455051 100644 --- a/src/glop/update_row.cc +++ b/ortools/glop/update_row.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/update_row.h" +#include "ortools/glop/update_row.h" #ifdef OMP #include #endif -#include "lp_data/lp_utils.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/glop/update_row.h b/ortools/glop/update_row.h similarity index 96% rename from src/glop/update_row.h rename to ortools/glop/update_row.h index f7b3b49a26..d124e2b7fe 100644 --- a/src/glop/update_row.h +++ b/ortools/glop/update_row.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_GLOP_UPDATE_ROW_H_ #define OR_TOOLS_GLOP_UPDATE_ROW_H_ -#include "glop/basis_representation.h" -#include "glop/parameters.pb.h" -#include "glop/variables_info.h" -#include "lp_data/lp_types.h" -#include "util/stats.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/variable_values.cc b/ortools/glop/variable_values.cc similarity index 98% rename from src/glop/variable_values.cc rename to ortools/glop/variable_values.cc index f02b25a5ff..59a4dfb418 100644 --- a/src/glop/variable_values.cc +++ b/ortools/glop/variable_values.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/variable_values.h" +#include "ortools/glop/variable_values.h" -#include "lp_data/lp_utils.h" -#include "util/iterators.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/util/iterators.h" namespace operations_research { namespace glop { diff --git a/src/glop/variable_values.h b/ortools/glop/variable_values.h similarity index 97% rename from src/glop/variable_values.h rename to ortools/glop/variable_values.h index 0b1f9458d2..c9e061bd3f 100644 --- a/src/glop/variable_values.h +++ b/ortools/glop/variable_values.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_GLOP_VARIABLE_VALUES_H_ #define OR_TOOLS_GLOP_VARIABLE_VALUES_H_ -#include "glop/basis_representation.h" -#include "glop/variables_info.h" -#include "lp_data/lp_types.h" -#include "util/stats.h" +#include "ortools/glop/basis_representation.h" +#include "ortools/glop/variables_info.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/stats.h" namespace operations_research { namespace glop { diff --git a/src/glop/variables_info.cc b/ortools/glop/variables_info.cc similarity index 99% rename from src/glop/variables_info.cc rename to ortools/glop/variables_info.cc index 26caabb950..467fbd292b 100644 --- a/src/glop/variables_info.cc +++ b/ortools/glop/variables_info.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glop/variables_info.h" +#include "ortools/glop/variables_info.h" namespace operations_research { namespace glop { diff --git a/src/glop/variables_info.h b/ortools/glop/variables_info.h similarity index 98% rename from src/glop/variables_info.h rename to ortools/glop/variables_info.h index 432b1bcf5f..a6e1d93abb 100644 --- a/src/glop/variables_info.h +++ b/ortools/glop/variables_info.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_GLOP_VARIABLES_INFO_H_ #define OR_TOOLS_GLOP_VARIABLES_INFO_H_ -#include "lp_data/lp_types.h" -#include "lp_data/sparse.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse.h" namespace operations_research { namespace glop { diff --git a/src/graph/BUILD b/ortools/graph/BUILD similarity index 100% rename from src/graph/BUILD rename to ortools/graph/BUILD diff --git a/src/graph/README b/ortools/graph/README similarity index 100% rename from src/graph/README rename to ortools/graph/README diff --git a/src/ortools/linear_solver/__init__.py b/ortools/graph/__init__.py similarity index 78% rename from src/ortools/linear_solver/__init__.py rename to ortools/graph/__init__.py index 58ec63a061..778a172379 100644 --- a/src/ortools/linear_solver/__init__.py +++ b/ortools/graph/__init__.py @@ -11,5 +11,5 @@ # See the License for the specific language governing permissions and # limitations under the License. import os as _os -__path__.append(_os.path.join(__path__[0], '..', '..', 'gen', 'ortools', 'linear_solver')) -__path__.append(_os.path.join(__path__[0], '..', '..', '..', 'lib')) +__path__.append(_os.path.join(__path__[0], '..', 'gen', 'ortools', 'graph')) +__path__.append(_os.path.join(__path__[0], '..', '..', 'lib')) diff --git a/src/graph/assignment.cc b/ortools/graph/assignment.cc similarity index 94% rename from src/graph/assignment.cc rename to ortools/graph/assignment.cc index 17bcbe3608..f998ef6f32 100644 --- a/src/graph/assignment.cc +++ b/ortools/graph/assignment.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "graph/assignment.h" +#include "ortools/graph/assignment.h" -#include "base/commandlineflags.h" -#include "graph/ebert_graph.h" -#include "graph/linear_assignment.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/linear_assignment.h" namespace operations_research { diff --git a/src/graph/assignment.h b/ortools/graph/assignment.h similarity index 98% rename from src/graph/assignment.h rename to ortools/graph/assignment.h index e84d367b82..1f523f0ee3 100644 --- a/src/graph/assignment.h +++ b/ortools/graph/assignment.h @@ -24,7 +24,7 @@ // // Example usage: // -// #include "graph/assignment.h" +// #include "ortools/graph/assignment.h" // // SimpleLinearSumAssignment assignment; // for (int arc = 0; arc < num_arcs; ++arc) { @@ -50,7 +50,7 @@ #include -#include "graph/ebert_graph.h" +#include "ortools/graph/ebert_graph.h" namespace operations_research { diff --git a/src/graph/astar.cc b/ortools/graph/astar.cc similarity index 97% rename from src/graph/astar.cc rename to ortools/graph/astar.cc index b3d6296f9f..75d46c94e7 100644 --- a/src/graph/astar.cc +++ b/ortools/graph/astar.cc @@ -12,13 +12,13 @@ // limitations under the License. -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/callback.h" -#include "base/integral_types.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/callback.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { namespace { diff --git a/src/graph/bellman_ford.cc b/ortools/graph/bellman_ford.cc similarity index 98% rename from src/graph/bellman_ford.cc rename to ortools/graph/bellman_ford.cc index eee63c09bf..14f71e5218 100644 --- a/src/graph/bellman_ford.cc +++ b/ortools/graph/bellman_ford.cc @@ -16,7 +16,7 @@ #include #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { class BellmanFord { diff --git a/src/graph/christofides.h b/ortools/graph/christofides.h similarity index 97% rename from src/graph/christofides.h rename to ortools/graph/christofides.h index ea06c51433..4f6865a2cd 100644 --- a/src/graph/christofides.h +++ b/ortools/graph/christofides.h @@ -22,12 +22,12 @@ #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "graph/eulerian_path.h" -#include "graph/minimum_spanning_tree.h" -#include "linear_solver/linear_solver.h" -#include "linear_solver/linear_solver.pb.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/graph/eulerian_path.h" +#include "ortools/graph/minimum_spanning_tree.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { diff --git a/src/graph/cliques.cc b/ortools/graph/cliques.cc similarity index 98% rename from src/graph/cliques.cc rename to ortools/graph/cliques.cc index ab4b647ea5..5f66e826b0 100644 --- a/src/graph/cliques.cc +++ b/ortools/graph/cliques.cc @@ -12,15 +12,16 @@ // limitations under the License. -#include "graph/cliques.h" +#include "ortools/graph/cliques.h" #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/hash.h" +#include "ortools/base/callback.h" +#include "ortools/base/hash.h" namespace operations_research { namespace { diff --git a/src/graph/cliques.h b/ortools/graph/cliques.h similarity index 97% rename from src/graph/cliques.h rename to ortools/graph/cliques.h index 4985dfd789..f5d9741776 100644 --- a/src/graph/cliques.h +++ b/ortools/graph/cliques.h @@ -25,15 +25,15 @@ #define OR_TOOLS_GRAPH_CLIQUES_H_ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/logging.h" -#include "base/join.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "util/time_limit.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/util/time_limit.h" namespace operations_research { @@ -244,15 +244,16 @@ class BronKerboschAlgorithm { // Creates a human-readable representation of the current state. std::string DebugString() { std::string buffer; - StrAppend(&buffer, "pivot = ", pivot, "\nnum_remaining_candidates = ", - num_remaining_candidates, "\ncandidates = ["); + StrAppend(&buffer, "pivot = ", pivot, + "\nnum_remaining_candidates = ", num_remaining_candidates, + "\ncandidates = ["); for (CandidateIndex i(0); i < candidates.size(); ++i) { if (i > 0) buffer += ", "; StrAppend(&buffer, candidates[i]); } - StrAppend(&buffer, "]\nfirst_candidate_index = ", - first_candidate_index.value(), "\ncandidate_for_recursion = ", - candidate_for_recursion.value()); + StrAppend( + &buffer, "]\nfirst_candidate_index = ", first_candidate_index.value(), + "\ncandidate_for_recursion = ", candidate_for_recursion.value()); return buffer; } @@ -475,7 +476,7 @@ void BronKerboschAlgorithm::PushState(NodeIndex selected) { } current_clique_.push_back(selected); - if (new_candidates.size() == 0) { + if (new_candidates.empty()) { // We've found a clique. Report it to the user, but do not push the state // because it would be popped immediately anyway. DVLOG(2) << CliqueDebugString(current_clique_); diff --git a/src/graph/connectivity.h b/ortools/graph/connectivity.h similarity index 98% rename from src/graph/connectivity.h rename to ortools/graph/connectivity.h index 2514deddc0..eaa8f6caab 100644 --- a/src/graph/connectivity.h +++ b/ortools/graph/connectivity.h @@ -23,9 +23,9 @@ #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" namespace operations_research { diff --git a/src/graph/csharp/graph.swig b/ortools/graph/csharp/graph.i similarity index 94% rename from src/graph/csharp/graph.swig rename to ortools/graph/csharp/graph.i index 4c1f713178..e971c30b24 100644 --- a/src/graph/csharp/graph.swig +++ b/ortools/graph/csharp/graph.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig file is only used in the open-source export of +// This .i file is only used in the open-source export of // // It exposes some of the C++ classes in ../, namely : // - SimpleMaxFlow, from ../max_flow.h @@ -22,14 +22,14 @@ // - examples/csharp/assignment.cs // - examples/csharp/csflow.cs -%include "base/base.swig" +%include "ortools/base/base.i" -%import "graph/ebert_graph.h" +%import "ortools/graph/ebert_graph.h" %{ -#include "graph/assignment.h" -#include "graph/max_flow.h" -#include "graph/min_cost_flow.h" +#include "ortools/graph/assignment.h" +#include "ortools/graph/max_flow.h" +#include "ortools/graph/min_cost_flow.h" %} // ############ max_flow.h ############ @@ -58,7 +58,7 @@ %unignore operations_research::SimpleMaxFlow::POSSIBLE_OVERFLOW; %unignore operations_research::SimpleMaxFlow::BAD_INPUT; %unignore operations_research::SimpleMaxFlow::BAD_RESULT; -%include "graph/max_flow.h" +%include "ortools/graph/max_flow.h" %unignoreall @@ -99,7 +99,7 @@ %unignore operations_research::SimpleMinCostFlow::Supply; %unignore operations_research::SimpleMinCostFlow::UnitCost; -%include "graph/min_cost_flow.h" +%include "ortools/graph/min_cost_flow.h" %unignoreall @@ -132,6 +132,6 @@ %unignore operations_research::SimpleLinearSumAssignment::INFEASIBLE; %unignore operations_research::SimpleLinearSumAssignment::POSSIBLE_OVERFLOW; -%include "graph/assignment.h" +%include "ortools/graph/assignment.h" %unignoreall diff --git a/src/graph/dijkstra.cc b/ortools/graph/dijkstra.cc similarity index 97% rename from src/graph/dijkstra.cc rename to ortools/graph/dijkstra.cc index b202045e85..f607056548 100644 --- a/src/graph/dijkstra.cc +++ b/ortools/graph/dijkstra.cc @@ -13,12 +13,12 @@ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/integral_types.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { namespace { diff --git a/src/graph/ebert_graph.h b/ortools/graph/ebert_graph.h similarity index 99% rename from src/graph/ebert_graph.h rename to ortools/graph/ebert_graph.h index 2032c3b53f..cb85bc6ce6 100644 --- a/src/graph/ebert_graph.h +++ b/ortools/graph/ebert_graph.h @@ -175,13 +175,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "util/permutation.h" -#include "util/zvector.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/util/permutation.h" +#include "ortools/util/zvector.h" namespace operations_research { diff --git a/src/graph/eulerian_path.h b/ortools/graph/eulerian_path.h similarity index 98% rename from src/graph/eulerian_path.h rename to ortools/graph/eulerian_path.h index 185b4127fc..2d11408a4d 100644 --- a/src/graph/eulerian_path.h +++ b/ortools/graph/eulerian_path.h @@ -31,7 +31,7 @@ #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { @@ -109,7 +109,7 @@ std::vector BuildEulerianPathFromNode(const Graph& graph, // Builds an Eulerian tour/circuit/cycle starting and ending at node root on an // undirected graph. // This function works only on Reverse graphs -// (cf. graph/graph.h). +// (cf. ortools/graph/graph.h). // Returns an empty tour if either root is invalid or if a tour cannot be built. // As of 10/2015, assumes the graph is connected. template @@ -131,7 +131,7 @@ std::vector BuildEulerianTour(const Graph& graph) { // Builds an Eulerian path/trail on an undirected graph. // This function works only on Reverse graphs -// (cf. graph/graph.h). +// (cf. ortools/graph/graph.h). // Returns an empty tour if a tour cannot be built. // As of 10/2015, assumes the graph is connected. template diff --git a/src/graph/flow_problem.proto b/ortools/graph/flow_problem.proto similarity index 100% rename from src/graph/flow_problem.proto rename to ortools/graph/flow_problem.proto diff --git a/src/graph/graph.h b/ortools/graph/graph.h similarity index 99% rename from src/graph/graph.h rename to ortools/graph/graph.h index 38b0904304..afb2d2565a 100644 --- a/src/graph/graph.h +++ b/ortools/graph/graph.h @@ -163,11 +163,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/port.h" -#include "util/iterators.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/port.h" +#include "ortools/util/iterators.h" namespace operations_research { diff --git a/src/graph/graphs.h b/ortools/graph/graphs.h similarity index 97% rename from src/graph/graphs.h rename to ortools/graph/graphs.h index 7e46a9f6a2..5a2bf8dd03 100644 --- a/src/graph/graphs.h +++ b/ortools/graph/graphs.h @@ -17,8 +17,8 @@ #ifndef OR_TOOLS_GRAPH_GRAPHS_H_ #define OR_TOOLS_GRAPH_GRAPHS_H_ -#include "graph/ebert_graph.h" -#include "graph/graph.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/graph.h" namespace operations_research { diff --git a/src/graph/hamiltonian_path.h b/ortools/graph/hamiltonian_path.h similarity index 99% rename from src/graph/hamiltonian_path.h rename to ortools/graph/hamiltonian_path.h index 9fe731b0f7..a0c82dc021 100644 --- a/src/graph/hamiltonian_path.h +++ b/ortools/graph/hamiltonian_path.h @@ -90,11 +90,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "util/bitset.h" -#include "util/saturated_arithmetic.h" -#include "util/vector_or_function.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/util/bitset.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/vector_or_function.h" namespace operations_research { diff --git a/src/graph/io.h b/ortools/graph/io.h similarity index 97% rename from src/graph/io.h rename to ortools/graph/io.h index 8e88622583..ce1b01a790 100644 --- a/src/graph/io.h +++ b/ortools/graph/io.h @@ -22,14 +22,14 @@ #include #include -#include "base/join.h" -#include "base/numbers.h" -#include "base/split.h" -#include "base/join.h" -#include "graph/graph.h" -#include "util/filelineiter.h" -#include "base/status.h" -#include "base/statusor.h" +#include "ortools/base/join.h" +#include "ortools/base/numbers.h" +#include "ortools/base/split.h" +#include "ortools/base/join.h" +#include "ortools/graph/graph.h" +#include "ortools/util/filelineiter.h" +#include "ortools/base/status.h" +#include "ortools/base/statusor.h" namespace operations_research { @@ -57,7 +57,7 @@ std::string GraphToString(const Graph& graph, GraphToStringFormat format); // . // // This returns a newly created graph upon success, which the user needs to take -// ownership of, or a failure status. See base/statusor.h. +// ownership of, or a failure status. See ortools/base/statusor.h. // // If "num_nodes_with_color_or_null" is not nullptr, it will be filled with the // color information: num_nodes_with_color_or_null[i] will be the number of diff --git a/src/graph/java/graph.swig b/ortools/graph/java/graph.i similarity index 94% rename from src/graph/java/graph.swig rename to ortools/graph/java/graph.i index 33fed83a97..a3be0b6592 100644 --- a/src/graph/java/graph.swig +++ b/ortools/graph/java/graph.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig files exposes some of the C++ classes in ../, namely : +// This .i files exposes some of the C++ classes in ../, namely : // - MaxFlow, from SimpleMaxFlow in ../max_flow.h // - MinCostFlow, from SimpleMinCostFlow in ../min_cost_flow.h // - LinearSumAssignment, from SimpleLinearSumAssignment in ../assignment.h @@ -29,14 +29,14 @@ // // TODO(user): test all the APIs that are currently marked as 'untested'. -%include "base/base.swig" +%include "ortools/base/base.i" -%import "graph/ebert_graph.h" +%import "ortools/graph/ebert_graph.h" %{ -#include "graph/assignment.h" -#include "graph/max_flow.h" -#include "graph/min_cost_flow.h" +#include "ortools/graph/assignment.h" +#include "ortools/graph/max_flow.h" +#include "ortools/graph/min_cost_flow.h" %} // ############ max_flow.h ############ @@ -67,7 +67,7 @@ %unignore operations_research::SimpleMaxFlow::BAD_INPUT; // untested %unignore operations_research::SimpleMaxFlow::BAD_RESULT; // untested -%include "graph/max_flow.h" +%include "ortools/graph/max_flow.h" %unignoreall @@ -111,7 +111,7 @@ %rename (getSupply) operations_research::SimpleMinCostFlow::Supply; // untested %rename (getUnitCost) operations_research::SimpleMinCostFlow::UnitCost; -%include "graph/min_cost_flow.h" +%include "ortools/graph/min_cost_flow.h" %unignoreall @@ -143,6 +143,6 @@ %unignore operations_research::SimpleLinearSumAssignment::INFEASIBLE; // untested %unignore operations_research::SimpleLinearSumAssignment::POSSIBLE_OVERFLOW; // untested -%include "graph/assignment.h" +%include "ortools/graph/assignment.h" %unignoreall diff --git a/src/graph/linear_assignment.cc b/ortools/graph/linear_assignment.cc similarity index 92% rename from src/graph/linear_assignment.cc rename to ortools/graph/linear_assignment.cc index 9b21ffc996..044faacf8b 100644 --- a/src/graph/linear_assignment.cc +++ b/ortools/graph/linear_assignment.cc @@ -12,9 +12,9 @@ // limitations under the License. -#include "graph/linear_assignment.h" +#include "ortools/graph/linear_assignment.h" -#include "base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" DEFINE_int64(assignment_alpha, 5, "Divisor for epsilon at each Refine " diff --git a/src/graph/linear_assignment.h b/ortools/graph/linear_assignment.h similarity index 99% rename from src/graph/linear_assignment.h rename to ortools/graph/linear_assignment.h index da44656c6b..82c246e605 100644 --- a/src/graph/linear_assignment.h +++ b/ortools/graph/linear_assignment.h @@ -32,8 +32,8 @@ // // Example usage: // -// #include "graph/graph.h" -// #include "graph/linear_assignment.h" +// #include "ortools/graph/graph.h" +// #include "ortools/graph/linear_assignment.h" // // // Choose a graph implementation (we recommend StaticGraph<>). // typedef operations_research::StaticGraph<> Graph; @@ -102,7 +102,7 @@ // problem and takes advantage of special properties of the resulting // minimum-cost flow problem to solve it efficiently using a // push-relabel method. For more information about minimum-cost flow -// see google3/graph/min_cost_flow.h +// see google3/ortools/graph/min_cost_flow.h // // The method used here is the cost-scaling approach for the // minimum-cost circulation problem as described in [Goldberg and @@ -204,14 +204,14 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "graph/ebert_graph.h" -#include "util/permutation.h" -#include "util/zvector.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/util/permutation.h" +#include "ortools/util/zvector.h" #ifndef SWIG DECLARE_int64(assignment_alpha); diff --git a/src/graph/max_flow.cc b/ortools/graph/max_flow.cc similarity index 99% rename from src/graph/max_flow.cc rename to ortools/graph/max_flow.cc index 8fde328862..8be6c72ad0 100644 --- a/src/graph/max_flow.cc +++ b/ortools/graph/max_flow.cc @@ -12,12 +12,12 @@ // limitations under the License. -#include "graph/max_flow.h" +#include "ortools/graph/max_flow.h" #include -#include "base/stringprintf.h" -#include "graph/graphs.h" +#include "ortools/base/stringprintf.h" +#include "ortools/graph/graphs.h" namespace operations_research { diff --git a/src/graph/max_flow.h b/ortools/graph/max_flow.h similarity index 99% rename from src/graph/max_flow.h rename to ortools/graph/max_flow.h index f63f9d6833..a6bc66f20a 100644 --- a/src/graph/max_flow.h +++ b/ortools/graph/max_flow.h @@ -129,14 +129,14 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "graph/ebert_graph.h" -#include "graph/flow_problem.pb.h" -#include "graph/graph.h" -#include "util/stats.h" -#include "util/zvector.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/flow_problem.pb.h" +#include "ortools/graph/graph.h" +#include "ortools/util/stats.h" +#include "ortools/util/zvector.h" namespace operations_research { diff --git a/src/graph/min_cost_flow.cc b/ortools/graph/min_cost_flow.cc similarity index 99% rename from src/graph/min_cost_flow.cc rename to ortools/graph/min_cost_flow.cc index 975a849a43..c37dacc005 100644 --- a/src/graph/min_cost_flow.cc +++ b/ortools/graph/min_cost_flow.cc @@ -12,17 +12,17 @@ // limitations under the License. -#include "graph/min_cost_flow.h" +#include "ortools/graph/min_cost_flow.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/stringprintf.h" -#include "base/mathutil.h" -#include "graph/graphs.h" -#include "graph/max_flow.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/mathutil.h" +#include "ortools/graph/graphs.h" +#include "ortools/graph/max_flow.h" // TODO(user): Remove these flags and expose the parameters in the API. // New clients, please do not use these flags! diff --git a/src/graph/min_cost_flow.h b/ortools/graph/min_cost_flow.h similarity index 98% rename from src/graph/min_cost_flow.h rename to ortools/graph/min_cost_flow.h index d9d3d24e76..fe2bdbaf3d 100644 --- a/src/graph/min_cost_flow.h +++ b/ortools/graph/min_cost_flow.h @@ -50,7 +50,7 @@ // given node v, it is said that there is an excess (or deficit) at // node v. A deficit is denoted by a negative excess and inflow = // outflow + excess. -// (Look at graph/max_flow.h to see that the definition +// (Look at ortools/graph/max_flow.h to see that the definition // of preflow is more restrictive than the one for pseudo-flow in that a preflow // only allows non-negative excesses, i.e., no deficit.) // More formally, a pseudo-flow is a function f such that: @@ -174,13 +174,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "graph/ebert_graph.h" -#include "graph/graph.h" -#include "util/stats.h" -#include "util/zvector.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/graph/ebert_graph.h" +#include "ortools/graph/graph.h" +#include "ortools/util/stats.h" +#include "ortools/util/zvector.h" namespace operations_research { diff --git a/src/graph/minimum_spanning_tree.h b/ortools/graph/minimum_spanning_tree.h similarity index 96% rename from src/graph/minimum_spanning_tree.h rename to ortools/graph/minimum_spanning_tree.h index cab8e95598..dad9009ee2 100644 --- a/src/graph/minimum_spanning_tree.h +++ b/ortools/graph/minimum_spanning_tree.h @@ -17,12 +17,12 @@ #include #include -#include "base/integral_types.h" -#include "graph/connectivity.h" -#include "graph/graph.h" -#include "util/vector_or_function.h" -#include "base/adjustable_priority_queue-inl.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/integral_types.h" +#include "ortools/graph/connectivity.h" +#include "ortools/graph/graph.h" +#include "ortools/util/vector_or_function.h" +#include "ortools/base/adjustable_priority_queue-inl.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { diff --git a/src/graph/one_tree_lower_bound.h b/ortools/graph/one_tree_lower_bound.h similarity index 99% rename from src/graph/one_tree_lower_bound.h rename to ortools/graph/one_tree_lower_bound.h index 659ecf3bcd..35f8cf19c9 100644 --- a/src/graph/one_tree_lower_bound.h +++ b/ortools/graph/one_tree_lower_bound.h @@ -125,9 +125,9 @@ #include #include -#include "base/integral_types.h" -#include "graph/christofides.h" -#include "graph/minimum_spanning_tree.h" +#include "ortools/base/integral_types.h" +#include "ortools/graph/christofides.h" +#include "ortools/graph/minimum_spanning_tree.h" namespace operations_research { diff --git a/src/graph/python/graph.swig b/ortools/graph/python/graph.i similarity index 91% rename from src/graph/python/graph.swig rename to ortools/graph/python/graph.i index e9dac3e4eb..15b5dc630b 100644 --- a/src/graph/python/graph.swig +++ b/ortools/graph/python/graph.i @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig files exposes some of the C++ classes in ../, namely : +// This .i files exposes some of the C++ classes in ../, namely : // - SimpleMaxFlow, from ../max_flow.h // - SimpleMinCostFlow, from ../min_cost_flow.h // - LinearSumAssignment, from ../assignment.h // // USAGE EXAMPLES: -// - python/pyflow_example.py -// - python/linear_assignment_api.py +// - examples/python/pyflow_example.py +// - examples/python/linear_assignment_api.py // // The rest of the code of ../ was not deemed worth exporting to python. // This could change; contact the code owners if you would like some C++ @@ -26,21 +26,20 @@ // // TODO(user): test all the APIs that are currently marked as 'untested'. -%include "base/base.swig" -%include "util/python/functions.swig" +%include "ortools/base/base.i" -%import "graph/ebert_graph.h" +%import "ortools/graph/ebert_graph.h" // Convert the "std::vector* result" parameters to python outputs. -// Note: the typemap itself is in "base/base.swig". +// Note: the typemap itself is in "ortools/base/base.i". %apply std::vector* OUTPUT {std::vector* result} %apply std::vector* OUTPUT {std::vector* nodes} %{ -#include "graph/assignment.h" -#include "graph/max_flow.h" -#include "graph/min_cost_flow.h" -#include "graph/shortestpaths.h" +#include "ortools/graph/assignment.h" +#include "ortools/graph/max_flow.h" +#include "ortools/graph/min_cost_flow.h" +#include "ortools/graph/shortestpaths.h" %} // ############ max_flow.h ############ @@ -69,7 +68,7 @@ %unignore operations_research::SimpleMaxFlow::GetSourceSideMinCut; // untested %unignore operations_research::SimpleMaxFlow::GetSinkSideMinCut; // untested -%include "graph/max_flow.h" +%include "ortools/graph/max_flow.h" %unignoreall @@ -111,7 +110,7 @@ %unignore operations_research::SimpleMinCostFlow::Supply; // untested %unignore operations_research::SimpleMinCostFlow::UnitCost; -%include "graph/min_cost_flow.h" +%include "ortools/graph/min_cost_flow.h" %unignoreall @@ -139,16 +138,12 @@ %unignore operations_research::SimpleLinearSumAssignment::RightMate; %unignore operations_research::SimpleLinearSumAssignment::AssignmentCost; -%include "graph/assignment.h" - -%unignoreall - -%ignoreall +%include "ortools/graph/assignment.h" %unignore operations_research::DijkstraShortestPath; %unignore operations_research::BellmanFordShortestPath; %unignore operations_research::AStarShortestPath; -%include "graph/shortestpaths.h" +%include "ortools/graph/shortestpaths.h" %unignoreall diff --git a/src/graph/shortestpaths.cc b/ortools/graph/shortestpaths.cc similarity index 73% rename from src/graph/shortestpaths.cc rename to ortools/graph/shortestpaths.cc index 20e7cf6233..c0cdc257de 100644 --- a/src/graph/shortestpaths.cc +++ b/ortools/graph/shortestpaths.cc @@ -12,20 +12,21 @@ // limitations under the License. -#include "graph/shortestpaths.h" +#include "ortools/graph/shortestpaths.h" #include #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/casts.h" -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/callback.h" +#include "ortools/base/casts.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" DEFINE_int32(shortestpaths_disconnected_distance, 200000, "Distance returned when two node are disconnected"); diff --git a/src/graph/shortestpaths.h b/ortools/graph/shortestpaths.h similarity index 97% rename from src/graph/shortestpaths.h rename to ortools/graph/shortestpaths.h index d1eb386393..66a65d6623 100644 --- a/src/graph/shortestpaths.h +++ b/ortools/graph/shortestpaths.h @@ -24,8 +24,8 @@ #include #include -#include "base/integral_types.h" -#include "base/macros.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" namespace operations_research { diff --git a/src/graph/util.cc b/ortools/graph/util.cc similarity index 96% rename from src/graph/util.cc rename to ortools/graph/util.cc index 9036e15e75..09ae75287a 100644 --- a/src/graph/util.cc +++ b/ortools/graph/util.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "graph/util.h" +#include "ortools/graph/util.h" namespace operations_research { diff --git a/src/graph/util.h b/ortools/graph/util.h similarity index 98% rename from src/graph/util.h rename to ortools/graph/util.h index b419c5f2f2..a37174a003 100644 --- a/src/graph/util.h +++ b/ortools/graph/util.h @@ -17,17 +17,17 @@ #define OR_TOOLS_GRAPH_UTIL_H_ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/map_util.h" -#include "base/hash.h" -#include "graph/graph.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/graph/graph.h" namespace operations_research { diff --git a/src/linear_solver/BUILD b/ortools/linear_solver/BUILD similarity index 100% rename from src/linear_solver/BUILD rename to ortools/linear_solver/BUILD diff --git a/src/linear_solver/README b/ortools/linear_solver/README similarity index 100% rename from src/linear_solver/README rename to ortools/linear_solver/README diff --git a/src/ortools/constraint_solver/__init__.py b/ortools/linear_solver/__init__.py similarity index 78% rename from src/ortools/constraint_solver/__init__.py rename to ortools/linear_solver/__init__.py index caea6898ff..c97cbc7319 100644 --- a/src/ortools/constraint_solver/__init__.py +++ b/ortools/linear_solver/__init__.py @@ -11,5 +11,5 @@ # See the License for the specific language governing permissions and # limitations under the License. import os as _os -__path__.append(_os.path.join(__path__[0], '..', '..', 'gen', 'ortools', 'constraint_solver')) -__path__.append(_os.path.join(__path__[0], '..', '..', '..', 'lib')) +__path__.append(_os.path.join(__path__[0], '..', 'gen', 'ortools', 'linear_solver')) +__path__.append(_os.path.join(__path__[0], '..', '..', 'lib')) diff --git a/src/linear_solver/bop_interface.cc b/ortools/linear_solver/bop_interface.cc similarity index 97% rename from src/linear_solver/bop_interface.cc rename to ortools/linear_solver/bop_interface.cc index 26a37ce0d1..5d8fcf66a2 100644 --- a/src/linear_solver/bop_interface.cc +++ b/ortools/linear_solver/bop_interface.cc @@ -15,16 +15,16 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" #include "google/protobuf/text_format.h" -#include "base/hash.h" -#include "bop/bop_parameters.pb.h" -#include "bop/integral_solver.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/hash.h" +#include "ortools/bop/bop_parameters.pb.h" +#include "ortools/bop/integral_solver.h" +#include "ortools/linear_solver/linear_solver.h" #if defined(USE_BOP) diff --git a/src/linear_solver/cbc_interface.cc b/ortools/linear_solver/cbc_interface.cc similarity index 98% rename from src/linear_solver/cbc_interface.cc rename to ortools/linear_solver/cbc_interface.cc index 967d1610e4..ef4931b94d 100644 --- a/src/linear_solver/cbc_interface.cc +++ b/ortools/linear_solver/cbc_interface.cc @@ -13,20 +13,20 @@ // -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/hash.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/hash.h" +#include "ortools/linear_solver/linear_solver.h" #if defined(USE_CBC) diff --git a/src/linear_solver/clp_interface.cc b/ortools/linear_solver/clp_interface.cc similarity index 98% rename from src/linear_solver/clp_interface.cc rename to ortools/linear_solver/clp_interface.cc index f266355ad2..5be96d9674 100644 --- a/src/linear_solver/clp_interface.cc +++ b/ortools/linear_solver/clp_interface.cc @@ -14,19 +14,19 @@ // #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/strutil.h" -#include "base/hash.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/strutil.h" +#include "ortools/base/hash.h" +#include "ortools/linear_solver/linear_solver.h" #if defined(USE_CLP) || defined(USE_CBC) diff --git a/src/linear_solver/cplex_interface.cc b/ortools/linear_solver/cplex_interface.cc similarity index 99% rename from src/linear_solver/cplex_interface.cc rename to ortools/linear_solver/cplex_interface.cc index 6fe9316ab1..546a312cba 100644 --- a/src/linear_solver/cplex_interface.cc +++ b/ortools/linear_solver/cplex_interface.cc @@ -16,11 +16,11 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/linear_solver/linear_solver.h" #if defined(USE_CPLEX) diff --git a/src/linear_solver/csharp/linear_solver.swig b/ortools/linear_solver/csharp/linear_solver.i similarity index 96% rename from src/linear_solver/csharp/linear_solver.swig rename to ortools/linear_solver/csharp/linear_solver.i index bf8002bbf4..c1dd90b95b 100644 --- a/src/linear_solver/csharp/linear_solver.swig +++ b/ortools/linear_solver/csharp/linear_solver.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig file is only used in the open-source export of +// This .i file is only used in the open-source export of // util/operations_research (github or-tools) // // It exposes the linear programming and integer programming solver. @@ -20,7 +20,7 @@ // supports the same "Natural language" API as the python wrapper. See the // usage examples. // -// This .swig file is complemented by C# extensions (using partial classes) +// This .i file is complemented by C# extensions (using partial classes) // of some wrapped C++ classes, like Solver or Variable. There are also // other C# helper classes. See src/com/google/ortools/linearsolver. // @@ -28,12 +28,12 @@ // - examples/csharp/cslinearprogramming.cs // - examples/csharp/csintegerprogramming.cs -%include "base/base.swig" +%include "ortools/base/base.i" %include "std_vector.i" %{ -#include "linear_solver/linear_solver.h" -#include "linear_solver/linear_solver.pb.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" %} // We need to forward-declare the proto here, so that the PROTO_* macros @@ -215,6 +215,6 @@ class MPSolutionResponse; // hash_map<>, swig complains about an undefined base class. Silence it. %warnfilter(401) CoeffMap; -%include "linear_solver/linear_solver.h" +%include "ortools/linear_solver/linear_solver.h" %unignoreall diff --git a/src/linear_solver/glop_interface.cc b/ortools/linear_solver/glop_interface.cc similarity index 96% rename from src/linear_solver/glop_interface.cc rename to ortools/linear_solver/glop_interface.cc index 8592576ac7..edf743985f 100644 --- a/src/linear_solver/glop_interface.cc +++ b/ortools/linear_solver/glop_interface.cc @@ -12,34 +12,34 @@ // limitations under the License. -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" #ifndef ANDROID_JNI -#include "base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" #endif -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" #ifndef ANDROID_JNI -#include "base/file.h" +#include "ortools/base/file.h" #include "google/protobuf/text_format.h" #endif -#include "base/hash.h" -#include "glop/lp_solver.h" -#include "glop/parameters.pb.h" -#include "linear_solver/glop_utils.h" -#include "linear_solver/linear_solver.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" -#include "util/time_limit.h" +#include "ortools/base/hash.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/linear_solver/glop_utils.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/time_limit.h" namespace operations_research { diff --git a/src/linear_solver/glop_utils.cc b/ortools/linear_solver/glop_utils.cc similarity index 98% rename from src/linear_solver/glop_utils.cc rename to ortools/linear_solver/glop_utils.cc index 7cc21ca731..c8f4440b61 100644 --- a/src/linear_solver/glop_utils.cc +++ b/ortools/linear_solver/glop_utils.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "linear_solver/glop_utils.h" +#include "ortools/linear_solver/glop_utils.h" namespace operations_research { diff --git a/src/linear_solver/glop_utils.h b/ortools/linear_solver/glop_utils.h similarity index 93% rename from src/linear_solver/glop_utils.h rename to ortools/linear_solver/glop_utils.h index 6027bab789..aae257f690 100644 --- a/src/linear_solver/glop_utils.h +++ b/ortools/linear_solver/glop_utils.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_LINEAR_SOLVER_GLOP_UTILS_H_ #define OR_TOOLS_LINEAR_SOLVER_GLOP_UTILS_H_ -#include "linear_solver/linear_solver.h" -#include "lp_data/lp_types.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { diff --git a/src/linear_solver/glpk_interface.cc b/ortools/linear_solver/glpk_interface.cc similarity index 99% rename from src/linear_solver/glpk_interface.cc rename to ortools/linear_solver/glpk_interface.cc index 5f54f44474..f50bf1e780 100644 --- a/src/linear_solver/glpk_interface.cc +++ b/ortools/linear_solver/glpk_interface.cc @@ -17,20 +17,20 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/hash.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/hash.h" +#include "ortools/linear_solver/linear_solver.h" extern "C" { #include "glpk.h" diff --git a/src/linear_solver/gurobi_interface.cc b/ortools/linear_solver/gurobi_interface.cc similarity index 98% rename from src/linear_solver/gurobi_interface.cc rename to ortools/linear_solver/gurobi_interface.cc index 73fb08afb2..ff1dc81906 100644 --- a/src/linear_solver/gurobi_interface.cc +++ b/ortools/linear_solver/gurobi_interface.cc @@ -15,20 +15,20 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/map_util.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/map_util.h" +#include "ortools/linear_solver/linear_solver.h" extern "C" { #include "gurobi_c.h" diff --git a/src/linear_solver/java/linear_solver.swig b/ortools/linear_solver/java/linear_solver.i similarity index 98% rename from src/linear_solver/java/linear_solver.swig rename to ortools/linear_solver/java/linear_solver.i index ac2f4f20bd..dc2c35bee4 100644 --- a/src/linear_solver/java/linear_solver.swig +++ b/ortools/linear_solver/java/linear_solver.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig file exposes the linear programming and integer programming +// This .i file exposes the linear programming and integer programming // a java codelab yet, as of July 2014) // // The java API is pretty much identical to the C++ API, with methods @@ -25,13 +25,13 @@ // // TODO(user): unit test all the APIs that are currently marked with 'no test'. -%include base/base.swig +%include ortools/base/base.i %include "enums.swg" // For native Java enum support. // We prefer our in-house vector wrapper to std_vector.i, because it // converts to and from native java arrays. -%include "util/java/vector.swig" +%include "ortools/util/java/vector.i" // We need to forward-declare the proto here, so that the PROTO_* macros @@ -44,7 +44,7 @@ class MPSolutionResponse; } // namespace operations_research %{ -#include "linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.h" %} %typemap(javaimports) SWIGTYPE %{ @@ -258,6 +258,6 @@ import java.lang.reflect.*; // hash_map<>, swig complains about an undefined base class. Silence it. %warnfilter(401) CoeffMap; -%include "linear_solver/linear_solver.h" +%include "ortools/linear_solver/linear_solver.h" %unignoreall diff --git a/src/linear_solver/linear_expr.cc b/ortools/linear_solver/linear_expr.cc similarity index 92% rename from src/linear_solver/linear_expr.cc rename to ortools/linear_solver/linear_expr.cc index 3bdae171df..f0fc3716a6 100644 --- a/src/linear_solver/linear_expr.cc +++ b/ortools/linear_solver/linear_expr.cc @@ -11,22 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "linear_solver/linear_expr.h" +#include "ortools/linear_solver/linear_expr.h" #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { -namespace { - -const MPVariable* dense_hash_map_empty_key() { - static const int* empty_key = new int; - return reinterpret_cast(empty_key); -} - -} // namespace LinearExpr::LinearExpr(double constant) : offset_(constant), terms_() { } diff --git a/src/linear_solver/linear_expr.h b/ortools/linear_solver/linear_expr.h similarity index 99% rename from src/linear_solver/linear_expr.h rename to ortools/linear_solver/linear_expr.h index 610296a67a..ac065522d1 100644 --- a/src/linear_solver/linear_expr.h +++ b/ortools/linear_solver/linear_expr.h @@ -119,8 +119,8 @@ class LinearExpr { double offset() const { return offset_; } const std::unordered_map& terms() const { - return terms_; - } + return terms_; + } private: double offset_; diff --git a/src/linear_solver/linear_solver.cc b/ortools/linear_solver/linear_solver.cc similarity index 98% rename from src/linear_solver/linear_solver.cc rename to ortools/linear_solver/linear_solver.cc index 42a8f0cf85..b4ecf4de1a 100644 --- a/src/linear_solver/linear_solver.cc +++ b/ortools/linear_solver/linear_solver.cc @@ -13,7 +13,7 @@ // -#include "linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.h" #if !defined(_MSC_VER) #include @@ -24,31 +24,31 @@ #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" #ifndef ANDROID_JNI -#include "base/file.h" +#include "ortools/base/file.h" #endif #ifdef ANDROID_JNI -#include "base/numbers.h" +#include "ortools/base/numbers.h" #endif /// ANDROID_JNI -#include "base/map_util.h" -#include "base/stl_util.h" -#include "base/hash.h" -#include "base/accurate_sum.h" -#include "linear_solver/linear_solver.pb.h" -#include "linear_solver/model_exporter.h" -#include "linear_solver/model_validator.h" -#include "util/fp_utils.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" +#include "ortools/base/hash.h" +#include "ortools/base/accurate_sum.h" +#include "ortools/linear_solver/linear_solver.pb.h" +#include "ortools/linear_solver/model_exporter.h" +#include "ortools/linear_solver/model_validator.h" +#include "ortools/util/fp_utils.h" #ifndef ANDROID_JNI -#include "util/proto_tools.h" +#include "ortools/util/proto_tools.h" #endif // TODO(user): Clean up includes. E.g., parameters.pb.h seems not used. @@ -347,9 +347,6 @@ extern MPSolverInterface* BuildGLOPInterface(MPSolver* const solver); #if defined(USE_SCIP) extern MPSolverInterface* BuildSCIPInterface(MPSolver* const solver); #endif -#if defined(USE_SLM) -extern MPSolverInterface* BuildSLMInterface(MPSolver* const solver, bool mip); -#endif #if defined(USE_GUROBI) extern MPSolverInterface* BuildGurobiInterface(bool mip, MPSolver* const solver); diff --git a/src/linear_solver/linear_solver.h b/ortools/linear_solver/linear_solver.h similarity index 99% rename from src/linear_solver/linear_solver.h rename to ortools/linear_solver/linear_solver.h index aa97f9eb8f..ea2ff44376 100644 --- a/src/linear_solver/linear_solver.h +++ b/ortools/linear_solver/linear_solver.h @@ -137,8 +137,8 @@ #define OR_TOOLS_LINEAR_SOLVER_LINEAR_SOLVER_H_ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include #include #include @@ -146,11 +146,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/timer.h" -#include "linear_solver/linear_expr.h" -#include "linear_solver/linear_solver.pb.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/timer.h" +#include "ortools/glop/parameters.pb.h" +#include "ortools/linear_solver/linear_expr.h" +#include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { diff --git a/src/linear_solver/linear_solver.proto b/ortools/linear_solver/linear_solver.proto similarity index 99% rename from src/linear_solver/linear_solver.proto rename to ortools/linear_solver/linear_solver.proto index f62029f1c1..8d1105e826 100644 --- a/src/linear_solver/linear_solver.proto +++ b/ortools/linear_solver/linear_solver.proto @@ -337,7 +337,7 @@ enum MPSolverResponseStatus { // Implementation error: the requested solver implementation is not // available (see MPModelRequest.solver_type). // The linear solver binary was probably not linked with the required library, - // eg //linear_solver:linear_solver_scip for SCIP. + // eg //ortools/linear_solver:linear_solver_scip for SCIP. MPSOLVER_SOLVER_TYPE_UNAVAILABLE = 0x7; }; diff --git a/src/ortools/linear_solver/linear_solver_natural_api.py b/ortools/linear_solver/linear_solver_natural_api.py similarity index 100% rename from src/ortools/linear_solver/linear_solver_natural_api.py rename to ortools/linear_solver/linear_solver_natural_api.py diff --git a/src/linear_solver/model_exporter.cc b/ortools/linear_solver/model_exporter.cc similarity index 98% rename from src/linear_solver/model_exporter.cc rename to ortools/linear_solver/model_exporter.cc index a0c4a152db..db74152d0e 100644 --- a/src/linear_solver/model_exporter.cc +++ b/ortools/linear_solver/model_exporter.cc @@ -11,20 +11,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "linear_solver/model_exporter.h" +#include "ortools/linear_solver/model_exporter.h" #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/strutil.h" -#include "base/map_util.h" -#include "linear_solver/linear_solver.pb.h" -#include "util/fp_utils.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/strutil.h" +#include "ortools/base/map_util.h" +#include "ortools/linear_solver/linear_solver.pb.h" +#include "ortools/util/fp_utils.h" DEFINE_bool(lp_shows_unused_variables, false, "Decides wether variable unused in the objective and constraints" diff --git a/src/linear_solver/model_exporter.h b/ortools/linear_solver/model_exporter.h similarity index 98% rename from src/linear_solver/model_exporter.h rename to ortools/linear_solver/model_exporter.h index 552816b48c..e42969420f 100644 --- a/src/linear_solver/model_exporter.h +++ b/ortools/linear_solver/model_exporter.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_LINEAR_SOLVER_MODEL_EXPORTER_H_ #define OR_TOOLS_LINEAR_SOLVER_MODEL_EXPORTER_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/macros.h" -#include "base/hash.h" +#include "ortools/base/macros.h" +#include "ortools/base/hash.h" namespace operations_research { diff --git a/src/linear_solver/model_validator.cc b/ortools/linear_solver/model_validator.cc similarity index 97% rename from src/linear_solver/model_validator.cc rename to ortools/linear_solver/model_validator.cc index 265906809d..0a29024aec 100644 --- a/src/linear_solver/model_validator.cc +++ b/ortools/linear_solver/model_validator.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "linear_solver/model_validator.h" +#include "ortools/linear_solver/model_validator.h" #include #include -#include "base/join.h" -#include "base/accurate_sum.h" -#include "util/fp_utils.h" +#include "ortools/base/join.h" +#include "ortools/base/accurate_sum.h" +#include "ortools/util/fp_utils.h" namespace operations_research { namespace { @@ -36,7 +36,8 @@ static const double kInfinity = std::numeric_limits::infinity(); // Internal method to detect errors in a single variable. std::string FindErrorInMPVariable(const MPVariableProto& variable) { - if (std::isnan(variable.lower_bound()) || std::isnan(variable.upper_bound()) || + if (std::isnan(variable.lower_bound()) || + std::isnan(variable.upper_bound()) || variable.lower_bound() == kInfinity || variable.upper_bound() == -kInfinity || variable.lower_bound() > variable.upper_bound()) { diff --git a/src/linear_solver/model_validator.h b/ortools/linear_solver/model_validator.h similarity index 97% rename from src/linear_solver/model_validator.h rename to ortools/linear_solver/model_validator.h index fa69c722bf..02863c1376 100644 --- a/src/linear_solver/model_validator.h +++ b/ortools/linear_solver/model_validator.h @@ -15,7 +15,7 @@ #define OR_TOOLS_LINEAR_SOLVER_MODEL_VALIDATOR_H_ #include -#include "linear_solver/linear_solver.pb.h" +#include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { // Returns an empty std::string iff the model is valid and not trivially infeasible. diff --git a/src/linear_solver/python/linear_solver.swig b/ortools/linear_solver/python/linear_solver.i similarity index 98% rename from src/linear_solver/python/linear_solver.swig rename to ortools/linear_solver/python/linear_solver.i index d468372935..9cc498a01a 100644 --- a/src/linear_solver/python/linear_solver.swig +++ b/ortools/linear_solver/python/linear_solver.i @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This .swig file exposes the linear programming and integer programming +// This .i file exposes the linear programming and integer programming // // The python API is enriched by custom code defined here, making it // extremely intuitive, like: @@ -23,12 +23,12 @@ // solver.Maximize(10 * x1 + 6 * x2) // // USAGE EXAMPLES: -// - python/linear_programming.py +// - examples/python/linear_programming.py // - ./pywraplp_test.py // // TODO(user): test all the APIs that are currently marked as 'untested'. -%include "base/base.swig" +%include "ortools/base/base.i" // We need to forward-declare the proto here, so that the PROTO_* macros @@ -41,7 +41,7 @@ class MPSolutionResponse; } // namespace operations_research %{ -#include "linear_solver/linear_solver.h" +#include "ortools/linear_solver/linear_solver.h" %} namespace operations_research { @@ -313,7 +313,7 @@ from ortools.linear_solver.linear_solver_natural_api import VariableExpr // hash_map<>, swig complains about an undefined base class. Silence it. %warnfilter(401) CoeffMap; -%include "linear_solver/linear_solver.h" +%include "ortools/linear_solver/linear_solver.h" %unignoreall diff --git a/src/linear_solver/scip_interface.cc b/ortools/linear_solver/scip_interface.cc similarity index 98% rename from src/linear_solver/scip_interface.cc rename to ortools/linear_solver/scip_interface.cc index e7bfc5a60c..59cf57f95b 100644 --- a/src/linear_solver/scip_interface.cc +++ b/ortools/linear_solver/scip_interface.cc @@ -15,20 +15,20 @@ #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include -#include "base/commandlineflags.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" #include "scip/scip.h" #include "scip/scipdefplugins.h" -#include "base/hash.h" -#include "linear_solver/linear_solver.h" +#include "ortools/base/hash.h" +#include "ortools/linear_solver/linear_solver.h" // Our own version of SCIP_CALL to do error management. // TODO(user): The error management could be improved, especially diff --git a/src/lp_data/BUILD b/ortools/lp_data/BUILD similarity index 100% rename from src/lp_data/BUILD rename to ortools/lp_data/BUILD diff --git a/src/lp_data/lp_data.cc b/ortools/lp_data/lp_data.cc similarity index 99% rename from src/lp_data/lp_data.cc rename to ortools/lp_data/lp_data.cc index 060c3ed0e8..9d6d809221 100644 --- a/src/lp_data/lp_data.cc +++ b/ortools/lp_data/lp_data.cc @@ -12,21 +12,21 @@ // limitations under the License. -#include "lp_data/lp_data.h" +#include "ortools/lp_data/lp_data.h" #include #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/join.h" -#include "base/join.h" -#include "lp_data/lp_print_utils.h" -#include "lp_data/lp_utils.h" -#include "lp_data/matrix_utils.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" +#include "ortools/base/join.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/matrix_utils.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_data.h b/ortools/lp_data/lp_data.h similarity index 98% rename from src/lp_data/lp_data.h rename to ortools/lp_data/lp_data.h index c3d80926cd..a7545702b7 100644 --- a/src/lp_data/lp_data.h +++ b/ortools/lp_data/lp_data.h @@ -25,20 +25,20 @@ #define OR_TOOLS_LP_DATA_LP_DATA_H_ #include // for max -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include // for std::string #include // for vector -#include "base/logging.h" // for CHECK* -#include "base/macros.h" // for DISALLOW_COPY_AND_ASSIGN, NULL -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/hash.h" -#include "lp_data/lp_types.h" -#include "lp_data/matrix_scaler.h" -#include "lp_data/sparse.h" -#include "util/fp_utils.h" +#include "ortools/base/logging.h" // for CHECK* +#include "ortools/base/macros.h" // for DISALLOW_COPY_AND_ASSIGN, NULL +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/hash.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/matrix_scaler.h" +#include "ortools/lp_data/sparse.h" +#include "ortools/util/fp_utils.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_decomposer.cc b/ortools/lp_data/lp_decomposer.cc similarity index 97% rename from src/lp_data/lp_decomposer.cc rename to ortools/lp_data/lp_decomposer.cc index 693e309f14..abe07aa293 100644 --- a/src/lp_data/lp_decomposer.cc +++ b/ortools/lp_data/lp_decomposer.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lp_data/lp_decomposer.h" +#include "ortools/lp_data/lp_decomposer.h" #include -#include "algorithms/dynamic_partition.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_utils.h" +#include "ortools/algorithms/dynamic_partition.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_decomposer.h b/ortools/lp_data/lp_decomposer.h similarity index 96% rename from src/lp_data/lp_decomposer.h rename to ortools/lp_data/lp_decomposer.h index df81ac70b9..56646605d2 100644 --- a/src/lp_data/lp_decomposer.h +++ b/ortools/lp_data/lp_decomposer.h @@ -17,9 +17,9 @@ #include #include -#include "base/mutex.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" +#include "ortools/base/mutex.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_print_utils.cc b/ortools/lp_data/lp_print_utils.cc similarity index 89% rename from src/lp_data/lp_print_utils.cc rename to ortools/lp_data/lp_print_utils.cc index 1d2fbc5d4a..f1d5b14c38 100644 --- a/src/lp_data/lp_print_utils.cc +++ b/ortools/lp_data/lp_print_utils.cc @@ -12,16 +12,16 @@ // limitations under the License. -#include "lp_data/lp_print_utils.h" +#include "ortools/lp_data/lp_print_utils.h" #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/join.h" -#include "lp_data/lp_types.h" -#include "util/rational_approximation.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/rational_approximation.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_print_utils.h b/ortools/lp_data/lp_print_utils.h similarity index 95% rename from src/lp_data/lp_print_utils.h rename to ortools/lp_data/lp_print_utils.h index 043b16dc78..6012cf0afe 100644 --- a/src/lp_data/lp_print_utils.h +++ b/ortools/lp_data/lp_print_utils.h @@ -19,9 +19,9 @@ #include -#include "base/integral_types.h" -#include "base/stringprintf.h" -#include "lp_data/lp_types.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/stringprintf.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_types.cc b/ortools/lp_data/lp_types.cc similarity index 99% rename from src/lp_data/lp_types.cc rename to ortools/lp_data/lp_types.cc index 9f73707c55..5f185bf9fb 100644 --- a/src/lp_data/lp_types.cc +++ b/ortools/lp_data/lp_types.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lp_data/lp_types.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_types.h b/ortools/lp_data/lp_types.h similarity index 98% rename from src/lp_data/lp_types.h rename to ortools/lp_data/lp_types.h index d5076d773e..a78d293677 100644 --- a/src/lp_data/lp_types.h +++ b/ortools/lp_data/lp_types.h @@ -19,10 +19,10 @@ #include #include -#include "base/basictypes.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "util/bitset.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/util/bitset.h" // We use typedefs as much as possible to later permit the usage of // types such as quad-doubles or rationals. diff --git a/src/lp_data/lp_utils.cc b/ortools/lp_data/lp_utils.cc similarity index 99% rename from src/lp_data/lp_utils.cc rename to ortools/lp_data/lp_utils.cc index 9520dcf5cd..8c4b56f5e9 100644 --- a/src/lp_data/lp_utils.cc +++ b/ortools/lp_data/lp_utils.cc @@ -12,7 +12,7 @@ // limitations under the License. -#include "lp_data/lp_utils.h" +#include "ortools/lp_data/lp_utils.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/lp_utils.h b/ortools/lp_data/lp_utils.h similarity index 99% rename from src/lp_data/lp_utils.h rename to ortools/lp_data/lp_utils.h index c985127494..680916d112 100644 --- a/src/lp_data/lp_utils.h +++ b/ortools/lp_data/lp_utils.h @@ -17,9 +17,9 @@ #ifndef OR_TOOLS_LP_DATA_LP_UTILS_H_ #define OR_TOOLS_LP_DATA_LP_UTILS_H_ -#include "base/accurate_sum.h" -#include "lp_data/lp_types.h" -#include "lp_data/sparse_column.h" +#include "ortools/base/accurate_sum.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse_column.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/matrix_scaler.cc b/ortools/lp_data/matrix_scaler.cc similarity index 98% rename from src/lp_data/matrix_scaler.cc rename to ortools/lp_data/matrix_scaler.cc index 70a2917cee..58f4659b15 100644 --- a/src/lp_data/matrix_scaler.cc +++ b/ortools/lp_data/matrix_scaler.cc @@ -12,16 +12,16 @@ // limitations under the License. -#include "lp_data/matrix_scaler.h" +#include "ortools/lp_data/matrix_scaler.h" #include #include #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "lp_data/lp_utils.h" -#include "lp_data/sparse.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/lp_data/lp_utils.h" +#include "ortools/lp_data/sparse.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/matrix_scaler.h b/ortools/lp_data/matrix_scaler.h similarity index 97% rename from src/lp_data/matrix_scaler.h rename to ortools/lp_data/matrix_scaler.h index 3f2491cacb..e19bc26963 100644 --- a/src/lp_data/matrix_scaler.h +++ b/ortools/lp_data/matrix_scaler.h @@ -63,10 +63,10 @@ #include -#include "base/integral_types.h" -#include "base/macros.h" -#include "base/int_type_indexed_vector.h" -#include "lp_data/lp_types.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/matrix_utils.cc b/ortools/lp_data/matrix_utils.cc similarity index 99% rename from src/lp_data/matrix_utils.cc rename to ortools/lp_data/matrix_utils.cc index 7cd3a899ce..a0520e76ba 100644 --- a/src/lp_data/matrix_utils.cc +++ b/ortools/lp_data/matrix_utils.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lp_data/matrix_utils.h" +#include "ortools/lp_data/matrix_utils.h" #include -#include "base/hash.h" +#include "ortools/base/hash.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/matrix_utils.h b/ortools/lp_data/matrix_utils.h similarity index 97% rename from src/lp_data/matrix_utils.h rename to ortools/lp_data/matrix_utils.h index c5a71eecb0..d43a618461 100644 --- a/src/lp_data/matrix_utils.h +++ b/ortools/lp_data/matrix_utils.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_LP_DATA_MATRIX_UTILS_H_ #define OR_TOOLS_LP_DATA_MATRIX_UTILS_H_ -#include "lp_data/lp_types.h" -#include "lp_data/sparse.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/sparse.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/mps_reader.cc b/ortools/lp_data/mps_reader.cc similarity index 97% rename from src/lp_data/mps_reader.cc rename to ortools/lp_data/mps_reader.cc index e80f7b1929..48cc20ca51 100644 --- a/src/lp_data/mps_reader.cc +++ b/ortools/lp_data/mps_reader.cc @@ -12,7 +12,7 @@ // limitations under the License. -#include "lp_data/mps_reader.h" +#include "ortools/lp_data/mps_reader.h" #include #include @@ -20,18 +20,18 @@ #include #include -#include "base/callback.h" -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/filelinereader.h" -#include "base/numbers.h" // for safe_strtod -#include "base/split.h" -#include "base/strutil.h" -#include "base/map_util.h" // for FindOrNull, FindWithDefault -#include "lp_data/lp_print_utils.h" -#include "base/status.h" +#include "ortools/base/callback.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/filelinereader.h" +#include "ortools/base/numbers.h" // for safe_strtod +#include "ortools/base/split.h" +#include "ortools/base/strutil.h" +#include "ortools/base/map_util.h" // for FindOrNull, FindWithDefault +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/base/status.h" DEFINE_bool(mps_free_form, false, "Read MPS files in free form."); DEFINE_bool(mps_stop_after_first_error, true, "Stop after the first error."); diff --git a/src/lp_data/mps_reader.h b/ortools/lp_data/mps_reader.h similarity index 94% rename from src/lp_data/mps_reader.h rename to ortools/lp_data/mps_reader.h index a502bd6427..20418e1e04 100644 --- a/src/lp_data/mps_reader.h +++ b/ortools/lp_data/mps_reader.h @@ -26,18 +26,18 @@ #define OR_TOOLS_LP_DATA_MPS_READER_H_ #include // for max -#include "base/hash.h" +#include "ortools/base/hash.h" #include // for std::string #include // for vector -#include "base/macros.h" // for DISALLOW_COPY_AND_ASSIGN, NULL -#include "base/stringprintf.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/map_util.h" // for FindOrNull, FindWithDefault -#include "base/hash.h" -#include "lp_data/lp_data.h" -#include "lp_data/lp_types.h" +#include "ortools/base/macros.h" // for DISALLOW_COPY_AND_ASSIGN, NULL +#include "ortools/base/stringprintf.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/map_util.h" // for FindOrNull, FindWithDefault +#include "ortools/base/hash.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/permutation.h b/ortools/lp_data/permutation.h similarity index 98% rename from src/lp_data/permutation.h rename to ortools/lp_data/permutation.h index 637b4d0434..fc70136955 100644 --- a/src/lp_data/permutation.h +++ b/ortools/lp_data/permutation.h @@ -15,8 +15,8 @@ #ifndef OR_TOOLS_LP_DATA_PERMUTATION_H_ #define OR_TOOLS_LP_DATA_PERMUTATION_H_ -#include "lp_data/lp_types.h" -#include "util/return_macros.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/util/return_macros.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/proto_utils.cc b/ortools/lp_data/proto_utils.cc similarity index 98% rename from src/lp_data/proto_utils.cc rename to ortools/lp_data/proto_utils.cc index 94cb311b23..e3e01dc6b3 100644 --- a/src/lp_data/proto_utils.cc +++ b/ortools/lp_data/proto_utils.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lp_data/proto_utils.h" +#include "ortools/lp_data/proto_utils.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/proto_utils.h b/ortools/lp_data/proto_utils.h similarity index 92% rename from src/lp_data/proto_utils.h rename to ortools/lp_data/proto_utils.h index c5db7f2056..0ad04e08a1 100644 --- a/src/lp_data/proto_utils.h +++ b/ortools/lp_data/proto_utils.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_LP_DATA_PROTO_UTILS_H_ #define OR_TOOLS_LP_DATA_PROTO_UTILS_H_ -#include "linear_solver/linear_solver.pb.h" -#include "lp_data/lp_data.h" +#include "ortools/linear_solver/linear_solver.pb.h" +#include "ortools/lp_data/lp_data.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse.cc b/ortools/lp_data/sparse.cc similarity index 99% rename from src/lp_data/sparse.cc rename to ortools/lp_data/sparse.cc index 43c81276d0..2b60b5c9ab 100644 --- a/src/lp_data/sparse.cc +++ b/ortools/lp_data/sparse.cc @@ -12,11 +12,11 @@ // limitations under the License. -#include "lp_data/sparse.h" +#include "ortools/lp_data/sparse.h" #include -#include "base/stringprintf.h" -#include "base/join.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/join.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse.h b/ortools/lp_data/sparse.h similarity index 99% rename from src/lp_data/sparse.h rename to ortools/lp_data/sparse.h index 011651fd59..7b097b23f1 100644 --- a/src/lp_data/sparse.h +++ b/ortools/lp_data/sparse.h @@ -31,11 +31,11 @@ #include -#include "base/integral_types.h" -#include "lp_data/lp_types.h" -#include "lp_data/permutation.h" -#include "lp_data/sparse_column.h" -#include "util/return_macros.h" +#include "ortools/base/integral_types.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/permutation.h" +#include "ortools/lp_data/sparse_column.h" +#include "ortools/util/return_macros.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse_column.cc b/ortools/lp_data/sparse_column.cc similarity index 94% rename from src/lp_data/sparse_column.cc rename to ortools/lp_data/sparse_column.cc index 1123f36c9e..4b84a351c1 100644 --- a/src/lp_data/sparse_column.cc +++ b/ortools/lp_data/sparse_column.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lp_data/sparse_column.h" +#include "ortools/lp_data/sparse_column.h" #include -#include "base/stringprintf.h" -#include "lp_data/lp_types.h" +#include "ortools/base/stringprintf.h" +#include "ortools/lp_data/lp_types.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse_column.h b/ortools/lp_data/sparse_column.h similarity index 99% rename from src/lp_data/sparse_column.h rename to ortools/lp_data/sparse_column.h index 08e349730f..eadb8dab1c 100644 --- a/src/lp_data/sparse_column.h +++ b/ortools/lp_data/sparse_column.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_LP_DATA_SPARSE_COLUMN_H_ #define OR_TOOLS_LP_DATA_SPARSE_COLUMN_H_ -#include "lp_data/sparse_vector.h" +#include "ortools/lp_data/sparse_vector.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse_row.h b/ortools/lp_data/sparse_row.h similarity index 98% rename from src/lp_data/sparse_row.h rename to ortools/lp_data/sparse_row.h index 44cc228d87..043fbd1eb5 100644 --- a/src/lp_data/sparse_row.h +++ b/ortools/lp_data/sparse_row.h @@ -14,7 +14,7 @@ #ifndef OR_TOOLS_LP_DATA_SPARSE_ROW_H_ #define OR_TOOLS_LP_DATA_SPARSE_ROW_H_ -#include "lp_data/sparse_vector.h" +#include "ortools/lp_data/sparse_vector.h" namespace operations_research { namespace glop { diff --git a/src/lp_data/sparse_vector.h b/ortools/lp_data/sparse_vector.h similarity index 99% rename from src/lp_data/sparse_vector.h rename to ortools/lp_data/sparse_vector.h index ce402f2ae5..1f6302a138 100644 --- a/src/lp_data/sparse_vector.h +++ b/ortools/lp_data/sparse_vector.h @@ -35,13 +35,13 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" // for CHECK* -#include "base/stringprintf.h" -#include "lp_data/lp_types.h" -#include "lp_data/permutation.h" -#include "util/iterators.h" -#include "util/return_macros.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" // for CHECK* +#include "ortools/base/stringprintf.h" +#include "ortools/lp_data/lp_types.h" +#include "ortools/lp_data/permutation.h" +#include "ortools/util/iterators.h" +#include "ortools/util/return_macros.h" namespace operations_research { namespace glop { diff --git a/src/sat/BUILD b/ortools/sat/BUILD similarity index 100% rename from src/sat/BUILD rename to ortools/sat/BUILD diff --git a/src/sat/boolean_problem.cc b/ortools/sat/boolean_problem.cc similarity index 98% rename from src/sat/boolean_problem.cc rename to ortools/sat/boolean_problem.cc index 3a2c6728d4..b916a537b6 100644 --- a/src/sat/boolean_problem.cc +++ b/ortools/sat/boolean_problem.cc @@ -11,18 +11,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/boolean_problem.h" +#include "ortools/sat/boolean_problem.h" -#include "base/hash.h" +#include "ortools/base/hash.h" -#include "base/commandlineflags.h" -#include "base/join.h" -#include "base/map_util.h" -#include "base/hash.h" -#include "algorithms/find_graph_symmetries.h" -#include "graph/graph.h" -#include "graph/io.h" -#include "graph/util.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/join.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" +#include "ortools/algorithms/find_graph_symmetries.h" +#include "ortools/graph/graph.h" +#include "ortools/graph/io.h" +#include "ortools/graph/util.h" DEFINE_string(debug_dump_symmetry_graph_to_file, "", "If this flag is non-empty, an undirected graph whose" diff --git a/src/sat/boolean_problem.h b/ortools/sat/boolean_problem.h similarity index 96% rename from src/sat/boolean_problem.h rename to ortools/sat/boolean_problem.h index e40b8fe860..8ab4325572 100644 --- a/src/sat/boolean_problem.h +++ b/ortools/sat/boolean_problem.h @@ -14,11 +14,11 @@ #ifndef OR_TOOLS_SAT_BOOLEAN_PROBLEM_H_ #define OR_TOOLS_SAT_BOOLEAN_PROBLEM_H_ -#include "algorithms/sparse_permutation.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" -#include "sat/simplification.h" -#include "base/status.h" +#include "ortools/algorithms/sparse_permutation.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/sat/simplification.h" +#include "ortools/base/status.h" namespace operations_research { namespace sat { diff --git a/src/sat/boolean_problem.proto b/ortools/sat/boolean_problem.proto similarity index 100% rename from src/sat/boolean_problem.proto rename to ortools/sat/boolean_problem.proto diff --git a/src/sat/clause.cc b/ortools/sat/clause.cc similarity index 99% rename from src/sat/clause.cc rename to ortools/sat/clause.cc index abe7631e5e..42691a6330 100644 --- a/src/sat/clause.cc +++ b/ortools/sat/clause.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/clause.h" +#include "ortools/sat/clause.h" #include #include @@ -19,12 +19,12 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/sysinfo.h" -#include "base/join.h" -#include "base/stl_util.h" -#include "util/time_limit.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/sysinfo.h" +#include "ortools/base/join.h" +#include "ortools/base/stl_util.h" +#include "ortools/util/time_limit.h" namespace operations_research { namespace sat { diff --git a/src/sat/clause.h b/ortools/sat/clause.h similarity index 97% rename from src/sat/clause.h rename to ortools/sat/clause.h index f0d8b3b46d..bdde9d2c57 100644 --- a/src/sat/clause.h +++ b/ortools/sat/clause.h @@ -18,24 +18,24 @@ #define OR_TOOLS_SAT_CLAUSE_H_ #include -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/hash.h" -#include "sat/sat_base.h" -#include "sat/sat_parameters.pb.h" -#include "util/bitset.h" -#include "util/stats.h" -#include "base/random.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/hash.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_parameters.pb.h" +#include "ortools/util/bitset.h" +#include "ortools/util/stats.h" +#include "ortools/base/random.h" namespace operations_research { namespace sat { diff --git a/src/sat/cp_constraints.cc b/ortools/sat/cp_constraints.cc similarity index 99% rename from src/sat/cp_constraints.cc rename to ortools/sat/cp_constraints.cc index 911a647bc8..af2d6f43af 100644 --- a/src/sat/cp_constraints.cc +++ b/ortools/sat/cp_constraints.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/cp_constraints.h" -#include "util/sort.h" +#include "ortools/sat/cp_constraints.h" +#include "ortools/util/sort.h" -#include "base/map_util.h" +#include "ortools/base/map_util.h" namespace operations_research { namespace sat { diff --git a/src/sat/cp_constraints.h b/ortools/sat/cp_constraints.h similarity index 99% rename from src/sat/cp_constraints.h rename to ortools/sat/cp_constraints.h index 655d1aa608..98fe796f31 100644 --- a/src/sat/cp_constraints.h +++ b/ortools/sat/cp_constraints.h @@ -16,9 +16,9 @@ #include -#include "sat/integer.h" -#include "sat/model.h" -#include "util/sorted_interval_list.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/util/sorted_interval_list.h" namespace operations_research { namespace sat { diff --git a/src/sat/cumulative.cc b/ortools/sat/cumulative.cc similarity index 97% rename from src/sat/cumulative.cc rename to ortools/sat/cumulative.cc index 67eba2ae25..ac753e5901 100644 --- a/src/sat/cumulative.cc +++ b/ortools/sat/cumulative.cc @@ -11,15 +11,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/cumulative.h" +#include "ortools/sat/cumulative.h" #include -#include "sat/disjunctive.h" -#include "sat/overload_checker.h" -#include "sat/sat_solver.h" -#include "sat/timetable.h" -#include "sat/timetable_edgefinding.h" +#include "ortools/sat/disjunctive.h" +#include "ortools/sat/overload_checker.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/sat/timetable.h" +#include "ortools/sat/timetable_edgefinding.h" namespace operations_research { namespace sat { diff --git a/src/sat/cumulative.h b/ortools/sat/cumulative.h similarity index 94% rename from src/sat/cumulative.h rename to ortools/sat/cumulative.h index feda168b0c..bbe2f29c78 100644 --- a/src/sat/cumulative.h +++ b/ortools/sat/cumulative.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_SAT_CUMULATIVE_H_ #define OR_TOOLS_SAT_CUMULATIVE_H_ -#include "sat/integer.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/disjunctive.cc b/ortools/sat/disjunctive.cc similarity index 86% rename from src/sat/disjunctive.cc rename to ortools/sat/disjunctive.cc index 5f1761e76b..1119f0fc82 100644 --- a/src/sat/disjunctive.cc +++ b/ortools/sat/disjunctive.cc @@ -11,10 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/disjunctive.h" +#include "ortools/sat/disjunctive.h" -//#include "base/iterator_adaptors.h" -#include "sat/sat_solver.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { @@ -189,73 +188,104 @@ IntegerValue TaskSet::ComputeEndMin(int task_to_ignore, return min_end; } +// TODO(user): Improve the Overload Checker using delayed insertion. +// We insert events at the cost of O(log n) per insertion, and this is where +// the algorithm spends most of its time, thus it is worth improving. +// We can insert an arbitrary set of tasks at the cost of O(n) for the whole +// set. This is useless for the overload checker as is since we need to check +// overload after every insertion, but we could use an upper bound of the +// theta envelope to save us from checking the actual value. bool DisjunctiveOverloadChecker::Propagate() { helper_->SetTimeDirection(time_direction_); - task_set_.Clear(); + + // Set up theta tree. + start_event_to_task_.clear(); + start_event_time_.clear(); + start_event_duration_.clear(); + int num_events = 0; + for (const auto task_time : helper_->TaskByIncreasingStartMin()) { + const int task = task_time.task_index; + // TODO(user): Add max energy deduction for variable durations. + // Those would take into account tasks with DurationMin(task) == 0. + if (helper_->IsAbsent(task) || helper_->DurationMin(task) == 0) { + task_to_start_event_[task] = -1; + continue; + } + start_event_to_task_.push_back(task); + start_event_time_.push_back(task_time.time); + start_event_duration_.push_back(helper_->DurationMin(task)); + task_to_start_event_[task] = num_events; + num_events++; + } + theta_tree_.Reset(start_event_time_, start_event_duration_); + + // Overload checker loop. for (auto it = helper_->TaskByDecreasingEndMax().rbegin(); it != helper_->TaskByDecreasingEndMax().rend(); ++it) { const auto& task_time = *it; - const int t = task_time.task_index; - if (helper_->IsPresent(t)) { - task_set_.AddEntry({t, helper_->StartMin(t), helper_->DurationMin(t)}); - } - int critical_index = 0; - const IntegerValue min_end_of_critical_tasks = - task_set_.ComputeEndMin(/*task_to_ignore=*/-1, &critical_index); - const std::vector& sorted_tasks = task_set_.SortedTasks(); - - // Check if we can detect that this optional task can't be executed. - // TODO(user): This test doesn't detect all the cases. A better way to do - // it would be like in the EdgeFindingPass() with the concept of gray tasks. - if (!helper_->IsPresent(t) && !helper_->IsAbsent(t) && - !sorted_tasks.empty()) { - const IntegerValue critical_start = - sorted_tasks[critical_index].min_start; - if (helper_->EndMin(t) <= critical_start) continue; - const IntegerValue new_min_end = CapAdd( - min_end_of_critical_tasks, - helper_->StartMin(t) >= critical_start - ? helper_->DurationMin(t) - : helper_->EndMin(t) - critical_start /* cannot overflow */); - if (new_min_end > helper_->EndMax(t)) { - // TODO(user): This could be done lazily, like most of the loop to - // compute the reasons in this file. - helper_->ClearReason(); - const IntegerValue window_start = - std::min(helper_->StartMin(t), critical_start); - const IntegerValue window_end = new_min_end - 1; - for (int i = critical_index; i < sorted_tasks.size(); ++i) { - const int ct = sorted_tasks[i].task; - helper_->AddPresenceReason(ct); - helper_->AddDurationMinReason(ct); - helper_->AddStartMinReason(ct, window_start); - helper_->AddEndMaxReason(ct, window_end); - } - helper_->AddDurationMinReason(t); - helper_->AddStartMinReason(t, window_start); - helper_->AddEndMaxReason(t, window_end); - - helper_->PushTaskAbsence(t); - continue; - } + const int current_task = task_time.task_index; + if (task_to_start_event_[current_task] == -1) { + continue; + } else if (helper_->IsPresent(current_task)) { + theta_tree_.AddEvent(task_to_start_event_[current_task]); + } else { + theta_tree_.AddOptionalEvent(task_to_start_event_[current_task]); } - // Overload checking. - if (min_end_of_critical_tasks > helper_->EndMax(t)) { - DCHECK(helper_->IsPresent(t)); + const IntegerValue current_end = task_time.time; + if (theta_tree_.GetEnvelope() > current_end) { + // Explain failure with tasks in critical interval. helper_->ClearReason(); + const int critical_event = + theta_tree_.GetRightmostEventWithEnvelopeGreaterOrEqualTo( + current_end + 1); + const IntegerValue window_start = start_event_time_[critical_event]; + const IntegerValue window_end = + theta_tree_.GetEnvelopeOf(critical_event) - 1; - const IntegerValue window_start = sorted_tasks[critical_index].min_start; - const IntegerValue window_end = min_end_of_critical_tasks - 1; - for (int i = critical_index; i < sorted_tasks.size(); ++i) { - const int ct = sorted_tasks[i].task; - helper_->AddPresenceReason(ct); - helper_->AddDurationMinReason(ct); - helper_->AddStartMinReason(ct, window_start); - helper_->AddEndMaxReason(ct, window_end); + for (int event = critical_event; event < num_events; event++) { + if (theta_tree_.IsPresent(event)) { + const int task = start_event_to_task_[event]; + helper_->AddPresenceReason(task); + helper_->AddDurationMinReason(task); + helper_->AddStartMinReason(task, window_start); + helper_->AddEndMaxReason(task, window_end); + } } return helper_->ReportConflict(); } + + // Exclude all optional tasks that would overload an interval ending here. + while (theta_tree_.GetOptionalEnvelope() > current_end) { + // Explain exclusion with tasks present in the critical interval. + // TODO(user): This could be done lazily, like most of the loop to + // compute the reasons in this file. + helper_->ClearReason(); + const int critical_event = + theta_tree_.GetEventRealizingOptionalEnvelope(); + const IntegerValue window_start = start_event_time_[critical_event]; + const IntegerValue window_end = theta_tree_.GetOptionalEnvelope() - 1; + + for (int event = critical_event; event < num_events; event++) { + if (theta_tree_.IsPresent(event)) { + const int task = start_event_to_task_[event]; + helper_->AddPresenceReason(task); + helper_->AddDurationMinReason(task); + helper_->AddStartMinReason(task, window_start); + helper_->AddEndMaxReason(task, window_end); + } + } + + const int optional_event = + theta_tree_.GetOptionalEventRealizingOptionalEnvelope(); + const int optional_task = start_event_to_task_[optional_event]; + helper_->AddDurationMinReason(optional_task); + helper_->AddStartMinReason(optional_task, window_start); + helper_->AddEndMaxReason(optional_task, window_end); + + helper_->PushTaskAbsence(optional_task); // This never fails. + theta_tree_.RemoveEvent(optional_event); + } } return true; } @@ -428,8 +458,8 @@ bool DisjunctiveNotLast::Propagate() { task_set_.Clear(); for (auto it = helper_->TaskByDecreasingEndMax().rbegin(); - it != helper_->TaskByDecreasingEndMax().rend(); ++it) { - const auto& task_time = *it; + it != helper_->TaskByDecreasingEndMax().rend(); ++it) { + const auto& task_time = *it; const int t = task_time.task_index; const IntegerValue max_end = task_time.time; diff --git a/src/sat/disjunctive.h b/ortools/sat/disjunctive.h similarity index 92% rename from src/sat/disjunctive.h rename to ortools/sat/disjunctive.h index 10a44ee4d6..1df71ecc75 100644 --- a/src/sat/disjunctive.h +++ b/ortools/sat/disjunctive.h @@ -14,12 +14,13 @@ #ifndef OR_TOOLS_SAT_DISJUNCTIVE_H_ #define OR_TOOLS_SAT_DISJUNCTIVE_H_ -#include "sat/integer.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/precedences.h" -#include "sat/sat_base.h" -#include "util/stats.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/theta_tree.h" +#include "ortools/util/stats.h" namespace operations_research { namespace sat { @@ -121,14 +122,21 @@ class DisjunctiveOverloadChecker : public PropagatorInterface { public: DisjunctiveOverloadChecker(bool time_direction, SchedulingConstraintHelper* helper) - : time_direction_(time_direction), helper_(helper) {} + : time_direction_(time_direction), helper_(helper), theta_tree_() { + // Resize this once and for all. + task_to_start_event_.resize(helper_->NumTasks()); + } bool Propagate() final; int RegisterWith(GenericLiteralWatcher* watcher); private: const bool time_direction_; SchedulingConstraintHelper* helper_; - TaskSet task_set_; + ThetaLambdaTree theta_tree_; + std::vector task_to_start_event_; + std::vector start_event_to_task_; + std::vector start_event_time_; + std::vector start_event_duration_; }; class DisjunctiveDetectablePrecedences : public PropagatorInterface { diff --git a/src/sat/drat.cc b/ortools/sat/drat.cc similarity index 97% rename from src/sat/drat.cc rename to ortools/sat/drat.cc index e454874bff..e08f5f7d0f 100644 --- a/src/sat/drat.cc +++ b/ortools/sat/drat.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/drat.h" +#include "ortools/sat/drat.h" -#include "base/commandlineflags.h" +#include "ortools/base/commandlineflags.h" DEFINE_string( drat_output, "", diff --git a/src/sat/drat.h b/ortools/sat/drat.h similarity index 97% rename from src/sat/drat.h rename to ortools/sat/drat.h index c6467d9e5a..d751773408 100644 --- a/src/sat/drat.h +++ b/ortools/sat/drat.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_SAT_DRAT_H_ #define OR_TOOLS_SAT_DRAT_H_ -#include "base/file.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/base/file.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/encoding.cc b/ortools/sat/encoding.cc similarity index 99% rename from src/sat/encoding.cc rename to ortools/sat/encoding.cc index 2483a40d71..3a7e45c42f 100644 --- a/src/sat/encoding.cc +++ b/ortools/sat/encoding.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/encoding.h" +#include "ortools/sat/encoding.h" #include #include diff --git a/src/sat/encoding.h b/ortools/sat/encoding.h similarity index 99% rename from src/sat/encoding.h rename to ortools/sat/encoding.h index 1eb39adfd8..d41d2d44e0 100644 --- a/src/sat/encoding.h +++ b/ortools/sat/encoding.h @@ -18,8 +18,8 @@ #ifndef OR_TOOLS_SAT_ENCODING_H_ #define OR_TOOLS_SAT_ENCODING_H_ -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { diff --git a/src/sat/flow_costs.cc b/ortools/sat/flow_costs.cc similarity index 99% rename from src/sat/flow_costs.cc rename to ortools/sat/flow_costs.cc index 4b95f538b3..e446219ccb 100644 --- a/src/sat/flow_costs.cc +++ b/ortools/sat/flow_costs.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/flow_costs.h" +#include "ortools/sat/flow_costs.h" #include #include diff --git a/src/sat/flow_costs.h b/ortools/sat/flow_costs.h similarity index 97% rename from src/sat/flow_costs.h rename to ortools/sat/flow_costs.h index d32600b03a..1882689397 100644 --- a/src/sat/flow_costs.h +++ b/ortools/sat/flow_costs.h @@ -16,10 +16,10 @@ #include -#include "linear_solver/linear_solver.h" -#include "sat/integer.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/linear_solver/linear_solver.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/integer.cc b/ortools/sat/integer.cc similarity index 99% rename from src/sat/integer.cc rename to ortools/sat/integer.cc index e07094dd9e..63ed8a607b 100644 --- a/src/sat/integer.cc +++ b/ortools/sat/integer.cc @@ -11,10 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/integer.h" +#include "ortools/sat/integer.h" -//#include "base/iterator_adaptors.h" -#include "base/stl_util.h" +#include "ortools/base/stl_util.h" namespace operations_research { namespace sat { @@ -422,7 +421,7 @@ IntegerVariable IntegerTrail::AddIntegerVariable( // Copy for the negated variable. var_to_current_lb_interval_index_.Set(NegationOf(var), all_intervals_.size()); - for (int i = domain.size() - 1; i >= 0; --i) { +for (int i = domain.size() - 1; i >= 0; --i) { const ClosedInterval interval = domain[i]; all_intervals_.push_back({-interval.end, -interval.start}); } diff --git a/src/sat/integer.h b/ortools/sat/integer.h similarity index 98% rename from src/sat/integer.h rename to ortools/sat/integer.h index 84f2adb86f..643c8a1a0c 100644 --- a/src/sat/integer.h +++ b/ortools/sat/integer.h @@ -17,19 +17,19 @@ #include #include -#include "base/port.h" -#include "base/logging.h" -#include "base/join.h" -#include "base/int_type.h" -#include "base/map_util.h" -#include "sat/model.h" -#include "sat/sat_base.h" -#include "sat/sat_solver.h" -#include "util/bitset.h" -#include "util/iterators.h" -#include "util/rev.h" -#include "util/saturated_arithmetic.h" -#include "util/sorted_interval_list.h" +#include "ortools/base/port.h" +#include "ortools/base/logging.h" +#include "ortools/base/join.h" +#include "ortools/base/int_type.h" +#include "ortools/base/map_util.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/bitset.h" +#include "ortools/util/iterators.h" +#include "ortools/util/rev.h" +#include "ortools/util/saturated_arithmetic.h" +#include "ortools/util/sorted_interval_list.h" namespace operations_research { namespace sat { @@ -506,7 +506,7 @@ class IntegerTrail : public SatPropagator { } // Returns true if the variable lower bound is still the one from level zero. - bool VariableLowerBoundIsFixed(IntegerVariable var) const { + bool VariableLowerBoundIsFromLevelZero(IntegerVariable var) const { return vars_[var.value()].current_trail_index < vars_.size(); } @@ -667,7 +667,7 @@ class PropagatorInterface { // indices of the literals modified after the registration will be present. virtual bool IncrementalPropagate(const std::vector& watch_indices) { LOG(FATAL) << "Not implemented."; - return false; + return false; // Remove warning in Windows } }; diff --git a/src/sat/integer_expr.cc b/ortools/sat/integer_expr.cc similarity index 87% rename from src/sat/integer_expr.cc rename to ortools/sat/integer_expr.cc index 1597b45d73..ff76e18ab8 100644 --- a/src/sat/integer_expr.cc +++ b/ortools/sat/integer_expr.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/integer_expr.h" +#include "ortools/sat/integer_expr.h" namespace operations_research { namespace sat { @@ -23,10 +23,10 @@ IntegerSumLE::IntegerSumLE(LiteralIndex reified_literal, IntegerTrail* integer_trail) : reified_literal_(reified_literal), upper_bound_(upper), - vars_(vars), - coeffs_(coeffs), trail_(trail), - integer_trail_(integer_trail) { + integer_trail_(integer_trail), + vars_(vars), + coeffs_(coeffs) { // TODO(user): deal with this corner case. CHECK(!vars_.empty()); @@ -43,14 +43,19 @@ IntegerSumLE::IntegerSumLE(LiteralIndex reified_literal, if (reified_literal_ != kNoLiteralIndex) { literal_reason_.push_back(Literal(reified_literal_).Negated()); } + + index_in_integer_reason_.resize(vars_.size()); + + // Initialize the reversible numbers. + rev_num_fixed_vars_ = 0; + rev_lb_fixed_vars_ = IntegerValue(0); } void IntegerSumLE::FillIntegerReason() { integer_reason_.clear(); - index_in_integer_reason_.resize(vars_.size(), -1); for (int i = 0; i < vars_.size(); ++i) { const IntegerVariable var = vars_[i]; - if (integer_trail_->VariableLowerBoundIsFixed(var)) { + if (integer_trail_->VariableLowerBoundIsFromLevelZero(var)) { index_in_integer_reason_[i] = -1; } else { index_in_integer_reason_[i] = integer_reason_.size(); @@ -66,11 +71,28 @@ bool IntegerSumLE::Propagate() { return true; } - IntegerValue new_lb(0); - for (int i = 0; i < vars_.size(); ++i) { - new_lb += integer_trail_->LowerBound(vars_[i]) * coeffs_[i]; + // Save the current number of fixed variables. + rev_repository_integer_value_.SaveState(&rev_lb_fixed_vars_); + + // Compute the new lower bound and update the reversible structures. + IntegerValue lb_unfixed_vars = IntegerValue(0); + for (int i = rev_num_fixed_vars_; i < vars_.size(); ++i) { + const IntegerVariable var = vars_[i]; + const IntegerValue coeff = coeffs_[i]; + const IntegerValue lb = integer_trail_->LowerBound(var); + if (lb != integer_trail_->UpperBound(var)) { + lb_unfixed_vars += lb * coeff; + } else { + // Update the set of fixed variables. + std::swap(vars_[i], vars_[rev_num_fixed_vars_]); + std::swap(coeffs_[i], coeffs_[rev_num_fixed_vars_]); + rev_num_fixed_vars_++; + rev_lb_fixed_vars_ += lb * coeff; + } } + const IntegerValue new_lb = rev_lb_fixed_vars_ + lb_unfixed_vars; + // Conflict? const IntegerValue slack = upper_bound_ - new_lb; if (slack < 0) { @@ -99,17 +121,20 @@ bool IntegerSumLE::Propagate() { // The lower bound of all the variables minus one can be used to update the // upper bound of the last one. - for (int i = 0; i < vars_.size(); ++i) { + for (int i = rev_num_fixed_vars_; i < vars_.size(); ++i) { const IntegerVariable var = vars_[i]; + const IntegerValue coeff = coeffs_[i]; const IntegerValue var_slack = integer_trail_->UpperBound(var) - integer_trail_->LowerBound(var); - if (var_slack * coeffs_[i] > slack) { + if (var_slack * coeff > slack) { if (first_push) { first_push = false; FillIntegerReason(); } - // We need to remove the entry index from the reason temporarily. + // We need to remove the entry index from the reason temporarily. This is + // OK with the reversible aspect of integer_reason_ because fixed + // variables will never be swapped. IntegerLiteral saved; const int index = index_in_integer_reason_[i]; if (index >= 0) { @@ -119,7 +144,7 @@ bool IntegerSumLE::Propagate() { } const IntegerValue new_ub = - integer_trail_->LowerBound(var) + slack / coeffs_[i]; + integer_trail_->LowerBound(var) + slack / coeff; if (!integer_trail_->Enqueue(IntegerLiteral::LowerOrEqual(var, new_ub), literal_reason_, integer_reason_)) { return false; @@ -146,6 +171,8 @@ void IntegerSumLE::RegisterWith(GenericLiteralWatcher* watcher) { // We only watch the true direction. watcher->WatchLiteral(Literal(reified_literal_), id); } + watcher->RegisterReversibleInt(id, &rev_num_fixed_vars_); + watcher->RegisterReversibleClass(id, &rev_repository_integer_value_); } MinPropagator::MinPropagator(const std::vector& vars, @@ -239,9 +266,9 @@ void MinPropagator::RegisterWith(GenericLiteralWatcher* watcher) { watcher->WatchUpperBound(min_var_, id); } -ProductPropagator::ProductPropagator(IntegerVariable a, IntegerVariable b, - IntegerVariable p, - IntegerTrail* integer_trail) +PositiveProductPropagator::PositiveProductPropagator( + IntegerVariable a, IntegerVariable b, IntegerVariable p, + IntegerTrail* integer_trail) : a_(a), b_(b), p_(p), integer_trail_(integer_trail) {} namespace { @@ -262,7 +289,7 @@ IntegerValue MinValue(IntegerValue b, IntegerValue p) { } // namespace -bool ProductPropagator::Propagate() { +bool PositiveProductPropagator::Propagate() { // Copy because we will swap them. IntegerVariable a = a_; IntegerVariable b = b_; @@ -338,7 +365,7 @@ bool ProductPropagator::Propagate() { return true; } -void ProductPropagator::RegisterWith(GenericLiteralWatcher* watcher) { +void PositiveProductPropagator::RegisterWith(GenericLiteralWatcher* watcher) { const int id = watcher->Register(this); watcher->WatchIntegerVariable(a_, id); watcher->WatchIntegerVariable(b_, id); diff --git a/src/sat/integer_expr.h b/ortools/sat/integer_expr.h similarity index 90% rename from src/sat/integer_expr.h rename to ortools/sat/integer_expr.h index afd2d686b9..e73634638a 100644 --- a/src/sat/integer_expr.h +++ b/ortools/sat/integer_expr.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_SAT_INTEGER_EXPR_H_ #define OR_TOOLS_SAT_INTEGER_EXPR_H_ -#include "sat/integer.h" -#include "sat/model.h" -#include "sat/precedences.h" -#include "sat/sat_base.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { @@ -63,11 +63,24 @@ class IntegerSumLE : public PropagatorInterface { const LiteralIndex reified_literal_; // kNoLiteralIndex if not reified. const IntegerValue upper_bound_; - std::vector vars_; - std::vector coeffs_; + Trail* trail_; IntegerTrail* integer_trail_; + RevRepository rev_repository_integer_value_; + + // Reversible sum of the lower bound of the fixed variables. + IntegerValue rev_lb_fixed_vars_; + + // Reversible number of fixed variables. + int rev_num_fixed_vars_; + + // Those vectors are shuffled during search to ensure that the variables + // (resp. coefficients) contained in the range [0, rev_num_fixed_vars_) of + // vars_ (resp. coeffs_) are fixed (resp. belong to fixed variables). + std::vector vars_; + std::vector coeffs_; + std::vector literal_reason_; std::vector integer_reason_; std::vector index_in_integer_reason_; @@ -122,10 +135,10 @@ class MinPropagator : public PropagatorInterface { // // TODO(user): For now this only works on variables that are non-negative. // TODO(user): Deal with overflow. -class ProductPropagator : public PropagatorInterface { +class PositiveProductPropagator : public PropagatorInterface { public: - ProductPropagator(IntegerVariable a, IntegerVariable b, IntegerVariable p, - IntegerTrail* integer_trail); + PositiveProductPropagator(IntegerVariable a, IntegerVariable b, + IntegerVariable p, IntegerTrail* integer_trail); bool Propagate() final; void RegisterWith(GenericLiteralWatcher* watcher); @@ -136,7 +149,7 @@ class ProductPropagator : public PropagatorInterface { const IntegerVariable p_; IntegerTrail* integer_trail_; - DISALLOW_COPY_AND_ASSIGN(ProductPropagator); + DISALLOW_COPY_AND_ASSIGN(PositiveProductPropagator); }; // Propagates a / b = c. Basic version, we don't extract any special cases, and @@ -476,16 +489,38 @@ inline std::function IsOneOf( }; } +template +void RegisterAndTransferOwnership(Model* model, T* ct) { + ct->RegisterWith(model->GetOrCreate()); + model->TakeOwnership(ct); +} // Adds the constraint: a * b = p. inline std::function ProductConstraint(IntegerVariable a, IntegerVariable b, IntegerVariable p) { return [=](Model* model) { IntegerTrail* integer_trail = model->GetOrCreate(); - ProductPropagator* constraint = - new ProductPropagator(a, b, p, integer_trail); - constraint->RegisterWith(model->GetOrCreate()); - model->TakeOwnership(constraint); + if (model->Get(LowerBound(a)) >= 0 && model->Get(LowerBound(b)) >= 0) { + RegisterAndTransferOwnership( + model, new PositiveProductPropagator(a, b, p, integer_trail)); + } else if (model->Get(LowerBound(a)) >= 0 && + model->Get(UpperBound(b)) <= 0) { + RegisterAndTransferOwnership( + model, new PositiveProductPropagator(a, NegationOf(b), NegationOf(p), + integer_trail)); + } else if (model->Get(UpperBound(a)) <= 0 && + model->Get(LowerBound(b)) >= 0) { + RegisterAndTransferOwnership( + model, new PositiveProductPropagator(NegationOf(a), b, NegationOf(p), + integer_trail)); + } else if (model->Get(UpperBound(a)) <= 0 && + model->Get(UpperBound(b)) <= 0) { + RegisterAndTransferOwnership( + model, new PositiveProductPropagator(NegationOf(a), NegationOf(b), p, + integer_trail)); + } else { + LOG(FATAL) << "Not supported"; + } }; } diff --git a/src/sat/intervals.cc b/ortools/sat/intervals.cc similarity index 99% rename from src/sat/intervals.cc rename to ortools/sat/intervals.cc index 31d52b72b7..01916a9bd2 100644 --- a/src/sat/intervals.cc +++ b/ortools/sat/intervals.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/intervals.h" +#include "ortools/sat/intervals.h" -#include "util/sort.h" +#include "ortools/util/sort.h" namespace operations_research { namespace sat { diff --git a/src/sat/intervals.h b/ortools/sat/intervals.h similarity index 98% rename from src/sat/intervals.h rename to ortools/sat/intervals.h index 1b3a95e4c9..a6bcd808b3 100644 --- a/src/sat/intervals.h +++ b/ortools/sat/intervals.h @@ -14,13 +14,13 @@ #ifndef OR_TOOLS_SAT_INTERVALS_H_ #define OR_TOOLS_SAT_INTERVALS_H_ -#include "sat/cp_constraints.h" -#include "sat/integer.h" -#include "sat/integer_expr.h" -#include "sat/model.h" -#include "sat/precedences.h" -#include "sat/sat_base.h" -#include "sat/sat_solver.h" +#include "ortools/sat/cp_constraints.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/integer_expr.h" +#include "ortools/sat/model.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { diff --git a/src/sat/linear_programming_constraint.cc b/ortools/sat/linear_programming_constraint.cc similarity index 99% rename from src/sat/linear_programming_constraint.cc rename to ortools/sat/linear_programming_constraint.cc index 5a9cfd1e35..6a447779a5 100644 --- a/src/sat/linear_programming_constraint.cc +++ b/ortools/sat/linear_programming_constraint.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/linear_programming_constraint.h" +#include "ortools/sat/linear_programming_constraint.h" -#include "base/commandlineflags.h" -#include "util/time_limit.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/util/time_limit.h" // TODO(user): remove the option once we know which algo work best. DEFINE_bool(lp_constraint_use_dual_ray, true, diff --git a/src/sat/linear_programming_constraint.h b/ortools/sat/linear_programming_constraint.h similarity index 97% rename from src/sat/linear_programming_constraint.h rename to ortools/sat/linear_programming_constraint.h index 0ae774fd56..f70b5d0e40 100644 --- a/src/sat/linear_programming_constraint.h +++ b/ortools/sat/linear_programming_constraint.h @@ -17,11 +17,11 @@ #include #include -#include "glop/revised_simplex.h" -#include "lp_data/lp_data.h" -#include "sat/integer.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/glop/revised_simplex.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/lp_utils.cc b/ortools/sat/lp_utils.cc similarity index 98% rename from src/sat/lp_utils.cc rename to ortools/sat/lp_utils.cc index 9ef006b18e..ec54ba8384 100644 --- a/src/sat/lp_utils.cc +++ b/ortools/sat/lp_utils.cc @@ -11,12 +11,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/lp_utils.h" +#include "ortools/sat/lp_utils.h" -#include "glop/lp_solver.h" -#include "lp_data/lp_print_utils.h" -#include "sat/boolean_problem.h" -#include "util/fp_utils.h" +#include "ortools/glop/lp_solver.h" +#include "ortools/lp_data/lp_print_utils.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/util/fp_utils.h" namespace operations_research { namespace sat { diff --git a/src/sat/lp_utils.h b/ortools/sat/lp_utils.h similarity index 93% rename from src/sat/lp_utils.h rename to ortools/sat/lp_utils.h index f1fc086d1c..d845a1e742 100644 --- a/src/sat/lp_utils.h +++ b/ortools/sat/lp_utils.h @@ -16,10 +16,10 @@ #ifndef OR_TOOLS_SAT_LP_UTILS_H_ #define OR_TOOLS_SAT_LP_UTILS_H_ -#include "linear_solver/linear_solver.pb.h" -#include "lp_data/lp_data.h" -#include "sat/boolean_problem.pb.h" -#include "sat/sat_solver.h" +#include "ortools/linear_solver/linear_solver.pb.h" +#include "ortools/lp_data/lp_data.h" +#include "ortools/sat/boolean_problem.pb.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { diff --git a/src/sat/model.h b/ortools/sat/model.h similarity index 98% rename from src/sat/model.h rename to ortools/sat/model.h index fb738c0efe..ad4aae0223 100644 --- a/src/sat/model.h +++ b/ortools/sat/model.h @@ -19,8 +19,8 @@ #include #include -#include "base/map_util.h" -#include "base/typeid.h" +#include "ortools/base/map_util.h" +#include "ortools/base/typeid.h" namespace operations_research { namespace sat { diff --git a/src/sat/no_cycle.cc b/ortools/sat/no_cycle.cc similarity index 99% rename from src/sat/no_cycle.cc rename to ortools/sat/no_cycle.cc index 179663ad17..a90aa2c6df 100644 --- a/src/sat/no_cycle.cc +++ b/ortools/sat/no_cycle.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/no_cycle.h" +#include "ortools/sat/no_cycle.h" #include -#include "base/stl_util.h" +#include "ortools/base/stl_util.h" namespace operations_research { namespace sat { diff --git a/src/sat/no_cycle.h b/ortools/sat/no_cycle.h similarity index 98% rename from src/sat/no_cycle.h rename to ortools/sat/no_cycle.h index f4d22a9b81..3500427ac2 100644 --- a/src/sat/no_cycle.h +++ b/ortools/sat/no_cycle.h @@ -16,9 +16,9 @@ #include -#include "sat/model.h" -#include "sat/sat_base.h" -#include "sat/sat_solver.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { diff --git a/src/sat/optimization.cc b/ortools/sat/optimization.cc similarity index 99% rename from src/sat/optimization.cc rename to ortools/sat/optimization.cc index 7489bf75e9..96fac1d0a1 100644 --- a/src/sat/optimization.cc +++ b/ortools/sat/optimization.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/optimization.h" +#include "ortools/sat/optimization.h" #include #include #include "google/protobuf/descriptor.h" -#include "sat/encoding.h" -#include "sat/util.h" +#include "ortools/sat/encoding.h" +#include "ortools/sat/util.h" namespace operations_research { namespace sat { diff --git a/src/sat/optimization.h b/ortools/sat/optimization.h similarity index 98% rename from src/sat/optimization.h rename to ortools/sat/optimization.h index 15587d67a8..eb6c9a740c 100644 --- a/src/sat/optimization.h +++ b/ortools/sat/optimization.h @@ -19,10 +19,10 @@ #ifndef OR_TOOLS_SAT_OPTIMIZATION_H_ #define OR_TOOLS_SAT_OPTIMIZATION_H_ -#include "sat/boolean_problem.h" -#include "sat/integer.h" -#include "sat/model.h" -#include "sat/sat_solver.h" +#include "ortools/sat/boolean_problem.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_solver.h" namespace operations_research { namespace sat { diff --git a/src/sat/overload_checker.cc b/ortools/sat/overload_checker.cc similarity index 99% rename from src/sat/overload_checker.cc rename to ortools/sat/overload_checker.cc index 22fd45028a..4cf19c11e5 100644 --- a/src/sat/overload_checker.cc +++ b/ortools/sat/overload_checker.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/overload_checker.h" -#include "sat/sat_solver.h" -#include "util/sort.h" +#include "ortools/sat/overload_checker.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/sort.h" namespace operations_research { namespace sat { diff --git a/src/sat/overload_checker.h b/ortools/sat/overload_checker.h similarity index 97% rename from src/sat/overload_checker.h rename to ortools/sat/overload_checker.h index 0ad8ba6a13..36034e1ff5 100644 --- a/src/sat/overload_checker.h +++ b/ortools/sat/overload_checker.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_SAT_OVERLOAD_CHECKER_H_ #define OR_TOOLS_SAT_OVERLOAD_CHECKER_H_ -#include "sat/integer.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/pb_constraint.cc b/ortools/sat/pb_constraint.cc similarity index 99% rename from src/sat/pb_constraint.cc rename to ortools/sat/pb_constraint.cc index a7d39e2e43..f627c83cdf 100644 --- a/src/sat/pb_constraint.cc +++ b/ortools/sat/pb_constraint.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/pb_constraint.h" +#include "ortools/sat/pb_constraint.h" -#include "base/thorough_hash.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/thorough_hash.h" +#include "ortools/util/saturated_arithmetic.h" namespace operations_research { namespace sat { diff --git a/src/sat/pb_constraint.h b/ortools/sat/pb_constraint.h similarity index 99% rename from src/sat/pb_constraint.h rename to ortools/sat/pb_constraint.h index 3c3334e9ac..8afe88dacc 100644 --- a/src/sat/pb_constraint.h +++ b/ortools/sat/pb_constraint.h @@ -16,9 +16,9 @@ #include #include -#include "sat/sat_base.h" -#include "sat/sat_parameters.pb.h" -#include "util/stats.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_parameters.pb.h" +#include "ortools/util/stats.h" namespace operations_research { namespace sat { diff --git a/src/sat/precedences.cc b/ortools/sat/precedences.cc similarity index 99% rename from src/sat/precedences.cc rename to ortools/sat/precedences.cc index 3335ee618d..6ab4377a8f 100644 --- a/src/sat/precedences.cc +++ b/ortools/sat/precedences.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/precedences.h" +#include "ortools/sat/precedences.h" -#include "base/cleanup.h" -#include "base/stl_util.h" +#include "ortools/base/cleanup.h" +#include "ortools/base/stl_util.h" namespace operations_research { namespace sat { diff --git a/src/sat/precedences.h b/ortools/sat/precedences.h similarity index 99% rename from src/sat/precedences.h rename to ortools/sat/precedences.h index 6d2b57227f..aff19953ff 100644 --- a/src/sat/precedences.h +++ b/ortools/sat/precedences.h @@ -17,11 +17,11 @@ #include #include -#include "sat/integer.h" -#include "sat/model.h" -#include "sat/sat_base.h" -#include "sat/sat_solver.h" -#include "util/bitset.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/bitset.h" namespace operations_research { namespace sat { diff --git a/src/sat/sat_base.h b/ortools/sat/sat_base.h similarity index 99% rename from src/sat/sat_base.h rename to ortools/sat/sat_base.h index 58f71eb9b1..544b2d7c9b 100644 --- a/src/sat/sat_base.h +++ b/ortools/sat/sat_base.h @@ -21,11 +21,11 @@ #include #include -#include "base/stringprintf.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "sat/model.h" -#include "util/bitset.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/sat/model.h" +#include "ortools/util/bitset.h" namespace operations_research { namespace sat { diff --git a/src/sat/sat_parameters.proto b/ortools/sat/sat_parameters.proto similarity index 100% rename from src/sat/sat_parameters.proto rename to ortools/sat/sat_parameters.proto diff --git a/src/sat/sat_solver.cc b/ortools/sat/sat_solver.cc similarity index 99% rename from src/sat/sat_solver.cc rename to ortools/sat/sat_solver.cc index 78775cbe95..0d8ec6671c 100644 --- a/src/sat/sat_solver.cc +++ b/ortools/sat/sat_solver.cc @@ -11,21 +11,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/sat_solver.h" +#include "ortools/sat/sat_solver.h" #include #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/sysinfo.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/sysinfo.h" #include "google/protobuf/text_format.h" -#include "base/split.h" -#include "base/join.h" -#include "base/stl_util.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/split.h" +#include "ortools/base/join.h" +#include "ortools/base/stl_util.h" +#include "ortools/util/saturated_arithmetic.h" namespace operations_research { namespace sat { @@ -514,7 +514,9 @@ void SatSolver::RestoreSolverToAssumptionLevel() { // Reapply any assumption that was backtracked over. if (CurrentDecisionLevel() < assumption_level_) { int unused = 0; + const int64 old_num_branches = counters_.num_branches; ReapplyDecisionsUpTo(assumption_level_ - 1, &unused); + counters_.num_branches = old_num_branches; assumption_level_ = CurrentDecisionLevel(); } } @@ -1046,10 +1048,13 @@ SatSolver::Status SatSolver::SolveInternal(TimeLimit* time_limit) { if (is_model_unsat_) return StatusWithLog(MODEL_UNSAT); } else { // We need to reapply any assumptions that are not currently applied. + // Note that we do not count these as "branches" for a reporting purpose. if (CurrentDecisionLevel() < assumption_level_) { int unused = 0; + const int64 old_num_branches = counters_.num_branches; const Status status = ReapplyDecisionsUpTo(assumption_level_ - 1, &unused); + counters_.num_branches = old_num_branches; if (status != MODEL_SAT) return StatusWithLog(status); assumption_level_ = CurrentDecisionLevel(); } diff --git a/src/sat/sat_solver.h b/ortools/sat/sat_solver.h similarity index 98% rename from src/sat/sat_solver.h rename to ortools/sat/sat_solver.h index ded2c5f444..d8a8927a83 100644 --- a/src/sat/sat_solver.h +++ b/ortools/sat/sat_solver.h @@ -19,31 +19,31 @@ #ifndef OR_TOOLS_SAT_SAT_SOLVER_H_ #define OR_TOOLS_SAT_SAT_SOLVER_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include #include #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/stringprintf.h" -#include "base/timer.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/timer.h" #include "google/protobuf/text_format.h" -#include "base/int_type.h" -#include "base/int_type_indexed_vector.h" -#include "base/map_util.h" -#include "sat/clause.h" -#include "sat/drat.h" -#include "sat/model.h" -#include "sat/pb_constraint.h" -#include "sat/sat_parameters.pb.h" -#include "util/bitset.h" -#include "util/running_stat.h" -#include "util/stats.h" -#include "util/time_limit.h" -#include "base/random.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/int_type.h" +#include "ortools/base/int_type_indexed_vector.h" +#include "ortools/base/map_util.h" +#include "ortools/sat/clause.h" +#include "ortools/sat/drat.h" +#include "ortools/sat/model.h" +#include "ortools/sat/pb_constraint.h" +#include "ortools/sat/sat_parameters.pb.h" +#include "ortools/util/bitset.h" +#include "ortools/util/running_stat.h" +#include "ortools/util/stats.h" +#include "ortools/util/time_limit.h" +#include "ortools/base/random.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { namespace sat { diff --git a/src/sat/simplification.cc b/ortools/sat/simplification.cc similarity index 99% rename from src/sat/simplification.cc rename to ortools/sat/simplification.cc index 9e7fc9a2c7..7612ca4826 100644 --- a/src/sat/simplification.cc +++ b/ortools/sat/simplification.cc @@ -11,16 +11,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/simplification.h" +#include "ortools/sat/simplification.h" #include -#include "base/timer.h" -#include "base/strongly_connected_components.h" -#include "base/stl_util.h" -#include "algorithms/dynamic_partition.h" -#include "sat/util.h" -#include "base/random.h" +#include "ortools/base/timer.h" +#include "ortools/base/strongly_connected_components.h" +#include "ortools/base/stl_util.h" +#include "ortools/algorithms/dynamic_partition.h" +#include "ortools/sat/util.h" +#include "ortools/base/random.h" namespace operations_research { namespace sat { diff --git a/src/sat/simplification.h b/ortools/sat/simplification.h similarity index 98% rename from src/sat/simplification.h rename to ortools/sat/simplification.h index 2364f4f72f..d50dba3cd0 100644 --- a/src/sat/simplification.h +++ b/ortools/sat/simplification.h @@ -22,12 +22,12 @@ #include #include -#include "sat/drat.h" -#include "sat/sat_base.h" -#include "sat/sat_parameters.pb.h" -#include "sat/sat_solver.h" +#include "ortools/sat/drat.h" +#include "ortools/sat/sat_base.h" +#include "ortools/sat/sat_parameters.pb.h" +#include "ortools/sat/sat_solver.h" -#include "base/adjustable_priority_queue.h" +#include "ortools/base/adjustable_priority_queue.h" namespace operations_research { namespace sat { diff --git a/src/sat/symmetry.cc b/ortools/sat/symmetry.cc similarity index 99% rename from src/sat/symmetry.cc rename to ortools/sat/symmetry.cc index 02799e556e..bc33512815 100644 --- a/src/sat/symmetry.cc +++ b/ortools/sat/symmetry.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/symmetry.h" +#include "ortools/sat/symmetry.h" namespace operations_research { namespace sat { diff --git a/src/sat/symmetry.h b/ortools/sat/symmetry.h similarity index 98% rename from src/sat/symmetry.h rename to ortools/sat/symmetry.h index f73138d013..977ed820c9 100644 --- a/src/sat/symmetry.h +++ b/ortools/sat/symmetry.h @@ -14,9 +14,9 @@ #ifndef OR_TOOLS_SAT_SYMMETRY_H_ #define OR_TOOLS_SAT_SYMMETRY_H_ -#include "algorithms/sparse_permutation.h" -#include "sat/sat_base.h" -#include "util/stats.h" +#include "ortools/algorithms/sparse_permutation.h" +#include "ortools/sat/sat_base.h" +#include "ortools/util/stats.h" namespace operations_research { namespace sat { diff --git a/src/sat/table.cc b/ortools/sat/table.cc similarity index 99% rename from src/sat/table.cc rename to ortools/sat/table.cc index b93aeee727..802870fb23 100644 --- a/src/sat/table.cc +++ b/ortools/sat/table.cc @@ -11,12 +11,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/table.h" +#include "ortools/sat/table.h" #include -#include "base/map_util.h" -#include "base/stl_util.h" +#include "ortools/base/map_util.h" +#include "ortools/base/stl_util.h" namespace operations_research { namespace sat { diff --git a/src/sat/table.h b/ortools/sat/table.h similarity index 97% rename from src/sat/table.h rename to ortools/sat/table.h index 77df507c43..6171b00e61 100644 --- a/src/sat/table.h +++ b/ortools/sat/table.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_SAT_TABLE_H_ #define OR_TOOLS_SAT_TABLE_H_ -#include "sat/integer.h" -#include "sat/model.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/model.h" namespace operations_research { namespace sat { diff --git a/ortools/sat/theta_tree.cc b/ortools/sat/theta_tree.cc new file mode 100644 index 0000000000..e9f8a56301 --- /dev/null +++ b/ortools/sat/theta_tree.cc @@ -0,0 +1,207 @@ +// Copyright 2010-2014 Google +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "ortools/sat/theta_tree.h" + +namespace operations_research { +namespace sat { + +ThetaLambdaTree::ThetaLambdaTree() {} + +// Make a tree using the first num_events events of the vectors. +void ThetaLambdaTree::Reset(std::vector event_initial_envelope, + std::vector event_energy) { + const int num_events = event_initial_envelope.size(); + DCHECK_EQ(num_events, event_energy.size()); + DCHECK(std::is_sorted(event_initial_envelope.begin(), + event_initial_envelope.end())); + event_initial_envelope_ = std::move(event_initial_envelope); + event_energy_ = std::move(event_energy); + + // Use 2^k leaves in the tree, with 2^k >= std::max(num_events, 2). + num_events_ = num_events; + for (num_leaves_ = 2; num_leaves_ < num_events; num_leaves_ <<= 1) { + } + const int num_nodes = 2 * num_leaves_; + tree_energy_.assign(num_nodes, IntegerValue(0)); + tree_energy_opt_.assign(num_nodes, IntegerValue(0)); + tree_envelope_.assign(num_nodes, kMinIntegerValue); + tree_envelope_opt_.assign(num_nodes, kMinIntegerValue); + is_present_.assign(num_events, false); + is_optional_.assign(num_events, false); +} + +void ThetaLambdaTree::AddEvent(int event) { + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + DCHECK(!IsPresent(event) && !IsOptional(event)); + is_present_[event] = true; + is_optional_[event] = false; + const int node = num_leaves_ + event; + tree_envelope_[node] = event_initial_envelope_[event] + event_energy_[event]; + tree_energy_[node] = event_energy_[event]; + tree_envelope_opt_[node] = tree_envelope_[node]; + tree_energy_opt_[node] = tree_energy_[node]; + RefreshNode(node); +} + +void ThetaLambdaTree::AddOptionalEvent(int event) { + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + DCHECK(!IsPresent(event) && !IsOptional(event)); + is_present_[event] = false; + is_optional_[event] = true; + const int node = num_leaves_ + event; + tree_envelope_[node] = kMinIntegerValue; + tree_energy_[node] = IntegerValue(0); + tree_envelope_opt_[node] = + event_initial_envelope_[event] + event_energy_[event]; + tree_energy_opt_[node] = event_energy_[event]; + RefreshNode(node); +} + +void ThetaLambdaTree::RemoveEvent(int event) { + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + DCHECK(IsPresent(event) || IsOptional(event)); + is_present_[event] = false; + is_optional_[event] = false; + const int node = num_leaves_ + event; + tree_envelope_[node] = kMinIntegerValue; + tree_energy_[node] = IntegerValue(0); + tree_envelope_opt_[node] = kMinIntegerValue; + tree_energy_opt_[node] = IntegerValue(0); + RefreshNode(node); +} + +bool ThetaLambdaTree::IsPresent(int event) const { + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + return is_present_[event]; +} +bool ThetaLambdaTree::IsOptional(int event) const { + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + return is_optional_[event]; +} + +IntegerValue ThetaLambdaTree::GetEnvelope() const { return tree_envelope_[1]; } +IntegerValue ThetaLambdaTree::GetOptionalEnvelope() const { + return tree_envelope_opt_[1]; +} + +int ThetaLambdaTree::GetRightmostEventWithEnvelopeGreaterOrEqualTo( + IntegerValue target_envelope) const { + DCHECK_LE(target_envelope, tree_envelope_[1]); + const int event = GetLeafRealizingEnvelope(1, target_envelope) - num_leaves_; + DCHECK(IsPresent(event)); + return event; +} + +IntegerValue ThetaLambdaTree::GetEnvelopeOf(int event) const { + DCHECK(IsPresent(event)); + DCHECK_LE(0, event); + DCHECK_LT(event, num_events_); + IntegerValue env = tree_envelope_[event + num_leaves_]; + for (int node = event + num_leaves_; node > 1; node >>= 1) { + const int right = node | 1; + if (right != node) env += tree_energy_[right]; + } + return env; +} + +int ThetaLambdaTree::GetOptionalEventRealizingOptionalEnvelope() const { + const int event = GetLeafRealizingOptionalEnvelope(1) - num_leaves_; + DCHECK(IsOptional(event)); + return event; +} + +int ThetaLambdaTree::GetEventRealizingOptionalEnvelope() const { + const int event = GetLeafRealizingOptionalEnvelope(1) - num_leaves_; + DCHECK(IsPresent(event) || IsOptional(event)); + return event; +} + +void ThetaLambdaTree::RefreshNode(int node) { + do { + const int right = node | 1; + const int left = right ^ 1; + node >>= 1; + tree_energy_[node] = tree_energy_[left] + tree_energy_[right]; + tree_envelope_[node] = std::max(tree_envelope_[right], + tree_envelope_[left] + tree_energy_[right]); + tree_energy_opt_[node] = + std::max(tree_energy_[left] + tree_energy_opt_[right], + tree_energy_[right] + tree_energy_opt_[left]); + tree_envelope_opt_[node] = + std::max(tree_envelope_opt_[left] + tree_energy_[right], + tree_envelope_[left] + tree_energy_opt_[right]); + tree_envelope_opt_[node] = + std::max(tree_envelope_opt_[node], tree_envelope_opt_[right]); + } while (node > 1); +} + +int ThetaLambdaTree::GetLeafRealizingEnvelope(int node, + IntegerValue envelope) const { + DCHECK_LE(envelope, tree_envelope_[node]); + while (node < num_leaves_) { + const int left = node << 1; + const int right = left | 1; + + if (envelope <= tree_envelope_[right]) { + node = right; + } else { + envelope -= tree_energy_[right]; + node = left; + } + } + return node; +} + +int ThetaLambdaTree::GetOptionalLeafOfMaximalEnergy(int node) const { + while (node < num_leaves_) { + const int left = node << 1; + const int right = left | 1; + + if (tree_energy_opt_[node] == + tree_energy_[left] + tree_energy_opt_[right]) { + node = right; + } else { // tree_energy_opt_[left] + tree_energy_[right] + node = left; + } + } + return node; +} + +template +int ThetaLambdaTree::GetLeafRealizingOptionalEnvelope(int node) const { + while (node < num_leaves_) { + const int left = node << 1; + const int right = left | 1; + + if (tree_envelope_opt_[node] == tree_envelope_opt_[right]) { + node = right; + } else if (tree_envelope_opt_[node] == + tree_envelope_[left] + tree_energy_opt_[right]) { + return initial_envelope_leaf_wanted + ? GetLeafRealizingEnvelope(left, tree_envelope_[left]) + : GetOptionalLeafOfMaximalEnergy(right); + } else { // tree_envelope_opt_[left] + tree_energy_[right] + node = left; + } + } + return node; +} + +} // namespace sat +} // namespace operations_research diff --git a/ortools/sat/theta_tree.h b/ortools/sat/theta_tree.h new file mode 100644 index 0000000000..8bf2219c1b --- /dev/null +++ b/ortools/sat/theta_tree.h @@ -0,0 +1,209 @@ +// Copyright 2010-2014 Google +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef OR_TOOLS_SAT_THETA_TREE_H_ +#define OR_TOOLS_SAT_THETA_TREE_H_ + +#include +#include +#include + +#include "ortools/sat/integer.h" + +namespace operations_research { +namespace sat { + +// The Theta-Lambda tree can be used to implement several scheduling algorithms. +// +// The tree structure itself is a binary tree coded in a vector, where node 0 is +// unused, node 1 is the root, node 2 is the left child of the root, node 3 its +// right child, etc. To represent num_events events, we use the smallest +// possible amount of leaves, num_leaves = 2^k >= num_events. The unused leaves +// are filled with dummy values, as if they were absent events. +// The API gives access to events that realize the maximal output. When it does +// so, it always gives the rightmost ones if there are several solutions, in +// an attempt to minimize the number of events used in explanations. +// +// See: +// _ (0) Petr Vilim's PhD thesis "Global Constraints in Scheduling". +// _ (1) Petr Vilim "Edge Finding Filtering Algorithm for Discrete Cumulative +// Resources in O(kn log n)" +// _ (2) Petr Vilim "Max energy filtering algorithm for discrete cumulative +// resources". +// _ (3) Wolf & Schrader "O(n log n) Overload Checking for the Cumulative +// Constraint and Its Application". +// _ (4) Kameugne & Fotso "A cumulative not-first/not-last filtering algorithm +// in O(n^2 log n)". +// _ (5) Ouellet & Quimper "Time-table extended-edge-finding for the cumulative +// constraint". +// +// Instead of providing one declination of the theta-tree per possible filtering +// algorithm, this generalization intends to provide a data structure that can +// fit several algorithms. +// This tree is based around the notion of events. It has events at its leaves +// that can be present, optional, or absent, internal nodes compute values on +// the set of events that are present/optional. +// Each event has an initial_envelope and an energy. +// The tree maintains: +// _ energy(node) = sum_{leaf \in leaves(node)} energy(leaf) +// _ envelope(node) = +// max_{leaf \in leaves(node)} +// initial_envelope(leaf) + +// sum_{leaf' \in leaves(node), leaf' at or right of leaf} energy(leaf'). +// +// Thus, the envelope of a leaf representing an event, when present, is +// initial_envelope(event) + energy(event). +// +// envelope_opt and energy_opt are similar, but compute the maximum value a node +// could have if one of the optional event were present: +// _ energy_opt(node) = sum_{leaf \in leaves(node)} energy(leaf) +// + max_{leaf \in leaves(node)} energy_opt(leaf) +// _ envelope_opt(node) = +// max_{leaf \in leaves(node)} +// initial_envelope(leaf) + +// sum_{leaf' \in leaves(node), leaf' at or right of leaf} energy(leaf') + +// max_{leaf_opt \in leaves(node)} energy_opt(leaf_opt) +// max_{leaf_opt \in leaves(node)} +// initial_envelope(leaf_opt) + energy_opt(leaf_opt) + +// sum_{leaf \in leaves(node), leaf at or right of leaf_opt} energy(leaf) +// +// Most articles using theta-tree variants hack Vilim's original theta tree +// for the disjunctive resource constraint by manipulating envelope and +// energy: +// _ in (0), initial_envelope = start_min, energy = duration +// _ in (3), initial_envelope = C * start_min, energy = demand * duration +// _ in (5), there are several trees in parallel: +// initial_envelope = C * start_min or (C - h) * start_min +// energy = demand * duration, h * (Horizon - start_min), +// or h * (end_min). +// _ in (2), same as (3), but putting the max energy instead of min in lambda. +// _ in OscaR's TimeTableOverloadChecker, +// initial_envelope = C * start_min - +// energy of mandatory profile before start_min, +// energy = demand * duration +// +// There is hope to unify the variants of these algorithms by abstracting the +// tasks away to reason only on events. +class ThetaLambdaTree { + public: + // Build a reusable tree. Initialization is done with Reset(). + ThetaLambdaTree(); + + // Reset() initializes this class; other operations refer to the values + // passed by the last Reset(). + // Instead of allocating and de-allocating trees at every usage, i.e. at + // every Propagate() of the scheduling algorithms that uses it, + // this class allows to keep the same memory for each call. + // Reset() should be called with (vector) attributes for events, + // then the resulting Add/Remove/Get operations will use these attributes. + // Events should be sorted by nondecreasing initial_envelope. + void Reset(std::vector event_initial_envelope, + std::vector event_energy); + + // Make event present, compute the new envelopes in O(log n). + // The event must not be already present or optional. + void AddEvent(int event); + + // Make event optional, compute the new envelopes in O(log n). + // The event must not be already present or optional. + void AddOptionalEvent(int event); + + // Make event absent, compute the new envelope in O(log n). + // The event must be present or optional. + void RemoveEvent(int event); + + // Returns true iff event is present, O(1). + bool IsPresent(int event) const; + + // Returns true iff event is optional, O(1). + bool IsOptional(int event) const; + + // Returns the current envelope of present tasks in O(1). + IntegerValue GetEnvelope() const; + + // Return the current envelope of present tasks + 1 optional task in O(1). + IntegerValue GetOptionalEnvelope() const; + + // Returns the rightmost event such that + // initial_envelope(event) + sum_{event' at or after event} energy(event'), + // is larger or equal to the given envelope, in O(log n). + // The given envelope can be at most GetEnvelope(). + int GetRightmostEventWithEnvelopeGreaterOrEqualTo( + IntegerValue target_envelope) const; + + // Returns the envelope obtained by using the given event's initial_envelope + // plus the sum of energies of present events at or on the right of given + // event in O(log n). + IntegerValue GetEnvelopeOf(int event) const; + + // Returns the rightmost optional event responsible for the current optional + // envelope in O(log n). There must be an optional event, + // i.e. GetOptionalEnvelope() > GetEnvelope(). + int GetOptionalEventRealizingOptionalEnvelope() const; + + // Returns the rightmost event responsible for the initial_envelope part of + // the current optional envelope, in O(log n). The event can be present or + // optional. + int GetEventRealizingOptionalEnvelope() const; + + private: + // Propagates the change of leaf energies and envelopes towards the root. + void RefreshNode(int leaf); + + // Returns the rightmost present leaf under node responsible for given + // envelope, see GetRightmostEventWithEnvelopeGreaterOrEqualTo(). + int GetLeafRealizingEnvelope(int node, IntegerValue envelope) const; + + // Returns the rightmost optional leaf of maximal energy under node. + // There must be an optional leaf under node. + int GetOptionalLeafOfMaximalEnergy(int node) const; + + // If initial_envelope_leaf_wanted is true, returns the rightmost leaf + // such that the optional envelope is initial_envelope(leaf) plus some + // energies. It can be a present or an optional leaf. + // If initial_envelope_leaf_wanted is false, returns the rightmost optional + // leaf whose energy is in the optional envelope above. + // Notice that with a given set of present and optional events, + // the leaf returned by calling with initial_envelope_leaf_wanted set to true + // is the same or at the left as the leaf returned by calling with the boolean + // set to false. + // See class description for more details. + template + int GetLeafRealizingOptionalEnvelope(int node) const; + + // Number of events of the last Reset(); + int num_events_; + + // Number of leaves used by the last Reset(), the smallest power of 2 such + // that 2 <= num_leaves_ and num_events_ <= num_leaves_. + int num_leaves_; + + // Event characteristics: initial_envelope and energy. + std::vector event_initial_envelope_; + std::vector event_energy_; + + // Envelopes and energies of nodes. + std::vector tree_envelope_; + std::vector tree_energy_; + std::vector tree_envelope_opt_; + std::vector tree_energy_opt_; + + // Stores whether an event is currently present/optional. + std::vector is_present_; + std::vector is_optional_; +}; + +} // namespace sat +} // namespace operations_research + +#endif // OR_TOOLS_SAT_THETA_TREE_H_ diff --git a/src/sat/timetable.cc b/ortools/sat/timetable.cc similarity index 66% rename from src/sat/timetable.cc rename to ortools/sat/timetable.cc index 37d4a6ccab..bb670c456e 100644 --- a/src/sat/timetable.cc +++ b/ortools/sat/timetable.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/timetable.h" +#include "ortools/sat/timetable.h" #include -#include "sat/overload_checker.h" -#include "sat/precedences.h" -#include "sat/sat_solver.h" -#include "util/sort.h" +#include "ortools/sat/overload_checker.h" +#include "ortools/sat/precedences.h" +#include "ortools/sat/sat_solver.h" +#include "ortools/util/sort.h" namespace operations_research { namespace sat { @@ -37,13 +37,34 @@ TimeTablingPerTask::TimeTablingPerTask( profile_.reserve(2 * num_tasks_ + 4); scp_.reserve(num_tasks_); ecp_.reserve(num_tasks_); - is_in_profile_.resize(num_tasks_); - in_profile_.reserve(num_tasks_); + // Reversible set of tasks to consider for propagation. num_tasks_to_sweep_ = num_tasks_; tasks_to_sweep_.resize(num_tasks_); + num_active_tasks_ = num_tasks_; + active_tasks_.resize(num_tasks_); + num_profile_tasks_ = 0; + profile_tasks_.resize(num_tasks_); + positions_in_profile_tasks_.resize(num_tasks_); + + // Reversible bounds and starting height of the profile. + starting_profile_height_ = IntegerValue(0); + left_start_ = 0; + left_end_ = 0; + right_start_ = num_tasks_; + right_end_ = num_tasks_; + + // Vector of tasks to sort to build the profile. + by_start_max_.resize(num_tasks_); + by_end_min_.resize(num_tasks_); + for (int t = 0; t < num_tasks_; ++t) { tasks_to_sweep_[t] = t; + active_tasks_[t] = t; + profile_tasks_[t] = t; + positions_in_profile_tasks_[t] = t; + by_start_max_[t].task_index = t; + by_end_min_[t].task_index = t; } } @@ -54,13 +75,20 @@ void TimeTablingPerTask::RegisterWith(GenericLiteralWatcher* watcher) { for (int t = 0; t < num_tasks_; t++) { watcher->WatchLowerBound(demand_vars_[t], id); } - // Reversible number of tasks to consider for propagation. - watcher->RegisterReversibleInt(id, &num_tasks_to_sweep_); + // Repositories responsible for restoring the reversible values. + watcher->RegisterReversibleClass(id, &rev_repository_int_); + watcher->RegisterReversibleClass(id, &rev_repository_integer_value_); } bool TimeTablingPerTask::Propagate() { // TODO(user): understand why the following line creates a bug. // if (num_tasks_to_sweep_ == 0) return true; + + // Save the current state of the set of tasks. + rev_repository_int_.SaveState(&num_tasks_to_sweep_); + rev_repository_int_.SaveState(&num_active_tasks_); + rev_repository_int_.SaveState(&num_profile_tasks_); + // Repeat until the propagator does not filter anymore. profile_changed_ = true; while (profile_changed_) { @@ -74,41 +102,64 @@ bool TimeTablingPerTask::Propagate() { // Update the maximum end times (reversed problem). if (!SweepAllTasks()) return false; } + + // Reduce the profile now that we know that it is stable. + // TODO(user): something seems to be wrong we the reduction. To reactivate + // once we'll have understood (and fixed) the behavior. + if (false) ReduceProfile(); + return true; } bool TimeTablingPerTask::BuildProfile() { helper_->SetTimeDirection(true); // forward - // Rely on the incremental sort algorithm of helper_. - const auto& by_decreasing_start_max = helper_->TaskByDecreasingStartMax(); - const auto& by_increasing_end_min = helper_->TaskByIncreasingEndMin(); - - scp_.clear(); - ecp_.clear(); - in_profile_.clear(); + // Update the set of tasks that contribute to the profile. Tasks that were + // contributing are still part of the profile so we only need to check the + // other tasks. + for (int i = num_profile_tasks_; i < num_tasks_; ++i) { + const int t1 = profile_tasks_[i]; + if (helper_->IsPresent(t1) && helper_->StartMax(t1) < helper_->EndMin(t1)) { + // Swap values and positions. + const int t2 = profile_tasks_[num_profile_tasks_]; + profile_tasks_[i] = t2; + profile_tasks_[num_profile_tasks_] = t1; + positions_in_profile_tasks_[t1] = num_profile_tasks_; + positions_in_profile_tasks_[t2] = i; + num_profile_tasks_++; + } + } + // Update start value of active tasks. + for (int i = left_start_; i < right_start_; ++i) { + by_start_max_[i].time = helper_->StartMax(by_start_max_[i].task_index); + } + // Likely to be already or almost sorted. + IncrementalSort(by_start_max_.begin() + left_start_, + by_start_max_.begin() + right_start_); // Build start of compulsory part events. - for (int i = num_tasks_ - 1; i >= 0; --i) { - const auto task_time = by_decreasing_start_max[i]; - const int t = task_time.task_index; - is_in_profile_[t] = - helper_->IsPresent(t) && task_time.time < helper_->EndMin(t); - if (is_in_profile_[t]) { - in_profile_.push_back(t); - scp_.push_back(task_time); + scp_.clear(); + for (int i = left_start_; i < right_start_; ++i) { + if (IsInProfile(by_start_max_[i].task_index)) { + scp_.push_back(by_start_max_[i]); } } + // Update end value of active tasks. + for (int i = left_end_; i < right_end_; ++i) { + by_end_min_[i].time = helper_->EndMin(by_end_min_[i].task_index); + } + // Likely to be already or almost sorted. + IncrementalSort(by_end_min_.begin() + left_end_, + by_end_min_.begin() + right_end_); // Build end of compulsory part events. - for (int i = 0; i < num_tasks_; ++i) { - if (is_in_profile_[by_increasing_end_min[i].task_index]) { - ecp_.push_back(by_increasing_end_min[i]); + ecp_.clear(); + for (int i = left_end_; i < right_end_; ++i) { + if (IsInProfile(by_end_min_[i].task_index)) { + ecp_.push_back(by_end_min_[i]); } } - DCHECK_EQ(scp_.size(), ecp_.size()); - // Build the profile. // ------------------ profile_.clear(); @@ -123,7 +174,7 @@ bool TimeTablingPerTask::BuildProfile() { // Start and height of the currently built profile rectange. IntegerValue current_start = kMinIntegerValue; - IntegerValue current_height = IntegerValue(0); + IntegerValue current_height = starting_profile_height_; // Next scp and ecp events to be processed. int next_scp = 0; @@ -134,7 +185,7 @@ bool TimeTablingPerTask::BuildProfile() { // Next time point. IntegerValue t = ecp_[next_ecp].time; - if (next_scp < ecp_.size()) { + if (next_scp < scp_.size()) { t = std::min(t, scp_[next_scp].time); } @@ -161,7 +212,7 @@ bool TimeTablingPerTask::BuildProfile() { } } // Build the last profile rectangle. - DCHECK_EQ(current_height, 0); + DCHECK_GE(current_height, 0); profile_.push_back( ProfileRectangle(current_start, kMaxIntegerValue, IntegerValue(0))); @@ -173,6 +224,67 @@ bool TimeTablingPerTask::BuildProfile() { return IncreaseCapacity(max_height_start, profile_max_height_); } +// TODO(user): calling this function currently have an impact on the search. +// This should not be the case and might be the symptom of a larger bug. +void TimeTablingPerTask::ReduceProfile() { + helper_->SetTimeDirection(true); // forward + + IntegerValue min_start_min = kMaxIntegerValue; + IntegerValue max_end_max = kMinIntegerValue; + + // TODO(user): we could probably go a step further by considering tasks + // that only have a fixed demand and start (resp. end) variables. The idea is + // that the start of their mandatory part is not going to change and could + // already be aggregated in starting_profile_height_. + for (int i = num_active_tasks_ - 1; i >= 0; --i) { + const int t = active_tasks_[i]; + // Discard absent and fixed tasks. + if (helper_->IsAbsent(t) || + (helper_->StartMin(t) == helper_->StartMax(t) && + helper_->EndMin(t) == helper_->EndMax(t) && + DemandMin(t) == DemandMax(t) && helper_->IsPresent(t))) { + std::swap(active_tasks_[i], active_tasks_[--num_active_tasks_]); + continue; + } + min_start_min = std::min(min_start_min, helper_->StartMin(t)); + max_end_max = std::max(max_end_max, helper_->EndMax(t)); + } + + // Save the current state of the reversible values. + rev_repository_integer_value_.SaveState(&starting_profile_height_); + rev_repository_int_.SaveState(&left_start_); + rev_repository_int_.SaveState(&left_end_); + rev_repository_int_.SaveState(&right_start_); + rev_repository_int_.SaveState(&right_end_); + + // Update the range of active tasks in their corresponding sorted vectors. + while (left_start_ < right_start_ && + by_start_max_[left_start_].time < min_start_min) { + const int t = by_start_max_[left_start_].task_index; + if (helper_->IsPresent(t)) starting_profile_height_ += DemandMin(t); + left_start_++; + } + + while (left_end_ < right_end_ && + by_end_min_[left_end_].time < min_start_min) { + const int t = by_end_min_[left_end_].task_index; + if (helper_->IsPresent(t)) starting_profile_height_ -= DemandMin(t); + left_end_++; + } + + while (left_start_ < right_start_ && + max_end_max < by_start_max_[right_start_ - 1].time) { + right_start_--; + } + + while (left_end_ < right_end_ && + max_end_max < by_end_min_[right_end_ - 1].time) { + right_end_--; + } + + DCHECK_GE(starting_profile_height_, 0); +} + void TimeTablingPerTask::ReverseProfile() { helper_->SetTimeDirection(false); // backward // Do not swap sentinels. @@ -220,9 +332,7 @@ bool TimeTablingPerTask::SweepAllTasks() { ((fixed_start && fixed_end) || helper_->DurationMax(t) == 0 || DemandMax(t) == 0))) { // Remove the task from the set of tasks to sweep. - num_tasks_to_sweep_--; - tasks_to_sweep_[i] = tasks_to_sweep_[num_tasks_to_sweep_]; - tasks_to_sweep_[num_tasks_to_sweep_] = t; + std::swap(tasks_to_sweep_[i], tasks_to_sweep_[--num_tasks_to_sweep_]); continue; } // A task does not have to be considered for propagation in this particular @@ -252,7 +362,7 @@ bool TimeTablingPerTask::SweepTask(int task_id) { // Find the profile rectangle that overlpas the minimum start time of task_id. // The sentinel prevents out of bound exceptions. - int rec_id = 0; + int rec_id = 1; while (profile_[rec_id].end <= new_start_min) rec_id++; // A profile rectangle is in conflict with the task if its height exceeds @@ -288,7 +398,7 @@ bool TimeTablingPerTask::SweepTask(int task_id) { new_start_min = profile_[rec_id].end; if (start_max < new_start_min) { new_start_min = start_max; - overload = !is_in_profile_[task_id]; + overload = !IsInProfile(task_id); } new_end_min = std::max(new_end_min, new_start_min + duration_min); @@ -305,7 +415,13 @@ bool TimeTablingPerTask::SweepTask(int task_id) { } // The profile needs to be recomputed if the task has a mandatory part. - profile_changed_ |= start_max < new_end_min; + // TODO(user): find an efficient way to keep the start_max < new_end_min + // condition. The problem is that ReduceProfile() assumes that by_end_min and + // by_start_max are up to date (this is not necessarily the case if we use + // the old condition). A solution is to update those vector before calling + // ReduceProfile() or to ReduceProfile() directly after BuildProfile() in the + // main loop. + profile_changed_ |= true; // Explain that the task should be absent or explain the resource overload. if (overload) return OverloadOrRemove(task_id, start_max); @@ -334,7 +450,8 @@ bool TimeTablingPerTask::UpdateStartingTime(int task_id, IntegerValue left, void TimeTablingPerTask::AddProfileReason(IntegerValue left, IntegerValue right) { - for (const int t : in_profile_) { + for (int i = 0; i < num_profile_tasks_; ++i) { + const int t = profile_tasks_[i]; const IntegerValue start_max = helper_->StartMax(t); const IntegerValue end_min = helper_->EndMin(t); diff --git a/src/sat/timetable.h b/ortools/sat/timetable.h similarity index 65% rename from src/sat/timetable.h rename to ortools/sat/timetable.h index a25cf8d612..79b2503af3 100644 --- a/src/sat/timetable.h +++ b/ortools/sat/timetable.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_SAT_TIMETABLE_H_ #define OR_TOOLS_SAT_TIMETABLE_H_ -#include "sat/integer.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { @@ -47,6 +47,14 @@ class TimeTablingPerTask : public PropagatorInterface { // variable accordingly. bool BuildProfile(); + // Reduces the set of tasks to be considered by BuildProfile(). This is done + // by not considering parts of mandatory part that are overlaped by no task. + // The set of tasks to consider is restored to its previous state each time a + // backtrack occurs. This function must be called only if the by_start_max_ + // and by_end_min_ vectors are up to date and if the profile contains no + // profile rectangle that can exceed the capacity of the resource. + void ReduceProfile(); + // Reverses the profile. This is needed to reuse a given profile to update // both the start and end times. void ReverseProfile(); @@ -92,6 +100,11 @@ class TimeTablingPerTask : public PropagatorInterface { return integer_trail_->UpperBound(demand_vars_[task_id]); } + // Returns true if the tasks is present and has a mantatory part. + bool IsInProfile(int t) const { + return positions_in_profile_tasks_[t] < num_profile_tasks_; + } + // Number of tasks. const int num_tasks_; @@ -104,6 +117,25 @@ class TimeTablingPerTask : public PropagatorInterface { IntegerTrail* integer_trail_; SchedulingConstraintHelper* helper_; + RevRepository rev_repository_int_; + RevRepository rev_repository_integer_value_; + + // Vector of tasks sorted by maximum starting (resp. minimum ending) time. + std::vector by_start_max_; + std::vector by_end_min_; + + // Tasks contained in the range [left_start_, right_start_) of by_start_max_ + // must be sorted and considered when building the profile. The state of these + // bounds is restored when a backtrack occurs. + int left_start_; + int right_start_; + + // Tasks contained in the range [left_end_, right_end_) of by_end_min_ must be + // sorted and considered when building the profile. The state of these bounds + // is restored when a backtrack occurs. + int left_end_; + int right_end_; + // Start (resp. end) of the compulsory parts used to build the profile. std::vector scp_; std::vector ecp_; @@ -112,13 +144,9 @@ class TimeTablingPerTask : public PropagatorInterface { std::vector profile_; IntegerValue profile_max_height_; - // True if the corresponding task is part of the profile, i.e., it has a - // mandatory part and is not optional. - std::vector is_in_profile_; - - // Tasks that are part of the profile. In other words, this vector contains - // all the tasks for which is_in_profile_ is true. - std::vector in_profile_; + // Reversible starting height of the reduced profile. This corresponds to the + // height of the leftmost profile rectangle that can be used for propagation. + IntegerValue starting_profile_height_; // True if the last call of the propagator has filtered the domain of a task // and changed the shape of the profile. @@ -129,6 +157,19 @@ class TimeTablingPerTask : public PropagatorInterface { std::vector tasks_to_sweep_; int num_tasks_to_sweep_; + // Reversible set of tasks to consider for reducing the profile. The set + // contains the [0, num_active_tasks_) prefix of active_tasks_. + std::vector active_tasks_; + int num_active_tasks_; + + // Reversible set (with random access) of tasks to consider for building the + // profile. The set contains the tasks in the [0, num_profile_tasks_) prefix + // of profile_tasks_. The positions of a task in profile_tasks_ is contained + // in positions_in_profile_tasks_. + std::vector profile_tasks_; + std::vector positions_in_profile_tasks_; + int num_profile_tasks_; + DISALLOW_COPY_AND_ASSIGN(TimeTablingPerTask); }; diff --git a/src/sat/timetable_edgefinding.cc b/ortools/sat/timetable_edgefinding.cc similarity index 99% rename from src/sat/timetable_edgefinding.cc rename to ortools/sat/timetable_edgefinding.cc index cfd8881233..548b29d5a8 100644 --- a/src/sat/timetable_edgefinding.cc +++ b/ortools/sat/timetable_edgefinding.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/timetable_edgefinding.h" +#include "ortools/sat/timetable_edgefinding.h" #include #include -#include "base/int_type.h" -#include "util/sort.h" +#include "ortools/base/int_type.h" +#include "ortools/util/sort.h" namespace operations_research { namespace sat { diff --git a/src/sat/timetable_edgefinding.h b/ortools/sat/timetable_edgefinding.h similarity index 98% rename from src/sat/timetable_edgefinding.h rename to ortools/sat/timetable_edgefinding.h index 01161548ef..7758429247 100644 --- a/src/sat/timetable_edgefinding.h +++ b/ortools/sat/timetable_edgefinding.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_SAT_TIMETABLE_EDGEFINDING_H_ #define OR_TOOLS_SAT_TIMETABLE_EDGEFINDING_H_ -#include "sat/integer.h" -#include "sat/intervals.h" -#include "sat/model.h" -#include "sat/sat_base.h" +#include "ortools/sat/integer.h" +#include "ortools/sat/intervals.h" +#include "ortools/sat/model.h" +#include "ortools/sat/sat_base.h" namespace operations_research { namespace sat { diff --git a/src/sat/util.cc b/ortools/sat/util.cc similarity index 98% rename from src/sat/util.cc rename to ortools/sat/util.cc index 6219a5a2d8..f896758db9 100644 --- a/src/sat/util.cc +++ b/ortools/sat/util.cc @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sat/util.h" +#include "ortools/sat/util.h" namespace operations_research { namespace sat { diff --git a/src/sat/util.h b/ortools/sat/util.h similarity index 92% rename from src/sat/util.h rename to ortools/sat/util.h index b5f42ce41b..e87cdd4e05 100644 --- a/src/sat/util.h +++ b/ortools/sat/util.h @@ -14,8 +14,8 @@ #ifndef OR_TOOLS_SAT_UTIL_H_ #define OR_TOOLS_SAT_UTIL_H_ -#include "sat/sat_parameters.pb.h" -#include "base/random.h" +#include "ortools/sat/sat_parameters.pb.h" +#include "ortools/base/random.h" namespace operations_research { namespace sat { diff --git a/src/util/BUILD b/ortools/util/BUILD similarity index 100% rename from src/util/BUILD rename to ortools/util/BUILD diff --git a/src/util/README b/ortools/util/README similarity index 100% rename from src/util/README rename to ortools/util/README diff --git a/src/util/bitset.cc b/ortools/util/bitset.cc similarity index 99% rename from src/util/bitset.cc rename to ortools/util/bitset.cc index 68ebb33373..ebc2bf2b2b 100644 --- a/src/util/bitset.cc +++ b/ortools/util/bitset.cc @@ -12,10 +12,10 @@ // limitations under the License. -#include "util/bitset.h" +#include "ortools/util/bitset.h" -#include "base/commandlineflags.h" -#include "base/logging.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" DEFINE_int32(bitset_small_bitset_count, 8, "threshold to count bits with buckets"); diff --git a/src/util/bitset.h b/ortools/util/bitset.h similarity index 99% rename from src/util/bitset.h rename to ortools/util/bitset.h index b1fdf2e545..34ba3766ba 100644 --- a/src/util/bitset.h +++ b/ortools/util/bitset.h @@ -21,9 +21,9 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/util/cached_log.cc b/ortools/util/cached_log.cc similarity index 94% rename from src/util/cached_log.cc rename to ortools/util/cached_log.cc index 5efc02bbfe..3a35fc6e97 100644 --- a/src/util/cached_log.cc +++ b/ortools/util/cached_log.cc @@ -12,9 +12,9 @@ // limitations under the License. -#include "util/cached_log.h" +#include "ortools/util/cached_log.h" -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/util/cached_log.h b/ortools/util/cached_log.h similarity index 90% rename from src/util/cached_log.h rename to ortools/util/cached_log.h index 0965f6330b..baaf86bca1 100644 --- a/src/util/cached_log.h +++ b/ortools/util/cached_log.h @@ -18,10 +18,10 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" namespace operations_research { // This class is used when manipulating search space estimations. It diff --git a/src/util/csharp/functions.swig b/ortools/util/csharp/functions.i similarity index 92% rename from src/util/csharp/functions.swig rename to ortools/util/csharp/functions.i index 0ce40e65d7..725aee3e43 100644 --- a/src/util/csharp/functions.swig +++ b/ortools/util/csharp/functions.i @@ -20,15 +20,15 @@ // ../functions_swig_helpers.h (which are SWIG-wrapped to C# in a // straightforward way). See the examples. -%include "base/base.swig" +%include "ortools/base/base.i" %include "std_common.i" %include "std_string.i" %{ #include -#include "base/integral_types.h" -#include "util/functions_swig_helpers.h" +#include "ortools/base/integral_types.h" +#include "ortools/util/functions_swig_helpers.h" %} %module(directors="1") operations_research_swig_util @@ -47,4 +47,4 @@ %feature("director") operations_research::swig_util::LongLongLongToBoolean; %feature("director") operations_research::swig_util::LongToVoid; -%include "util/functions_swig_helpers.h" +%include "ortools/util/functions_swig_helpers.h" diff --git a/src/util/csharp/proto.swig b/ortools/util/csharp/proto.i similarity index 98% rename from src/util/csharp/proto.swig rename to ortools/util/csharp/proto.i index 1cd239bfe3..4ec733cb7e 100644 --- a/src/util/csharp/proto.swig +++ b/ortools/util/csharp/proto.i @@ -12,11 +12,11 @@ // limitations under the License. // TODO(user): make this SWIG file comply with the SWIG style guide. -%include base/base.swig +%include ortools/base/base.i %{ #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" %} // SWIG macros to be used in generating C# wrappers for C++ protocol diff --git a/src/util/csharp/tuple_set.swig b/ortools/util/csharp/tuple_set.i similarity index 84% rename from src/util/csharp/tuple_set.swig rename to ortools/util/csharp/tuple_set.i index 058be888c9..0adbb56e80 100644 --- a/src/util/csharp/tuple_set.swig +++ b/ortools/util/csharp/tuple_set.i @@ -14,14 +14,14 @@ // This is the C# SWIG wrapper for ../tuple_set.h. See that file. // TODO(user): Refactor this file to comply with the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" %{ // TODO(user): See if we really need . #include -#include "base/integral_types.h" -#include "util/tuple_set.h" +#include "ortools/base/integral_types.h" +#include "ortools/util/tuple_set.h" %} -%include util/tuple_set.h +%include ortools/util/tuple_set.h diff --git a/src/util/filelineiter.h b/ortools/util/filelineiter.h similarity index 96% rename from src/util/filelineiter.h rename to ortools/util/filelineiter.h index 06cc6736e8..7ede53aaed 100644 --- a/src/util/filelineiter.h +++ b/ortools/util/filelineiter.h @@ -25,10 +25,10 @@ #ifndef OR_TOOLS_UTIL_FILELINEITER_H_ #define OR_TOOLS_UTIL_FILELINEITER_H_ -#include "base/logging.h" -#include "base/file.h" -#include "base/stringpiece_utils.h" -#include "base/strutil.h" +#include "ortools/base/logging.h" +#include "ortools/base/file.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/base/strutil.h" namespace operations_research { diff --git a/src/util/fp_utils.cc b/ortools/util/fp_utils.cc similarity index 99% rename from src/util/fp_utils.cc rename to ortools/util/fp_utils.cc index b9836f1b9d..904a2e6151 100644 --- a/src/util/fp_utils.cc +++ b/ortools/util/fp_utils.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/fp_utils.h" +#include "ortools/util/fp_utils.h" #include -#include "util/bitset.h" +#include "ortools/util/bitset.h" namespace operations_research { diff --git a/src/util/fp_utils.h b/ortools/util/fp_utils.h similarity index 98% rename from src/util/fp_utils.h rename to ortools/util/fp_utils.h index 0632d7295c..04952bc519 100644 --- a/src/util/fp_utils.h +++ b/ortools/util/fp_utils.h @@ -40,7 +40,7 @@ #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" #if defined(_MSC_VER) static inline double isnan(double value) { return _isnan(value); } @@ -201,7 +201,7 @@ inline bool IsIntegerWithinTolerance(FloatType x, FloatType tolerance) { // Handy alternatives to EXPECT_NEAR(), using relative and absolute tolerance // instead of relative tolerance only, and with a proper support for infinity. -// TODO(user): investigate moving this to base/ or some other place. +// TODO(user): investigate moving this to ortools/base/ or some other place. #define EXPECT_COMPARABLE(expected, obtained, epsilon) \ EXPECT_TRUE(operations_research::AreWithinAbsoluteOrRelativeTolerances( \ expected, obtained, epsilon, epsilon)) \ diff --git a/src/util/functions_swig_helpers.h b/ortools/util/functions_swig_helpers.h similarity index 94% rename from src/util/functions_swig_helpers.h rename to ortools/util/functions_swig_helpers.h index 6b82c0cb56..eed56e43ca 100644 --- a/src/util/functions_swig_helpers.h +++ b/ortools/util/functions_swig_helpers.h @@ -15,13 +15,13 @@ #define OR_TOOLS_UTIL_FUNCTIONS_SWIG_HELPERS_H_ // This file contains class definitions for the wrapping of C++ std::functions -// in Java and C#. It is #included by java/functions.swig and -// csharp/functions.swig. +// in Java and C#. It is #included by java/functions.i and +// csharp/functions.i. #include #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { namespace swig_util { diff --git a/src/util/functions_swig_test_helpers.h b/ortools/util/functions_swig_test_helpers.h similarity index 98% rename from src/util/functions_swig_test_helpers.h rename to ortools/util/functions_swig_test_helpers.h index 2d94e064bc..433a1228e4 100644 --- a/src/util/functions_swig_test_helpers.h +++ b/ortools/util/functions_swig_test_helpers.h @@ -22,7 +22,7 @@ // to find (whereas the class methods are easy to find). #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { class FunctionSwigTestHelpers { diff --git a/src/util/graph_export.cc b/ortools/util/graph_export.cc similarity index 95% rename from src/util/graph_export.cc rename to ortools/util/graph_export.cc index 7c142cde44..76e9a65e3e 100644 --- a/src/util/graph_export.cc +++ b/ortools/util/graph_export.cc @@ -12,15 +12,15 @@ // limitations under the License. -#include "util/graph_export.h" +#include "ortools/util/graph_export.h" #include -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" -#include "base/file.h" -#include "base/status.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/file.h" +#include "ortools/base/status.h" namespace operations_research { diff --git a/src/util/graph_export.h b/ortools/util/graph_export.h similarity index 95% rename from src/util/graph_export.h rename to ortools/util/graph_export.h index 261e76dd1d..01d7df2303 100644 --- a/src/util/graph_export.h +++ b/ortools/util/graph_export.h @@ -17,9 +17,9 @@ #include -#include "base/logging.h" -#include "base/macros.h" -#include "base/file.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/file.h" namespace operations_research { // ----- Export to graph file ----- diff --git a/src/util/iterators.h b/ortools/util/iterators.h similarity index 100% rename from src/util/iterators.h rename to ortools/util/iterators.h diff --git a/src/util/java/functions.swig b/ortools/util/java/functions.i similarity index 98% rename from src/util/java/functions.swig rename to ortools/util/java/functions.i index d0325d86e5..7950a6d85a 100644 --- a/src/util/java/functions.swig +++ b/ortools/util/java/functions.i @@ -21,15 +21,15 @@ // ../functions_swig_helpers.h (which are SWIG-wrapped to Java in a // straightforward way). See the examples. -%include "base/base.swig" +%include "ortools/base/base.i" %include "std_common.i" %include "std_string.i" %{ #include -#include "base/integral_types.h" -#include "util/functions_swig_helpers.h" +#include "ortools/base/integral_types.h" +#include "ortools/util/functions_swig_helpers.h" %} @@ -255,4 +255,4 @@ WRAP_STD_FUNCTION_JAVA_AUX(Package, "CppClass", CppClass, ReturnType, %feature("director") operations_research::swig_util::VoidToVoid; %rename (run) operations_research::swig_util::VoidToVoid::Run; -%include "util/functions_swig_helpers.h" +%include "ortools/util/functions_swig_helpers.h" diff --git a/src/util/java/proto.swig b/ortools/util/java/proto.i similarity index 97% rename from src/util/java/proto.swig rename to ortools/util/java/proto.i index ecf37d9f54..3080e1efca 100644 --- a/src/util/java/proto.swig +++ b/ortools/util/java/proto.i @@ -38,14 +38,14 @@ // // TODO(user): move this file to base/swig/java -%include "base/base.swig" +%include "ortools/base/base.i" %{ -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" %} %{ -#include "base/jniutil.h" +#include "ortools/base/jniutil.h" %} %define PROTO_INPUT(CppProtoType, JavaProtoType, param_name) diff --git a/src/util/java/tuple_set.swig b/ortools/util/java/tuple_set.i similarity index 89% rename from src/util/java/tuple_set.swig rename to ortools/util/java/tuple_set.i index 087ecaf8d1..539461aed2 100644 --- a/src/util/java/tuple_set.swig +++ b/ortools/util/java/tuple_set.i @@ -14,15 +14,15 @@ // This is the java SWIG wrapper for ../tuple_set.h. See that file. // TODO(user): Refactor this file to comply with the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" -%include "util/java/vector.swig" +%include "ortools/util/java/vector.i" %{ // TODO(user): see if we can remove #include -#include "base/integral_types.h" -#include "util/tuple_set.h" +#include "ortools/base/integral_types.h" +#include "ortools/util/tuple_set.h" %} %rename (insert) operations_research::IntTupleSet::Insert; @@ -37,4 +37,4 @@ %rename (clear) operations_research::IntTupleSet::Clear; %rename (rawData) operations_research::IntTupleSet::RawData; -%include util/tuple_set.h +%include ortools/util/tuple_set.h diff --git a/src/util/java/vector.swig b/ortools/util/java/vector.i similarity index 97% rename from src/util/java/vector.swig rename to ortools/util/java/vector.i index 6f5e2ed1ba..a3e2bb3674 100644 --- a/src/util/java/vector.swig +++ b/ortools/util/java/vector.i @@ -15,16 +15,16 @@ // where Num is an atomic numeric type. // // Normally we'd simply use %include "std_vector.i" with the %template -// directive (see http://www.swig.org/Doc1.3/Library.html#Library_nn15), but +// directive (see http://www.i.org/Doc1.3/Library.html#Library_nn15), but // in google3 we can't, because exceptions are forbidden. // // TODO(user): move to base/swig/java. -%include "base/base.swig" +%include "ortools/base/base.i" %{ #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" %} // Typemaps to represent const std::vector& arguments as arrays of diff --git a/src/util/monoid_operation_tree.h b/ortools/util/monoid_operation_tree.h similarity index 98% rename from src/util/monoid_operation_tree.h rename to ortools/util/monoid_operation_tree.h index e0cc8403f7..49b31cf590 100644 --- a/src/util/monoid_operation_tree.h +++ b/ortools/util/monoid_operation_tree.h @@ -18,9 +18,9 @@ #include #include -#include "base/logging.h" -#include "base/macros.h" -#include "base/stringprintf.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/stringprintf.h" namespace operations_research { diff --git a/src/util/permutation.h b/ortools/util/permutation.h similarity index 98% rename from src/util/permutation.h rename to ortools/util/permutation.h index 8f40728af5..8e7898c3bb 100644 --- a/src/util/permutation.h +++ b/ortools/util/permutation.h @@ -46,7 +46,7 @@ // operator[]() we could simply use that for the assignments we need // to do while walking around cycles of the permutation. But we cannot // insist on any such thing. To see why, consider the PackedArray -// class template in util/packed_array.h +// class template in ortools/util/packed_array.h // where operator[] is supplied for rvalues, but because each logical // array element is packed across potentially multiple instances of // the underlying data type that the C++ language knows about, there @@ -83,8 +83,8 @@ #ifndef OR_TOOLS_UTIL_PERMUTATION_H_ #define OR_TOOLS_UTIL_PERMUTATION_H_ -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" namespace operations_research { diff --git a/src/util/piecewise_linear_function.cc b/ortools/util/piecewise_linear_function.cc similarity index 99% rename from src/util/piecewise_linear_function.cc rename to ortools/util/piecewise_linear_function.cc index e7f3225f4d..73bcf38b07 100644 --- a/src/util/piecewise_linear_function.cc +++ b/ortools/util/piecewise_linear_function.cc @@ -11,15 +11,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/piecewise_linear_function.h" +#include "ortools/util/piecewise_linear_function.h" #include #include #include #include -#include "base/logging.h" -#include "base/stringprintf.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" namespace operations_research { namespace { diff --git a/src/util/piecewise_linear_function.h b/ortools/util/piecewise_linear_function.h similarity index 98% rename from src/util/piecewise_linear_function.h rename to ortools/util/piecewise_linear_function.h index 6ab46f3644..15b02c7904 100644 --- a/src/util/piecewise_linear_function.h +++ b/ortools/util/piecewise_linear_function.h @@ -26,11 +26,11 @@ #include #include -#include "base/basictypes.h" -#include "base/integral_types.h" -#include "base/macros.h" +#include "ortools/base/basictypes.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/macros.h" -#include "util/saturated_arithmetic.h" +#include "ortools/util/saturated_arithmetic.h" namespace operations_research { // This structure stores one straight line. It contains the start point, the diff --git a/src/util/proto_tools.cc b/ortools/util/proto_tools.cc similarity index 97% rename from src/util/proto_tools.cc rename to ortools/util/proto_tools.cc index 83c7948f44..2d5118f587 100644 --- a/src/util/proto_tools.cc +++ b/ortools/util/proto_tools.cc @@ -11,10 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/proto_tools.h" +#include "ortools/util/proto_tools.h" -#include "base/logging.h" -#include "base/file.h" +#include "ortools/base/logging.h" +#include "ortools/base/file.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/message.h" diff --git a/src/util/proto_tools.h b/ortools/util/proto_tools.h similarity index 100% rename from src/util/proto_tools.h rename to ortools/util/proto_tools.h diff --git a/src/util/python/functions.swig b/ortools/util/python/functions.i similarity index 99% rename from src/util/python/functions.swig rename to ortools/util/python/functions.i index c7847cc4fe..45f62e9a0d 100644 --- a/src/util/python/functions.swig +++ b/ortools/util/python/functions.i @@ -21,7 +21,7 @@ // // Usage and tests in pywrapfunctions_test.py -%include "base/base.swig" +%include "ortools/base/base.i" %{ #include diff --git a/src/util/python/proto.swig b/ortools/util/python/proto.i similarity index 98% rename from src/util/python/proto.swig rename to ortools/util/python/proto.i index 3453d0751a..70d2331950 100644 --- a/src/util/python/proto.swig +++ b/ortools/util/python/proto.i @@ -12,9 +12,9 @@ // limitations under the License. // TODO(user): make this SWIG file comply with the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" -%import "base/integral_types.h" +%import "ortools/base/integral_types.h" namespace operations_research { %define PY_PROTO_TYPEMAP(PythonModule, PythonType, CppType) diff --git a/src/util/python/vector.swig b/ortools/util/python/vector.i similarity index 96% rename from src/util/python/vector.swig rename to ortools/util/python/vector.i index d2ca4f32cc..9c8be649a7 100644 --- a/src/util/python/vector.swig +++ b/ortools/util/python/vector.i @@ -12,19 +12,19 @@ // limitations under the License. // TODO(user): make this SWIG file comply with the SWIG style guide. -%include "base/base.swig" +%include "ortools/base/base.i" -%import "base/integral_types.h" +%import "ortools/base/integral_types.h" namespace operations_research { // --------- std::vector wrapping ---------- -// We can't just reuse the google.swig code (see LIST_OUTPUT_TYPEMAP in that +// We can't just reuse the google.i code (see LIST_OUTPUT_TYPEMAP in that // file); for two reasons: // 1) We want a few extra typemaps (ITI integers <-> int, for example), but -// can't invoke google.swig's LIST_OUTPUT_TYPEMAP because it's only +// can't invoke google.i's LIST_OUTPUT_TYPEMAP because it's only // defined there. We may reuse base/swig/python-swig.cc though, since it's -// bundled with the google.swig rule. +// bundled with the google.i rule. // 2) We use a lot of function overloading, so we must add extra typechecks. // // Note(user): for an unknown reason, using the (handy) method PyObjAs() diff --git a/src/util/range_minimum_query.h b/ortools/util/range_minimum_query.h similarity index 99% rename from src/util/range_minimum_query.h rename to ortools/util/range_minimum_query.h index c8d6a1ea53..e8040b8ce7 100644 --- a/src/util/range_minimum_query.h +++ b/ortools/util/range_minimum_query.h @@ -39,7 +39,7 @@ #include #include -#include "util/bitset.h" +#include "ortools/util/bitset.h" namespace operations_research { template > diff --git a/src/util/range_query_function.cc b/ortools/util/range_query_function.cc similarity index 97% rename from src/util/range_query_function.cc rename to ortools/util/range_query_function.cc index 4a8cef72b9..cd251bee4c 100644 --- a/src/util/range_query_function.cc +++ b/ortools/util/range_query_function.cc @@ -11,14 +11,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/range_query_function.h" +#include "ortools/util/range_query_function.h" #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "util/range_minimum_query.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/util/range_minimum_query.h" namespace operations_research { namespace { diff --git a/src/util/range_query_function.h b/ortools/util/range_query_function.h similarity index 98% rename from src/util/range_query_function.h rename to ortools/util/range_query_function.h index 0764279c13..2ccd1a55b9 100644 --- a/src/util/range_query_function.h +++ b/ortools/util/range_query_function.h @@ -20,7 +20,7 @@ #include #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { // RangeIntToIntFunction is an interface to int64->int64 functions supporting diff --git a/src/util/rational_approximation.cc b/ortools/util/rational_approximation.cc similarity index 96% rename from src/util/rational_approximation.cc rename to ortools/util/rational_approximation.cc index a5ea2d71cc..8cd0929fa6 100644 --- a/src/util/rational_approximation.cc +++ b/ortools/util/rational_approximation.cc @@ -11,11 +11,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/rational_approximation.h" +#include "ortools/util/rational_approximation.h" #include #include -#include "base/logging.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/util/rational_approximation.h b/ortools/util/rational_approximation.h similarity index 97% rename from src/util/rational_approximation.h rename to ortools/util/rational_approximation.h index 4ec1d05075..8e4b2a9dad 100644 --- a/src/util/rational_approximation.h +++ b/ortools/util/rational_approximation.h @@ -16,7 +16,7 @@ #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { diff --git a/src/util/rcpsp_parser.cc b/ortools/util/rcpsp_parser.cc similarity index 98% rename from src/util/rcpsp_parser.cc rename to ortools/util/rcpsp_parser.cc index b9a0c9e539..982ec48bf4 100644 --- a/src/util/rcpsp_parser.cc +++ b/ortools/util/rcpsp_parser.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/rcpsp_parser.h" +#include "ortools/util/rcpsp_parser.h" -#include "base/strtoint.h" -#include "base/numbers.h" -#include "base/split.h" -#include "base/stringpiece_utils.h" -#include "util/filelineiter.h" +#include "ortools/base/strtoint.h" +#include "ortools/base/numbers.h" +#include "ortools/base/split.h" +#include "ortools/base/stringpiece_utils.h" +#include "ortools/util/filelineiter.h" namespace operations_research { diff --git a/src/util/rcpsp_parser.h b/ortools/util/rcpsp_parser.h similarity index 99% rename from src/util/rcpsp_parser.h rename to ortools/util/rcpsp_parser.h index 9f419e4a25..8979e1c6d9 100644 --- a/src/util/rcpsp_parser.h +++ b/ortools/util/rcpsp_parser.h @@ -20,7 +20,7 @@ #include #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { diff --git a/src/util/return_macros.h b/ortools/util/return_macros.h similarity index 100% rename from src/util/return_macros.h rename to ortools/util/return_macros.h diff --git a/src/util/rev.h b/ortools/util/rev.h similarity index 98% rename from src/util/rev.h rename to ortools/util/rev.h index 5384a52db2..d45cf42029 100644 --- a/src/util/rev.h +++ b/ortools/util/rev.h @@ -15,11 +15,11 @@ #ifndef OR_TOOLS_UTIL_REV_H_ #define OR_TOOLS_UTIL_REV_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/logging.h" -#include "base/map_util.h" +#include "ortools/base/logging.h" +#include "ortools/base/map_util.h" namespace operations_research { @@ -43,7 +43,7 @@ class ReversibleInterface { // This is meant to be used for small types that are efficient to copy, like // all the basic types, std::pair and things like this. template -class RevRepository : ReversibleInterface { +class RevRepository : public ReversibleInterface { public: RevRepository() : stamp_(0) {} diff --git a/src/util/running_stat.h b/ortools/util/running_stat.h similarity index 98% rename from src/util/running_stat.h rename to ortools/util/running_stat.h index b2c8a97e4d..feb1d3ec34 100644 --- a/src/util/running_stat.h +++ b/ortools/util/running_stat.h @@ -16,8 +16,8 @@ #include -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" namespace operations_research { diff --git a/src/util/saturated_arithmetic.h b/ortools/util/saturated_arithmetic.h similarity index 98% rename from src/util/saturated_arithmetic.h rename to ortools/util/saturated_arithmetic.h index c08fe92f59..cb4ff64462 100644 --- a/src/util/saturated_arithmetic.h +++ b/ortools/util/saturated_arithmetic.h @@ -14,10 +14,10 @@ #ifndef OR_TOOLS_UTIL_SATURATED_ARITHMETIC_H_ #define OR_TOOLS_UTIL_SATURATED_ARITHMETIC_H_ -#include "base/casts.h" -#include "base/integral_types.h" +#include "ortools/base/casts.h" +#include "ortools/base/integral_types.h" -#include "util/bitset.h" +#include "ortools/util/bitset.h" namespace operations_research { // ---------- Overflow utility functions ---------- diff --git a/src/util/sort.h b/ortools/util/sort.h similarity index 100% rename from src/util/sort.h rename to ortools/util/sort.h diff --git a/src/util/sorted_interval_list.cc b/ortools/util/sorted_interval_list.cc similarity index 98% rename from src/util/sorted_interval_list.cc rename to ortools/util/sorted_interval_list.cc index 2455f785fa..5d9750fe89 100644 --- a/src/util/sorted_interval_list.cc +++ b/ortools/util/sorted_interval_list.cc @@ -11,13 +11,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/sorted_interval_list.h" +#include "ortools/util/sorted_interval_list.h" #include -#include "base/logging.h" -#include "base/stringprintf.h" -#include "util/saturated_arithmetic.h" +#include "ortools/base/logging.h" +#include "ortools/base/stringprintf.h" +#include "ortools/util/saturated_arithmetic.h" namespace operations_research { diff --git a/src/util/sorted_interval_list.h b/ortools/util/sorted_interval_list.h similarity index 99% rename from src/util/sorted_interval_list.h rename to ortools/util/sorted_interval_list.h index 7d5910a5cb..ea87107416 100644 --- a/src/util/sorted_interval_list.h +++ b/ortools/util/sorted_interval_list.h @@ -19,7 +19,7 @@ #include #include -#include "base/integral_types.h" +#include "ortools/base/integral_types.h" namespace operations_research { diff --git a/src/util/stats.cc b/ortools/util/stats.cc similarity index 97% rename from src/util/stats.cc rename to ortools/util/stats.cc index a583c983ab..4a39ded5ab 100644 --- a/src/util/stats.cc +++ b/ortools/util/stats.cc @@ -12,18 +12,16 @@ // limitations under the License. -#include "util/stats.h" +#include "ortools/util/stats.h" #include -#include "base/stringprintf.h" -#include "base/sysinfo.h" - -#ifndef ANDROID_JNI -#include "base/encodingutils.h" -#endif +#include "ortools/base/encodingutils.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/sysinfo.h" -#include "base/stl_util.h" + +#include "ortools/base/stl_util.h" namespace operations_research { diff --git a/src/util/stats.h b/ortools/util/stats.h similarity index 99% rename from src/util/stats.h rename to ortools/util/stats.h index c6f5f4865e..bc1d80afb1 100644 --- a/src/util/stats.h +++ b/ortools/util/stats.h @@ -71,7 +71,7 @@ #include #include -#include "base/timer.h" +#include "ortools/base/timer.h" namespace operations_research { diff --git a/src/util/string_array.h b/ortools/util/string_array.h similarity index 100% rename from src/util/string_array.h rename to ortools/util/string_array.h diff --git a/src/util/time_limit.cc b/ortools/util/time_limit.cc similarity index 97% rename from src/util/time_limit.cc rename to ortools/util/time_limit.cc index eecf84e024..9331a51899 100644 --- a/src/util/time_limit.cc +++ b/ortools/util/time_limit.cc @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/time_limit.h" +#include "ortools/util/time_limit.h" -#include "base/join.h" +#include "ortools/base/join.h" DEFINE_bool(time_limit_use_usertime, false, "If true, rely on the user time in the TimeLimit class. This is " diff --git a/src/util/time_limit.h b/ortools/util/time_limit.h similarity index 97% rename from src/util/time_limit.h rename to ortools/util/time_limit.h index 3ddc5f126e..7c7d2f08c0 100644 --- a/src/util/time_limit.h +++ b/ortools/util/time_limit.h @@ -23,13 +23,14 @@ #include #endif -#include "base/commandlineflags.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/port.h" -#include "base/timer.h" -#include "base/time_support.h" -#include "util/running_stat.h" +#include "ortools/base/commandlineflags.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/port.h" +#include "ortools/base/timer.h" +#include "ortools/base/time_support.h" +#include "ortools/base/sysinfo.h" +#include "ortools/util/running_stat.h" // Enables to change the behavior of the TimeLimit class to use "usertime" // instead of walltime. This is mainly useful for benchmarks. @@ -212,9 +213,7 @@ return 1e-9 * (base::GetCurrentTimeNanos() - start_ns_); RunningMax running_max_; // Only used when FLAGS_time_limit_use_usertime is true. -#ifndef ANDROID_JNI UserTimer user_timer_; -#endif double limit_in_seconds_; double deterministic_limit_; @@ -298,7 +297,7 @@ class NestedTimeLimit { // ################## Implementations below ##################### inline TimeLimit::TimeLimit(double limit_in_seconds, double deterministic_limit) -: start_ns_(base::GetCurrentTimeNanos()), + : start_ns_(base::GetCurrentTimeNanos()), last_ns_(start_ns_), limit_ns_(limit_in_seconds >= 1e-9 * (kint64max - start_ns_) ? kint64max @@ -325,7 +324,7 @@ inline bool TimeLimit::LimitReached() { return true; } -const int64 current_ns = base::GetCurrentTimeNanos(); + const int64 current_ns = base::GetCurrentTimeNanos(); running_max_.Add(std::max(safety_buffer_ns_, current_ns - last_ns_)); last_ns_ = current_ns; if (current_ns + running_max_.GetCurrentMax() >= limit_ns_) { @@ -351,7 +350,7 @@ const int64 current_ns = base::GetCurrentTimeNanos(); inline double TimeLimit::GetTimeLeft() const { if (limit_ns_ == kint64max) return std::numeric_limits::infinity(); -const int64 delta_ns = limit_ns_ - base::GetCurrentTimeNanos(); + const int64 delta_ns = limit_ns_ - base::GetCurrentTimeNanos(); if (delta_ns < 0) return 0.0; #ifdef ANDROID_JNI return delta_ns * 1e-9; diff --git a/src/util/tuple_set.h b/ortools/util/tuple_set.h similarity index 98% rename from src/util/tuple_set.h rename to ortools/util/tuple_set.h index 7a48a4f371..e003f9a1b8 100644 --- a/src/util/tuple_set.h +++ b/ortools/util/tuple_set.h @@ -35,15 +35,15 @@ #define OR_TOOLS_UTIL_TUPLE_SET_H_ #include -#include "base/hash.h" -#include "base/hash.h" +#include "ortools/base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/map_util.h" -#include "base/hash.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" +#include "ortools/base/map_util.h" +#include "ortools/base/hash.h" namespace operations_research { // ----- Main IntTupleSet class ----- diff --git a/src/util/vector_map.h b/ortools/util/vector_map.h similarity index 98% rename from src/util/vector_map.h rename to ortools/util/vector_map.h index 110f60e63f..a074047521 100644 --- a/src/util/vector_map.h +++ b/ortools/util/vector_map.h @@ -17,9 +17,9 @@ #ifndef OR_TOOLS_UTIL_VECTOR_MAP_H_ #define OR_TOOLS_UTIL_VECTOR_MAP_H_ -#include "base/hash.h" +#include "ortools/base/hash.h" #include -#include "base/map_util.h" +#include "ortools/base/map_util.h" namespace operations_research { diff --git a/src/util/vector_or_function.h b/ortools/util/vector_or_function.h similarity index 97% rename from src/util/vector_or_function.h rename to ortools/util/vector_or_function.h index 31fe6885a8..d87930ba2d 100644 --- a/src/util/vector_or_function.h +++ b/ortools/util/vector_or_function.h @@ -17,8 +17,8 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" namespace operations_research { diff --git a/src/util/xml_helper.cc b/ortools/util/xml_helper.cc similarity index 94% rename from src/util/xml_helper.cc rename to ortools/util/xml_helper.cc index 5b3b923449..2aec1c06c1 100644 --- a/src/util/xml_helper.cc +++ b/ortools/util/xml_helper.cc @@ -12,14 +12,14 @@ // limitations under the License. -#include "util/xml_helper.h" +#include "ortools/util/xml_helper.h" #include #include -#include "base/stringprintf.h" -#include "base/strutil.h" -#include "base/join.h" +#include "ortools/base/stringprintf.h" +#include "ortools/base/strutil.h" +#include "ortools/base/join.h" namespace operations_research { diff --git a/src/util/xml_helper.h b/ortools/util/xml_helper.h similarity index 98% rename from src/util/xml_helper.h rename to ortools/util/xml_helper.h index 1bc1cecbbd..c887928cd1 100644 --- a/src/util/xml_helper.h +++ b/ortools/util/xml_helper.h @@ -18,7 +18,7 @@ #include #include #include -#include "base/macros.h" +#include "ortools/base/macros.h" namespace operations_research { diff --git a/src/util/zvector.h b/ortools/util/zvector.h similarity index 97% rename from src/util/zvector.h rename to ortools/util/zvector.h index ea4f6df6ff..3a3ac89dd4 100644 --- a/src/util/zvector.h +++ b/ortools/util/zvector.h @@ -26,9 +26,9 @@ #include #include -#include "base/integral_types.h" -#include "base/logging.h" -#include "base/macros.h" +#include "ortools/base/integral_types.h" +#include "ortools/base/logging.h" +#include "ortools/base/macros.h" // An array class for storing arrays of integers. // diff --git a/src/algorithms/__init__.py b/src/algorithms/__init__.py deleted file mode 100644 index 4a3e5f3bca..0000000000 --- a/src/algorithms/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import os as _os -__path__.append(_os.path.join(__path__[0], '../gen/ortools/algorithms')) -__path__.append(_os.path.join(__path__[0], '../../lib')) diff --git a/src/constraint_solver/__init__.py b/src/constraint_solver/__init__.py deleted file mode 100644 index 4f485039ee..0000000000 --- a/src/constraint_solver/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import os as _os -__path__.append(_os.path.join(__path__[0], '../gen/ortools/constraint_solver')) -__path__.append(_os.path.join(__path__[0], '../../lib')) diff --git a/src/graph/__init__.py b/src/graph/__init__.py deleted file mode 100644 index 5ef670ab87..0000000000 --- a/src/graph/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import os as _os -__path__.append(_os.path.join(__path__[0], '../gen/ortools/graph')) -__path__.append(_os.path.join(__path__[0], '../../lib')) diff --git a/src/linear_solver/__init__.py b/src/linear_solver/__init__.py deleted file mode 100644 index b7ae67b29e..0000000000 --- a/src/linear_solver/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import os as _os -__path__.append(_os.path.join(__path__[0], '../gen/ortools/linear_solver')) -__path__.append(_os.path.join(__path__[0], '../../lib')) diff --git a/src/ortools/__init__.py b/src/ortools/__init__.py deleted file mode 100644 index 8fe4794541..0000000000 --- a/src/ortools/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2010-2014 Google -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -__version__ = "VVVV" \ No newline at end of file diff --git a/tools/generate_deps.sh b/tools/generate_deps.sh index 5f0d1b9067..db61bb8f60 100755 --- a/tools/generate_deps.sh +++ b/tools/generate_deps.sh @@ -1,10 +1,10 @@ main_dir=$2 -# List all files on src/$main_dir -all_cc=`ls src/$main_dir/*.cc` -all_h=`ls src/$main_dir/*.h` -if ls src/$main_dir/*proto 1> /dev/null 2>&1; then - all_proto=`ls src/$main_dir/*.proto` +# List all files on ortools/$main_dir +all_cc=`ls ortools/$main_dir/*.cc` +all_h=`ls ortools/$main_dir/*.h` +if ls ortools/$main_dir/*proto 1> /dev/null 2>&1; then + all_proto=`ls ortools/$main_dir/*.proto` else all_proto= fi @@ -51,7 +51,7 @@ function print_list_with_prefix { all_deps_str= for dir in ${@:2} do - all_deps_str+=\ $(grep -e "^\#include \"$dir" src/$dir/*.h | cut -d '"' -f 2 | sort -u) + all_deps_str+=\ $(grep -e "^\#include \"ortools/$dir" ortools/$dir/*.h | cut -d '"' -f 2 | sort -u) done echo $1_DEPS = \\ print_include_list "$all_deps_str" @@ -59,9 +59,9 @@ echo # generate XXX_LIB_OBJS macro. # Get list of obj files to build. -all_cc_objs_tmp=${all_cc//src/\$\(OBJ_DIR\)} +all_cc_objs_tmp=${all_cc//ortools/\$\(OBJ_DIR\)} all_cc_objs=${all_cc_objs_tmp//\.cc/\.\$O} -all_proto_objs_tmp=${all_proto//src/\$\(OBJ_DIR\)} +all_proto_objs_tmp=${all_proto//ortools/\$\(OBJ_DIR\)} all_proto_objs=${all_proto_objs_tmp//\.proto/.pb.\$O} all_objs=$all_cc_objs all_objs+=\ $all_proto_objs @@ -78,12 +78,12 @@ do all_deps_str= for dir in ${@:2} do - all_deps_str+=\ $(grep -e "^\#include \"$dir" $file | cut -d '"' -f 2 | sort -u) + all_deps_str+=\ $(grep -e "^\#include \"ortools/$dir" $file | cut -d '"' -f 2 | sort -u) done # Print makefile command. if [[ ! -z ${all_deps_str// } ]] then - echo \$\(SRC_DIR\)/$2/$name.h: \\ + echo \$\(SRC_DIR\)/ortools/$2/$name.h: \\ print_include_list "$all_deps_str" echo fi @@ -97,13 +97,13 @@ do all_deps_str= for dir in ${@:2} do - all_deps_str+=\ $(grep -e "^\#include \"$dir" $file | cut -d '"' -f 2 | sort -u) + all_deps_str+=\ $(grep -e "^\#include \"ortools/$dir" $file | cut -d '"' -f 2 | sort -u) done # Print makefile command. echo \$\(OBJ_DIR\)/$2/$name.\$O: \\ - echo \ \ \ \ \$\(SRC_DIR\)/$2/$name.cc \\ + echo \ \ \ \ \$\(SRC_DIR\)/ortools/$2/$name.cc \\ print_include_list "$all_deps_str" - echo -e '\t'\$\(CCC\) \$\(CFLAGS\) -c \$\(SRC_DIR\)/$2/$name.cc \$\(OBJ_OUT\)\$\(OBJ_DIR\)\$S$2$\S$name.\$O + echo -e '\t'\$\(CCC\) \$\(CFLAGS\) -c \$\(SRC_DIR\)\$Sortools\$S$2\$S$name.cc \$\(OBJ_OUT\)\$\(OBJ_DIR\)\$S$2$\S$name.\$O echo done @@ -115,21 +115,21 @@ do all_deps_str= for dir in ${@:2} do - all_deps_str+=\ $(grep -e "^\import \"$dir" $file | cut -d '"' -f 2 | sed -e "s/proto/pb.h/" | sort -u) + all_deps_str+=\ $(grep -e "^\import \"ortools/$dir" $file | cut -d '"' -f 2 | sed -e "s/proto/pb.h/" | sort -u) done # Print makefile command. - echo \$\(GEN_DIR\)/$2/$name.pb.cc: \$\(SRC_DIR\)/$2/$name.proto - echo -e '\t'\$\(PROTOBUF_DIR\)/bin/protoc --proto_path=\$\(INC_DIR\) --cpp_out=\$\(GEN_DIR\) \$\(SRC_DIR\)/$2/$name.proto + echo \$\(GEN_DIR\)/ortools/$2/$name.pb.cc: \$\(SRC_DIR\)/ortools/$2/$name.proto + echo -e '\t'\$\(PROTOBUF_DIR\)/bin/protoc --proto_path=\$\(INC_DIR\) --cpp_out=\$\(GEN_DIR\) \$\(SRC_DIR\)/ortools/$2/$name.proto echo if [[ ! -z ${all_deps_str// } ]] then - echo \$\(GEN_DIR\)/$2/$name.pb.h: \$\(GEN_DIR\)/$2/$name.pb.cc \\ + echo \$\(GEN_DIR\)/ortools/$2/$name.pb.h: \$\(GEN_DIR\)/ortools/$2/$name.pb.cc \\ print_include_list "$all_deps_str" else - echo \$\(GEN_DIR\)/$2/$name.pb.h: \$\(GEN_DIR\)/$2/$name.pb.cc + echo \$\(GEN_DIR\)/ortools/$2/$name.pb.h: \$\(GEN_DIR\)/ortools/$2/$name.pb.cc fi echo - echo \$\(OBJ_DIR\)/$2/$name.pb.\$O: \$\(GEN_DIR\)/$2/$name.pb.cc - echo -e '\t'\$\(CCC\) \$\(CFLAGS\) -c \$\(GEN_DIR\)/$2/$name.pb.cc \$\(OBJ_OUT\)\$\(OBJ_DIR\)\$S$2$\S$name.pb.\$O + echo \$\(OBJ_DIR\)/$2/$name.pb.\$O: \$\(GEN_DIR\)/ortools/$2/$name.pb.cc + echo -e '\t'\$\(CCC\) \$\(CFLAGS\) -c \$\(GEN_DIR\)/ortools/$2/$name.pb.cc \$\(OBJ_OUT\)\$\(OBJ_DIR\)\$S$2$\S$name.pb.\$O echo done