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

Timestamp:

04/24/12 15:22:13 (12 years ago)

Author:

sforsten

Message:

#1784:

• deleted not needed Consumer in ProblemInstanceProvider and IProblemInstanceProvider
• changed protection level of exporter and consumer in ProblemInstanceProviderViewGeneric
• renamed property FileExtension to FileName in ResourceClassificationInstanceProvider and ResourceRegressionInstanceProvider
• deleted ImportProblemDataFromFile method from IDataAnalysisProblem and all classes and interfaces, which implement this method
• removed unnecessary yield return in GetDoubleValues in the Dataset. Now it's a normal return statement

File:

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

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

@@ -31 +31 @@
   public abstract class ResourceRegressionInstanceProvider : RegressionInstanceProvider {
 
-    protected abstract string FileExtension { get; }
+    protected abstract string FileName { get; }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var solutionsArchiveName = GetResourceName(FileExtension + @"\.zip");
+      var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
         using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
@@ -66 +66 @@
 
     private string GetTempFileForResource(string resourceName) {
-      var instanceArchiveName = GetResourceName(FileExtension + @"\.zip");
+      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
       using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
         var entry = instancesZipFile.GetEntry(resourceName);