Changeset 3870

Timestamp:

05/30/10 18:58:01 (14 years ago)

Author:

abeham

Message:

#866

• Updated external evaluation problem

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

Files:

• Drivers/ExternalEvaluationStreamDriver.cs (modified) (4 diffs)
• ExternalEvaluationCrossover.cs (added)
• ExternalEvaluationManipulator.cs (added)
• HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (1 diff)
• SolutionMessageBuilding.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationStreamDriver.cs

@@ -33 +33 @@
     public override bool CanChangeDescription { get { return false; } }
 
-    private CodedInputStream inputStream;
     private Stream input;
-    private CodedOutputStream outputStream;
     private Stream output;
 
@@ -42 +40 @@
       : base() {
       if (!input.CanRead) throw new ArgumentException("Input stream cannot be read", "input");
-      this.inputStream = CodedInputStream.CreateInstance(input);
       this.input = input;
       if (!output.CanWrite) throw new ArgumentException("Output stream cannot be written", "output");
-      this.outputStream = CodedOutputStream.CreateInstance(output);
       this.output = output;
     }
@@ -51 +47 @@
     #region Overrides
     public override QualityMessage Evaluate(SolutionMessage solution) {
-      solution.WriteTo(outputStream);
-      outputStream.Flush();
-      output.Flush();
-      QualityMessage message = QualityMessage.ParseFrom(inputStream);
+      Send(solution);
+      QualityMessage message = QualityMessage.ParseDelimitedFrom(input);
       return message;
     }
 
     public override void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback) {
-      solution.WriteTo(outputStream);
-      outputStream.Flush();
-      output.Flush();
+      Send(solution);
       System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ReceiveAsync), callback);
+    }
+
+    private void Send(SolutionMessage solution) {
+      lock (output) {
+        solution.WriteDelimitedTo(output);
+        output.Flush();
+      }
     }
 
     public override void Stop() {
       base.Stop();
-      inputStream = null;
       input.Close();
-      outputStream = null;
       output.Close();
     }
@@ -76 +73 @@
     private void ReceiveAsync(object callback) {
       QualityMessage message;
-      lock (inputStream) { // only one thread can read from the stream at one time
-        message = QualityMessage.ParseFrom(inputStream);
+      lock (input) { // only one thread can read from the stream at one time
+        message = QualityMessage.ParseDelimitedFrom(input);
       }
       ((Action<QualityMessage>)callback).Invoke(message);

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj

@@ -84 +84 @@
     <Compile Include="Analyzers\BestExternalEvaluationSolutionAnalyzer.cs" />
     <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
+    <Compile Include="ExternalEvaluationManipulator.cs" />
     <Compile Include="Drivers\ExternalEvaluationDriver.cs" />
     <Compile Include="Drivers\ExternalEvaluationProcessDriver.cs" />
     <Compile Include="Drivers\ExternalEvaluationStreamDriver.cs" />
+    <Compile Include="ExternalEvaluationCrossover.cs" />
     <Compile Include="ExternalEvaluationProblem.cs" />
     <Compile Include="ExternalEvaluationSolutionCreator.cs" />

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

@@ -87 +87 @@
       tmp.SetName(name);
       for (int i = 0; i < valueTypeArray.Length; i++)
-        tmp.SetData(i, valueTypeArray[i]);
+        tmp.AddData(valueTypeArray[i]);
       builder.AddIntegerArrayVars(tmp.Build());
     }
@@ -94 +94 @@
       tmp.SetName(name);
       for (int i = 0; i < valueTypeArray.Length; i++)
-        tmp.SetData(i, valueTypeArray[i]);
+        tmp.AddData(valueTypeArray[i]);
       builder.AddDoubleArrayVars(tmp.Build());
     }
@@ -101 +101 @@
       tmp.SetName(name);
       for (int i = 0; i < valueTypeArray.Length; i++)
-        tmp.SetData(i, valueTypeArray[i]);
+        tmp.AddData(valueTypeArray[i]);
       builder.AddBoolArrayVars(tmp.Build());
     }