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

routing: backport from main

Browse Source
This commit is contained in:
Mizux Seiha
2025-12-09 22:50:14 +01:00
parent 210bfe0cac
commit dfcec1fde6
19 changed files with 802 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ortools/constraint_solver/routing_ils_parameters_utils.cc
View File

@@ -32,6 +32,10 @@ RecreateParameters::ParametersCase GetParameterCaseForRecreateHeuristic(
return RecreateParameters::kSavings;
case FirstSolutionStrategy::PARALLEL_SAVINGS:
return RecreateParameters::kSavings;
case FirstSolutionStrategy::SEQUENTIAL_CHEAPEST_INSERTION:
return RecreateParameters::kGlobalCheapestInsertion;
case FirstSolutionStrategy::PARALLEL_CHEAPEST_INSERTION:
return RecreateParameters::kGlobalCheapestInsertion;
default:
return RecreateParameters::PARAMETERS_NOT_SET;
}
@@ -40,7 +44,8 @@ RecreateParameters::ParametersCase GetParameterCaseForRecreateHeuristic(
std::vector<RecreateParameters::ParametersCase>
GetSupportedRecreateParametersCases() {
return {RecreateParameters::kLocalCheapestInsertion,
RecreateParameters::kSavings};
RecreateParameters::kSavings,
RecreateParameters::kGlobalCheapestInsertion};
}
std::string GetRecreateParametersName(
@@ -50,6 +55,8 @@ std::string GetRecreateParametersName(
return "local_cheapest_insertion";
case RecreateParameters::kSavings:
return "savings";
case RecreateParameters::kGlobalCheapestInsertion:
return "global_cheapest_insertion";
case RecreateParameters::PARAMETERS_NOT_SET:
return "PARAMETERS_NOT_SET";
}