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

Timestamp:

11/02/14 03:03:21 (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) (4 diffs)
• HookOperator.cs (added)
• IHookOperator.cs (added)
• Nodes/AlgorithmNode.cs (modified) (6 diffs)
• Nodes/AlgorithmServiceNode.cs (deleted)
• Nodes/IAlgorithmNode.cs (modified) (1 diff)
• Nodes/IAlgorithmServiceNode.cs (deleted)
• Nodes/KSPTSPConnector.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• Ports/ConfigurationPort.cs (added)
• Ports/ExecutionPort.cs (added)
• Ports/GenericPort.cs (modified) (8 diffs)
• Ports/IConfigurationPort.cs (added)
• Ports/IExecutionPort.cs (added)
• Ports/IGenericPort.cs (modified) (1 diff)
• Ports/IMessage.cs (modified) (1 diff)
• Ports/Message.cs (modified) (1 diff)

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

@@ -108 +108 @@
     <Compile Include="### obsolete\ServiceParameter.cs" />
     <Compile Include="### obsolete\ServiceParameterCollection.cs" />
+    <Compile Include="IHookOperator.cs" />
+    <Compile Include="Nodes\KSPTSPConnector.cs" />
     <Compile Include="Nodes\GenericNode.cs" />
     <Compile Include="Nodes\IGenericNode.cs" />
+    <Compile Include="Ports\ConfigurationPort.cs" />
+    <Compile Include="Ports\ExecutionPort.cs" />
+    <Compile Include="Ports\IConfigurationPort.cs" />
+    <Compile Include="Ports\IExecutionPort.cs" />
     <Compile Include="Ports\MessageCollection.cs" />
     <Compile Include="### obsolete\ServiceParameterCollectionCollection.cs" />
@@ -116 +122 @@
     <Compile Include="### obsolete\ValuePort.cs" />
     <Compile Include="Nodes\AlgorithmNode.cs" />
-    <Compile Include="Nodes\AlgorithmServiceNode.cs" />
     <Compile Include="Nodes\ClientNode.cs" />
     <Compile Include="Nodes\IAlgorithmNode.cs" />
-    <Compile Include="Nodes\IAlgorithmServiceNode.cs" />
     <Compile Include="Nodes\IClientNode.cs" />
     <Compile Include="Nodes\INetwork.cs" />
@@ -150 +154 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="HookOperator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -177 +182 @@
       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
       <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
+      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
+      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
+      <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
+      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Nodes/AlgorithmNode.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
 
 namespace HeuristicLab.Optimization.Networks {
@@ -29 +32 @@
   [StorableClass]
   public class AlgorithmNode : Node, IAlgorithmNode {
+    private object locker = new object();
+    private Dictionary<IAlgorithm, AutoResetEvent> waitHandles = new Dictionary<IAlgorithm, AutoResetEvent>();
+    private Dictionary<IAlgorithm, Exception> exceptions = new Dictionary<IAlgorithm, Exception>();
+
     new public PortCollection Ports {
       get { return base.Ports; }
@@ -39 +46 @@
       set {
         if (value != algorithm) {
-          DeregisterAlgorithmEvents();
           algorithm = value;
-          RegisterAlgorithmEvents();
           OnAlgorithmChanged();
         }
       }
+    }
+
+    [Storable]
+    private RunCollection runs;
+    public RunCollection Runs {
+      get { return runs; }
     }
 
@@ -52 +63 @@
       : base(original, cloner) {
       algorithm = cloner.Clone(original.algorithm);
-      RegisterAlgorithmEvents();
-    }
-    public AlgorithmNode() : base("AlgorithmNode") { }
-    public AlgorithmNode(string name) : base(name) { }
-    public AlgorithmNode(string name, string description) : base(name, description) { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterAlgorithmEvents();
+      runs = cloner.Clone(original.runs);
+    }
+    public AlgorithmNode()
+      : base("AlgorithmNode") {
+      runs = new RunCollection();
+    }
+    public AlgorithmNode(string name)
+      : base(name) {
+      runs = new RunCollection();
+    }
+    public AlgorithmNode(string name, string description)
+      : base(name, description) {
+      runs = new RunCollection();
     }
 
@@ -67 +82 @@
     }
 
-    private void UpdateParameter(IInputPort port) {
-      if (algorithm != null) {
+    protected virtual void Configure(IConfigurationPort port, IMessage message, CancellationToken token) {
+      // set algorithm and problem parameters
+      lock (locker) {
+        if (algorithm != null) {
+          foreach (var v in message.Values) {
+            IParameter param = null;
+            if (Algorithm.Parameters.TryGetValue(v.Name, out param)) {
+              var vp = param as IValueParameter;
+              if (vp != null) vp.Value = v.Value;
+            }
+            if (Algorithm.Problem.Parameters.TryGetValue(v.Name, out param)) {
+              var vp = param as IValueParameter;
+              if (vp != null) vp.Value = v.Value;
+            }
+          }
+        }
+      }
+    }
+
+    protected virtual void Execute(IExecutionPort port, IMessage message, CancellationToken token) {
+      if (Algorithm == null) throw new InvalidOperationException("Algorithm is null");
+
+      IAlgorithm algorithm;
+      lock (locker) {
+        algorithm = (IAlgorithm)Algorithm.Clone();
+        waitHandles.Add(algorithm, new AutoResetEvent(false));
+      }
+
+      // set parameters
+      foreach (var v in message.Values) {
         IParameter param = null;
-        if (algorithm.Parameters.TryGetValue(port.Name, out param)) {
-          IValueParameter p = param as IValueParameter;
-          if ((p != null) && (port.Value != null)) {
-            p.Value = (IItem)port.Value;
-          }
-        }
-      }
-    }
-    private void UpdateOutputPort(IResult result) {
-      IPort port = null;
-      if (Ports.TryGetValue(result.Name, out port)) {
-        IOutputPort p = port as IOutputPort;
-        if (p != null) {
-          p.Value = result.Value;
-        }
-      }
-    }
-    private void UpdateOutputPort(IOutputPort port) {
-      if ((algorithm != null) && (algorithm.Results != null)) {
-        IResult result = null;
-        if (algorithm.Results.TryGetValue(port.Name, out result)) {
-          port.Value = result != null ? result.Value : null;
-        } else {
-          port.Value = null;
-        }
+        if (algorithm.Parameters.TryGetValue(v.Name, out param)) {
+          var vp = param as IValueParameter;
+          if (vp != null) vp.Value = v.Value;
+        }
+        if (algorithm.Problem.Parameters.TryGetValue(v.Name, out param)) {
+          var vp = param as IValueParameter;
+          if (vp != null) vp.Value = v.Value;
+        }
+      }
+
+      algorithm.StoreAlgorithmInEachRun = false;
+      algorithm.Runs.Clear();
+      algorithm.Prepare();
+      algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
+      algorithm.Stopped += Algorithm_Stopped;
+
+      using (token.Register(() => { algorithm.Stop(); })) {
+        algorithm.Start();
+        waitHandles[algorithm].WaitOne();
+      }
+
+      lock (locker) {
+        waitHandles[algorithm].Dispose();
+        waitHandles.Remove(algorithm);
+
+        Exception ex = null;
+        if (exceptions.TryGetValue(algorithm, out ex)) {
+          exceptions.Remove(algorithm);
+          throw ex;
+        }
+      }
+
+      // retrieve results
+      var run = algorithm.Runs.First();
+      foreach (var v in message.Values) {
+        IItem result = null;
+        if (run.Results.TryGetValue(v.Name, out result)) {
+          v.Value = result;
+        }
+      }
+
+      lock (locker) {
+        Runs.Add(run);
+      }
+    }
+
+    private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      var algorithm = (IAlgorithm)sender;
+      lock (locker) {
+        exceptions.Add(algorithm, e.Value);
+      }
+      algorithm.Stop();
+    }
+    private void Algorithm_Stopped(object sender, EventArgs e) {
+      lock (locker) {
+        waitHandles[(IAlgorithm)sender].Set();
       }
     }
@@ -138 +212 @@
     #region Port Events
     private void RegisterPortEvents(IPort port) {
-      IInputPort i = port as IInputPort;
-      if (i != null) {
-        i.NameChanged += InputPort_NameChanged;
-        i.ValueChanged += InputPort_ValueChanged;
-        UpdateParameter(i);
-      }
-      IOutputPort o = port as IOutputPort;
-      if (o != null) {
-        o.NameChanged += OutputPort_NameChanged;
-        UpdateOutputPort(o);
+      IConfigurationPort c = port as IConfigurationPort;
+      if (c != null) {
+        c.MessageReceived += ConfigurationPort_MessageReceived;
+      }
+      IExecutionPort e = port as IExecutionPort;
+      if (e != null) {
+        e.MessageReceived += ExecutionPort_MessageReceived;
       }
     }
     private void DeregisterPortEvents(IPort port) {
-      IInputPort i = port as IInputPort;
-      if (i != null) {
-        i.NameChanged -= InputPort_NameChanged;
-        i.ValueChanged -= InputPort_ValueChanged;
-      }
-      IOutputPort o = port as IOutputPort;
-      if (o != null) {
-        o.NameChanged -= OutputPort_NameChanged;
-      }
-    }
-    private void InputPort_NameChanged(object sender, EventArgs e) {
-      UpdateParameter((IInputPort)sender);
-    }
-    private void InputPort_ValueChanged(object sender, EventArgs e) {
-      UpdateParameter((IInputPort)sender);
-    }
-    private void OutputPort_NameChanged(object sender, EventArgs e) {
-      UpdateOutputPort((IOutputPort)sender);
-    }
-    #endregion
-
-    #region Algorithm Events
-    private void RegisterAlgorithmEvents() {
-      if (algorithm != null) {
-        algorithm.Prepared += Algorithm_Prepared;
-        RegisterResultsEvents();
-      }
-    }
-
-    private void DeregisterAlgorithmEvents() {
-      if (algorithm != null) {
-        algorithm.Prepared -= Algorithm_Prepared;
-        DeregisterResultsEvents();
-      }
-    }
-    private void Algorithm_Prepared(object sender, EventArgs e) {
-      RegisterResultsEvents();
-    }
-    #endregion
-
-    #region Results Events
-    private void RegisterResultsEvents() {
-      if ((algorithm != null) && (algorithm.Results != null)) {
-        algorithm.Results.ItemsAdded += Results_ItemsAdded;
-        algorithm.Results.ItemsRemoved += Results_ItemsRemoved;
-        algorithm.Results.ItemsReplaced += Results_ItemsReplaced;
-        algorithm.Results.CollectionReset += Results_CollectionReset;
-        foreach (var r in algorithm.Results)
-          RegisterResultEvents(r);
-      }
-    }
-    private void DeregisterResultsEvents() {
-      if ((algorithm != null) && (algorithm.Results != null)) {
-        algorithm.Results.ItemsAdded -= Results_ItemsAdded;
-        algorithm.Results.ItemsRemoved -= Results_ItemsRemoved;
-        algorithm.Results.ItemsReplaced -= Results_ItemsReplaced;
-        algorithm.Results.CollectionReset -= Results_CollectionReset;
-        foreach (var r in algorithm.Results)
-          DeregisterResultEvents(r);
-      }
-    }
-    private void Results_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IResult> e) {
-      foreach (var r in e.Items)
-        RegisterResultEvents(r);
-    }
-    private void Results_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IResult> e) {
-      foreach (var r in e.Items)
-        DeregisterResultEvents(r);
-    }
-    private void Results_ItemsReplaced(object sender, Collections.CollectionItemsChangedEventArgs<IResult> e) {
-      foreach (var r in e.OldItems)
-        DeregisterResultEvents(r);
-      foreach (var r in e.Items)
-        RegisterResultEvents(r);
-    }
-    private void Results_CollectionReset(object sender, Collections.CollectionItemsChangedEventArgs<IResult> e) {
-      foreach (var r in e.OldItems)
-        DeregisterResultEvents(r);
-      foreach (var r in e.Items)
-        RegisterResultEvents(r);
-    }
-    #endregion
-
-    #region Result Events
-    private void RegisterResultEvents(IResult result) {
-      if (result != null) {
-        result.ValueChanged += Result_ValueChanged;
-        result.ToStringChanged += Result_ToStringChanged;
-        UpdateOutputPort(result);
-      }
-    }
-    private void DeregisterResultEvents(IResult result) {
-      if (result != null) {
-        result.ValueChanged -= Result_ValueChanged;
-        result.ToStringChanged += Result_ToStringChanged;
-      }
-    }
-    private void Result_ValueChanged(object sender, EventArgs e) {
-      UpdateOutputPort((IResult)sender);
-    }
-    private void Result_ToStringChanged(object sender, EventArgs e) {
-      UpdateOutputPort((IResult)sender);
+      IConfigurationPort c = port as IConfigurationPort;
+      if (c != null) {
+        c.MessageReceived -= ConfigurationPort_MessageReceived;
+      }
+      IExecutionPort e = port as IExecutionPort;
+      if (e != null) {
+        e.MessageReceived -= ExecutionPort_MessageReceived;
+      }
+    }
+    protected virtual void ConfigurationPort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+      Configure((IConfigurationPort)sender, e.Value, e.Value2);
+    }
+    protected virtual void ExecutionPort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+      Execute((IExecutionPort)sender, e.Value, e.Value2);
     }
     #endregion

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Nodes/IAlgorithmNode.cs

@@ -26 +26 @@
     new PortCollection Ports { get; }
     IAlgorithm Algorithm { get; set; }
+    RunCollection Runs { get; }
 
     event EventHandler AlgorithmChanged;

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

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/GenericPort.cs

@@ -61 +61 @@
         if (value != portConnectionValid) {
           portConnectionValid = value;
+          OnPortConnectionValidChanged();
           OnItemImageChanged();
+        }
+      }
+    }
+    [Storable]
+    protected bool logMessages;
+    public bool LogMessages {
+      get { return logMessages; }
+      set {
+        if (value != logMessages) {
+          logMessages = value;
+          OnLogMessagesChanged();
         }
       }
@@ -77 +89 @@
       connectedPort = cloner.Clone(original.connectedPort);
       portConnectionValid = original.portConnectionValid;
+      logMessages = original.logMessages;
       messages = cloner.Clone(original.messages);
       RegisterConnectedPortEvents();
@@ -83 +96 @@
       : base("GenericPort") {
       portConnectionValid = true;
+      logMessages = false;
       messages = new MessageCollection();
     }
@@ -88 +102 @@
       : base(name) {
       portConnectionValid = true;
+      logMessages = false;
       messages = new MessageCollection();
     }
@@ -93 +108 @@
       : base(name, description) {
       portConnectionValid = true;
+      logMessages = false;
       messages = new MessageCollection();
     }
@@ -183 +199 @@
     public void SendMessage(IMessage message, CancellationToken token) {
       if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
-      Messages.Add(message);
+      if (LogMessages) Messages.Add(message);
       if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       OnMessageSent(message, token);
@@ -201 +217 @@
     public void ReceiveMessage(IMessage message, CancellationToken token) {
       if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
-      Messages.Add(message);
+      if (LogMessages) Messages.Add(message);
       OnMessageReceived(message, token);
     }
@@ -213 +229 @@
     protected virtual void OnConnectedPortChanged() {
       var handler = ConnectedPortChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler PortConnectionValidChanged;
+    protected virtual void OnPortConnectionValidChanged() {
+      var handler = PortConnectionValidChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler LogMessagesChanged;
+    protected virtual void OnLogMessagesChanged() {
+      var handler = LogMessagesChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/IGenericPort.cs

@@ -29 +29 @@
     IConnectedPort ConnectedPort { get; set; }
     bool PortConnectionValid { get; }
+    bool LogMessages { get; set; }
     MessageCollection Messages { get; }
 
     event EventHandler ConnectedPortChanged;
+    event EventHandler PortConnectionValidChanged;
+    event EventHandler LogMessagesChanged;
 
     bool CanConnectToPort(IPort port);

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/IMessage.cs

@@ -25 +25 @@
   public interface IMessage : IItem {
     MessageValueCollection Values { get; }
-    IItem this[string valueName] { get; }
+    IItem this[string valueName] { get; set; }
   }
 }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/Message.cs

@@ -40 +40 @@
     public IItem this[string valueName] {
       get { return Values[valueName].Value; }
+      set { Values[valueName].Value = value; }
     }