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

Timestamp:

07/26/15 21:32:52 (9 years ago)

Author:

abeham

Message:

#2431:

• worked on IRRRun (early abort still troublesome)
• Updated RLD view to allow defining targets
• Attempting to handle maximization/minimization

Location:

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis

Files:

• QualityPerClockAnalyzer.cs (modified) (1 diff)
• QualityPerEvaluationsAnalyzer.cs (modified) (3 diffs)

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

@@ -75 +75 @@
 
     public override IOperation Apply() {
-      var lastUpdateTime = LastUpdateTimeParameter.ActualValue;
-      if (lastUpdateTime == null) {
-        lastUpdateTime = new DateTimeValue(DateTime.UtcNow.AddMilliseconds(-1));
-        LastUpdateTimeParameter.ActualValue = lastUpdateTime;
-      }
-      var now = DateTime.UtcNow;
-
       var bestQuality = BestQualityParameter.ActualValue.Value;
-
       var dataTable = QualityPerClockParameter.ResultValue;
       var values = dataTable.Rows["First-hit Graph"].Values;
-      if (values.Count == 0 || values.Last().Item2 != bestQuality)
-        dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create((now - lastUpdateTime.Value).TotalSeconds, bestQuality));
 
-      lastUpdateTime.Value = now;
+      if (values.Count == 0 || values.Last().Item2 != bestQuality) {
+        var lastUpdateTime = LastUpdateTimeParameter.ActualValue;
+        if (lastUpdateTime == null) {
+          lastUpdateTime = new DateTimeValue(DateTime.UtcNow.AddMilliseconds(-1));
+          LastUpdateTimeParameter.ActualValue = lastUpdateTime;
+        }
+
+        var now = DateTime.UtcNow;
+        var runtimeSoFar = (now - lastUpdateTime.Value).TotalSeconds + (values.Count > 0 ? values.Last().Item1 : 0);
+        dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(runtimeSoFar, bestQuality));
+        lastUpdateTime.Value = now;
+      }
       return base.Apply();
     }

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

@@ -44 +44 @@
       get { return (ILookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
+    public ILookupParameter<IntValue> EvaluatedMovesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["EvaluatedMoves"]; }
+    }
+    public IValueLookupParameter<DoubleValue> MoveCostPerSolutionParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["MoveCostPerSolution"]; }
+    }
     public IResultParameter<IndexedDataTable<double>> QualityPerEvaluationsParameter {
       get { return (IResultParameter<IndexedDataTable<double>>)Parameters["QualityPerEvaluations"]; }
@@ -54 +60 @@
       : 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 LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated solutions."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of evaluated moves."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("MoveCostPerSolution", "The cost to evaluate a move as a ratio to the cost of evaluating a solution.", new DoubleValue(1)));
       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") {
@@ -74 +82 @@
     public override IOperation Apply() {
       var bestQuality = BestQualityParameter.ActualValue.Value;
-      var evaluations = Math.Max(EvaluatedSolutionsParameter.ActualValue.Value, 1);
+      var evalSols = EvaluatedSolutionsParameter.ActualValue;
+      var evalMoves = EvaluatedMovesParameter.ActualValue;
+      var evaluations = 0.0;
+      if (evalSols != null) evaluations += evalSols.Value;
+      if (evalMoves != null) evaluations += evalMoves.Value * MoveCostPerSolutionParameter.ActualValue.Value;
 
       var dataTable = QualityPerEvaluationsParameter.ResultValue;
       var values = dataTable.Rows["First-hit Graph"].Values;
+      if (evaluations == 0 || values.Count > 0 && evaluations < values.Last().Item1) evaluations = 1;
       if (values.Count == 0 || values.Last().Item2 != bestQuality)
         values.Add(Tuple.Create((double)evaluations, bestQuality));