Changeset 12771 for branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis

Timestamp:

07/17/15 09:25:44 (9 years ago)

Author:

abeham

Message:

#2431:

• Added run collection view
• Changed name of analyzers
• Modified algorithms to include Execution Time as a result

Location:

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis

Files:

• QualityPerClockAnalyzer.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityVsEvaluationsAnalyzer.cs) (2 diffs)
• QualityPerEvaluationsAnalyzer.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityVsEvaluationsAnalyzer.cs) (2 diffs)

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Analysis {
-  [Item("QualityVsEvaluationsAnalyzer", @"Creates a plot of the solution quality with respect to the number of evaluated solutions.")]
+  [Item("QualityPerClockAnalyzer", @"Creates a plot of the solution quality with respect to the elapsed wall-clock time.")]
   [StorableClass]
-  public class QualityVsEvaluationsAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
+  public class QualityPerClockAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
     public virtual bool EnabledByDefault {
       get { return false; }
@@ -40 +40 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["BestQuality"]; }
     }
-    public ILookupParameter<IntValue> EvaluatedSolutionsParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
+
+    public IResultParameter<TimeSpanValue> ExecutionTimeParameter {
+      get { return (IResultParameter<TimeSpanValue>)Parameters["Execution Time"]; }
     }
-    public IResultParameter<IndexedDataTable<int>> QualityVsEvaluationsParameter {
-      get { return (IResultParameter<IndexedDataTable<int>>)Parameters["QualityVsEvaluations"]; }
+
+    public IResultParameter<IndexedDataTable<double>> QualityPerClockParameter {
+      get { return (IResultParameter<IndexedDataTable<double>>)Parameters["QualityPerClock"]; }
     }
 
     [StorableConstructor]
-    protected QualityVsEvaluationsAnalyzer(bool deserializing) : base(deserializing) { }
-    protected QualityVsEvaluationsAnalyzer(QualityVsEvaluationsAnalyzer original, Cloner cloner) : base(original, cloner) { }
-    public QualityVsEvaluationsAnalyzer()
+    protected QualityPerClockAnalyzer(bool deserializing) : base(deserializing) { }
+    protected QualityPerClockAnalyzer(QualityPerClockAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    public QualityPerClockAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("BestQuality", "The quality value that should be compared."));
-      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The quality value that should be compared."));
-      Parameters.Add(new ResultParameter<IndexedDataTable<int>>("QualityVsEvaluations", "Data table containing the first hitting graph with evaluations as the x-axis."));
-      QualityVsEvaluationsParameter.DefaultValue = new IndexedDataTable<int>("Quality vs Evaluations") {
-        Rows = { new IndexedDataRow<int>("First-hit Graph") { VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.StepLine } } }
+      Parameters.Add(new ResultParameter<TimeSpanValue>("Execution Time", "The execution time."));
+      Parameters.Add(new ResultParameter<IndexedDataTable<double>>("QualityPerClock", "Data table containing the first hitting graph with elapsed wall clock time (in seconds) as the x-axis."));
+      QualityPerClockParameter.DefaultValue = new IndexedDataTable<double>("Quality per Clock") {
+        VisualProperties = {
+          XAxisTitle = "Elapsed time [s]",
+          YAxisTitle = "Quality"
+        },
+        Rows = { new IndexedDataRow<double>("First-hit Graph") { VisualProperties = {
+          ChartType = DataRowVisualProperties.DataRowChartType.StepLine,
+          LineWidth = 3
+        } } }
       };
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new QualityVsEvaluationsAnalyzer(this, cloner);
+      return new QualityPerClockAnalyzer(this, cloner);
     }
 
     public override IOperation Apply() {
+      var executionTime = Math.Max(ExecutionTimeParameter.ResultValue.Value.TotalSeconds, 0.001);
       var bestQuality = BestQualityParameter.ActualValue.Value;
-      var evaluations = EvaluatedSolutionsParameter.ActualValue.Value;
 
-      var dataTable = QualityVsEvaluationsParameter.ResultValue;
-      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(evaluations, bestQuality));
+      var dataTable = QualityPerClockParameter.ResultValue;
+      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(executionTime, bestQuality));
 
       return base.Apply();

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Analysis {
-  [Item("QualityVsEvaluationsAnalyzer", @"Creates a plot of the solution quality with respect to the number of evaluated solutions.")]
+  [Item("QualityPerEvaluationsAnalyzer", @"Creates a plot of the solution quality with respect to the number of evaluated solutions.")]
   [StorableClass]
-  public class QualityVsEvaluationsAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
+  public class QualityPerEvaluationsAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
     public virtual bool EnabledByDefault {
       get { return false; }
@@ -43 +43 @@
       get { return (ILookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
-    public IResultParameter<IndexedDataTable<int>> QualityVsEvaluationsParameter {
-      get { return (IResultParameter<IndexedDataTable<int>>)Parameters["QualityVsEvaluations"]; }
+    public IResultParameter<IndexedDataTable<double>> QualityPerEvaluationsParameter {
+      get { return (IResultParameter<IndexedDataTable<double>>)Parameters["QualityPerEvaluations"]; }
     }
 
     [StorableConstructor]
-    protected QualityVsEvaluationsAnalyzer(bool deserializing) : base(deserializing) { }
-    protected QualityVsEvaluationsAnalyzer(QualityVsEvaluationsAnalyzer original, Cloner cloner) : base(original, cloner) { }
-    public QualityVsEvaluationsAnalyzer()
+    protected QualityPerEvaluationsAnalyzer(bool deserializing) : base(deserializing) { }
+    protected QualityPerEvaluationsAnalyzer(QualityPerEvaluationsAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    public QualityPerEvaluationsAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("BestQuality", "The quality value that should be compared."));
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The quality value that should be compared."));
-      Parameters.Add(new ResultParameter<IndexedDataTable<int>>("QualityVsEvaluations", "Data table containing the first hitting graph with evaluations as the x-axis."));
-      QualityVsEvaluationsParameter.DefaultValue = new IndexedDataTable<int>("Quality vs Evaluations") {
-        Rows = { new IndexedDataRow<int>("First-hit Graph") { VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.StepLine } } }
+      Parameters.Add(new ResultParameter<IndexedDataTable<double>>("QualityPerEvaluations", "Data table containing the first hitting graph with evaluations as the x-axis."));
+      QualityPerEvaluationsParameter.DefaultValue = new IndexedDataTable<double>("Quality per Evaluations") {
+        VisualProperties = {
+          XAxisTitle = "Evaluations",
+          YAxisTitle = "Quality"
+        },
+        Rows = { new IndexedDataRow<double>("First-hit Graph") { VisualProperties = {
+          ChartType = DataRowVisualProperties.DataRowChartType.StepLine,
+          LineWidth = 3
+        } } }
       };
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new QualityVsEvaluationsAnalyzer(this, cloner);
+      return new QualityPerEvaluationsAnalyzer(this, cloner);
     }
 
     public override IOperation Apply() {
       var bestQuality = BestQualityParameter.ActualValue.Value;
-      var evaluations = EvaluatedSolutionsParameter.ActualValue.Value;
+      var evaluations = Math.Max(EvaluatedSolutionsParameter.ActualValue.Value, 1);
 
-      var dataTable = QualityVsEvaluationsParameter.ResultValue;
-      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(evaluations, bestQuality));
+      var dataTable = QualityPerEvaluationsParameter.ResultValue;
+      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create((double)evaluations, bestQuality));
 
       return base.Apply();