Changeset 10538 for branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding

Timestamp:

03/05/14 14:48:13 (11 years ago)

Author:

pfleck

Message:

• merged trunk

Location:

branches/DataPreprocessing

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/MultiIntegerVectorCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCreator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCrossover.cs (modified) (1 diff)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorManipulator.cs (modified) (1 diff)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorOperator.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/MultiIntegerVectorCrossover.cs

@@ -70 +70 @@
           Operators.Add((IIntegerVectorCrossover)Activator.CreateInstance(type), true);
       }
+
+      SelectedOperatorParameter.ActualName = "SelectedCrossoverOperator";
     }
 
@@ -99 +101 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one integer vector crossover to choose from.");
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }

branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCreator.cs

@@ -34 +34 @@
   [Item("IntegerVectorCreator", "A base class for operators creating int-valued vectors.")]
   [StorableClass]
-  public abstract class IntegerVectorCreator : SingleSuccessorOperator, IIntegerVectorCreator, IStochasticOperator {
+  public abstract class IntegerVectorCreator : InstrumentedOperator, IIntegerVectorCreator, IStochasticOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -79 +79 @@
     #endregion
 
-    public sealed override IOperation Apply() {
+    public sealed override IOperation InstrumentedApply() {
       IntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, BoundsParameter.ActualValue);
-      return base.Apply();
+      return base.InstrumentedApply();
     }
 

branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCrossover.cs

@@ -58 +58 @@
     }
 
-    public sealed override IOperation Apply() {
+    public sealed override IOperation InstrumentedApply() {
       ChildParameter.ActualValue = Cross(RandomParameter.ActualValue, ParentsParameter.ActualValue);
-      return base.Apply();
+      return base.InstrumentedApply();
     }
 

branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorManipulator.cs

@@ -52 +52 @@
     }
 
-    public sealed override IOperation Apply() {
+    public sealed override IOperation InstrumentedApply() {
       Manipulate(RandomParameter.ActualValue, IntegerVectorParameter.ActualValue);
-      return base.Apply();
+      return base.InstrumentedApply();
     }
 

branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorOperator.cs

@@ -29 +29 @@
   [Item("IntegerVectorOperator", "Base class for integer vectoro operators.")]
   [StorableClass]
-  public abstract class IntegerVectorOperator : SingleSuccessorOperator, IIntegerVectorOperator {
+  public abstract class IntegerVectorOperator : InstrumentedOperator, IIntegerVectorOperator {
 
     [StorableConstructor]