Changeset 2994 for trunk/sources/HeuristicLab.Operators/3.3

Timestamp:

03/10/10 18:28:50 (14 years ago)

Author:

epitzer

Message:

Make StorableClass attribute compulsory for StorableSerializer to work, add named property StorableClassType to choose between Empty and MarkedOnly, later other options will be added. (#548)

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• Assigner.cs (modified) (1 diff)
• Comparator.cs (modified) (1 diff)
• ConditionalBranch.cs (modified) (1 diff)
• DoubleCounter.cs (modified) (1 diff)
• EmptyOperator.cs (modified) (1 diff)
• IntCounter.cs (modified) (1 diff)
• Placeholder.cs (modified) (1 diff)
• ResultsCollector.cs (modified) (1 diff)
• ScopeCleaner.cs (modified) (1 diff)
• SingleSuccessorOperator.cs (modified) (1 diff)
• StochasticBranch.cs (modified) (1 diff)
• SubScopesCreator.cs (modified) (1 diff)
• SubScopesRemover.cs (modified) (1 diff)
• SubScopesSorter.cs (modified) (1 diff)
• UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• UniformSequentialSubScopesProcessor.cs (modified) (1 diff)
• VariableCreator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators/3.3/Assigner.cs

@@ -29 +29 @@
   /// </summary>
   [Item("Assigner", "An operator which clones and assigns the value of one parameter to another parameter.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class Assigner : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/Comparator.cs

@@ -31 +31 @@
   /// </summary>
   [Item("Comparator", "An operator which compares two items.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class Comparator : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/ConditionalBranch.cs

@@ -31 +31 @@
   [Item("ConditionalBranch", "A branch of two operators whose executions depend on a boolean condition.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public class ConditionalBranch : SingleSuccessorOperator {
     public LookupParameter<BoolData> ConditionParameter {

trunk/sources/HeuristicLab.Operators/3.3/DoubleCounter.cs

@@ -30 +30 @@
   /// </summary>
   [Item("DoubleCounter", "An operator which increments a double variable.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class DoubleCounter : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/EmptyOperator.cs

@@ -29 +29 @@
   [Item("EmptyOperator", "An operator which represents an empty statement.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public sealed class EmptyOperator : SingleSuccessorOperator {
     public EmptyOperator()

trunk/sources/HeuristicLab.Operators/3.3/IntCounter.cs

@@ -30 +30 @@
   /// </summary>
   [Item("IntCounter", "An operator which increments an integer variable.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class IntCounter : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/Placeholder.cs

@@ -30 +30 @@
   [Item("Placeholder", "An operator which acts as a placeholder for another operator retrieved from the scope or a parent execution context.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public sealed class Placeholder : SingleSuccessorOperator {
     public LookupParameter<IOperator> OperatorParameter {

trunk/sources/HeuristicLab.Operators/3.3/ResultsCollector.cs

@@ -30 +30 @@
   [Item("ResultsCollector", "An operator which collects the actual values of parameters and adds them to a collection of variables.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public class ResultsCollector : ValuesCollector {
     public ValueLookupParameter<VariableCollection> ResultsParameter {

trunk/sources/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -29 +29 @@
   /// </summary>
   [Item("ScopeCleaner", "An operator which removes all variables and sub-scopes from the current scope.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class ScopeCleaner : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

@@ -30 +30 @@
   [Item("SingleSuccessorOperator", "A base class for operators which have only one successor.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public abstract class SingleSuccessorOperator : Operator {
     protected OperatorParameter SuccessorParameter {

trunk/sources/HeuristicLab.Operators/3.3/StochasticBranch.cs

@@ -31 +31 @@
   [Item("StochasticBranch", "A branch of two operators which are executed with a specified probability.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public class StochasticBranch : SingleSuccessorOperator {
     public LookupParameter<IRandom> RandomParameter {

trunk/sources/HeuristicLab.Operators/3.3/SubScopesCreator.cs

@@ -30 +30 @@
   /// </summary>
   [Item("SubScopesCreator", "An operator which adds new and empty sub-scopes to the current scope.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public class SubScopesCreator : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/SubScopesRemover.cs

@@ -30 +30 @@
   /// </summary>
   [Item("SubScopesRemover", "An operator which removes all sub-scopes or one specified sub-scope from the current scope.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class SubScopesRemover : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/SubScopesSorter.cs

@@ -30 +30 @@
   /// </summary>
   [Item("SubScopesSorter", "An operator which sorts the sub-scopes of the current scope.")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   [Creatable("Test")]
   public sealed class SubScopesSorter : SingleSuccessorOperator {

trunk/sources/HeuristicLab.Operators/3.3/UniformParallelSubScopesProcessor.cs

@@ -30 +30 @@
   [Item("UniformParallelSubScopesProcessor", "An operator which applies a specified operator on all sub-scopes of the current scope in parallel.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public sealed class UniformParallelSubScopesProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {

trunk/sources/HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs

@@ -30 +30 @@
   [Item("UniformSequentialSubScopesProcessor", "An operator which applies a specified operator sequentially on all sub-scopes of the current scope.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public sealed class UniformSequentialSubScopesProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {

trunk/sources/HeuristicLab.Operators/3.3/VariableCreator.cs

@@ -30 +30 @@
   [Item("VariableCreator", "An operator which collects the actual values of parameters and clones them into the current scope.")]
   [Creatable("Test")]
-  [EmptyStorableClass]
+  [StorableClass(StorableClassType.Empty)]
   public class VariableCreator : ValuesCollector {
     protected ScopeParameter CurrentScopeParameter {