Changeset 7849 for trunk/sources/HeuristicLab.Tests

Timestamp:

05/21/12 10:19:26 (12 years ago)

Author:

sforsten

Message:

#1784:

• added project HeuristicLab.Problem.Instances.DataAnalysis and deleted HeuristicLab.Problem.Instances.Classification and HeuristicLab.Problem.Instances.Regression
• buttons are now big enough for the icons

Location:

trunk/sources/HeuristicLab.Tests

Files:

• HeuristicLab-3.3/SamplesTest.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis-3.4/TableFileParserTest.cs (modified) (1 diff)
• HeuristicLab.Tests.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -44 +44 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Classification;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
+using HeuristicLab.Problems.Instances.DataAnalysis;
 using HeuristicLab.Problems.Instances.TSPLIB;
 using HeuristicLab.Problems.Knapsack;
@@ -53 +54 @@
 using HeuristicLab.Selection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using classification = HeuristicLab.Problems.Instances.Classification;
-using regression = HeuristicLab.Problems.Instances.Regression;
 
 namespace HeuristicLab_33.Tests {
@@ -250 +249 @@
       symbRegProblem.Name = "Tower Symbolic Regression Problem";
       symbRegProblem.Description = "Tower Dataset (downloaded from: http://vanillamodeling.com/realproblems.html)";
-      regression.RealWorldInstanceProvider provider = new regression.RealWorldInstanceProvider();
+      RegressionRealWorldInstanceProvider provider = new RegressionRealWorldInstanceProvider();
       var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("towerData")).Single();
       var towerProblemData = (RegressionProblemData)provider.LoadData(instance);
@@ -355 +354 @@
       symbClassProblem.Name = "Mammography Classification Problem";
       symbClassProblem.Description = "Mammography dataset imported from the UCI machine learning repository (http://archive.ics.uci.edu/ml/datasets/Mammographic+Mass)";
-      classification.RealWorldInstanceProvider provider = new classification.RealWorldInstanceProvider();
+      ClassificationRealWorldInstanceProvider provider = new ClassificationRealWorldInstanceProvider();
       var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("mammography")).Single();
       var mammoData = (ClassificationProblemData)provider.LoadData(instance);

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/TableFileParserTest.cs

@@ -23 +23 @@
 using System.Globalization;
 using System.IO;
-using HeuristicLab.Problems.Instances;
+using HeuristicLab.Problems.Instances.DataAnalysis;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 namespace HeuristicLab.Problems.DataAnalysis_3_4.Tests {
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -595 +595 @@
       <Name>HeuristicLab.Problems.ExternalEvaluation-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.Problems.Instances.Classification\3.3\HeuristicLab.Problems.Instances.Classification-3.3.csproj">
-      <Project>{1BBFCD5B-8A1C-4225-A682-ADEC7800E683}</Project>
-      <Name>HeuristicLab.Problems.Instances.Classification-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.Instances.CordeauGQAP\3.3\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj">
       <Project>{1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}</Project>
       <Name>HeuristicLab.Problems.Instances.CordeauGQAP-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj">
+      <Project>{94C7714E-29D4-4D6D-B213-2C18D627AB75}</Project>
+      <Name>HeuristicLab.Problems.Instances.DataAnalysis-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj">
       <Project>{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}</Project>
@@ -610 +610 @@
       <Project>{73F29D43-5714-4069-8FAB-0D18FEB5F175}</Project>
       <Name>HeuristicLab.Problems.Instances.QAPLIB-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.Problems.Instances.Regression\3.3\HeuristicLab.Problems.Instances.Regression-3.3.csproj">
-      <Project>{26BF13E1-C8B2-4ACE-862D-EBFD360116B3}</Project>
-      <Name>HeuristicLab.Problems.Instances.Regression-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB.Views\3.3\HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj">