Changeset 3787 for trunk/sources/HeuristicLab.Analysis

Timestamp:

05/11/10 21:16:12 (14 years ago)

Author:

abeham

Message:

#893

• Removed best known quality tracking from BestAverageWorstQualityAnalyzer
• Added best known quality / solution tracking to problem specific analyzers

File:

• trunk/sources/HeuristicLab.Analysis/3.3/BestAverageWorstQualityAnalyzer.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/BestAverageWorstQualityAnalyzer.cs

@@ -77 +77 @@
       get { return (BestQualityMemorizer)OperatorGraph.InitialOperator; }
     }
-    private BestQualityMemorizer BestKnownQualityMemorizer {
-      get { return (BestQualityMemorizer)BestQualityMemorizer.Successor; }
-    }
     private BestAverageWorstQualityCalculator BestAverageWorstQualityCalculator {
-      get { return (BestAverageWorstQualityCalculator)BestKnownQualityMemorizer.Successor; }
+      get { return (BestAverageWorstQualityCalculator)BestQualityMemorizer.Successor; }
     }
     #endregion
@@ -103 +100 @@
       #region Create operators
       BestQualityMemorizer bestQualityMemorizer = new BestQualityMemorizer();
-      BestQualityMemorizer bestKnownQualityMemorizer = new BestQualityMemorizer();
       BestAverageWorstQualityCalculator bestAverageWorstQualityCalculator = new BestAverageWorstQualityCalculator();
       DataTableValuesCollector dataTableValuesCollector = new DataTableValuesCollector();
@@ -113 +109 @@
       bestQualityMemorizer.QualityParameter.ActualName = QualityParameter.Name;
       bestQualityMemorizer.QualityParameter.Depth = QualityParameter.Depth;
-
-      bestKnownQualityMemorizer.BestQualityParameter.ActualName = BestKnownQualityParameter.Name;
-      bestKnownQualityMemorizer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      bestKnownQualityMemorizer.QualityParameter.ActualName = QualityParameter.Name;
-      bestKnownQualityMemorizer.QualityParameter.Depth = QualityParameter.Depth;
 
       bestAverageWorstQualityCalculator.AverageQualityParameter.ActualName = CurrentAverageQualityParameter.Name;
@@ -151 +142 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = bestQualityMemorizer;
-      bestQualityMemorizer.Successor = bestKnownQualityMemorizer;
-      bestKnownQualityMemorizer.Successor = bestAverageWorstQualityCalculator;
+      bestQualityMemorizer.Successor = bestAverageWorstQualityCalculator;
       bestAverageWorstQualityCalculator.Successor = dataTableValuesCollector;
       dataTableValuesCollector.Successor = qualityDifferenceCalculator;
@@ -177 +167 @@
     private void QualityParameter_DepthChanged(object sender, System.EventArgs e) {
       BestQualityMemorizer.QualityParameter.Depth = QualityParameter.Depth;
-      BestKnownQualityMemorizer.QualityParameter.Depth = QualityParameter.Depth;
       BestAverageWorstQualityCalculator.QualityParameter.Depth = QualityParameter.Depth;
     }