Changeset 7247 for trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/Whetstone.cs

Timestamp:

12/30/11 02:38:12 (12 years ago)

Author:

swagner

Message:

Changes due to review of benchmark algorithms (#1659):

• added base class Benchmark for benchmark implementations
• implemented ToString in Benchmark base class
• removed suffix Benchmark from class names of benchmark implementations
• sealed benchmark implementations Linpack, Dhrystone and Whetstone

File:

• trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/Whetstone.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneBenchmark.cs) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/Whetstone.cs

@@ -22 +22 @@
 using System;
 using System.Diagnostics;
-using System.Drawing;
 using System.Threading;
 using HeuristicLab.Common;
@@ -31 +30 @@
 
 namespace HeuristicLab.Algorithms.Benchmarks {
-  [Item("Whetstone Benchmark", "Whetstone performance benchmark algorithm.")]
+  [Item("Whetstone", "Whetstone performance benchmark.")]
   [StorableClass]
-  public class WhetstoneBenchmark : IBenchmark {
-    [Storable]
-    private byte[][] chunk;
-    public byte[][] ChunkData {
-      get { return chunk; }
-      set { chunk = value; }
-    }
-
-    [Storable]
-    private TimeSpan timeLimit;
-    public TimeSpan TimeLimit {
-      get { return timeLimit; }
-      set { timeLimit = value; }
-    }
-
-    private bool stopBenchmark;
-
-    private CancellationToken cancellationToken;
-
-    public string ItemName {
-      get { return ItemAttribute.GetName(this.GetType()); }
-    }
-
-    public string ItemDescription {
-      get { return ItemAttribute.GetDescription(this.GetType()); }
-    }
-
-    public Version ItemVersion {
-      get { return ItemAttribute.GetVersion(this.GetType()); }
-    }
-
-    public static Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
-    }
-    public Image ItemImage {
-      get { return ItemAttribute.GetImage(this.GetType()); }
-    }
-
-    #region Benchmark Fields
-
+  public sealed class Whetstone : Benchmark {
     private long begin_time;
     private long end_time;
@@ -84 +44 @@
     private int i, j, k, l, n1, n2, n3, n4, n6, n7, n8, n9, n10, n11;
 
-    #endregion
-
-    #region Costructors
-
     [StorableConstructor]
-    public WhetstoneBenchmark(bool deserializing) { }
-
-    public WhetstoneBenchmark() { }
-
-    protected WhetstoneBenchmark(WhetstoneBenchmark original, Cloner cloner) {
-      cloner.RegisterClonedObject(original, this);
-    }
-
-    #endregion
-
-    #region Whetstone Benchmark
+    private Whetstone(bool deserializing) : base(deserializing) { }
+    private Whetstone(Whetstone original, Cloner cloner) : base(original, cloner) { }
+    public Whetstone() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Whetstone(this, cloner);
+    }
+
     // implementation based on Java version: www.aicas.com/download/Whetstone.java
-
-    public void Run(CancellationToken token, ResultCollection results) {
-      cancellationToken = token;
-      stopBenchmark = false;
+    public override void Run(CancellationToken cancellationToken, ResultCollection results) {
+      bool stopBenchmark = false;
 
       ITERATIONS = 100; // ITERATIONS / 10 = Millions Whetstone instructions
@@ -132 +83 @@
         }
 
-        if ((timeLimit == null) || (timeLimit.TotalMilliseconds == 0)) {
+        if ((TimeLimit == null) || (TimeLimit.TotalMilliseconds == 0)) {
           if (runNumber > defaultNumberOfRuns) {
             stopBenchmark = true;
           }
-        } else if (sw.Elapsed > timeLimit) {
+        } else if (sw.Elapsed > TimeLimit) {
           stopBenchmark = true;
         }
@@ -293 +244 @@
       e1[l] = e1[j];
     }
-
-    #endregion
-
-    #region Clone
-
-    public IDeepCloneable Clone(Cloner cloner) {
-      return new WhetstoneBenchmark(this, cloner);
-    }
-
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler ItemImageChanged;
-    protected virtual void OnItemImageChanged() {
-      EventHandler handler = ItemImageChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler ToStringChanged;
-    protected virtual void OnToStringChanged() {
-      EventHandler handler = ToStringChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    #endregion
   }
 }