Changeset 14927 for branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms

Timestamp:

05/04/17 17:19:35 (8 years ago)

Author:

gkronber

Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms

Files:

• Algorithm.cs (modified) (4 diffs)
• BasicAlgorithm.cs (modified) (3 diffs)
• EngineAlgorithm.cs (modified) (2 diffs)
• HeuristicOptimizationAlgorithm.cs (modified) (2 diffs)
• HeuristicOptimizationEngineAlgorithm.cs (modified) (2 diffs)
• UserDefinedAlgorithm.cs (modified) (2 diffs)

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
@@ -35 +35 @@
   /// </summary>
   [Item("Algorithm", "A base class for algorithms.")]
-  [StorableClass]
+  [StorableType("53c02848-6ed3-4e1e-8414-a3f0671267a0")]
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
     public static new Image StaticItemImage {
@@ -292 +292 @@
         foreach (
           IStatefulItem statefulObject in
-          this.GetObjectGraphObjects(new HashSet<object>() {Runs}).OfType<IStatefulItem>()) {
+          this.GetObjectGraphObjects(new HashSet<object>() { Runs }).OfType<IStatefulItem>()) {
           statefulObject.ClearState();
         }
@@ -298 +298 @@
         try {
           runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));
-        }
-        catch (ArgumentException e) {
+        } catch (ArgumentException e) {
           OnExceptionOccurred(new InvalidOperationException("Run creation failed.", e));
         }
-      }    
-      finally {
+      } finally {
         ExecutionState = ExecutionState.Stopped;
         EventHandler handler = Stopped;

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("56321a10-4f23-4ef8-88ce-35775f002e9a")]
   public abstract class BasicAlgorithm : Algorithm, IStorableContent {
 
@@ -81 +81 @@
         try {
           t.Wait();
-        }
-        catch (AggregateException ex) {
+        } catch (AggregateException ex) {
           try {
             ex.Flatten().Handle(x => x is OperationCanceledException);
-          }
-          catch (AggregateException remaining) {
+          } catch (AggregateException remaining) {
             if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
             else OnExceptionOccurred(remaining);
@@ -129 +127 @@
         initialized = true;
         Run(cancellationToken);
-      }
-      finally {
+      } finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.PluginInfrastructure;
 
@@ -32 +32 @@
   /// </summary>
   [Item("EngineAlgorithm", "A base class for algorithms which use an engine for execution.")]
-  [StorableClass]
+  [StorableType("032cf0ca-febf-4482-a5c2-49ab0bbae2e2")]
   public abstract class EngineAlgorithm : Algorithm {
     [Storable]

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
@@ -30 +30 @@
   /// </summary>
   [Item("Heuristic Optimization Algorithm", "A base class for heuristic optimization algorithms.")]
-  [StorableClass]
+  [StorableType("4d992b71-ad1e-46b0-8208-8dac699b04bf")]
   public abstract class HeuristicOptimizationAlgorithm : Algorithm {
     public new IHeuristicOptimizationProblem Problem {

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
@@ -30 +30 @@
   /// </summary>
   [Item("Heuristic Optimization Enigne Algorithm", "A base class for heuristic optimization algorithms using an execution engine.")]
-  [StorableClass]
+  [StorableType("5eaa6392-3972-41c3-8c71-d5e5c8bd4f92")]
   public abstract class HeuristicOptimizationEngineAlgorithm : EngineAlgorithm {
     public new IHeuristicOptimizationProblem Problem {

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
@@ -31 +31 @@
   [Item("User-Defined Algorithm", "An algorithm which can be defined by the user.")]
   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 100)]
-  [StorableClass]
+  [StorableType("59cdbec9-8beb-477b-aa38-f6f8fb9807ce")]
   public sealed class UserDefinedAlgorithm : EngineAlgorithm, IParameterizedItem, IStorableContent {
     public string Filename { get; set; }