Changeset 9363 for branches/OaaS/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationChannel.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs (modified) (7 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationStreamChannel.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs (modified) (4 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (7 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationChannel.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationServiceClient.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ExternalEvaluationMessages.proto (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ProcessProtos.cmd (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationChannel.cs

@@ -51 +51 @@
     public abstract void Send(IMessage message);
 
-    public abstract IMessage Receive(IBuilder builder);
+    public abstract IMessage Receive(IBuilder builder, ExtensionRegistry extensions);
 
     public virtual void Close() {

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs

@@ -111 +111 @@
       try {
         streamingChannel.Send(message);
-      }
-      catch {
+      } catch {
         Close();
         throw;
@@ -118 +117 @@
     }
 
-    public override IMessage Receive(IBuilder builder) {
+    public override IMessage Receive(IBuilder builder, ExtensionRegistry extensions) {
       try {
-        return streamingChannel.Receive(builder);
-      }
-      catch {
+        return streamingChannel.Receive(builder, extensions);
+      } catch {
         Close();
         throw;
@@ -138 +136 @@
               process.WaitForExit(1000);
               process.Close();
-            }
-            catch { }
+            } catch { }
           }
           // for some reasons the event process_Exited does not fire

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs

@@ -21 +21 @@
 
 using System;
+using System.IO;
+using Google.ProtocolBuffers;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -73 +75 @@
 
     #region IEvaluationServiceClient Members
-    public QualityMessage Evaluate(SolutionMessage solution) {
+    public QualityMessage Evaluate(SolutionMessage solution, ExtensionRegistry qualityExtensions) {
       int tries = 0, maxTries = RetryParameter.Value.Value;
       bool success = false;
@@ -82 +84 @@
           CheckAndOpenChannel();
           Channel.Send(solution);
-          result = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+          result = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder(), qualityExtensions);
           success = true;
         } catch (InvalidOperationException) {
@@ -91 +93 @@
         }
       }
+      if (result != null && result.SolutionId != solution.SolutionId) throw new InvalidDataException(Name + ": Received a quality for a different solution.");
       return result;
     }
 
-    public void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback) {
+    public void EvaluateAsync(SolutionMessage solution, ExtensionRegistry qualityExtensions, Action<QualityMessage> callback) {
       int tries = 0, maxTries = RetryParameter.Value.Value;
       bool success = false;
@@ -110 +113 @@
         }
       }
-      System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ReceiveAsync), callback);
+      System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ReceiveAsync), new ReceiveAsyncInfo(solution, callback, qualityExtensions));
     }
     #endregion
@@ -126 +129 @@
     }
 
-    private void ReceiveAsync(object callback) {
+    private void ReceiveAsync(object callbackInfo) {
+      var info = (ReceiveAsyncInfo)callbackInfo;
       QualityMessage message = null;
       try {
-        message = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+        message = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder(), info.QualityExtensions);
       } catch { }
-      ((Action<QualityMessage>)callback).Invoke(message);
+      if (message != null && message.SolutionId != info.SolutionMessage.SolutionId) throw new InvalidDataException(Name + ": Received a quality for a different solution.");
+      info.CallbackDelegate.Invoke(message);
     }
 
@@ -146 +151 @@
     }
     #endregion
+
+    private class ReceiveAsyncInfo {
+      public SolutionMessage SolutionMessage { get; set; }
+      public Action<QualityMessage> CallbackDelegate { get; set; }
+      public ExtensionRegistry QualityExtensions { get; set; }
+      public ReceiveAsyncInfo(SolutionMessage solutionMessage, Action<QualityMessage> callbackDelegate, ExtensionRegistry qualityExtensions) {
+        SolutionMessage = solutionMessage;
+        CallbackDelegate = callbackDelegate;
+        QualityExtensions = qualityExtensions;
+      }
+    }
   }
 }

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationStreamChannel.cs

@@ -60 +60 @@
     }
 
-    public override IMessage Receive(IBuilder builder) {
+    public override IMessage Receive(IBuilder builder, ExtensionRegistry extensions) {
       QualityMessage message;
       lock (input) { // only one thread can read from the stream at one time
-        message = QualityMessage.ParseDelimitedFrom(input);
+        message = QualityMessage.ParseDelimitedFrom(input, extensions);
       }
       return message;

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

@@ -88 +88 @@
     #endregion
 
-    
+
 
     #region IExternalEvaluationChannel Members
@@ -105 +105 @@
         byte[] buffer = EncodeDelimited(message);
         socket.Send(buffer);
-      }
-      catch (SocketException) {
-        Close();
-        throw;
-      }
-      catch (ObjectDisposedException) {
+      } catch (SocketException) {
+        Close();
+        throw;
+      } catch (ObjectDisposedException) {
         socket = null;
         Close();
@@ -138 +136 @@
     }
 
-    public override IMessage Receive(IBuilder builder) {
+    public override IMessage Receive(IBuilder builder, ExtensionRegistry extensions) {
       try {
         byte[] buffer = GetMessageBuffer();
-        return builder.WeakMergeFrom(ByteString.CopyFrom(buffer)).WeakBuild();
-      }
-      catch (SocketException) {
-        Close();
-        throw;
-      }
-      catch (ObjectDisposedException) {
+        return builder.WeakMergeFrom(ByteString.CopyFrom(buffer), extensions).WeakBuild();
+      } catch (SocketException) {
+        Close();
+        throw;
+      } catch (ObjectDisposedException) {
         socket = null;
         Close();
@@ -186 +182 @@
             socket.Disconnect(false);
           socket.Close();
-        }
-        catch { }
+        } catch { }
         socket = null;
       }

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using Google.ProtocolBuffers;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +36 @@
   [StorableClass]
   public class ExternalEvaluator : ValuesCollector, IExternalEvaluationProblemEvaluator {
+    protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
+    protected object clientLock = new object();
 
     #region Parameters
@@ -48 +51 @@
     #endregion
 
-    #region Parameter Values
+    #region Parameter Properties
     protected SolutionMessageBuilder MessageBuilder {
       get { return MessageBuilderParameter.Value; }
@@ -55 +58 @@
       get { return ClientsParameter.ActualValue; }
     }
-    #endregion
-
-    #region Fields
-    protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    protected object clientLock = new object();
     #endregion
 
@@ -103 +101 @@
     }
 
-    protected QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
+    protected virtual QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
       IEvaluationServiceClient client = null;
       lock (clientLock) {
@@ -115 +113 @@
       }
       try {
-        return client.Evaluate(message);
+        return client.Evaluate(message, GetQualityMessageExtensions());
       } finally {
         lock (clientLock) {
@@ -124 +122 @@
     }
 
-    protected SolutionMessage BuildSolutionMessage() {
+    protected virtual ExtensionRegistry GetQualityMessageExtensions() {
+      return ExtensionRegistry.CreateInstance();
+    }
+
+    protected virtual SolutionMessage BuildSolutionMessage() {
       lock (clientLock) {
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj

@@ -95 +95 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Google.ProtocolBuffers-0.9.1, Version=0.9.0.0, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\Google.ProtocolBuffers-0.9.1.dll</HintPath>
+    <Reference Include="Google.ProtocolBuffers-2.4.1.473, Version=2.4.1.473">
+      <HintPath>..\..\bin\Google.ProtocolBuffers-2.4.1.473.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -250 +250 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
+
 call "$(ProjectDir)\Protos\ProcessProtos.cmd"
-
 call PreBuildEvent.cmd
 </PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
 </Project>

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationChannel.cs

@@ -48 +48 @@
     /// <param name="builder">The builder that must match the message type that is to be received.</param>
     /// <returns>The received message.</returns>
-    IMessage Receive(IBuilder builder);
+    IMessage Receive(IBuilder builder, ExtensionRegistry extensions);
     /// <summary>
     /// Tells the channel to close down and terminate open connections.

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationServiceClient.cs

@@ -21 +21 @@
 
 using System;
+using Google.ProtocolBuffers;
 using HeuristicLab.Core;
 
@@ -29 +30 @@
     /// </summary>
     /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <param name="qualityExtensions">An extension registry for the quality message that specifies additional custom fields.</param>
     /// <returns>The resulting quality message from the external process.</returns>
-    QualityMessage Evaluate(SolutionMessage solution);
+    QualityMessage Evaluate(SolutionMessage solution, ExtensionRegistry qualityExtensions);
     /// <summary>
     /// Evaluates a given solution in a non-blocking manner.
     /// </summary>
     /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <param name="qualityExtensions">An extension registry for the quality message that specifies additional custom fields.</param>
     /// <param name="callback">The callback method that is invoked when evaluation is finished.</param>
-    void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback);
+    void EvaluateAsync(SolutionMessage solution, ExtensionRegistry qualityExtensions, Action<QualityMessage> callback);
   }
 }

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
-  [Plugin("HeuristicLab.Problems.ExternalEvaluation", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.ExternalEvaluation", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
@@ -36 +36 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.ProtobufCS", "0.9.1")]
+  [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
   public class HeuristicLabProblemsExternalEvaluationPlugin : PluginBase {
   }

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Properties/AssemblyInfo.cs.frame

@@ -34 +34 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ExternalEvaluationMessages.proto

@@ -67 +67 @@
   required int32 solutionId = 1;
   required double quality = 2;
+
+  extensions 1000 to max;
 }
   

branches/OaaS/HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ProcessProtos.cmd

@@ -1 @@
-cd "%ProjectDir%"Protos
-
-for %%i in (*.proto) do (
-  "%SolutionDir%"protoc -otmp %%i
-  "%SolutionDir%"ProtoGen tmp
-  del tmp)
+for %%i in ("%ProjectDir%Protos\*.proto") do (
+  echo Processing %%i
+  ProtoGen --proto_path="%ProjectDir%\Protos" "%%i" --include_imports -output_directory="%ProjectDir%Protos"
+)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages