Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3
- Timestamp:
- 07/26/12 09:51:13 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Plugin.cs.frame
r7259 r8331 26 26 /// Plugin class for HeuristicLab.Algorithms.VariableNeighborhoodSearch plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.cs.frame
r7259 r8331 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs
r8086 r8331 58 58 get { return (FixedValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; } 59 59 } 60 public ConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {61 get { return ( ConstrainedValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }62 } 63 public ConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter {64 get { return ( ConstrainedValueParameter<IMultiNeighborhoodShakingOperator>)Parameters["ShakingOperator"]; }60 public IConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter { 61 get { return (IConstrainedValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; } 62 } 63 public IConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter { 64 get { return (IConstrainedValueParameter<IMultiNeighborhoodShakingOperator>)Parameters["ShakingOperator"]; } 65 65 } 66 66 private FixedValueParameter<IntValue> MaximumIterationsParameter { … … 294 294 LocalImprovementParameter.ValidValues.Clear(); 295 295 } else { 296 LocalImprovementParameter.ValidValues.RemoveWhere(x => !x.ProblemType.IsAssignableFrom(Problem.GetType())); 296 foreach (var entry in LocalImprovementParameter.ValidValues.ToList()) { 297 if (!entry.ProblemType.IsAssignableFrom(Problem.GetType())) { 298 LocalImprovementParameter.ValidValues.Remove(entry); 299 } 300 } 297 301 foreach (ILocalImprovementOperator op in ApplicationManager.Manager.GetInstances<ILocalImprovementOperator>().Where(x => x.ProblemType.IsAssignableFrom(Problem.GetType()))) { 298 302 if (!LocalImprovementParameter.ValidValues.Any(x => x.GetType() == op.GetType()))
Note: See TracChangeset
for help on using the changeset viewer.