Changeset 11452 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks

Timestamp:

10/12/14 03:02:37 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• HeuristicLab.Optimization.Networks-3.3.csproj (modified) (2 diffs)
• IInputOutputPort.cs (modified) (1 diff)
• IValuePort.cs (modified) (1 diff)
• InputOutputPort.cs (modified) (1 diff)
• InputPort.cs (modified) (3 diffs)
• MultiplierNode.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• VariablesNode.cs (modified) (5 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj

@@ -89 +89 @@
     <Compile Include="Entity.cs" />
     <Compile Include="Port.cs" />
+    <Compile Include="MultiplierNode.cs" />
     <Compile Include="VariablesNode.cs" />
     <Compile Include="EventArgs.cs" />
@@ -134 +135 @@
       <Name>HeuristicLab.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
+      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
+      <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/IInputOutputPort.cs

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IInputOutputPort : IValuePort {
-    IOutputInputPort OutputInputPort { get; }
+    IOutputInputPort OutputInputPort { get; set; }
 
     event EventHandler OutputInputPortChanged;

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/IValuePort.cs

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IValuePort : IPort {
-    //DISCUSS: Should there be a reference to the node of this port?
-
     object Value { get; }
 

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/InputOutputPort.cs

@@ -46 +46 @@
     IOutputInputPort IInputOutputPort.OutputInputPort {
       get { return outputInputPort; }
+      set {
+        var val = value as IOutputInputPort<TIn, TOut>;
+        if ((value != null) && (val == null))
+          throw new InvalidOperationException(
+            string.Format("Type mismatch. OutputInputPort is not a \"{0}\".",
+                          typeof(IOutputInputPort<TIn, TOut>).GetPrettyName())
+          );
+        OutputInputPort = val;
+      }
     }
 

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/InputPort.cs

@@ -44 +44 @@
           RegisterOutputPortEvents();
           OnOutputPortChanged();
+          UpdateValue();
         }
       }
@@ -79 +80 @@
     }
 
+    protected virtual void UpdateValue() {
+      if (OutputPort != null) {
+        var value = OutputPort.Value;
+        if (value != null)
+          value = (T)value.Clone();
+        Value = value;
+        //DISCUSS: clone value?
+        //DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
+      }
+    }
+
     public event EventHandler OutputPortChanged;
     protected void OnOutputPortChanged() {
@@ -96 +108 @@
     }
     protected void OutputPort_ValueChanged(object sender, EventArgs e) {
-      var value = OutputPort.Value;
-      if (value != null)
-        value = (T)value.Clone();
-      Value = value;
-      //DISCUSS: clone value?
-      //DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
+      UpdateValue();
     }
   }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/VariablesNode.cs

@@ -77 +77 @@
 
     private void UpdateVariable(IInputPort port) {
-      IVariable var = null;
-      if (variables.TryGetValue(port.Name, out var)) {
-        var.Value = (IItem)port.Value;
-      }
+      if (!variables.ContainsKey(port.Name))
+        variables.Add(new Variable(port.Name));
+      variables[port.Name].Value = (IItem)port.Value;
     }
     private void UpdateOutputPort(IVariable variable) {
       IPort port = null;
       if (Ports.TryGetValue(variable.Name, out port)) {
-        IOutputPort p = port as IOutputPort;
-        if (p != null) {
-          p.Value = variable.Value;
+        IOutputPort o = port as IOutputPort;
+        if (o != null) {
+          o.Value = variable.Value;
+        }
+        IOutputInputPort oi = port as IOutputInputPort;
+        if (oi != null) {
+          var result = (IItem)oi.SendValue(variable.Value);
+          if (!variables.ContainsKey(oi.Name + "Result"))
+            variables.Add(new Variable(oi.Name + "Result"));
+          variables[oi.Name + "Result"].Value = result;
         }
       }
@@ -98 +104 @@
         port.Value = null;
       }
+    }
+    private void UpdateOutputInputPort(IOutputInputPort port) {
+      IVariable var = null;
+      IItem result = null;
+      if (variables.TryGetValue(port.Name, out var)) {
+        result = (IItem)port.SendValue(var.Value);
+      } else {
+        result = (IItem)port.SendValue(null);
+      }
+      if (!variables.ContainsKey(port.Name + "Result"))
+        variables.Add(new Variable(port.Name + "Result"));
+      variables[port.Name + "Result"].Value = result;
     }
 
@@ -145 +163 @@
         UpdateOutputPort(o);
       }
+      IOutputInputPort oi = port as IOutputInputPort;
+      if (oi != null) {
+        oi.NameChanged += OutputInputPort_NameChanged;
+        UpdateOutputInputPort(oi);
+      }
     }
     private void DeregisterPortEvents(IPort port) {
@@ -156 +179 @@
         o.NameChanged -= OutputPort_NameChanged;
       }
+      IOutputInputPort oi = port as IOutputInputPort;
+      if (oi != null) {
+        oi.NameChanged -= OutputInputPort_NameChanged;
+      }
     }
     private void InputPort_NameChanged(object sender, EventArgs e) {
@@ -165 +192 @@
     private void OutputPort_NameChanged(object sender, EventArgs e) {
       UpdateOutputPort((IOutputPort)sender);
+    }
+    private void OutputInputPort_NameChanged(object sender, EventArgs e) {
+      UpdateOutputInputPort((IOutputInputPort)sender);
     }
     #endregion