always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move proto_util

Browse Source
This commit is contained in:
Laurent Perron
2016-10-07 17:29:07 +02:00
parent f23c254a51
commit 18b97584c4
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cpp/mps_driver.cc
View File

@@ -30,9 +30,9 @@
#include "base/strutil.h"
#include "glop/lp_solver.h"
#include "glop/parameters.pb.h"
#include "glop/proto_utils.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"

2
examples/cpp/solve.cc
View File

@@ -27,12 +27,12 @@
#include "base/file.h"
//#include "base/options.h"
#include "base/stringpiece_utils.h"
#include "glop/proto_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"
DEFINE_string(input, "", "REQUIRED: Input file name.");

28
makefiles/Makefile.gen.mk
View File

@@ -518,7 +518,9 @@ LP_DATA_DEPS = \
$(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)/algorithms/dynamic_permutation.h \
$(SRC_DIR)/linear_solver/linear_solver.h \
$(GEN_DIR)/linear_solver/linear_solver.pb.h
LP_DATA_LIB_OBJS = \
$(OBJ_DIR)/lp_data/lp_data.$O \
@@ -529,6 +531,7 @@ LP_DATA_LIB_OBJS = \
$(OBJ_DIR)/lp_data/matrix_scaler.$O \
$(OBJ_DIR)/lp_data/matrix_utils.$O \
$(OBJ_DIR)/lp_data/mps_reader.$O \
$(OBJ_DIR)/lp_data/proto_utils.$O \
$(OBJ_DIR)/lp_data/sparse.$O \
$(OBJ_DIR)/lp_data/sparse_column.$O
@@ -588,6 +591,10 @@ $(SRC_DIR)/lp_data/permutation.h: \
$(SRC_DIR)/lp_data/lp_types.h \
$(SRC_DIR)/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)/lp_data/sparse_column.h: \
$(SRC_DIR)/lp_data/sparse_vector.h
@@ -679,6 +686,11 @@ $(OBJ_DIR)/lp_data/mps_reader.$O: \
$(SRC_DIR)/base/strutil.h
$(CCC) $(CFLAGS) -c $(SRC_DIR)/lp_data/mps_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
$(OBJ_DIR)/lp_data/sparse.$O: \
$(SRC_DIR)/lp_data/sparse.cc \
$(SRC_DIR)/lp_data/lp_data.h \
@@ -750,7 +762,6 @@ GLOP_LIB_OBJS = \
$(OBJ_DIR)/glop/markowitz.$O \
$(OBJ_DIR)/glop/preprocessor.$O \
$(OBJ_DIR)/glop/primal_edge_norms.$O \
$(OBJ_DIR)/glop/proto_utils.$O \
$(OBJ_DIR)/glop/reduced_costs.$O \
$(OBJ_DIR)/glop/revised_simplex.$O \
$(OBJ_DIR)/glop/status.$O \
@@ -833,10 +844,6 @@ $(SRC_DIR)/glop/primal_edge_norms.h: \
$(SRC_DIR)/lp_data/lp_data.h \
$(SRC_DIR)/lp_data/lp_types.h
$(SRC_DIR)/glop/proto_utils.h: \
$(SRC_DIR)/lp_data/lp_data.h \
$(GEN_DIR)/linear_solver/linear_solver.pb.h
$(SRC_DIR)/glop/rank_one_update.h: \
$(SRC_DIR)/glop/status.h \
$(SRC_DIR)/base/logging.h \
@@ -929,7 +936,6 @@ $(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/proto_utils.h \
$(SRC_DIR)/glop/status.h \
$(SRC_DIR)/util/fp_utils.h \
$(SRC_DIR)/util/proto_tools.h \
@@ -939,7 +945,8 @@ $(OBJ_DIR)/glop/lp_solver.$O: \
$(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/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
$(OBJ_DIR)/glop/lu_factorization.$O: \
@@ -972,11 +979,6 @@ $(OBJ_DIR)/glop/primal_edge_norms.$O: \
$(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
$(OBJ_DIR)/glop/proto_utils.$O: \
$(SRC_DIR)/glop/proto_utils.cc \
$(SRC_DIR)/glop/proto_utils.h
$(CCC) $(CFLAGS) -c $(SRC_DIR)/glop/proto_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sproto_utils.$O
$(OBJ_DIR)/glop/reduced_costs.$O: \
$(SRC_DIR)/glop/reduced_costs.cc \
$(SRC_DIR)/glop/reduced_costs.h \

2
src/glop/lp_solver.cc
View File

@@ -25,10 +25,10 @@
#include "base/join.h"
#include "base/strutil.h"
#include "glop/preprocessor.h"
#include "glop/proto_utils.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"
#ifndef ANDROID_JNI

2
src/glop/proto_utils.cc → src/lp_data/proto_utils.cc
View File

@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "glop/proto_utils.h"
#include "lp_data/proto_utils.h"
namespace operations_research {
namespace glop {

6
src/glop/proto_utils.h → src/lp_data/proto_utils.h
View File

@@ -11,8 +11,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef OR_TOOLS_GLOP_PROTO_UTILS_H_
#define OR_TOOLS_GLOP_PROTO_UTILS_H_
#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"
@@ -31,4 +31,4 @@ void MPModelProtoToLinearProgram(const MPModelProto& input,
} // namespace glop
} // namespace operations_research
#endif // OR_TOOLS_GLOP_PROTO_UTILS_H_
#endif // OR_TOOLS_LP_DATA_PROTO_UTILS_H_

2
tools/generate_all_deps.sh
View File

@@ -1,6 +1,6 @@
tools/generate_deps.sh BASE base
tools/generate_deps.sh UTIL util base
tools/generate_deps.sh LP_DATA lp_data util base algorithms
tools/generate_deps.sh LP_DATA lp_data util base algorithms linear_solver
tools/generate_deps.sh GLOP glop util base lp_data linear_solver
tools/generate_deps.sh GRAPH graph base util
tools/generate_deps.sh ALGORITHMS algorithms base util graph linear_solver