Changeset 6460

Timestamp:

06/21/11 11:11:38 (13 years ago)

Author:

epitzer

Message:

Correct locking construct for external evaluation on multiple clients and simplify string formatting (#1526)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.ExternalEvaluation.GP/3.4/ExternalEvaluationSymbolicExpressionTreeStringFormatter.cs (modified) (4 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/ExternalEvaluationSymbolicExpressionTreeStringFormatter.cs

@@ -28 +28 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using System;
+using System.Globalization;
 
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
@@ -57 +58 @@
       StringBuilder strBuilder = new StringBuilder();
       if (Indent) strBuilder.Append(' ', indentLength);
-      strBuilder.Append("(");
-      // internal nodes or leaf nodes?
-      if (node.Subtrees.Count() > 0) {
-        // symbol on same line as '('
+      if (node.Subtrees.Count() > 0) { // internal node
+        strBuilder.Append("(");
         if (node.Symbol is Addition) {
           strBuilder.AppendLine("+");
@@ -98 +97 @@
         // each subtree expression on a new line
         // and closing ')' also on new line
-
         foreach (var subtree in node.Subtrees) {
           strBuilder.AppendLine(FormatRecursively(subtree, indentLength + 2));
@@ -107 +105 @@
         if (node is VariableTreeNode) {
           var varNode = node as VariableTreeNode;
-          // symbol in the same line with as '(' and ')'
-          strBuilder.Append(";" + varNode.VariableName + ";" + varNode.Weight.ToString("E4"));
-          strBuilder.Append(")");
+          strBuilder.AppendFormat("(* {0} {1})", varNode.VariableName, varNode.Weight.ToString("g17", CultureInfo.InvariantCulture));
         } else if (node is ConstantTreeNode) {
           var constNode = node as ConstantTreeNode;
-          // symbol in the same line with as '(' and ')'
-          strBuilder.Append(";" + constNode.Value.ToString("E4"));
-          strBuilder.Append(")");
+          strBuilder.Append(constNode.Value.ToString("g17", CultureInfo.InvariantCulture));
         } else {
           throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " not supported for external evaluation.");

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

@@ -59 +59 @@
     #region Fields
     protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    protected object clientLock = new object();
-    protected AutoResetEvent clientAvailable = new AutoResetEvent(false);
+    protected object clientLock = new object();    
     #endregion
 
@@ -109 +108 @@
         client = Clients.CheckedItems.FirstOrDefault(c => !activeClients.Contains(c));
         while (client == null && Clients.Count > 0) {
-          Monitor.Exit(clientLock);
-          clientAvailable.WaitOne();
-          Monitor.Enter(clientLock);
+          Monitor.Wait(clientLock);
           client = Clients.CheckedItems.FirstOrDefault(c => !activeClients.Contains(c));
         }
@@ -122 +119 @@
         lock (clientLock) {
           activeClients.Remove(client);
-          clientAvailable.Set();
+          Monitor.PulseAll(clientLock);
         }
       }