Changeset 13656 for branches/WebJobManager/HeuristicLab.Algorithms.Benchmarks

Timestamp:

03/07/16 10:18:05 (9 years ago)

Author:

ascheibe

Message:

#2582 created branch for Hive Web Job Manager

Location:

branches/WebJobManager

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Algorithms.Benchmarks/3.3/Benchmark.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (14 diffs)

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

@@ -32 +32 @@
   [StorableClass]
   public abstract class Benchmark : IBenchmark {
-    public virtual string ItemName {
+    public virtual string ItemName
+    {
       get { return ItemAttribute.GetName(this.GetType()); }
     }
-    public virtual string ItemDescription {
+    public virtual string ItemDescription
+    {
       get { return ItemAttribute.GetDescription(this.GetType()); }
     }
-    public Version ItemVersion {
+    public Version ItemVersion
+    {
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
-    public static Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
-    }
-    public virtual Image ItemImage {
+
+    public virtual Image ItemImage
+    {
       get { return ItemAttribute.GetImage(this.GetType()); }
     }
@@ -50 +52 @@
     [Storable]
     private byte[][] chunk;
-    public byte[][] ChunkData {
+    public byte[][] ChunkData
+    {
       get { return chunk; }
       set { chunk = value; }
@@ -57 +60 @@
     [Storable]
     private TimeSpan timeLimit;
-    public TimeSpan TimeLimit {
+    public TimeSpan TimeLimit
+    {
       get { return timeLimit; }
       set { timeLimit = value; }

branches/WebJobManager/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -42 +42 @@
     private CancellationTokenSource cancellationTokenSource;
 
-    public string ItemName {
+    public string ItemName
+    {
       get { return ItemAttribute.GetName(this.GetType()); }
     }
-    public string ItemDescription {
+    public string ItemDescription
+    {
       get { return ItemAttribute.GetDescription(this.GetType()); }
     }
-    public Version ItemVersion {
+    public Version ItemVersion
+    {
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
-    public static Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
-    }
-    public Image ItemImage {
-      get {
+    public static Image StaticItemImage
+    {
+      get { return new Bitmap(25, 25); }
+    }
+    public Image ItemImage
+    {
+      get
+      {
         if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
         else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
@@ -69 +75 @@
     [Storable]
     private IBenchmark benchmark;
-    public IBenchmark Benchmark {
+    public IBenchmark Benchmark
+    {
       get { return benchmark; }
-      set {
+      set
+      {
         if (value == null) throw new ArgumentNullException();
         benchmark = value;
@@ -79 +87 @@
     [Storable]
     private ExecutionState executionState;
-    public ExecutionState ExecutionState {
+    public ExecutionState ExecutionState
+    {
       get { return executionState; }
-      private set {
+      private set
+      {
         if (executionState != value) {
           executionState = value;
@@ -92 +102 @@
     [Storable]
     private TimeSpan executionTime;
-    public TimeSpan ExecutionTime {
+    public TimeSpan ExecutionTime
+    {
       get { return executionTime; }
-      private set {
+      private set
+      {
         executionTime = value;
         OnExecutionTimeChanged();
@@ -102 +114 @@
     [Storable]
     private bool storeAlgorithmInEachRun;
-    public bool StoreAlgorithmInEachRun {
+    public bool StoreAlgorithmInEachRun
+    {
       get { return storeAlgorithmInEachRun; }
-      set {
+      set
+      {
         if (storeAlgorithmInEachRun != value) {
           storeAlgorithmInEachRun = value;
@@ -117 +131 @@
     [Storable]
     private RunCollection runs = new RunCollection();
-    public RunCollection Runs {
+    public RunCollection Runs
+    {
       get { return runs; }
-      private set {
+      private set
+      {
         if (value == null) throw new ArgumentNullException();
         if (runs != value) {
@@ -131 +147 @@
     [Storable]
     private ResultCollection results;
-    public ResultCollection Results {
+    public ResultCollection Results
+    {
       get { return results; }
     }
 
-    public Type ProblemType {
-      get {
+    public Type ProblemType
+    {
+      get
+      {
         // BenchmarkAlgorithm does not have a problem, so return a type which is no problem for sure
         return typeof(BenchmarkAlgorithm);
@@ -142 +161 @@
     }
 
-    public IProblem Problem {
+    public IProblem Problem
+    {
       get { return null; }
       set { throw new NotImplementedException("BenchmarkAlgorithm does not have a problem."); }
@@ -149 +169 @@
     [Storable]
     private string name;
-    public string Name {
+    public string Name
+    {
       get { return name; }
-      set {
+      set
+      {
         if (!CanChangeName) throw new NotSupportedException("Name cannot be changed.");
         if (!(name.Equals(value) || (value == null) && (name == string.Empty))) {
@@ -164 +186 @@
       }
     }
-    public bool CanChangeName {
+    public bool CanChangeName
+    {
       get { return true; }
     }
@@ -170 +193 @@
     [Storable]
     private string description;
-    public string Description {
+    public string Description
+    {
       get { return description; }
-      set {
+      set
+      {
         if (!CanChangeDescription) throw new NotSupportedException("Description cannot be changed.");
         if (!(description.Equals(value) || (value == null) && (description == string.Empty))) {
@@ -180 +205 @@
       }
     }
-    public bool CanChangeDescription {
+    public bool CanChangeDescription
+    {
       get { return true; }
     }
@@ -186 +212 @@
     [Storable]
     private ParameterCollection parameters = new ParameterCollection();
-    public IKeyedItemCollection<string, IParameter> Parameters {
+    public IKeyedItemCollection<string, IParameter> Parameters
+    {
       get { return parameters; }
     }
     private ReadOnlyKeyedItemCollection<string, IParameter> readOnlyParameters;
-    IKeyedItemCollection<string, IParameter> IParameterizedItem.Parameters {
-      get {
+    IKeyedItemCollection<string, IParameter> IParameterizedItem.Parameters
+    {
+      get
+      {
         if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
         return readOnlyParameters;
@@ -197 +226 @@
     }
 
-    public IEnumerable<IOptimizer> NestedOptimizers {
+    public IEnumerable<IOptimizer> NestedOptimizers
+    {
       get { return Enumerable.Empty<IOptimizer>(); }
     }
 
     #region Parameter Properties
-    public IConstrainedValueParameter<IBenchmark> BenchmarkParameter {
+    public IConstrainedValueParameter<IBenchmark> BenchmarkParameter
+    {
       get { return (IConstrainedValueParameter<IBenchmark>)Parameters["Benchmark"]; }
     }
-    private ValueParameter<IntValue> ChunkSizeParameter {
+    private ValueParameter<IntValue> ChunkSizeParameter
+    {
       get { return (ValueParameter<IntValue>)Parameters["ChunkSize"]; }
     }
-    private ValueParameter<DoubleValue> TimeLimitParameter {
+    private ValueParameter<DoubleValue> TimeLimitParameter
+    {
       get { return (ValueParameter<DoubleValue>)Parameters["TimeLimit"]; }
     }