Changeset 14588 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/DatastreamAnalysisOptimizer.cs

Timestamp:

01/19/17 19:15:33 (7 years ago)

Author:

jzenisek

Message:

#2719 updated databar set and view

File:

• branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/DatastreamAnalysisOptimizer.cs (modified) (4 diffs)

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/DatastreamAnalysisOptimizer.cs

@@ -158 +158 @@
 
     private DataBarSet ResultsQualitiesBars {
-      get { return (DataBarSet) Results["Ensemble"].Value; }
+      get { return (DataBarSet) Results["Ensemble Comparison"].Value; }
     }
 
@@ -165 +165 @@
 
       Results.Add(new Result("Sliding Window Movements", new IntValue(0)));
-      Results.Add(new Result("Qualities", new DataTable("Qualities")));
+      Results.Add(new Result("Qualities", new DataTable("Pearson R²")));
       Results.Add(new Result("Targets", new DataTable("Targets")));
       Results.Add(new Result("Ensemble Comparison", new DataBarSet("Ensemble Comparison")));
@@ -179 +179 @@
 
         // qualities (bars)
-        ResultsQualitiesBars.Bars.Add(new StringValue(ensemble.Name), new DoubleValue(0.0));
+        ResultsQualitiesBars.Bars.Add(new DataBar(ensemble.Name, 0.9));
       }
     }
@@ -435 +435 @@
         var pR2 = error == OnlineCalculatorError.None ? pR * pR : 0.0;
 
+        int replayAmount = Datastream.FitnessPartition.End - replayedIndex;
+        int replayCount = estimatedValues.Length - replayAmount;
+
         for (int i = replayedIndex; i < Datastream.FitnessPartition.End; i++) {
-          ResultsTargets.Rows[ensemble.Name].Values.Add(averageEstimatedValue);
+          //ResultsTargets.Rows[ensemble.Name].Values.Add(averageEstimatedValue);
+          ResultsTargets.Rows[ensemble.Name].Values.Add(estimatedValues[replayCount]);
+          replayCount++;
 
           //ResultsQualities.Rows[ensemble.Name + " - " + ResultsQualitiesMSE].Values.Add(mse);
           ResultsQualities.Rows[ensemble.Name + " - " + ResultsQualitiesPR2].Values.Add(pR2);
-          ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)].Value = pR2;
-          ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)] = new DoubleValue(pR2);
-          //ResultsQualitiesBars.Bars[new StringValue(ensemble.ItemName)]
+          ResultsQualitiesBars.Bars[ensemble.Name].Value = pR2;
         }
       }