Changeset 3862

Timestamp:

05/27/10 13:18:14 (14 years ago)

Author:

abeham

Message:

#866

• updated external evaluation problem
• included in build config

Location:

trunk/sources

Files:

• Google.ProtocolBuffers.dll (added)
• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/HeuristicLabProtobufCSPlugin.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3 (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Analyzers/BestExternalEvaluationSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationDriver.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationProcessDriver.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationStreamDriver.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs (modified) (5 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationSolutionCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLabProblemsExternalEvaluationPlugin.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLabProblemsExternalEvaluationPlugin.cs.frame (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationDriver.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationProblemEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Properties (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Protos (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ExternalEvaluationMessages.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilding.cs (modified) (1 diff)
• HeuristicLab/3.3/Files.txt (modified) (2 diffs)
• ProtoGen.exe (added)
• protoc.exe (added)

trunk/sources/HeuristicLab 3.3.sln

@@ -82 +82 @@
     {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA} = {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}
     {887425B4-4348-49ED-A457-B7D2C26DDBF9} = {887425B4-4348-49ED-A457-B7D2C26DDBF9}
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55} = {25735DB4-8E54-4A2C-83E3-A60C76565E55}
     {A16F23B5-FB62-499E-A831-26953AA56FE2} = {A16F23B5-FB62-499E-A831-26953AA56FE2}
     {F4539FB6-4708-40C9-BE64-0A1390AEA197} = {F4539FB6-4708-40C9-BE64-0A1390AEA197}
@@ -1801 +1802 @@
     {89B50302-9CEE-4D13-9779-633EADCAE624}.Silverlight2|x86.Build.0 = Release|x86
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|x64.ActiveCfg = Debug|x64
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|x64.Build.0 = Debug|x64
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|x86.ActiveCfg = Debug|x86
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Debug|x86.Build.0 = Debug|x86
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|Any CPU.Build.0 = Release|Any CPU
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x64.ActiveCfg = Release|x64
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x64.Build.0 = Release|x64
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.ActiveCfg = Release|x86
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.Build.0 = Release|x86
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Services|Any CPU.ActiveCfg = Release|Any CPU
     {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Services|Any CPU.Build.0 = Release|Any CPU
@@ -1942 +1949 @@
     {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x64.ActiveCfg = Release|x64
     {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x64.Build.0 = Release|x64
-    {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x86.ActiveCfg = Release|Any CPU
+    {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x86.ActiveCfg = Release|x86
+    {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x86.Build.0 = Release|x86
     {236459CE-80CF-4991-972F-DE74C826BCCC}.Services|Any CPU.ActiveCfg = Release|Any CPU
     {236459CE-80CF-4991-972F-DE74C826BCCC}.Services|Any CPU.Build.0 = Release|Any CPU

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsExternalEvaluationPlugin.cs

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsExternalEvaluationPlugin.cs

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Analyzers/BestExternalEvaluationSolutionAnalyzer.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
-using HeuristicLab.Data;
-using HeuristicLab.Core;
-using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Google.ProtocolBuffers;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 using System.IO;
-using Google.ProtocolBuffers;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -40 +37 @@
     private ExternalEvaluationStreamDriver driver;
 
+    public LocalProcessDriver() : this(String.Empty, String.Empty) { }
     public LocalProcessDriver(string executable, string arguments)
       : base() {

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using Google.ProtocolBuffers;
@@ -38 +35 @@
     private Stream output;
 
+    public ExternalEvaluationStreamDriver() : base() { }
     public ExternalEvaluationStreamDriver(Stream input, Stream output)
       : base() {

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

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -33 +34 @@
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("External Evaluation Problem", "A problem that is evaluated in a different process.")]
+  [Creatable("Problems")]
   [StorableClass]
-  public class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
+  public sealed class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
@@ -124 +126 @@
       Parameters.Add(new ValueParameter<IExternalEvaluationDriver>("Driver", "The communication driver that is used to exchange data with the external process."));
       Parameters.Add(new ValueParameter<IExternalEvaluationProblemEvaluator>("Evaluator", "The evaluator that collects the values to exchange.", evaluator));
-      Parameters.Add(new ValueParameter<IOperator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
+      Parameters.Add(new ValueParameter<ISolutionCreator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
       Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to false as most test functions are minimization problems.", new BoolValue(false)));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
@@ -132 +134 @@
       InitializeOperators();
       AttachEventHandlers();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      ExternalEvaluationProblem clone = (ExternalEvaluationProblem)base.Clone(cloner);
+      clone.AttachEventHandlers();
+      return clone;
     }
 
@@ -199 +207 @@
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
       Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
-      OperatorsParameter.ValueChanged += new System.EventHandler(OperatorsParameter_ValueChanged);
+      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
       OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
       OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
-using System.Collections;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {

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

@@ -13 +13 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -80 +82 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestExternalEvaluationSolutionAnalyzer.cs" />
+    <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
     <Compile Include="Drivers\ExternalEvaluationDriver.cs" />
     <Compile Include="Drivers\ExternalEvaluationProcessDriver.cs" />
@@ -90 +93 @@
     <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="Properties\AssemblyInfo.frame" />
     <Compile Include="Protos\ExternalEvaluationMessages.cs" />
     <Compile Include="SolutionMessageBuilding.cs" />
@@ -145 +149 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="HeuristicLab.snk" />
     <None Include="Protos\ExternalEvaluationMessages.proto" />
   </ItemGroup>
@@ -156 +161 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set ProjectDir=$(ProjectDir)
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
-call "$(ProjectDir)"Protos\ProcessProtos.cmd</PreBuildEvent>
+call "$(ProjectDir)Protos\ProcessProtos.cmd"
+
+call PreBuildEvent.cmd
+SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs"</PreBuildEvent>
   </PropertyGroup>
 </Project>

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationDriver.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using Google.ProtocolBuffers;
-using Google.ProtocolBuffers.Descriptors;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationProblemEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using HeuristicLab.Core;
-using Google.ProtocolBuffers;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {

trunk/sources/HeuristicLab/3.3/Files.txt

@@ -47 +47 @@
 HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll
 HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll
+HeuristicLab.Problems.ExternalEvaluation\3.3:HeuristicLab.Problems.ExternalEvaluation-3.3.dll
 HeuristicLab.Problems.Knapsack\3.3:HeuristicLab.Problems.Knapsack-3.3.dll
 HeuristicLab.Problems.Knapsack.Views\3.3:HeuristicLab.Problems.Knapsack.Views-3.3.dll
@@ -77 +78 @@
 HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446:Netron.Diagramming.Core License.txt
 
+HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:HeuristicLab.ProtobufCS-0.9.1.dll
+HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS:Google.ProtocolBuffers-license-0.9.1.txt
+
 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:HeuristicLab.SharpDevelop-3.1.1.5327.dll
 HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327:ICSharpCode.NRefactory.dll

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsExternalEvaluationPlugin.cs