Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.Benchmarks

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.Benchmarks/3.3/Benchmark.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs (modified) (1 diff)
• HeuristicLab.Algorithms.Benchmarks/3.3/LinpackBenchmark.cs (modified) (1 diff)
• HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneBenchmark.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.Benchmarks/3.3/Benchmark.cs

@@ -189 +189 @@
     }
 
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public Image ItemImage {
       get {
@@ -195 +198 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return ItemAttribute.GetImage(this.GetType());
       }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs

@@ -64 +64 @@
     }
 
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.Benchmarks/3.3/LinpackBenchmark.cs

@@ -64 +64 @@
     }
 
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneBenchmark.cs

@@ -64 +64 @@
     }
 
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }