Commit 7c25b0fe authored by Tong Li's avatar Tong Li

优化

parent 8e292cd5
......@@ -183,9 +183,9 @@ public class HybridAlgorithm {
best = _simulatedAnnealing.search(best, _tabuSearch, _vns, sharedDecoder, machines);
best = _vns.search(best, sharedDecoder, machines);
best = _vns.search(best,_tabuSearch, sharedDecoder, machines);
best = _tabuSearch.search(best, _vns, sharedDecoder, machines);
// best = _tabuSearch.search(best, _vns, sharedDecoder, machines);
return getBestChromosome(best, param.getBaseTime(), starttime);
......@@ -260,8 +260,8 @@ public class HybridAlgorithm {
// }
// 核心融合链(工业级标准顺序:GA生成子代 → SA跳坑 → VNS扩邻域 → TS精优化)
child = _simulatedAnnealing.search(child,_tabuSearch,_vns, sharedDecoder, machines);
child = _vns.search(child, sharedDecoder, machines);
child = _tabuSearch.search(child, _vns,sharedDecoder, machines);
child = _vns.search(child,_tabuSearch, sharedDecoder, machines);
// child = _tabuSearch.search(child, _vns,sharedDecoder, machines);
newPopulation.add(child);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment