Context Navigation

Changeset 11406 for branches/OptimizationNetworks

Timestamp:

09/30/14 02:14:09 (10 years ago)

Author:

swagner

Message:

#2205: Worked on basic infrastructure for optimization networks

Location:

Files:

-                      r11401
+                      r11406
 namespace HeuristicLab.Optimization.Networks {
+  public class OutputInputPortEventArgs<T> : EventArgs where T : class, IItem {
+    public T Result { get; set; }
+  public class OutputInputPortEventArgs<TOut, TIn> : EventArgs
+    where TOut : class, IItem
+    where TIn : class, IItem {
+    public TOut Value { get; private set; }
+    public TIn Result { get; set; }
+    public OutputInputPortEventArgs() { }
+    public OutputInputPortEventArgs(TOut value) {
+      Value = value;
+    }
+  }
+}

-                      r11401
+                      r11406
     <Compile Include="EventArgs.cs" />
     <Compile Include="IInputOutputPort.cs" />
+    <Compile Include="IAlgorithmNode.cs" />
     <Compile Include="InputOutputPort.cs" />
     <Compile Include="IOutputInputPort.cs" />
+    <Compile Include="AlgorithmNode.cs" />
     <Compile Include="OutputInputPort.cs" />
     <Compile Include="OutputPort.cs" />
 …
       <Name>HeuristicLab.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>

-                      r11401
+                      r11406
 using HeuristicLab.Core;
+using System;
 namespace HeuristicLab.Optimization.Networks {
 …
     where TOut : class, IItem {
     new IOutputInputPort<TIn, TOut> OutputInputPort { get; set; }
+    event EventHandler<OutputInputPortEventArgs<TIn, TOut>> ValueReceived;
+  }
+}

r11401	r11406
33	33	TIn SendValue(TOut value);
34	34
35		event EventHandler<OutputInputPortEventArgs<TIn>> ValueSent;
	35	event EventHandler<OutputInputPortEventArgs<TOut, TIn>> ValueSent;
36	36	}
37	37	}

-                      r11401
+                      r11406
+    }
+    public event EventHandler<OutputInputPortEventArgs<TIn, TOut>> ValueReceived;
+    protected TOut OnValueReceived(TIn value) {
+      var args = new OutputInputPortEventArgs<TIn, TOut>(value);
+      var handler = ValueReceived;
+      if (handler != null) handler(this, args);
+      return args.Result;
+    }
     protected void RegisterOutputInputPortEvents() {
       outputInputPort.ValueSent += OutputInputPort_ValueSent;
 …
       outputInputPort.ValueSent -= OutputInputPort_ValueSent;
+    }
+    protected void OutputInputPort_ValueSent(object sender, OutputInputPortEventArgs<TOut> e) {
+      Value = OutputInputPort.Value;
+      //TODO: switch threads to decouple value propagation and resulting action
+      //TODO: clone value?
+      //TODO: add computed result to event args
+    protected void OutputInputPort_ValueSent(object sender, OutputInputPortEventArgs<TIn, TOut> e) {
+      var value = (TIn)e.Value.Clone();
+      Value = value;
+      e.Result = OnValueReceived(value);
+      //DISCUSS: clone value?
+      //DISCUSS: switch threads to decouple value propagation and resulting action -> should be done in Node?
+    }
+  }

r11401	r11406
79	79	}
80	80	protected void OutputPort_ValueChanged(object sender, EventArgs e) {
81		Value = OutputPort.Value;
82		//TODO: switch threads to decouple value propagation and to make communication asynchronous
83		//TODO: clone value?
84		//TODO: clone value?
	81	Value = (T)OutputPort.Value.Clone();
	82	//DISCUSS: clone value?
	83	//DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
85	84	}
86	85	}

-                      r11401
+                      r11406
     public TIn SendValue(TOut value) {
       Value = value;
       return OnValueSent();
+      return OnValueSent(value);
+    }
     public object SendValue(object value) {
 …
+    }
     public event EventHandler<OutputInputPortEventArgs<TIn>> ValueSent;
     protected virtual TIn OnValueSent() {
       var args = new OutputInputPortEventArgs<TIn>();
+    public event EventHandler<OutputInputPortEventArgs<TOut, TIn>> ValueSent;
+    protected virtual TIn OnValueSent(TOut value) {
+      var args = new OutputInputPortEventArgs<TOut, TIn>(value);
       var handler = ValueSent;
       if (handler != null) handler(this, args);

r11401	r11406
34	34	// [PluginDependency("HeuristicLab.Data", "3.3")]
35	35	// [PluginDependency("HeuristicLab.Parameters", "3.3")]
	36	[PluginDependency("HeuristicLab.Optimization", "3.3")]
36	37	[PluginDependency("HeuristicLab.Persistence", "3.3")]
37	38	public class HeuristicLabOptimizationNetworksPlugin : PluginBase {

-                      r11401
+                      r11406
       get { return value; }
       protected set {
+        if (value != this.value) {
+          DeregisterValueEvents();
+          this.value = value;
+          RegisterValueEvents();
+          OnValueChanged();
+        }
+        DeregisterValueEvents();
+        this.value = value;
+        RegisterValueEvents();
+        OnValueChanged();
+      }
+    }
 …
     public event EventHandler ValueChanged;
     protected virtual void OnValueChanged() {
       EventHandler handler = ValueChanged;
+      var handler = ValueChanged;
       if (handler != null) handler(this, EventArgs.Empty);
       OnToStringChanged();

Note: See TracChangeset for help on using the changeset viewer.