Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Algorithms.LocalSearch

Timestamp:

01/02/12 11:40:31 (13 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (1 diff)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs (modified) (2 diffs)

branches/RegressionBenchmarks/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

@@ -335 +335 @@
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
             param.Depth = 0;
-          Analyzer.Operators.Add(analyzer);
-        }
-      }
-      Analyzer.Operators.Add(moveQualityAnalyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+        }
+      }
+      Analyzer.Operators.Add(moveQualityAnalyzer, moveQualityAnalyzer.EnabledByDefault);
     }
     private void ClearMoveParameters() {

branches/RegressionBenchmarks/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

@@ -244 +244 @@
       }
       return false;
-    } 
+    }
 
     private void UpdateAnalyzers() {
@@ -255 +255 @@
             foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
               param.Depth = 0;
-            Analyzer.Operators.Add(clone);
+            Analyzer.Operators.Add(clone, clone.EnabledByDefault);
           }
         }
       }
-      Analyzer.Operators.Add(qualityAnalyzer);
+      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }