Changeset 11155


Ignore:
Timestamp:
07/09/14 09:35:20 (8 years ago)
Author:
mkommend
Message:

#2082: Merged r11099, r11100, r11102, r11124, r11125, r11126, r11127, r11128, r11131, r11153 into the trunk.

Location:
stable
Files:
2 deleted
10 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r11151 r11155  
    393393EndProject
    394394Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3", "HeuristicLab.Problems.ExternalEvaluation.Scilab\3.3\HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj", "{C633FB23-BAE6-448E-BF5D-E1F9A839B5ED}"
     395EndProject
     396Project("{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}"
    395397EndProject
    396398Global
     
    19161918    {C633FB23-BAE6-448E-BF5D-E1F9A839B5ED}.Release|x86.ActiveCfg = Release|x86
    19171919    {C633FB23-BAE6-448E-BF5D-E1F9A839B5ED}.Release|x86.Build.0 = Release|x86
     1920    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1921    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1922    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x64.ActiveCfg = Debug|x64
     1923    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x64.Build.0 = Debug|x64
     1924    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x86.ActiveCfg = Debug|x86
     1925    {362A5DC3-969D-43FB-A552-D2F52B780188}.Debug|x86.Build.0 = Debug|x86
     1926    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1927    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|Any CPU.Build.0 = Release|Any CPU
     1928    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x64.ActiveCfg = Release|x64
     1929    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x64.Build.0 = Release|x64
     1930    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.ActiveCfg = Release|x86
     1931    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.Build.0 = Release|x86
    19181932  EndGlobalSection
    19191933  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs.sln

    r11151 r11155  
    4848EndProject
    4949Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DotNetScilab-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DotNetScilab\1.0\HeuristicLab.DotNetScilab-1.0\HeuristicLab.DotNetScilab-1.0.csproj", "{F2F242B0-9996-4B49-828D-2BFC5925FDE0}"
     50EndProject
     51Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MatlabConnector-1.0", "HeuristicLab.ExtLibs\HeuristicLab.MatlabConnector\1.0\HeuristicLab.MatlabConnector-1.0\HeuristicLab.MatlabConnector-1.0.csproj", "{52C66DEA-0250-477B-97F8-5CD2CD4B7332}"
    5052EndProject
    5153Global
     
    307309    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x64.ActiveCfg = Release|Any CPU
    308310    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x86.ActiveCfg = Release|Any CPU
     311    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     312    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|Any CPU.Build.0 = Debug|Any CPU
     313    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x64.ActiveCfg = Debug|Any CPU
     314    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x86.ActiveCfg = Debug|Any CPU
     315    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|Any CPU.ActiveCfg = Release|Any CPU
     316    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|Any CPU.Build.0 = Release|Any CPU
     317    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x64.ActiveCfg = Release|Any CPU
     318    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x86.ActiveCfg = Release|Any CPU
    309319  EndGlobalSection
    310320  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.ExtLibs/HeuristicLab.MatlabConnector/1.0/HeuristicLab.MatlabConnector-1.0/Plugin.cs.frame

    r11127 r11155  
    3333  [PluginFile("Interop.MLApp.dll",  PluginFileType.Assembly)]
    3434  [PluginFile("Mathworks Interop License.txt", PluginFileType.License)]
    35   public class HeuristicLabMathJaxPlugin : PluginBase { 
     35  public class HeuristicLabMatlabConnectorPlugin : PluginBase { 
    3636  }
    3737}
  • stable/HeuristicLab.ExtLibs/HeuristicLab.MatlabConnector/1.0/HeuristicLab.MatlabConnector-1.0/Properties/AssemblyInfo.cs.frame

    r11124 r11155  
    2828// associated with an assembly.
    2929[assembly: AssemblyTitle("HeuristicLab.MatlabConnector")]
    30 [assembly: AssemblyDescription("HeuristicLab transport plugin for MathJax (www.mathjax.org) , an open source JavaScript display engine for mathematics that works in all browsers")]
     30[assembly: AssemblyDescription("HeuristicLab transport plugin for the COM MATLAB connector Interop.MLAPP.dll")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("")]
  • stable/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

    r11099 r11155  
    2121    <DebugType>full</DebugType>
    2222    <Optimize>false</Optimize>
    23     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     23    <OutputPath>..\..\bin\</OutputPath>
    2424    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2525    <ErrorReport>prompt</ErrorReport>
     
    2929    <DebugType>pdbonly</DebugType>
    3030    <Optimize>true</Optimize>
    31     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     31    <OutputPath>..\..\bin\</OutputPath>
    3232    <DefineConstants>TRACE</DefineConstants>
    3333    <ErrorReport>prompt</ErrorReport>
     
    5050  </PropertyGroup>
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    52     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     52    <OutputPath>..\..\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <Optimize>true</Optimize>
     
    7878  <ItemGroup>
    7979    <Reference Include="Interop.MLApp">
    80       <HintPath>.\Interop.MLApp.dll</HintPath>
     80      <HintPath>..\..\bin\Interop.MLApp.dll</HintPath>
    8181      <EmbedInteropTypes>True</EmbedInteropTypes>
    8282    </Reference>
     
    103103  </ItemGroup>
    104104  <ItemGroup>
    105     <Content Include="Interop.MLApp.dll">
    106       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    107     </Content>
    108     <Content Include="Mathworks Interop License.txt">
    109       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    110     </Content>
    111   </ItemGroup>
    112   <ItemGroup>
    113105    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    114106      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    115107      <Name>HeuristicLab.Collections-3.3</Name>
     108      <Private>False</Private>
    116109    </ProjectReference>
    117110    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    118111      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    119112      <Name>HeuristicLab.Common-3.3</Name>
     113      <Private>False</Private>
    120114    </ProjectReference>
    121115    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    122116      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    123117      <Name>HeuristicLab.Core-3.3</Name>
     118      <Private>False</Private>
    124119    </ProjectReference>
    125120    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    126121      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    127122      <Name>HeuristicLab.Data-3.3</Name>
     123      <Private>False</Private>
    128124    </ProjectReference>
    129125    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    130126      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
    131127      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     128      <Private>False</Private>
    132129    </ProjectReference>
    133130    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    134131      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    135132      <Name>HeuristicLab.Operators-3.3</Name>
     133      <Private>False</Private>
    136134    </ProjectReference>
    137135    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    138136      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    139137      <Name>HeuristicLab.Optimization-3.3</Name>
     138      <Private>False</Private>
    140139    </ProjectReference>
    141140    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    142141      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
    143142      <Name>HeuristicLab.Parameters-3.3</Name>
     143      <Private>False</Private>
    144144    </ProjectReference>
    145145    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    146146      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    147147      <Name>HeuristicLab.Persistence-3.3</Name>
     148      <Private>False</Private>
    148149    </ProjectReference>
    149150    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    150151      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    151152      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     153      <Private>False</Private>
    152154    </ProjectReference>
    153155    <ProjectReference Include="..\..\HeuristicLab.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization-3.3.csproj">
    154156      <Project>{d2c39fba-a1d5-403a-9211-b0a299a76313}</Project>
    155157      <Name>HeuristicLab.Problems.ParameterOptimization-3.3</Name>
     158      <Private>False</Private>
    156159    </ProjectReference>
    157160  </ItemGroup>
  • stable/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/Plugin.cs.frame

    r11099 r11155  
    3030  [Plugin("HeuristicLab.Problems.ExternalEvaluation.MATLAB", "3.3.9.$WCREV$")]
    3131  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.dll", PluginFileType.Assembly)]
    32   [PluginFile("Interop.MLApp.dll",PluginFileType.Assembly)]
    33   [PluginFile("Mathworks Interop License.txt", PluginFileType.License)]
    3432  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3533  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3735  [PluginDependency("HeuristicLab.Data", "3.3")]
    3836  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
     37  [PluginDependency("HeuristicLab.MatlabConnector", "1.0")]
    3938  [PluginDependency("HeuristicLab.Operators", "3.3")]
    4039  [PluginDependency("HeuristicLab.Parameters", "3.3")]
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs

    r9885 r11155  
    9292
    9393          if (pluginDependencyName == "HeuristicLab.MathJax") continue; //is never referenced as this plugin contains HTML files
     94          if (pluginDependencyName == "HeuristicLab.MatlabConnector") continue; //the matlab connector is loaded dynamically and hence not referenced by the dll
    9495          var referencedPluginAssemblies = pluginAssembly.GetReferencedAssemblies().Where(IsPluginAssemblyName);
    9596          if (referencedPluginAssemblies.Any(a => pluginNames[a.FullName] == pluginDependencyName)) continue;
Note: See TracChangeset for help on using the changeset viewer.