Changeset 6052

Timestamp:

04/26/11 11:41:52 (13 years ago)

Author:

svonolfe

Message:

#1425

• Readded problem-specific analyzers
• Updated VNS sample

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Documents/VNS_TSP.hl (modified) (previous)

trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

@@ -200 +200 @@
       ParameterizeLSMainLoop();
       ParameterizeAnalyzers();
+      UpdateAnalyzers();
     }
 
@@ -234 +235 @@
     }
 
+    private bool IsSubclassOfGeneric(Type generic, Type toCheck) {
+      while (toCheck != typeof(object)) {
+        var cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck;
+        if (generic == cur) {
+          return true;
+        }
+        toCheck = toCheck.BaseType;
+      }
+      return false;
+    } 
+
+    private void UpdateAnalyzers() {
+      Analyzer.Operators.Clear();
+      if (problem != null) {
+        foreach (IAnalyzer analyzer in problem.Operators.OfType<IAnalyzer>()) {
+          if (!IsSubclassOfGeneric(typeof(AlleleFrequencyAnalyzer<>), analyzer.GetType()) &&
+              !IsSubclassOfGeneric(typeof(PopulationDiversityAnalyzer<>), analyzer.GetType())) {
+            IAnalyzer clone = analyzer.Clone() as IAnalyzer;
+            foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
+              param.Depth = 0;
+            Analyzer.Operators.Add(clone);
+          }
+        }
+      }
+      Analyzer.Operators.Add(qualityAnalyzer);
+    }
+
     private void UpdateMoveOperators() {
       IMoveGenerator oldMoveGenerator = MoveGenerator;

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs

@@ -259 +259 @@
     }
 
+    private bool IsSubclassOfGeneric(Type generic, Type toCheck) {
+      while (toCheck != typeof(object)) {
+        var cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck;
+        if (generic == cur) {
+          return true;
+        }
+        toCheck = toCheck.BaseType;
+      }
+      return false;
+    }
+
     private void UpdateAnalyzers() {
       Analyzer.Operators.Clear();
       if (problem != null) {
         foreach (IAnalyzer analyzer in problem.Operators.OfType<IAnalyzer>()) {
-          IAnalyzer clone = analyzer.Clone() as IAnalyzer;
-          foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
-            param.Depth = 0;
-          Analyzer.Operators.Add(clone);
+          if (!IsSubclassOfGeneric(typeof(AlleleFrequencyAnalyzer<>), analyzer.GetType()) &&
+              !IsSubclassOfGeneric(typeof(PopulationDiversityAnalyzer<>), analyzer.GetType())) {
+            IAnalyzer clone = analyzer.Clone() as IAnalyzer;
+            foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
+              param.Depth = 0;
+            Analyzer.Operators.Add(clone);
+          }
         }
       }