Changeset 2877 for trunk

Timestamp:

02/26/10 16:40:01 (15 years ago)

Author:

epitzer

Message:

further steps towards migration of ProgrammableOperator to HL 3.3 (#842)

File:

• trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -40 +40 @@
 namespace HeuristicLab.Operators.Programmable {
 
-  public class ProgrammableOperator : Operator {
+  [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
+  [Creatable("Test")]
+  [EmptyStorableClass]
+  public class ProgrammableOperator : SingleSuccessorOperator {
 
     #region Fields & Properties
@@ -98 +101 @@
     }
 
+    public override bool CanChangeDescription {
+      get {
+        return true;
+      }
+    }
+
     #endregion
 
@@ -153 +162 @@
 
     public ProgrammableOperator() {      
-      code = "";
-      Description = "An operator that can be programmed for arbitrary needs.";
+      code = "";      
       executeMethod = null;
       ProgrammableOperator.StaticInitialize();
@@ -347 +355 @@
       CodeMemberMethod method = new CodeMemberMethod();
       method.Name = "Execute";
-      method.ReturnType = new CodeTypeReference(typeof(HeuristicLab.Core.IExecutionSequence));
+      method.ReturnType = new CodeTypeReference(typeof(HeuristicLab.Core.IOperation));
       method.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-      method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IOperator), "op"));
-//      method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IScope), "scope"));
+      method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IOperator), "op"));      
       foreach (var param in Parameters)
         method.Parameters.Add(new CodeParameterDeclarationExpression(param.DataType, param.Name));
@@ -366 +373 @@
 
     #region HeuristicLab interfaces
-    
-    public override IExecutionSequence Apply() {
+
+    public override IOperation Apply() {
       lock (syncRoot) {
         if (executeMethod == null) {
@@ -376 +383 @@
       var parameters = new List<object>() { this };      
       parameters.AddRange(Parameters.Select(p => (object)p.ActualValue));
-      return (IExecutionSequence)executeMethod.Invoke(null, parameters.ToArray());
+      return (IOperation)executeMethod.Invoke(null, parameters.ToArray());
     }
     
@@ -402 +409 @@
     
     #endregion
-   
+    
   }
 }