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.ExternalEvaluation.GP/3.5
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/HeuristicLab.Problems.ExternalEvaluation.GP-3.5.csproj

    r11892 r11961  
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{B7A64A60-B538-479F-9C47-A3180C458F6C}</ProjectGuid>
     8    <ProjectGuid>{64CC53AC-156B-4D8A-8DB0-B68990BEA4D3}</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|x64' ">
    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|x64' ">
    71     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7272    <DefineConstants>TRACE</DefineConstants>
    7373    <Optimize>true</Optimize>
    … …  
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    8181    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8383    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8484    <DebugType>full</DebugType>
    … …  
    8989  </PropertyGroup>
    9090  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    91     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9292    <DefineConstants>TRACE</DefineConstants>
    9393    <Optimize>true</Optimize>
    … …  
    129129    <Compile Include="Properties\AssemblyInfo.cs" />
    130130    <None Include="Properties\AssemblyInfo.cs.frame" />
    131   </ItemGroup>
    132   <ItemGroup>
    133     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    134       <SpecificVersion>False</SpecificVersion>
    135       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    136       <Private>False</Private>
    137     </Reference>
    138     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    139       <SpecificVersion>False</SpecificVersion>
    140       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    141       <Private>False</Private>
    142     </Reference>
    143     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    144       <SpecificVersion>False</SpecificVersion>
    145       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    146       <Private>False</Private>
    147     </Reference>
    148     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    149       <SpecificVersion>False</SpecificVersion>
    150       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    151       <Private>False</Private>
    152     </Reference>
    153     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    154       <SpecificVersion>False</SpecificVersion>
    155       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    156       <Private>False</Private>
    157     </Reference>
    158     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    159       <SpecificVersion>False</SpecificVersion>
    160       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    161       <Private>False</Private>
    162     </Reference>
    163131  </ItemGroup>
    164132  <ItemGroup>
    … …  
    186154  </ItemGroup>
    187155  <ItemGroup>
     156    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     157      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     158      <Name>HeuristicLab.Common-3.3</Name>
     159      <Private>False</Private>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     162      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     163      <Name>HeuristicLab.Core-3.3</Name>
     164      <Private>False</Private>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     167      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
     168      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     169      <Private>False</Private>
     170    </ProjectReference>
     171    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     172      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     173      <Name>HeuristicLab.Persistence-3.3</Name>
     174      <Private>False</Private>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     177      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     178      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     179      <Private>False</Private>
     180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     182      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
     183      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     184      <Private>False</Private>
     185    </ProjectReference>
    188186    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation\3.4\HeuristicLab.Problems.ExternalEvaluation-3.4.csproj">
    189       <Project>{25735db4-8e54-4a2c-83e3-a60c76565e55}</Project>
     187      <Project>{8a0b2a2b-47a7-410d-97a0-4296293bb00d}</Project>
    190188      <Name>HeuristicLab.Problems.ExternalEvaluation-3.4</Name>
    191189      <Private>False</Private>

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/Plugin.cs.frame

    r11892 r11961  
    2323
    2424namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    25   [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "Provides a symbolic expression tree grammar and formatters for external evaluation problems.", "3.4.6.$WCREV$")]
     25  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "Provides a symbolic expression tree grammar and formatters for external evaluation problems.", "3.5.6.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.