Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.VariableNeighborhoodSearch
- Timestamp:
- 03/28/12 15:47:26 (13 years ago)
- Location:
- branches/HeuristicLab.Hive.Azure
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive.Azure
- Property svn:ignore
-
old new 3 3 *.resharper 4 4 *.suo 5 *.user 5 6 *.vsp 6 7 Doxygen 8 FxCopResults.txt 7 9 Google.ProtocolBuffers-0.9.1.dll 8 10 HeuristicLab 3.3.5.1.ReSharper.user
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs
r7270 r7669 302 302 } 303 303 private void UpdateShakingOperators() { 304 IMultiNeighborhoodShakingOperator oldShakingOperator = ShakingOperator; 305 IMultiNeighborhoodShakingOperator defaultShakingOperator = Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>().FirstOrDefault(); 304 306 ShakingOperatorParameter.ValidValues.Clear(); 305 foreach (IMultiNeighborhoodShakingOperator op in Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>() ) {307 foreach (IMultiNeighborhoodShakingOperator op in Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>().OrderBy(op => op.Name)) { 306 308 ShakingOperatorParameter.ValidValues.Add(op); 307 309 op.CurrentNeighborhoodIndexParameter.ActualName = "CurrentNeighborhoodIndex"; 308 310 op.NeighborhoodCountParameter.ActualName = "NeighborhoodCount"; 311 } 312 if (oldShakingOperator != null) { 313 IMultiNeighborhoodShakingOperator shakingOperator = ShakingOperatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldShakingOperator.GetType()); 314 if (shakingOperator != null) ShakingOperator = shakingOperator; 315 else oldShakingOperator = null; 316 } 317 if (oldShakingOperator == null && defaultShakingOperator != null) { 318 ShakingOperator = defaultShakingOperator; 309 319 } 310 320 }
Note: See TracChangeset
for help on using the changeset viewer.