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

generate proto3 version of the linear solver proto in C#

Browse Source
This commit is contained in:
Laurent Perron
2022-02-15 18:33:14 +01:00
parent 8fe2df9a18
commit e1d25c96ee
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
makefiles/Makefile.dotnet.mk
View File

@@ -119,6 +119,19 @@ $(GEN_DIR)/ortools/constraint_solver/RoutingEnums.pb.cs: \
--csharp_opt=file_extension=.pb.cs \
$(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_enums.proto
$(GEN_DIR)/ortools/linear_solver/linear_solver.proto: \
$(SRC_DIR)/ortools/linear_solver/linear_solver.proto \
| $(GEN_DIR)/ortools/linear_solver
$(SED) -f tools$Sproto2_to_proto3.sed $(SRC_DIR)/ortools/linear_solver/linear_solver.proto > $(GEN_DIR)/ortools/linear_solver/linear_solver.proto
$(GEN_DIR)/ortools/linear_solver/LinearSolver.pb.cs: \
$(GEN_DIR)/ortools/linear_solver/linear_solver.proto \
| $(GEN_DIR)/ortools/linear_solver
$(PROTOC) --proto_path=$(GEN_DIR) --proto_path=$(SRC_DIR) \
--csharp_out=$(GEN_PATH)$Sortools$Slinear_solver \
--csharp_opt=file_extension=.pb.cs \
$(GEN_DIR)$Sortools$Slinear_solver$Slinear_solver.proto
$(GEN_DIR)/ortools/sat/CpModel.pb.cs: \
$(SRC_DIR)/ortools/sat/cp_model.proto \
| $(GEN_DIR)/ortools/sat

2
ortools/linear_solver/linear_solver.proto
View File

@@ -419,8 +419,8 @@ message MPModelRequest {
// program?).
// This must remain consistent with MPSolver::OptimizationProblemType.
enum SolverType {
GLOP_LINEAR_PROGRAMMING = 2; // Recommended default for LP models.
CLP_LINEAR_PROGRAMMING = 0;
GLOP_LINEAR_PROGRAMMING = 2; // Recommended default for LP models.
GLPK_LINEAR_PROGRAMMING = 1;
GUROBI_LINEAR_PROGRAMMING = 6; // Commercial, needs a valid license.
XPRESS_LINEAR_PROGRAMMING = 101; // Commercial, needs a valid license. NOLINT

3
tools/proto2_to_proto3.sed Normal file
View File

@@ -0,0 +1,3 @@
s| \[default = [^;]*\]||g
s|proto2|proto3|g