Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs (modified) (6 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs

@@ -32 +32 @@
   [StorableClass]
   public class EvaluationTCPChannel : EvaluationChannel {
+
     public const int MAX_VARINT32_SIZE = 5;
 
+    #region Fields & Properties
     [Storable]
     private string ipAddress;
@@ -39 +41 @@
       get { return ipAddress; }
       set {
-        bool changed = !ipAddress.Equals(value);
+        if (value == ipAddress) return;
         ipAddress = value;
-        if (changed)
-          OnIpAddressChanged();
+        UpdateName();
+        OnIpAddressChanged();
       }
     }
@@ -50 +52 @@
       get { return port; }
       set {
-        bool changed = port != value;
+        if (value == port) return;
         port = value;
-        if (changed)
-          OnPortChanged();
+        UpdateName();
+        OnPortChanged();
       }
     }
     private Socket socket;
-
+    #endregion
+
+    #region Construction & Cloning
     [StorableConstructor]
     protected EvaluationTCPChannel(bool deserializing) : base(deserializing) { }
@@ -64 +68 @@
       ipAddress = original.ipAddress;
       port = original.port;
-    }
+      UpdateName();
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EvaluationTCPChannel(this, cloner);
@@ -74 +80 @@
       this.ipAddress = ip;
       this.port = port;
-    }
+      UpdateName();
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      UpdateName();
+    }
+    #endregion
+
+    
 
     #region IExternalEvaluationChannel Members
@@ -183 +197 @@
     #endregion
 
+    #region Auxiliary Methods
+    private void UpdateName() {
+      name = string.Format("TCPChannel {0}:{1}", ipAddress, port);
+      OnNameChanged();
+    }
+    #endregion
+
     #region Events
     public event EventHandler IpAddressChanged;

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates