Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/11 13:59:25 (13 years ago)
Author:
epitzer
Message:

#1530 integrate changes from trunk

Location:
branches/PersistenceSpeedUp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceSpeedUp

  • branches/PersistenceSpeedUp/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

    r6232 r6760  
    126126    <Compile Include="CollectObjectGraphTest.cs" />
    127127    <Compile Include="ContentViewTests.cs" />
     128    <Compile Include="SupportVectorMachineTest.cs" />
     129    <Compile Include="ThreadSafeLogTest.cs" />
     130    <Compile Include="Properties\Resources.Designer.cs">
     131      <AutoGen>True</AutoGen>
     132      <DesignTime>True</DesignTime>
     133      <DependentUpon>Resources.resx</DependentUpon>
     134    </Compile>
     135    <Compile Include="SamplesTest.cs" />
    128136    <Compile Include="SymbolicRegressionTest.cs" />
    129137    <Compile Include="PluginDependenciesTest.cs" />
     
    134142  </ItemGroup>
    135143  <ItemGroup>
    136     <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis.Views\3.3\HeuristicLab.Algorithms.DataAnalysis.Views-3.3.csproj">
    137       <Project>{C3E69936-0DB5-42A4-B1B4-12E9700B080E}</Project>
    138       <Name>HeuristicLab.Algorithms.DataAnalysis.Views-3.3</Name>
    139     </ProjectReference>
    140144    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis.Views\3.4\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj">
    141145      <Project>{A2330DB0-413D-4424-B4E6-591118E2B9F8}</Project>
    142146      <Name>HeuristicLab.Algorithms.DataAnalysis.Views-3.4</Name>
    143147    </ProjectReference>
    144     <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis\3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.csproj">
    145       <Project>{A8D5676D-9662-437A-B44D-ECB4046CDE12}</Project>
    146       <Name>HeuristicLab.Algorithms.DataAnalysis-3.3</Name>
    147     </ProjectReference>
    148148    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
    149149      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
     
    254254      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    255255    </ProjectReference>
    256     <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
    257       <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
    258       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
    259     </ProjectReference>
    260256    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
    261257      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
    262258      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
    263259    </ProjectReference>
    264     <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    265       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    266       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    267     </ProjectReference>
    268260    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    269261      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     
    390382      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    391383    </ProjectReference>
    392     <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt.Views\3.3\HeuristicLab.Problems.ArtificialAnt.Views-3.3.csproj">
    393       <Project>{30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F}</Project>
    394       <Name>HeuristicLab.Problems.ArtificialAnt.Views-3.3</Name>
    395     </ProjectReference>
    396384    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt.Views\3.4\HeuristicLab.Problems.ArtificialAnt.Views-3.4.csproj">
    397385      <Project>{3083C7AA-5AF4-4C75-BA19-B69B86E2F66A}</Project>
    398386      <Name>HeuristicLab.Problems.ArtificialAnt.Views-3.4</Name>
    399387    </ProjectReference>
    400     <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt\3.3\HeuristicLab.Problems.ArtificialAnt-3.3.csproj">
    401       <Project>{F5C0ECAC-EDBA-4024-872A-1F74AFCB20B4}</Project>
    402       <Name>HeuristicLab.Problems.ArtificialAnt-3.3</Name>
    403     </ProjectReference>
    404388    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt\3.4\HeuristicLab.Problems.ArtificialAnt-3.4.csproj">
    405389      <Project>{0C67A033-F6D9-4237-B3CA-C033A44706BE}</Project>
    406390      <Name>HeuristicLab.Problems.ArtificialAnt-3.4</Name>
    407391    </ProjectReference>
    408     <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Classification.Views\3.3\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj">
    409       <Project>{7F038E9A-B91E-4F49-8C27-D47BC86F1220}</Project>
    410       <Name>HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3</Name>
    411     </ProjectReference>
    412     <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj">
    413       <Project>{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}</Project>
    414       <Name>HeuristicLab.Problems.DataAnalysis.Classification-3.3</Name>
    415     </ProjectReference>
    416     <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    417       <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    418       <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    419     </ProjectReference>
    420392    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj">
    421393      <Project>{BF1E4DF4-A4CC-451F-9D50-303F405E265E}</Project>
     
    442414      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    443415    </ProjectReference>
    444     <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj">
    445       <Project>{799B0B38-E384-4A17-A73C-F211EB854592}</Project>
    446       <Name>HeuristicLab.Problems.DataAnalysis.Views-3.3</Name>
    447     </ProjectReference>
    448416    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    449417      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
    450418      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
    451419    </ProjectReference>
    452     <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    453       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    454       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    455     </ProjectReference>
    456420    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    457421      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    458422      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    459     </ProjectReference>
    460     <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj">
    461       <Project>{1778134B-866B-4CB3-BFC0-52B2FAAA5777}</Project>
    462       <Name>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3</Name>
    463     </ProjectReference>
    464     <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj">
    465       <Project>{E86E215D-E3CE-4244-978D-555D4E17AC09}</Project>
    466       <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</Name>
    467423    </ProjectReference>
    468424    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.4\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj">
     
    560516      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    561517    </None>
    562   </ItemGroup>
     518    <Content Include="Resources\ch130.opt.tour">
     519      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     520    </Content>
     521    <Content Include="Resources\ch130.tsp">
     522      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     523    </Content>
     524  </ItemGroup>
     525  <ItemGroup>
     526    <EmbeddedResource Include="Properties\Resources.resx">
     527      <Generator>ResXFileCodeGenerator</Generator>
     528      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     529    </EmbeddedResource>
     530  </ItemGroup>
     531  <ItemGroup>
     532    <Content Include="Resources\C101.opt.txt">
     533      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     534    </Content>
     535    <Content Include="Resources\C101.txt">
     536      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     537    </Content>
     538    <Content Include="Resources\mammographic_masses.txt">
     539      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     540    </Content>
     541    <Content Include="Resources\towerData.txt">
     542      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     543    </Content>
     544  </ItemGroup>
     545  <ItemGroup />
    563546  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    564547  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.