Changeset 7823 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

Timestamp:

05/15/12 13:54:24 (12 years ago)

Author:

sforsten

Message:

#1784: merge branch ProblemInstancesRegressionAndClassification into trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (3 diffs)

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

@@ -53 +53 @@
 using HeuristicLab.Selection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using classification = HeuristicLab.Problems.Instances.Classification;
+using regression = HeuristicLab.Problems.Instances.Regression;
 
 namespace HeuristicLab_33.Tests {
   [TestClass]
   [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.opt.txt")]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/mammographic_masses.txt")]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/towerData.txt")]
   [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.txt")]
   public class SamplesTest {
@@ -250 +250 @@
       symbRegProblem.Name = "Tower Symbolic Regression Problem";
       symbRegProblem.Description = "Tower Dataset (downloaded from: http://vanillamodeling.com/realproblems.html)";
-      var towerProblemData = RegressionProblemData.ImportFromFile("towerData.txt");
+      regression.RealWorldInstanceProvider provider = new regression.RealWorldInstanceProvider();
+      var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("towerData")).Single();
+      var towerProblemData = (RegressionProblemData)provider.LoadData(instance);
       towerProblemData.TargetVariableParameter.Value = towerProblemData.TargetVariableParameter.ValidValues
         .First(v => v.Value == "towerResponse");
@@ -353 +355 @@
       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)";
-      var mammoData = ClassificationProblemData.ImportFromFile("mammographic_masses.txt");
+      classification.RealWorldInstanceProvider provider = new classification.RealWorldInstanceProvider();
+      var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("mammography")).Single();
+      var mammoData = (ClassificationProblemData)provider.LoadData(instance);
       mammoData.TargetVariableParameter.Value = mammoData.TargetVariableParameter.ValidValues
         .First(v => v.Value == "Severity");