Changeset 11104

Timestamp:

07/07/14 13:55:36 (10 years ago)

Author:

gkronber

Message:

#1638: merged r11050,r11051,r11091 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/Documents/OSGP_TimeSeries.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/OSGP_TimeSeries.hl)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPTimeSeriesSampleTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPTimeSeriesSampleTest.cs)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (deleted)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)
• HeuristicLab.Tests/Test Resources/multiplexer11.csv (copied) (copied from trunk/sources/HeuristicLab.Tests/Test Resources/multiplexer11.csv)

stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -357 +357 @@
     <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
     <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
-    <Compile Include="HeuristicLab-3.3\SamplesTest.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\GPTimeSeriesSampleTest.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\GPMultiplexerSampleTest.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\SamplesTest.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\SamplesUtils.cs" />
     <Compile Include="HeuristicLab-3.3\StorableConstructorTest.cs" />
     <Compile Include="HeuristicLab-3.3\ThreadSafeLogTest.cs" />
@@ -489 +492 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Test Resources\Multiplexer11.csv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Test Resources\SamplesExperimentFinished.hl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>