Changeset 14547 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4

Timestamp:

01/05/17 15:59:47 (7 years ago)

Author:

jzenisek

Message:

#2719 added type and view for representing dictionary<string,double> as bar chart (implementation in progress)

Location:

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4

Files:

• DatastreamAnalysisOptimizer.cs (modified) (5 diffs)
• HeuristicLab.DatastreamAnalysis.csproj (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

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

@@ -157 +157 @@
     private const string ResultsTargetsReal = "Real";
 
-    private DataTable ResultsQualitiesBars {
-      get { return ((DataTable) Results["Ensembles"].Value); }
+    private DataBarSet ResultsQualitiesBars {
+      get { return (DataBarSet) Results["Ensemble"].Value; }
     }
 
@@ -167 +167 @@
       Results.Add(new Result("Qualities", new DataTable("Qualities")));
       Results.Add(new Result("Targets", new DataTable("Targets")));
-
-      ResultsQualitiesBars.Rows.Add(new DataRow("Ensembles"));
+      Results.Add(new Result("Ensemble Comparison", new DataBarSet("Ensemble Comparison")));
 
       ResultsTargets.Rows.Add(new DataRow(ResultsTargetsReal));
@@ -180 +179 @@
 
         // qualities (bars)
-        //ResultsQualitiesBars.Rows.Add(new DataRow(ensemble.Name + " - " + ResultsQualitiesPR2));
-        //ResultsQualitiesBars.Rows["Ensembles"].Values.
+        ResultsQualitiesBars.Bars.Add(new StringValue(ensemble.Name), new DoubleValue(0.0));
       }
     }
@@ -437 +435 @@
         var pR2 = error == OnlineCalculatorError.None ? pR * pR : 0.0;
 
-        DataRow qualitiesBarsRow = ResultsQualitiesBars.Rows[ensemble.Name + " - " + ResultsQualitiesPR2];
-
         for (int i = replayedIndex; i < Datastream.FitnessPartition.End; i++) {
           ResultsTargets.Rows[ensemble.Name].Values.Add(averageEstimatedValue);
@@ -444 +440 @@
           //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)]
         }
       }

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj

@@ -103 +103 @@
   <ItemGroup>
     <Compile Include="AnalysisBase.cs" />
+    <Compile Include="DataBarSet.cs" />
     <Compile Include="Datastream.cs" />
     <Compile Include="DatastreamAnalysisOptimizer.cs" />

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.DatastreamAnalysis {
-  [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14538")]
+  [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14543")]
   [PluginFile("HeuristicLab.DatastreamAnalysis-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.14.14538")]
+[assembly: AssemblyFileVersion("3.4.14.14543")]