Changeset 13298 for stable

Timestamp:

11/19/15 13:46:27 (9 years ago)

Author:

gkronber

Message:

#2428: partial merge of r13160 from trunk to stable

Location:

stable

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs (modified) (1 diff)

stable/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

@@ -167 +167 @@
       <DependentUpon>NcaDimensionReductionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="OneRClassificationModelView.cs" />
+    <Compile Include="OneRClassificationModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="OneRClassificationModelView.Designer.cs">
       <DependentUpon>OneRClassificationModelView.cs</DependentUpon>

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs

@@ -61 +61 @@
 
       var osga = new OffspringSelectionGeneticAlgorithm();
-      osga.Name = "Genetic Programming - Multiplexer 11 problem";
+      osga.Name = "Genetic Programming - Multiplexer 11 Problem";
       osga.Description = "A genetic programming algorithm that solves the 11-bit multiplexer problem.";
       osga.Problem = problem;