Changeset 2891 for trunk/sources/HeuristicLab.Operators

Timestamp:

03/01/10 04:46:06 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms and parameters

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• Comparator.cs (modified) (2 diffs)
• SubScopesRemover.cs (modified) (2 diffs)

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

@@ -40 +40 @@
       get { return (ValueLookupParameter<IItem>)Parameters["RightSide"]; }
     }
-    private OptionalValueParameter<ComparisonData> ComparisonParameter {
-      get { return (OptionalValueParameter<ComparisonData>)Parameters["Comparison"]; }
+    private ValueParameter<ComparisonData> ComparisonParameter {
+      get { return (ValueParameter<ComparisonData>)Parameters["Comparison"]; }
     }
     public LookupParameter<BoolData> ResultParameter {
@@ -55 +55 @@
       Parameters.Add(new LookupParameter<IItem>("LeftSide", "The left side of the comparison."));
       Parameters.Add(new ValueLookupParameter<IItem>("RightSide", "The right side of the comparison."));
-      Parameters.Add(new OptionalValueParameter<ComparisonData>("Comparison", "The type of comparison.", new ComparisonData()));
+      Parameters.Add(new ValueParameter<ComparisonData>("Comparison", "The type of comparison.", new ComparisonData(Data.Comparison.Equal)));
       Parameters.Add(new LookupParameter<BoolData>("Result", "The result of the comparison."));
     }

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

@@ -33 +33 @@
   [Creatable("Test")]
   public sealed class SubScopesRemover : SingleSuccessorOperator {
-    private OptionalValueParameter<BoolData> RemoveAllSubScopesParameter {
-      get { return (OptionalValueParameter<BoolData>)Parameters["RemoveAllSubScopes"]; }
+    private ValueParameter<BoolData> RemoveAllSubScopesParameter {
+      get { return (ValueParameter<BoolData>)Parameters["RemoveAllSubScopes"]; }
     }
     public ValueLookupParameter<IntData> SubScopeIndexParameter {
@@ -53 +53 @@
     public SubScopesRemover()
       : base() {
-      Parameters.Add(new OptionalValueParameter<BoolData>("RemoveAllSubScopes", "True if all sub-scopes of the current scope should be removed, otherwise false.", new BoolData(true)));
+      Parameters.Add(new ValueParameter<BoolData>("RemoveAllSubScopes", "True if all sub-scopes of the current scope should be removed, otherwise false.", new BoolData(true)));
       Parameters.Add(new ValueLookupParameter<IntData>("SubScopeIndex", "The index of the sub-scope which should be removed. This parameter is ignored, if RemoveAllSubScopes is true."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which one or all sub-scopes should be removed."));