Changeset 14058 for branches/PerformanceComparison/HeuristicLab.Analysis

Timestamp:

07/13/16 10:51:56 (8 years ago)

Author:

abeham

Message:

#2431: Refactored ResultsParameter

Location:

branches/PerformanceComparison/HeuristicLab.Analysis/3.3

Files:

• Optimizers/IteratedAlgorithm.cs (modified) (1 diff)
• QualityAnalysis/QualityPerClockAnalyzer.cs (modified) (2 diffs)
• QualityAnalysis/QualityPerEvaluationsAnalyzer.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

@@ -475 +475 @@
         }
       }
-      if (Algorithm.Results.TryGetValue(perClockAnalyzer.QualityPerClockParameter.ResultName, out result)) UpdateQualityPerClockResult((IndexedDataTable<double>)result.Value, restarts.Value);
-      if (Algorithm.Results.TryGetValue(perEvaluationsAnalyzer.QualityPerEvaluationsParameter.ResultName, out result)) UpdateQualityPerEvaluationsResult((IndexedDataTable<double>)result.Value, restarts.Value);
+      if (Algorithm.Results.TryGetValue(perClockAnalyzer.QualityPerClockParameter.ActualName, out result)) UpdateQualityPerClockResult((IndexedDataTable<double>)result.Value, restarts.Value);
+      if (Algorithm.Results.TryGetValue(perEvaluationsAnalyzer.QualityPerEvaluationsParameter.ActualName, out result)) UpdateQualityPerEvaluationsResult((IndexedDataTable<double>)result.Value, restarts.Value);
       if (StoreSolutionInRun) {
         foreach (var r in Algorithm.Results) {

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -76 +76 @@
     public override IOperation Apply() {
       var bestQuality = BestQualityParameter.ActualValue.Value;
-      var dataTable = QualityPerClockParameter.ResultValue;
+      var dataTable = QualityPerClockParameter.ActualValue;
       var values = dataTable.Rows["First-hit Graph"].Values;
 

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -88 +88 @@
       if (evalMoves != null) evaluations += evalMoves.Value * MoveCostPerSolutionParameter.ActualValue.Value;
 
-      var dataTable = QualityPerEvaluationsParameter.ResultValue;
+      var dataTable = QualityPerEvaluationsParameter.ActualValue;
       var values = dataTable.Rows["First-hit Graph"].Values;
       if (evaluations == 0 || values.Count > 0 && evaluations < values.Last().Item1) evaluations = 1;