Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/06/15 17:52:14 (10 years ago)
Author:
abeham
Message:

#2174: Integrated programmable problem into trunk

  • Fixed build configuration
  • Fixed some assembly references that had CopyLocal set to true
  • Added a missing license header
  • Cleaned some usings
  • Fixed the version number in ExternalEvaluation.GP
  • Added ProgrammableProblem and new ExternalEvaluationProblem as a reference to unit tests
  • Fixed plugin dependencies and assembly references
  • Changed icon of programmable problem to script icon
  • Fixed name clash in VRP that also had defined a "PermutationEncoding" class
  • (Hopefully) fixed all output paths
Location:
trunk/sources/HeuristicLab.Problems.ExternalEvaluation
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r11616 r11961  
    3636namespace HeuristicLab.Problems.ExternalEvaluation {
    3737  [Item("External Evaluation Problem", "A problem that is evaluated in a different process.")]
    38   [Creatable("Problems")]
    3938  [StorableClass]
    4039  public sealed class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
    … …  
    120119      get { return OperatorsParameter.Value; }
    121120    }
     121
     122    public IEnumerable<IParameterizedItem> ExecutionContextItems { get { return new[] { this }; } }
     123
    122124    private BestScopeSolutionAnalyzer BestScopeSolutionAnalyzer {
    123125      get { return OperatorsParameter.Value.OfType<BestScopeSolutionAnalyzer>().FirstOrDefault(); }

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

    r11900 r11961  
    2626using System.Threading;
    2727using Google.ProtocolBuffers;
     28using HeuristicLab.Analysis;
    2829using HeuristicLab.Common;
    2930using HeuristicLab.Core;
    … …  
    3233using HeuristicLab.Parameters;
    3334using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    34 using HeuristicLab.Problems.Programmable;
    3535
    3636namespace HeuristicLab.Problems.ExternalEvaluation {
    … …  
    8989      Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()));
    9090      Parameters.Add(new FixedValueParameter<SingleObjectiveOptimizationSupportScript>("SupportScript", "A script that can provide neighborhood and analyze the results of the optimization.", new SingleObjectiveOptimizationSupportScript()));
     91
     92      Operators.Add(new BestScopeSolutionAnalyzer());
    9193    }
    9294

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

    r11893 r11961  
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{25735DB4-8E54-4A2C-83E3-A60C76565E55}</ProjectGuid>
     8    <ProjectGuid>{8A0B2A2B-47A7-410D-97A0-4296293BB00D}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    … …  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
    … …  
    6060  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6161    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6363    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6464    <DebugType>full</DebugType>
    … …  
    6969  </PropertyGroup>
    7070  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    71     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7272    <DefineConstants>TRACE</DefineConstants>
    7373    <Optimize>true</Optimize>
    … …  
    8282  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8383    <DebugSymbols>true</DebugSymbols>
    84     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8585    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8686    <DebugType>full</DebugType>
    … …  
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <Optimize>true</Optimize>
    … …  
    102102  <ItemGroup>
    103103    <Reference Include="Google.ProtocolBuffers-2.4.1.473, Version=2.4.1.473">
    104       <HintPath>..\..\..\..\trunk\sources\bin\Google.ProtocolBuffers-2.4.1.473.dll</HintPath>
    105       <Private>False</Private>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <SpecificVersion>False</SpecificVersion>
    109       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
     104      <HintPath>..\..\bin\Google.ProtocolBuffers-2.4.1.473.dll</HintPath>
    110105      <Private>False</Private>
    111106    </Reference>
    … …  
    161156  </ItemGroup>
    162157  <ItemGroup>
    163     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    164       <SpecificVersion>False</SpecificVersion>
    165       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    166       <Private>False</Private>
    167     </Reference>
    168     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    169       <SpecificVersion>False</SpecificVersion>
    170       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    171       <Private>False</Private>
    172     </Reference>
    173     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    174       <SpecificVersion>False</SpecificVersion>
    175       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    176       <Private>False</Private>
    177     </Reference>
    178     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    179       <SpecificVersion>False</SpecificVersion>
    180       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    181       <Private>False</Private>
    182     </Reference>
    183     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    184       <SpecificVersion>False</SpecificVersion>
    185       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    186       <Private>False</Private>
    187     </Reference>
    188     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    189       <SpecificVersion>False</SpecificVersion>
    190       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    191       <Private>False</Private>
    192     </Reference>
    193     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    194       <SpecificVersion>False</SpecificVersion>
    195       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    196       <Private>False</Private>
    197     </Reference>
    198     <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    199       <SpecificVersion>False</SpecificVersion>
    200       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    201       <Private>False</Private>
    202     </Reference>
    203     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    204       <SpecificVersion>False</SpecificVersion>
    205       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    206       <Private>False</Private>
    207     </Reference>
    208     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    209       <SpecificVersion>False</SpecificVersion>
    210       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    211       <Private>False</Private>
    212     </Reference>
    213     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    214       <SpecificVersion>False</SpecificVersion>
    215       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    216       <Private>False</Private>
    217     </Reference>
    218   </ItemGroup>
    219   <ItemGroup>
    220     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    221       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    222       <Name>HeuristicLab.Optimization-3.3</Name>
    223       <Private>False</Private>
    224     </ProjectReference>
    225     <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
    226       <Project>{ee07bff8-b23d-41f5-8ad7-ac9598d7a2c9}</Project>
    227       <Name>HeuristicLab.Problems.Programmable-3.3</Name>
    228     </ProjectReference>
    229   </ItemGroup>
    230   <ItemGroup>
    231158    <None Include="ExternalEvaluationCD.cd" />
    232159    <None Include="HeuristicLab.snk" />
    … …  
    255182      <LastGenOutput>Templates.Designer.cs</LastGenOutput>
    256183    </EmbeddedResource>
     184  </ItemGroup>
     185  <ItemGroup>
     186    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     187      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     188      <Name>HeuristicLab.Analysis-3.3</Name>
     189      <Private>False</Private>
     190    </ProjectReference>
     191    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     192      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     193      <Name>HeuristicLab.Collections-3.3</Name>
     194      <Private>False</Private>
     195    </ProjectReference>
     196    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     197      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     198      <Name>HeuristicLab.Common.Resources-3.3</Name>
     199      <Private>False</Private>
     200    </ProjectReference>
     201    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     202      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     203      <Name>HeuristicLab.Common-3.3</Name>
     204      <Private>False</Private>
     205    </ProjectReference>
     206    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     207      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     208      <Name>HeuristicLab.Core-3.3</Name>
     209      <Private>False</Private>
     210    </ProjectReference>
     211    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     212      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     213      <Name>HeuristicLab.Data-3.3</Name>
     214      <Private>False</Private>
     215    </ProjectReference>
     216    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     217      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     218      <Name>HeuristicLab.Operators-3.3</Name>
     219      <Private>False</Private>
     220    </ProjectReference>
     221    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     222      <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
     223      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     224      <Private>False</Private>
     225    </ProjectReference>
     226    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     227      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     228      <Name>HeuristicLab.Optimization-3.3</Name>
     229      <Private>False</Private>
     230    </ProjectReference>
     231    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     232      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     233      <Name>HeuristicLab.Parameters-3.3</Name>
     234      <Private>False</Private>
     235    </ProjectReference>
     236    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     237      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     238      <Name>HeuristicLab.Persistence-3.3</Name>
     239      <Private>False</Private>
     240    </ProjectReference>
     241    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     242      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     243      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     244      <Private>False</Private>
     245    </ProjectReference>
     246    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
     247      <Project>{21977cc3-1757-4b3b-87bd-ff817aaa900f}</Project>
     248      <Name>HeuristicLab.Scripting-3.3</Name>
     249      <Private>False</Private>
     250    </ProjectReference>
    257251  </ItemGroup>
    258252  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Interfaces/ISingleObjectiveOptimizationSupport.cs

    r11893 r11961  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Problems.Programmable;
    2625
    2726namespace HeuristicLab.Problems.ExternalEvaluation {

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Plugin.cs.frame

    r11892 r11961  
    3131  [PluginDependency("HeuristicLab.Core", "3.3")]
    3232  [PluginDependency("HeuristicLab.Data", "3.3")]
    33   [PluginDependency("HeuristicLab.Operators", "3.3")]
    3433  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    35   [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3634  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3735  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3836  [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]
     37  [PluginDependency("HeuristicLab.Scripting", "3.3")]
    3938  public class HeuristicLabProblemsExternalEvaluationPlugin : PluginBase {
    4039  }

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/CompiledOptimizationSupport.cs

    r11893 r11961  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using HeuristicLab.Core;
    24 using HeuristicLab.Optimization;
    25 using HeuristicLab.Problems.Programmable;
    26 
    2722namespace HeuristicLab.Problems.ExternalEvaluation {
    2823  public abstract class CompiledOptimizationSupport {

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/CompiledSingleObjectiveOptimizationSupport.cs

    r11893 r11961  
    66using HeuristicLab.Data;
    77using HeuristicLab.Optimization;
    8 using HeuristicLab.Problems.Programmable;
    98
    109namespace HeuristicLab.Problems.ExternalEvaluation {

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs

    r11900 r11961  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.ExternalEvaluation.Programmable;
    31 using HeuristicLab.Problems.Programmable;
    3231using HeuristicLab.Scripting;
    3332
Note: See TracChangeset for help on using the changeset viewer.