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

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.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (1 diff)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs (modified) (1 diff)

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

@@ -452 +452 @@
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
             param.Depth = 0;
-          Analyzer.Operators.Add(analyzer);
-        }
-      }
-      Analyzer.Operators.Add(qualityAnalyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+        }
+      }
+      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }
     private SimulatedAnnealingMainLoop FindMainLoop(IOperator start) {

branches/RegressionBenchmarks/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs

@@ -279 +279 @@
             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);
     }