Changeset 5796 for branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3

Timestamp:

03/22/11 16:45:46 (13 years ago)

Author:

mkommend

Message:

#1418: Merged trunk changes into branch.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.VariableNeighborhoodSearch

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch)
• 3.3 (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3)
• 3.3/HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj)
• 3.3/HeuristicLab.snk (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLab.snk)
• 3.3/HeuristicLabAlgorithmsVariableNeighborhoodSearchPlugin.cs.frame (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLabAlgorithmsVariableNeighborhoodSearchPlugin.cs.frame)
• 3.3/IShakingOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/IShakingOperator.cs)
• 3.3/Properties (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties)
• 3.3/Properties/AssemblyInfo.frame (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.frame)
• 3.3/ShakingOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/ShakingOperator.cs)
• 3.3/VariableNeighborhoodSearch.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs) (5 diffs)
• 3.3/VariableNeighborhoodSearchMainLoop.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs)

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using HeuristicLab.Algorithms.LocalSearch;
+using HeuristicLab.Analysis;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
-using HeuristicLab.Data;
-using HeuristicLab.Analysis;
 using HeuristicLab.Random;
-using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Operators;
-using HeuristicLab.Algorithms.LocalSearch;
 
 namespace HeuristicLab.Algorithms.VariableNeighborhoodSearch {
@@ -19 +18 @@
   [Creatable("Algorithms")]
   [StorableClass]
-  public sealed class VariableNeighborhoodSearch : EngineAlgorithm, IStorableContent {
+  public sealed class VariableNeighborhoodSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
 
     #region Problem Properties
     public override Type ProblemType {
-      get { return typeof(ISingleObjectiveProblem); }
-    }
-    public new ISingleObjectiveProblem Problem {
-      get { return (ISingleObjectiveProblem)base.Problem; }
+      get { return typeof(ISingleObjectiveHeuristicOptimizationProblem); }
+    }
+    public new ISingleObjectiveHeuristicOptimizationProblem Problem {
+      get { return (ISingleObjectiveHeuristicOptimizationProblem)base.Problem; }
       set { base.Problem = value; }
     }
@@ -234 +233 @@
         Type[] interfaces = t.GetInterfaces();
 
-        for(int i = 0; i < interfaces.Length; i++) {
+        for (int i = 0; i < interfaces.Length; i++) {
           if (manipulatorType.IsAssignableFrom(interfaces[i])) {
             bool assignable = false;
@@ -244 +243 @@
             }
 
-            if(!assignable)
+            if (!assignable)
               manipulatorInterfaces.Add(interfaces[i]);
-          }         
+          }
         }
       }
@@ -266 +265 @@
         }
       }
-      
+
       Type genericType = typeof(ShakingOperator<>).MakeGenericType(manipulatorType);
-      ShakingParameter.Value = (IShakingOperator)Activator.CreateInstance(genericType, new object[]{});
+      ShakingParameter.Value = (IShakingOperator)Activator.CreateInstance(genericType, new object[] { });
 
       ShakingParameter.Value.OnProblemChanged(Problem);