Changeset 1207

Timestamp:

02/05/09 11:24:25 (16 years ago)

Author:

abeham

Message:

fixed some bugs (#486)

Location:

trunk/sources/HeuristicLab.Communication.Operators

Files:

• CommunicatorBase.cs (modified) (1 diff)
• DataStreamCommunicator.cs (modified) (3 diffs)
• LocalProcessInitiator.cs (modified) (1 diff)
• MessageProcessor.cs (modified) (1 diff)
• SubScopeMessageDecomposer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Communication.Operators/CommunicatorBase.cs

@@ -28 +28 @@
       Message message = GetVariableValue<Message>("Message", scope, false, false);
 
-      if (message == null) { // RECEIVE MODE (no message present or not from this source)
+      if (message == null) { // RECEIVE MODE (no message present)
         message = Receive(scope, protocol, currentState);
+        if (message == null) throw new InvalidOperationException("ERROR in Communicator: Message could not be received");
         if (!info.Local) scope.AddVariable(new Variable(actualName, message));
         else AddVariable(new Variable(actualName, message));

trunk/sources/HeuristicLab.Communication.Operators/DataStreamCommunicator.cs

@@ -43 +43 @@
     private string Encode(Message message) {
       XmlDocument document = new XmlDocument();
-      return message.GetXmlNode("Message", document, new Dictionary<Guid, IStorable>()).ToString();
+      return message.GetXmlNode("Message", document, new Dictionary<Guid, IStorable>()).OuterXml;
     }
 
@@ -57 +57 @@
       IDataStream connection = scope.GetVariableValue<IDataStream>("DataStream", true);
       connection.Write("PROTOCOL_ID " + protocol.Name);
-      if (connection.Read().Equals("ACK")) {
+      string s = connection.Read();
+      if (s.Trim().Equals("ACK")) {
         connection.Write("STATE_ID " + currentState.Name);
-        if (connection.Read().Equals("ACK")) {
+        s = connection.Read();
+        if (s.Trim().Equals("ACK")) {
           connection.Write(Encode(message));
-        }
-      }
+        } else throw new InvalidOperationException("Received unexpected response [2]: " + s);
+      } else throw new InvalidOperationException("Received unexpected response [1]: " + s);
     }
 
@@ -70 +72 @@
       string rcvd = connection.Read();
       if (rcvd.StartsWith("PROTOCOL_ID ")) {
-        if (rcvd.Substring(12).Equals(protocol.Name)) {
+        if (rcvd.Substring(12).Trim().Equals(protocol.Name)) {
           connection.Write("ACK");
           rcvd = connection.Read();
           if (rcvd.StartsWith("STATE_ID ")) {
-            if (rcvd.Substring(9).Equals(currentState.Name)) {
+            if (rcvd.Substring(9).Trim().Equals(currentState.Name)) {
               connection.Write("ACK");
               message = Decode(connection.Read());

trunk/sources/HeuristicLab.Communication.Operators/LocalProcessInitiator.cs

@@ -42 +42 @@
       ProcessData proc = new ProcessData();
       proc.Initialize(config);
+      proc.Connect();
 
       IVariableInfo info = GetVariableInfo("Process");

trunk/sources/HeuristicLab.Communication.Operators/MessageProcessor.cs

@@ -61 +61 @@
               message.Source = peerName;
               message.Timestamp = DateTime.Now;
+            } else { // otherwise delete the message
+              IVariableInfo messageInfo = GetVariableInfo("Message");
+              if (messageInfo.Local) {
+                RemoveVariable(messageInfo.ActualName);
+              } else {
+                scope.RemoveVariable(scope.TranslateName(messageInfo.ActualName));
+              }
             }
           }

trunk/sources/HeuristicLab.Communication.Operators/SubScopeMessageDecomposer.cs

@@ -22 +22 @@
       if (message.Expect.Count > scope.SubScopes.Count) throw new InvalidOperationException("ERROR in SubScopeMessageDecomposer: There are not enough subscopes to put the contents of the message into");
       int i = 0;
-      foreach (IVariable var in message.Expect) {
+      foreach (IVariable var in message.Give) {
         scope.SubScopes[i].AddVariable(var);
       }