Changeset 7759 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

Timestamp:

04/24/12 16:37:40 (12 years ago)

Author:

sforsten

Message:

#1784:

• deleted ClassificationData and RegressionData. RegressionProblemData and ClassificationProblemData are used instead
• deleted not needed Transformer
• ValueGenerator is now a static class and yield return is used return IEnumerable

File:

• branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs (modified) (4 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

@@ -26 +26 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
+using HeuristicLab.Problems.DataAnalysis;
 using ICSharpCode.SharpZipLib.Zip;
 
@@ -31 +32 @@
   public abstract class ResourceRegressionInstanceProvider : RegressionInstanceProvider {
 
-    protected abstract string FileName { get; }
+    protected abstract string FileExtension { get; }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
+      var solutionsArchiveName = GetResourceName(FileExtension + @"\.zip");
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
         using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
@@ -43 +44 @@
     }
 
-    public override RegressionData LoadData(IDataDescriptor id) {
+    public override RegressionProblemData LoadData(IDataDescriptor id) {
       var descriptor = (ResourceRegressionDataDescriptor)id;
 
-      RegressionData regData = LoadData(GetTempFileForResource(descriptor.ResourceName));
+      RegressionProblemData regData = LoadData(GetTempFileForResource(descriptor.ResourceName));
       regData.Name = descriptor.Name;
       regData.Description = descriptor.Description;
@@ -66 +67 @@
 
     private string GetTempFileForResource(string resourceName) {
-      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
+      var instanceArchiveName = GetResourceName(FileExtension + @"\.zip");
       using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
         var entry = instancesZipFile.GetEntry(resourceName);