Changeset 11490

Timestamp:

10/24/14 05:05:47 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• GenericPort.cs (added)
• HeuristicLab.Optimization.Networks-3.3.csproj (modified) (2 diffs)
• IConnectedPort.cs (added)
• IGenericPort.cs (modified) (2 diffs)
• IMessage.cs (modified) (1 diff)
• IPortParameter.cs (modified) (1 diff)
• Message.cs (added)
• PortParameter.cs (modified) (6 diffs)
• PortParameterType.cs (modified) (1 diff)

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

@@ -92 +92 @@
     <Compile Include="ClientNode.cs" />
     <Compile Include="AlgorithmServiceNode.cs" />
+    <Compile Include="IConnectedPort.cs" />
     <Compile Include="IGenericPort.cs" />
     <Compile Include="IMessage.cs" />
     <Compile Include="IMessageValue.cs" />
+    <Compile Include="Message.cs" />
     <Compile Include="ParameterizedPort.cs" />
     <Compile Include="IClientNode.cs" />
@@ -119 +121 @@
     <Compile Include="ClientServicePort.cs" />
     <Compile Include="ClientPort.cs" />
+    <Compile Include="GenericPort.cs" />
     <Compile Include="ServicePort.cs" />
     <Compile Include="Port.cs" />

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

@@ -27 +27 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IGenericPort : IParameterizedPort {
-    IGenericPort ConnectedPort { get; set; }
+    IConnectedPort ConnectedPort { get; set; }
     bool PortConnectionValid { get; }
 
@@ -40 +40 @@
     Task SendMessageAsync(IMessage message);
     Task SendMessageAsync(IMessage message, CancellationToken token);
-    event EventHandler<EventArgs<IMessage, CancellationToken>> MessageSent;
 
-    void ReceiveMessage(IMessage message);
-    void ReceiveMessage(IMessage message, CancellationToken token);
-    Task ReceiveMessageAsync(IMessage message);
-    Task ReceiveMessageAsync(IMessage message, CancellationToken token);
     event EventHandler<EventArgs<IMessage, CancellationToken>> MessageReceived;
   }

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IMessage {
+  public interface IMessage : IItem {
     MessageValueCollection Values { get; }
+    IItem this[string valueName] { get; }
   }
 }

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

@@ -28 +28 @@
     Type DataType { get; }
     PortParameterType Type { get; set; }
-    IItem Value { get; set; }
+    IItem DefaultValue { get; set; }
 
     event EventHandler TypeChanged;
     event EventHandler ValueChanged;
+
+    IMessageValue CreateMessageValue();
   }
 
   public interface IPortParameter<T> : IPortParameter where T : class, IItem {
-    new T Value { get; set; }
+    new T DefaultValue { get; set; }
+
+    new IMessageValue<T> CreateMessageValue();
   }
 }

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

@@ -63 +63 @@
     }
     [Storable]
-    protected T value;
-    public T Value {
-      get { return value; }
+    protected T defaultValue;
+    public T DefaultValue {
+      get { return defaultValue; }
       set {
-        if (value != this.value) {
-          DeregisterValueEvents();
-          this.value = value;
-          RegisterValueEvents();
+        if (value != this.defaultValue) {
+          DeregisterDefaultValueEvents();
+          this.defaultValue = value;
+          RegisterDefaultValueEvents();
           OnValueChanged();
         }
       }
     }
-    IItem IPortParameter.Value {
-      get { return Value; }
+    IItem IPortParameter.DefaultValue {
+      get { return DefaultValue; }
       set {
         T val = value as T;
@@ -84 +84 @@
                           typeof(T).GetPrettyName())
           );
-        Value = val;
+        DefaultValue = val;
       }
     }
@@ -93 +93 @@
       : base(original, cloner) {
       this.type = original.type;
-      this.value = cloner.Clone(original.value);
-      RegisterValueEvents();
+      this.defaultValue = cloner.Clone(original.defaultValue);
+      RegisterDefaultValueEvents();
     }
     public PortParameter() : base("PortParameter") { }
@@ -102 +102 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      RegisterValueEvents();
+      RegisterDefaultValueEvents();
     }
 
@@ -111 +111 @@
     public override string ToString() {
       var s = base.ToString();
-      if (Value != null)
-        s += ": " + Value.ToString();
+      if (DefaultValue != null)
+        s += ": " + DefaultValue.ToString();
       return s;
     }
@@ -129 +129 @@
       OnToStringChanged();
     }
-    protected virtual void RegisterValueEvents() {
-      if (value != null) {
-        value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+
+    public IMessageValue<T> CreateMessageValue() {
+      if (DefaultValue == null)
+        return new MessageValue<T>(Name);
+      else
+        return new MessageValue<T>(Name, (T)DefaultValue.Clone());
+    }
+    IMessageValue IPortParameter.CreateMessageValue() {
+      return CreateMessageValue();
+    }
+
+    #region DefaultValue Events
+    protected virtual void RegisterDefaultValueEvents() {
+      if (defaultValue != null) {
+        defaultValue.ToStringChanged += new EventHandler(DefaultValue_ToStringChanged);
       }
     }
-    protected virtual void DeregisterValueEvents() {
-      if (value != null) {
-        value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
+    protected virtual void DeregisterDefaultValueEvents() {
+      if (defaultValue != null) {
+        defaultValue.ToStringChanged -= new EventHandler(DefaultValue_ToStringChanged);
       }
     }
-    private void Value_ToStringChanged(object sender, EventArgs e) {
+    private void DefaultValue_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }
+    #endregion
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 
 namespace HeuristicLab.Optimization.Networks {
+  [Flags]
   public enum PortParameterType {
-    Input,
-    Output
+    Input = 1,
+    Output = 2
   }
 }