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

fix .Net and Java build

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-08-27 13:27:19 +02:00
parent 70fa00beaa
commit 454bb2cb44
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/Makefile.dotnet.mk
View File

@@ -409,6 +409,7 @@ $(DOTNET_ORTOOLS_RUNTIME_NUPKG): \
$(GEN_DIR)/ortools/constraint_solver/RoutingParameters.pb.cs \
$(GEN_DIR)/ortools/constraint_solver/RoutingEnums.pb.cs \
$(GEN_DIR)/ortools/sat/CpModel.pb.cs \
$(GEN_DIR)/ortools/sat/SatParameters.pb.cs \
$(GEN_DIR)/ortools/util/OptionalBoolean.pb.cs \
| $(DOTNET_ORTOOLS_SNK) $(DOTNET_PACKAGE_DIR)
"$(DOTNET_BIN)" build $(DOTNET_BUILD_ARGS) $(TEMP_DOTNET_DIR)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME)$S$(DOTNET_ORTOOLS_RUNTIME_ASSEMBLY_NAME).csproj

4
makefiles/Makefile.java.mk
View File

@@ -347,9 +347,9 @@ $(JAVA_ORTOOLS_JAR): \
$(GEN_DIR)/java/com/google/ortools/constraintsolver/RoutingParameters.java \
$(GEN_DIR)/java/com/google/ortools/constraintsolver/RoutingEnums.java \
$(GEN_DIR)/java/com/google/ortools/linearsolver/MPModelProto.java \
$(GEN_DIR)/java/com/google/ortools/sat/CpModelProto.java \
$(GEN_DIR)/java/com/google/ortools/sat/SatParameters.java \
$(GEN_DIR)/java/com/google/ortools/util/OptionalBoolean.java \
$(GEN_DIR)/java/com/google/ortools/sat/CpModelProto.java \
$(SRC_DIR)/ortools/java/com/google/ortools/Loader.java \
$(SRC_DIR)/ortools/java/com/google/ortools/constraintsolver/IntIntToLongFunction.java \
$(SRC_DIR)/ortools/java/com/google/ortools/constraintsolver/JavaDecisionBuilder.java \
@@ -481,9 +481,9 @@ $(TEMP_JAVA_DIR)/$(JAVA_ORTOOLS_PROJECT)/timestamp: \
$(GEN_DIR)/java/com/google/ortools/constraintsolver/RoutingParameters.java \
$(GEN_DIR)/java/com/google/ortools/constraintsolver/RoutingEnums.java \
$(GEN_DIR)/java/com/google/ortools/linearsolver/MPModelProto.java \
$(GEN_DIR)/java/com/google/ortools/sat/CpModelProto.java \
$(GEN_DIR)/java/com/google/ortools/sat/SatParameters.java \
$(GEN_DIR)/java/com/google/ortools/util/OptionalBoolean.java \
$(GEN_DIR)/java/com/google/ortools/sat/CpModelProto.java \
$(SRC_DIR)/ortools/java/com/google/ortools/Loader.java \
$(SRC_DIR)/ortools/java/com/google/ortools/constraintsolver/IntIntToLongFunction.java \
$(SRC_DIR)/ortools/java/com/google/ortools/constraintsolver/JavaDecisionBuilder.java \

4
ortools/constraint_solver/routing.h
View File

@@ -376,6 +376,7 @@ class RoutingModel {
// clang-format on
};
#ifndef SWIG
/// A ResourceGroup defines a set of available Resources with attributes on
/// one or multiple dimensions.
/// For every ResourceGroup in the model, each (used) vehicle in the solution
@@ -444,6 +445,7 @@ class RoutingModel {
/// All indices of dimensions affected by this resource group.
absl::flat_hash_set<DimensionIndex> affected_dimension_indices_;
};
#endif // SWIG
/// Constant used to express a hard constraint instead of a soft penalty.
static const int64_t kNoPenalty;
@@ -680,12 +682,14 @@ class RoutingModel {
return primary_constrained_dimension_;
}
#ifndef SWIG
ResourceGroup* const AddResourceGroup();
// clang-format off
const std::vector<std::unique_ptr<ResourceGroup> >& GetResourceGroups()
const {
return resource_groups_;
}
#endif // SWIG
// clang-format on
/// Returns the indices of resource groups for this dimension. This method can
/// only be called after the model has been closed.

1
ortools/sat/sat_parameters.proto
View File

@@ -17,6 +17,7 @@ package operations_research.sat;
option java_package = "com.google.ortools.sat";
option java_multiple_files = true;
option csharp_namespace = "Google.OrTools.Sat";
// Contains the definitions for all the sat algorithm parameters and their