Changeset 9133 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld

Timestamp:

01/09/13 14:56:57 (12 years ago)

Author:

sforsten

Message:

#2001:

• removed IRealWorldRegressionDataDescriptor and RealWorldResourceRegressionDataDescriptor
• simplified regression data descriptors as suggested by mkommend

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld

Files:

• ChemicalOne.cs (added)
• Housing.cs (added)
• IRealWorldRegressionDataDescriptor.cs (deleted)
• RealWorldRegressionInstanceProvider.cs (modified) (3 diffs)
• RealWorldResourceRegressionDataDescriptor.cs (deleted)
• Tower.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
-using HeuristicLab.Problems.DataAnalysis;
 using ICSharpCode.SharpZipLib.Zip;
 
@@ -47 +46 @@
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      List<IRealWorldRegressionDataDescriptor> descriptorList = new List<IRealWorldRegressionDataDescriptor>();
+      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
+      descriptorList.Add(new ChemicalOne());
+      descriptorList.Add(new Housing());
       descriptorList.Add(new Tower());
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
@@ -59 +60 @@
           foreach (var entry in entries.OrderBy(x => x)) {
             string prettyName = Path.GetFileNameWithoutExtension(entry);
-            IRealWorldRegressionDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            ResourceRegressionDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
             if (desc != null) {
-              yield return new RealWorldResourceRegressionDataDescriptor(prettyName, desc.Description, entry, desc.Training, desc.Test);
+              desc.ResourceName = entry;
+              yield return desc;
             } else
-              yield return new ResourceRegressionDataDescriptor(prettyName, Description, entry);
+              throw new ArgumentNullException("No Descriptor could be found for this entry.");
           }
         }
       }
     }
-
-    public override IRegressionProblemData LoadData(IDataDescriptor id) {
-      var problem = base.LoadData(id);
-
-      var descriptor = id as RealWorldResourceRegressionDataDescriptor;
-
-      if (descriptor == null) {
-        return problem;
-      }
-
-      problem.TrainingPartition.Start = descriptor.Training.Start;
-      problem.TrainingPartition.End = descriptor.Training.End;
-      problem.TestPartition.Start = descriptor.Test.Start;
-      problem.TestPartition.End = descriptor.Test.End;
-
-      return problem;
-    }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Tower.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 
-using System;
-using HeuristicLab.Data;
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class Tower : IRealWorldRegressionDataDescriptor {
-    public string Name { get { return "Tower"; } }
-    public string Description {
+  public class Tower : ResourceRegressionDataDescriptor {
+    public override string Name { get { return "Tower"; } }
+    public override string Description {
       get {
         return "Publication: Order of Nonlinearity as a Complexity Measure for Models " +
@@ -33 +32 @@
       }
     }
-    public IntRange Training { get { return new IntRange(0, 3135); } }
-    public IntRange Test { get { return new IntRange(3135, 4999); } }
+    protected override string TargetVariable { get { return "towerResponse"; } }
+    protected override string[] VariableNames {
+      get { return new string[] { "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "towerResponse" }; }
+    }
+    protected override string[] AllowedInputVariables {
+      get { return new string[] { "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25" }; }
+    }
+    protected override int TrainingPartitionStart { get { return 0; } }
+    protected override int TrainingPartitionEnd { get { return 3135; } }
+    protected override int TestPartitionStart { get { return 3135; } }
+    protected override int TestPartitionEnd { get { return 4999; } }
   }
 }