Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/06/15 17:52:14 (9 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.Programmable
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    • Property svn:ignore

      •  

        old new  
        11*.user
         2bin

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

    r11949 r11961  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2727    <DebugType>pdbonly</DebugType>
    2828    <Optimize>true</Optimize>
    29     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     29    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3030    <DefineConstants>TRACE</DefineConstants>
    3131    <ErrorReport>prompt</ErrorReport>
    … …  
    3939    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    4040  </PropertyGroup>
     41  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     42    <DebugSymbols>true</DebugSymbols>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     44    <DefineConstants>DEBUG;TRACE</DefineConstants>
     45    <DebugType>full</DebugType>
     46    <PlatformTarget>x64</PlatformTarget>
     47    <ErrorReport>prompt</ErrorReport>
     48    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     49  </PropertyGroup>
     50  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     51    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <DefineConstants>TRACE</DefineConstants>
     53    <Optimize>true</Optimize>
     54    <DebugType>pdbonly</DebugType>
     55    <PlatformTarget>x64</PlatformTarget>
     56    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     58  </PropertyGroup>
     59  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     60    <DebugSymbols>true</DebugSymbols>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <DefineConstants>DEBUG;TRACE</DefineConstants>
     63    <DebugType>full</DebugType>
     64    <PlatformTarget>x86</PlatformTarget>
     65    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     67  </PropertyGroup>
     68  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <DefineConstants>TRACE</DefineConstants>
     71    <Optimize>true</Optimize>
     72    <DebugType>pdbonly</DebugType>
     73    <PlatformTarget>x86</PlatformTarget>
     74    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     76  </PropertyGroup>
    4177  <ItemGroup>
    42     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    43       <SpecificVersion>False</SpecificVersion>
    44       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    45       <Private>False</Private>
    46     </Reference>
    47     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    48       <SpecificVersion>False</SpecificVersion>
    49       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    50       <Private>False</Private>
    51     </Reference>
    52     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    53       <SpecificVersion>False</SpecificVersion>
    54       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    55       <Private>False</Private>
    56     </Reference>
    57     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    58       <SpecificVersion>False</SpecificVersion>
    59       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    60     </Reference>
    61     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    62       <SpecificVersion>False</SpecificVersion>
    63       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    64       <Private>False</Private>
    65     </Reference>
    66     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    67       <SpecificVersion>False</SpecificVersion>
    68       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    69       <Private>False</Private>
    70     </Reference>
    71     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    72       <SpecificVersion>False</SpecificVersion>
    73       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    74       <Private>False</Private>
    75     </Reference>
    76     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    77       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    78       <Private>False</Private>
    79     </Reference>
    80     <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    81       <SpecificVersion>False</SpecificVersion>
    82       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
    83       <Private>False</Private>
    84     </Reference>
    8578    <Reference Include="System" />
    8679    <Reference Include="System.Core" />
    … …  
    118111  </ItemGroup>
    119112  <ItemGroup>
     113    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     114      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     115      <Name>HeuristicLab.Collections-3.3</Name>
     116      <Private>False</Private>
     117    </ProjectReference>
     118    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     119      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     120      <Name>HeuristicLab.Common.Resources-3.3</Name>
     121      <Private>False</Private>
     122    </ProjectReference>
     123    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     124      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     125      <Name>HeuristicLab.Common-3.3</Name>
     126      <Private>False</Private>
     127    </ProjectReference>
     128    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     129      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     130      <Name>HeuristicLab.Core-3.3</Name>
     131      <Private>False</Private>
     132    </ProjectReference>
     133    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     134      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     135      <Name>HeuristicLab.Data-3.3</Name>
     136      <Private>False</Private>
     137    </ProjectReference>
    120138    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
    121139      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
    … …  
    134152      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    135153    </ProjectReference>
     154    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     155      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     156      <Name>HeuristicLab.Operators-3.3</Name>
     157      <Private>False</Private>
     158    </ProjectReference>
    136159    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    137160      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    138161      <Name>HeuristicLab.Optimization-3.3</Name>
     162      <Private>False</Private>
     163    </ProjectReference>
     164    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     165      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     166      <Name>HeuristicLab.Parameters-3.3</Name>
     167      <Private>False</Private>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     170      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     171      <Name>HeuristicLab.Persistence-3.3</Name>
     172      <Private>False</Private>
     173    </ProjectReference>
     174    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     175      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     176      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     177      <Private>False</Private>
     178    </ProjectReference>
     179    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
     180      <Project>{21977cc3-1757-4b3b-87bd-ff817aaa900f}</Project>
     181      <Name>HeuristicLab.Scripting-3.3</Name>
     182      <Private>False</Private>
    139183    </ProjectReference>
    140184  </ItemGroup>
    141   <ItemGroup />
    142185  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    143186  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

    r11949 r11961  
    2020#endregion
    2121
    22 using System;
     22using System.Drawing;
    2323using HeuristicLab.Common;
     24using HeuristicLab.Common.Resources;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Optimization;
    … …  
    2930namespace HeuristicLab.Problems.Programmable {
    3031  [Item("Programmable Problem (multi-objective)", "Represents a multi-objective problem that can be programmed with a script.")]
    31   [Creatable("1 Test")]
     32  [Creatable("Problems")]
    3233  [StorableClass]
    3334  public sealed class MultiObjectiveProgrammableProblem : MultiObjectiveBasicProblem<IEncoding> {
     35    public static new Image StaticItemImage {
     36      get { return VSImageLibrary.Script; }
     37    }
    3438
    3539    private FixedValueParameter<MultiObjectiveProblemDefinitionScript> MultiObjectiveProblemScriptParameter {

  • trunk/sources/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

    r11949 r11961  
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common", "3.3")]
     29  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2930  [PluginDependency("HeuristicLab.Core", "3.3")]
    30   [PluginDependency("HeuristicLab.Operators", "3.3")]
    3131  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3232  [PluginDependency("HeuristicLab.Parameters", "3.3")]

  • trunk/sources/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

    r11949 r11961  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
     23using System.Drawing;
    2424using HeuristicLab.Common;
     25using HeuristicLab.Common.Resources;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Optimization;
    … …  
    3031namespace HeuristicLab.Problems.Programmable {
    3132  [Item("Programmable Problem (single-objective)", "Represents a single-objective problem that can be programmed with a script.")]
    32   [Creatable("1 Test")]
     33  [Creatable("Problems")]
    3334  [StorableClass]
    3435  public sealed class SingleObjectiveProgrammableProblem : SingleObjectiveBasicProblem<IEncoding> {
     36    public static new Image StaticItemImage {
     37      get { return VSImageLibrary.Script; }
     38    }
    3539
    3640    private FixedValueParameter<SingleObjectiveProblemDefinitionScript> SingleObjectiveProblemScriptParameter {
Note: See TracChangeset for help on using the changeset viewer.