Changeset 7758 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/24/12 15:22:13 (13 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

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Dataset.cs (modified) (1 diff)
• Implementation/Classification/ClassificationProblem.cs (modified) (1 diff)
• Implementation/Classification/ClassificationProblemData.cs (modified) (3 diffs)
• Implementation/Clustering/ClusteringProblem.cs (modified) (1 diff)
• Implementation/Clustering/ClusteringProblemData.cs (modified) (2 diffs)
• Implementation/DataAnalysisProblem.cs (modified) (1 diff)
• Implementation/Regression/RegressionProblem.cs (modified) (1 diff)
• Implementation/Regression/RegressionProblemData.cs (modified) (3 diffs)
• Interfaces/IDataAnalysisProblem.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -166 +166 @@
       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a double variable.");
 
-      //mkommend yield return used to enable lazy evaluation
-      foreach (double value in values)
-        yield return value;
+      return values;
     }
     public ReadOnlyCollection<double> GetReadOnlyDoubleValues(string variableName) {

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -46 +46 @@
     }
 
-    public override void ImportProblemDataFromFile(string fileName) {
-      ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
-      ProblemData = problemData;
-    }
-
     public void Load(ClassificationData data) {
       Name = data.Name;

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
@@ -29 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -404 +402 @@
     }
     #endregion
-
-    #region Import from file
-    public static ClassificationProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-
-      ClassificationProblemData problemData = new ClassificationProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
-    }
-    #endregion
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs

@@ -38 +38 @@
       ProblemData = new ClusteringProblemData();
     }
-
-    public override void ImportProblemDataFromFile(string fileName) {
-      ClusteringProblemData problemData = ClusteringProblemData.ImportFromFile(fileName);
-      ProblemData = problemData;
-    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.IO;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -91 +89 @@
       : base(dataset, allowedInputVariables) {
     }
-
-
-    #region Import from file
-    public static ClusteringProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-
-      ClusteringProblemData problemData = new ClusteringProblemData(dataset, dataset.DoubleVariables);
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
-    }
-    #endregion
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

@@ -90 +90 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
-    public abstract void ImportProblemDataFromFile(string fileName);
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

@@ -46 +46 @@
     }
 
-    public override void ImportProblemDataFromFile(string fileName) {
-      RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
-      ProblemData = problemData;
-    }
-
     public void Load(RegressionData data) {
       Name = data.Name;

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
@@ -29 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -137 +135 @@
       OnChanged();
     }
-
-    #region Import from file
-    public static RegressionProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-
-      RegressionProblemData problemData = new RegressionProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
-    }
-    #endregion
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

@@ -29 +29 @@
     IDataAnalysisProblemData ProblemData { get; }
     event EventHandler ProblemDataChanged;
-
-    void ImportProblemDataFromFile(string fileName);
   }