Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/27/10 13:18:14 (15 years ago)
Author:
abeham
Message:

#866

  • updated external evaluation problem
  • included in build config
Location:
trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3
Files:
3 added
3 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
         4HeuristicLabProblemsExternalEvaluationPlugin.cs

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

    r3861 r3862  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HeuristicLab.Core;
     25using HeuristicLab.Data;
     26using HeuristicLab.Operators;
    2427using HeuristicLab.Optimization;
    25 using HeuristicLab.Data;
    26 using HeuristicLab.Core;
    27 using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

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

    r3859 r3862  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using Google.ProtocolBuffers;
    2723using HeuristicLab.Core;
    2824using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

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

    r3859 r3862  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    2523using System.Diagnostics;
    2624using System.IO;
    27 using Google.ProtocolBuffers;
    2825using HeuristicLab.Core;
    2926using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    4037    private ExternalEvaluationStreamDriver driver;
    4138
     39    public LocalProcessDriver() : this(String.Empty, String.Empty) { }
    4240    public LocalProcessDriver(string executable, string arguments)
    4341      : base() {

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

    r3859 r3862  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623using System.IO;
    2724using Google.ProtocolBuffers;
    … …  
    3835    private Stream output;
    3936
     37    public ExternalEvaluationStreamDriver() : base() { }
    4038    public ExternalEvaluationStreamDriver(Stream input, Stream output)
    4139      : base() {

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

    r3861 r3862  
    2525using System.Linq;
    2626using HeuristicLab.Collections;
     27using HeuristicLab.Common;
    2728using HeuristicLab.Core;
    2829using HeuristicLab.Data;
    … …  
    3334namespace HeuristicLab.Problems.ExternalEvaluation {
    3435  [Item("External Evaluation Problem", "A problem that is evaluated in a different process.")]
     36  [Creatable("Problems")]
    3537  [StorableClass]
    36   public class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
     38  public sealed class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
    3739    public override Image ItemImage {
    3840      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
    … …  
    124126      Parameters.Add(new ValueParameter<IExternalEvaluationDriver>("Driver", "The communication driver that is used to exchange data with the external process."));
    125127      Parameters.Add(new ValueParameter<IExternalEvaluationProblemEvaluator>("Evaluator", "The evaluator that collects the values to exchange.", evaluator));
    126       Parameters.Add(new ValueParameter<IOperator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
     128      Parameters.Add(new ValueParameter<ISolutionCreator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
    127129      Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to false as most test functions are minimization problems.", new BoolValue(false)));
    128130      Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
    … …  
    132134      InitializeOperators();
    133135      AttachEventHandlers();
     136    }
     137
     138    public override IDeepCloneable Clone(Cloner cloner) {
     139      ExternalEvaluationProblem clone = (ExternalEvaluationProblem)base.Clone(cloner);
     140      clone.AttachEventHandlers();
     141      return clone;
    134142    }
    135143
    … …  
    199207      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
    200208      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    201       OperatorsParameter.ValueChanged += new System.EventHandler(OperatorsParameter_ValueChanged);
     209      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
    202210      OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
    203211      OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);

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

    r3861 r3862  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.Linq;
    25 using System.Text;
    2623using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2824using HeuristicLab.Operators;
    2925using HeuristicLab.Optimization;
     26using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3027
    3128namespace HeuristicLab.Problems.ExternalEvaluation {

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

    r3859 r3862  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    2523using HeuristicLab.Core;
     24using HeuristicLab.Data;
    2625using HeuristicLab.Operators;
    2726using HeuristicLab.Parameters;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Data;
    30 using System.Collections;
    31 using HeuristicLab.Optimization;
    3228
    3329namespace HeuristicLab.Problems.ExternalEvaluation {

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

    r3861 r3862  
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <SignAssembly>true</SignAssembly>
     16    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    1517  </PropertyGroup>
    1618  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    8082  <ItemGroup>
    8183    <Compile Include="Analyzers\BestExternalEvaluationSolutionAnalyzer.cs" />
     84    <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
    8285    <Compile Include="Drivers\ExternalEvaluationDriver.cs" />
    8386    <Compile Include="Drivers\ExternalEvaluationProcessDriver.cs" />
    … …  
    9093    <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
    9194    <Compile Include="Properties\AssemblyInfo.cs" />
     95    <None Include="Properties\AssemblyInfo.frame" />
    9296    <Compile Include="Protos\ExternalEvaluationMessages.cs" />
    9397    <Compile Include="SolutionMessageBuilding.cs" />
    … …  
    145149  </ItemGroup>
    146150  <ItemGroup>
     151    <None Include="HeuristicLab.snk" />
    147152    <None Include="Protos\ExternalEvaluationMessages.proto" />
    148153  </ItemGroup>
    … …  
    156161  -->
    157162  <PropertyGroup>
    158     <PreBuildEvent>set ProjectDir=$(ProjectDir)
     163    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     164set ProjectDir=$(ProjectDir)
    159165set SolutionDir=$(SolutionDir)
    160 call "$(ProjectDir)"Protos\ProcessProtos.cmd</PreBuildEvent>
     166call "$(ProjectDir)Protos\ProcessProtos.cmd"
     167
     168call PreBuildEvent.cmd
     169SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs"</PreBuildEvent>
    161170  </PropertyGroup>
    162171</Project>

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

    r3859 r3862  
    2222using System;
    2323using HeuristicLab.Core;
    24 using Google.ProtocolBuffers;
    25 using Google.ProtocolBuffers.Descriptors;
    2624
    2725namespace HeuristicLab.Problems.ExternalEvaluation {

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

    r3861 r3862  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
    2623using HeuristicLab.Optimization;
    27 using HeuristicLab.Core;
    28 using HeuristicLab.Data;
    2924
    3025namespace HeuristicLab.Problems.ExternalEvaluation {

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Protos

    • Property svn:ignore set to
      ExternalEvaluationMessages.cs

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

    r3859 r3862  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
     25using HeuristicLab.Core;
    2226using HeuristicLab.Data;
    23 using System;
    24 using System.Linq;
    25 using System.Collections.Generic;
    26 using HeuristicLab.Core;
    27 using Google.ProtocolBuffers;
    2827
    2928namespace HeuristicLab.Problems.ExternalEvaluation {
Note: See TracChangeset for help on using the changeset viewer.