Changeset 2756 for trunk/sources/HeuristicLab.Core

Timestamp:

02/05/10 05:23:56 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• Interfaces/ILookupParameter.cs (added)
• Interfaces/IOperatorParameter.cs (deleted)
• Interfaces/IValueLookupParameter.cs (added)
• Interfaces/IValueParameter.cs (added)
• OperatorGraph.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -104 +104 @@
     <Compile Include="ChangedEventArgs.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
+    <Compile Include="Interfaces\IValueLookupParameter.cs" />
+    <Compile Include="Interfaces\IValueParameter.cs" />
+    <Compile Include="Interfaces\ILookupParameter.cs" />
     <Compile Include="ItemArray.cs" />
     <Compile Include="DeepCloneable.cs" />
     <Compile Include="Engine.cs" />
-    <Compile Include="Interfaces\IOperatorParameter.cs" />
     <Compile Include="Interfaces\IScope.cs" />
     <Compile Include="Interfaces\IVariable.cs" />

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -115 +115 @@
       var opParams = from o in Operators
                      from p in o.Parameters
-                     where p is IOperatorParameter
-                     where (((IOperatorParameter)p).Value != null) && (((IOperatorParameter)p).Value == op)
-                     select (IOperatorParameter)p;
-      foreach (IOperatorParameter opParam in opParams)
+                     where p is IValueParameter<IOperator>
+                     where (((IValueParameter<IOperator>)p).Value != null) && (((IValueParameter<IOperator>)p).Value == op)
+                     select (IValueParameter<IOperator>)p;
+      foreach (IValueParameter<IOperator> opParam in opParams)
         opParam.Value = null;
     }
     private void AddParameter(IParameter param) {
-      IOperatorParameter opParam = param as IOperatorParameter;
+      IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
       if (opParam != null) {
         RegisterOperatorParameterEvents(opParam);
@@ -129 +129 @@
     }
     private void RemoveParameter(IParameter param) {
-      IOperatorParameter opParam = param as IOperatorParameter;
+      IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
       if (opParam != null) {
         DeregisterOperatorParameterEvents(opParam);
@@ -163 +163 @@
       op.Parameters.CollectionReset -= new CollectionItemsChangedEventHandler<IParameter>(Parameters_CollectionReset);
     }
-    private void RegisterOperatorParameterEvents(IOperatorParameter opParam) {
+    private void RegisterOperatorParameterEvents(IValueParameter<IOperator> opParam) {
       opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
     }
-    private void DeregisterOperatorParameterEvents(IOperatorParameter opParam) {
+    private void DeregisterOperatorParameterEvents(IValueParameter<IOperator> opParam) {
       opParam.ValueChanged -= new EventHandler(opParam_ValueChanged);
     }
@@ -207 +207 @@
     }
     private void opParam_ValueChanged(object sender, EventArgs e) {
-      IOperatorParameter opParam = (IOperatorParameter)sender;
+      IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
       if (opParam.Value != null) Operators.Add(opParam.Value);
     }