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

[PACKING] update packing solver

Browse Source
This commit is contained in:
Laurent Perron
2021-11-19 10:34:24 +01:00
parent 65951e1b13
commit 6c474223bd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ortools/packing/arc_flow_solver.cc
View File

@@ -72,13 +72,18 @@ double ConvertVectorBinPackingProblem(const vbp::VectorBinPackingProblem& input,
vbp::VectorBinPackingSolution SolveVectorBinPackingWithArcFlow(
const vbp::VectorBinPackingProblem& problem,
MPSolver::OptimizationProblemType solver_type,
const std::string& mip_params, double time_limit, int num_threads) {
const std::string& mip_params, double time_limit, int num_threads,
int max_bins) {
ArcFlowGraph graph;
const double arc_flow_time = ConvertVectorBinPackingProblem(problem, &graph);
int max_num_bins = 0;
for (const auto& item : problem.item()) {
max_num_bins += item.num_copies();
if (max_bins > 0) {
max_num_bins = max_bins;
} else {
for (const auto& item : problem.item()) {
max_num_bins += item.num_copies();
}
}
const int num_types = problem.item_size();
std::vector<std::vector<MPVariable*>> incoming_vars(graph.nodes.size());

3
ortools/packing/arc_flow_solver.h
View File

@@ -23,7 +23,8 @@ namespace packing {
vbp::VectorBinPackingSolution SolveVectorBinPackingWithArcFlow(
const vbp::VectorBinPackingProblem& problem,
MPSolver::OptimizationProblemType solver_type,
const std::string& mip_params, double time_limit, int num_threads);
const std::string& mip_params, double time_limit, int num_threads,
int max_bins);
} // namespace packing
} // namespace operations_research