Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11099 for trunk


Ignore:
Timestamp:
07/06/14 20:39:57 (10 years ago)
Author:
mkommend
Message:

#2082: Integrated HeuristicLab.ExternalEvaluation.Matlab in the trunk.

Location:
trunk/sources
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r10988 r11099  
    396396EndProject
    397397Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GrammaticalEvolution-3.3", "HeuristicLab.Problems.GrammaticalEvolution\3.3\HeuristicLab.Problems.GrammaticalEvolution-3.3.csproj", "{7FC70D74-1813-48B7-9CE5-0BD913457579}"
     398EndProject
     399Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3", "HeuristicLab.Problems.ExternalEvaluation.Matlab\3.3\HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj", "{362A5DC3-969D-43FB-A552-D2F52B780188}"
    398400EndProject
    399401Global
    … …  
    19311933    {7FC70D74-1813-48B7-9CE5-0BD913457579}.Release|x86.ActiveCfg = Release|x86
    19321934    {7FC70D74-1813-48B7-9CE5-0BD913457579}.Release|x86.Build.0 = Release|x86
     1935    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1936    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1937    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x64.ActiveCfg = Debug|x64
     1938    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x64.Build.0 = Debug|x64
     1939    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x86.ActiveCfg = Debug|x86
     1940    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x86.Build.0 = Debug|x86
     1941    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1942    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|Any CPU.Build.0 = Release|Any CPU
     1943    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x64.ActiveCfg = Release|x64
     1944    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x64.Build.0 = Release|x64
     1945    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.ActiveCfg = Release|x86
     1946    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.Build.0 = Release|x86
    19331947  EndGlobalSection
    19341948  GlobalSection(SolutionProperties) = preSolution

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

    r10608 r11099  
    7777  </PropertyGroup>
    7878  <ItemGroup>
    79     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    80       <SpecificVersion>False</SpecificVersion>
    81       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    82       <Private>False</Private>
    83     </Reference>
    84     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    85       <SpecificVersion>False</SpecificVersion>
    86       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    87       <Private>False</Private>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    90       <SpecificVersion>False</SpecificVersion>
    91       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    92       <Private>False</Private>
    93     </Reference>
    94     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    95       <SpecificVersion>False</SpecificVersion>
    96       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    97       <Private>False</Private>
    98     </Reference>
    99     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    100       <SpecificVersion>False</SpecificVersion>
    101       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    102       <Private>False</Private>
    103     </Reference>
    104     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105       <SpecificVersion>False</SpecificVersion>
    106       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    107       <Private>False</Private>
    108     </Reference>
    109     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    110       <SpecificVersion>False</SpecificVersion>
    111       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    112       <Private>False</Private>
    113     </Reference>
    114     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    115       <SpecificVersion>False</SpecificVersion>
    116       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    117       <Private>False</Private>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <SpecificVersion>False</SpecificVersion>
    121       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    122       <Private>False</Private>
    123     </Reference>
    124     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    125       <SpecificVersion>False</SpecificVersion>
    126       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    127       <Private>False</Private>
    128     </Reference>
    129     <Reference Include="HeuristicLab.Problems.ParameterOptimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    130       <SpecificVersion>False</SpecificVersion>
    131       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.ParameterOptimization-3.3.dll</HintPath>
    132     </Reference>
    13379    <Reference Include="Interop.MLApp">
    13480      <HintPath>.\Interop.MLApp.dll</HintPath>
    … …  
    164110    </Content>
    165111  </ItemGroup>
     112  <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    </ProjectReference>
     117    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     118      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     119      <Name>HeuristicLab.Common-3.3</Name>
     120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     122      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     123      <Name>HeuristicLab.Core-3.3</Name>
     124    </ProjectReference>
     125    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     126      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     127      <Name>HeuristicLab.Data-3.3</Name>
     128    </ProjectReference>
     129    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     130      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
     131      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     132    </ProjectReference>
     133    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     134      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     135      <Name>HeuristicLab.Operators-3.3</Name>
     136    </ProjectReference>
     137    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     138      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     139      <Name>HeuristicLab.Optimization-3.3</Name>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     142      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     143      <Name>HeuristicLab.Parameters-3.3</Name>
     144    </ProjectReference>
     145    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     146      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     147      <Name>HeuristicLab.Persistence-3.3</Name>
     148    </ProjectReference>
     149    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     150      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     151      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\HeuristicLab.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization-3.3.csproj">
     154      <Project>{d2c39fba-a1d5-403a-9211-b0a299a76313}</Project>
     155      <Name>HeuristicLab.Problems.ParameterOptimization-3.3</Name>
     156    </ProjectReference>
     157  </ItemGroup>
    166158  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    167159  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/Plugin.cs.frame

    r10594 r11099  
    2828  /// Plugin class for HeuristicLab.Problems.ExternalEvaluation.Matlab plugin.
    2929  /// </summary>
    30   [Plugin("HeuristicLab.Problems.ExternalEvaluation.MATLAB", "3.3.8.$WCREV$")]
     30  [Plugin("HeuristicLab.Problems.ExternalEvaluation.MATLAB", "3.3.9.$WCREV$")]
    3131  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.dll", PluginFileType.Assembly)]
    3232  [PluginFile("Interop.MLApp.dll",PluginFileType.Assembly)]

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/Properties/AssemblyInfo.cs.frame

    r11094 r11099  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.8.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.