Changeset 10723

Timestamp:

04/04/14 09:56:44 (11 years ago)

Author:

bburlacu

Message:

#1837: Added missing SlidingWindowBestSolutionsCollectionHeatMapView files, fixed heatmap orientation.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (3 diffs)
• SlidingWindowBestSolutionsCollectionHeatMapControl.cs (modified) (2 diffs)
• SlidingWindowBestSolutionsCollectionHeatMapView.Designer.cs (added)
• SlidingWindowBestSolutionsCollectionHeatMapView.cs (added)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -217 +217 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapView.Designer.cs">
+      <DependentUpon>SlidingWindowBestSolutionsCollectionHeatMapView.cs</DependentUpon>
+    </Compile>
     <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapControl.cs">
       <SubType>UserControl</SubType>
@@ -222 +228 @@
     <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapControl.Designer.cs">
       <DependentUpon>SlidingWindowBestSolutionsCollectionHeatMapControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SlidingWindowBestSolutionsCollectionHeatMapView.Designer.cs">
-      <DependentUpon>SlidingWindowBestSolutionsCollectionHeatMapView.cs</DependentUpon>
     </Compile>
     <Compile Include="SlidingWindowBestSolutionsCollectionView.cs">
@@ -349 +349 @@
   <ItemGroup>
     <Folder Include="Exporters\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SlidingWindowBestSolutionsCollectionView.resx">
-      <DependentUpon>SlidingWindowBestSolutionsCollectionView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionHeatMapControl.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
-  [View("Sliding Window Best Solutions HeatMap View")]
+  [View("Sliding Window Best Solutions HeatMap Control")]
   [Content(typeof(SlidingWindowBestSolutionsCollection), false)]
   public partial class SlidingWindowBestSolutionsCollectionHeatMapControl : ItemView {
@@ -108 +108 @@
         }
       }
-      int rows = values.GetLength(0);
-      int cols = values.GetLength(1);
-      var flipped = new double[rows, cols];
-      for (int i = 0; i < rows; ++i) {
-        for (int j = 0; j < cols; ++j) {
-          flipped[i, j] = values[rows - i - 1, j];
-        }
-      }
-      heatMapView.Content = new HeatMap(flipped, "Best Sliding Window Solutions", min, max);
+
+      heatMapView.Content = new HeatMap(values, string.Empty, min, max);
     }