Changeset 10160

Timestamp:

11/27/13 15:23:28 (11 years ago)

Author:

tsteinre

Message:

• reverted changes from Dataset to r10085
• removed IDataset
• removed EditableDataset

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/EditableDataset.cs (deleted)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataset.cs (deleted)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -84 +84 @@
       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     </Compile>
-    <Compile Include="EditableDataset.cs" />
     <Compile Include="DataSetStatisticInfo.cs" />
     <Compile Include="Interfaces\IDataSetStatisticInfo.cs" />

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

@@ -33 +33 @@
   [Item("Dataset", "Represents a dataset containing data that should be analyzed.")]
   [StorableClass]
-  public class Dataset : NamedItem, IDataset {
+  public sealed class Dataset : NamedItem, IStringConvertibleMatrix {
     [StorableConstructor]
-    protected Dataset(bool deserializing) : base(deserializing) { }
-    protected Dataset(Dataset original, Cloner cloner)
+    private Dataset(bool deserializing) : base(deserializing) { }
+    private Dataset(Dataset original, Cloner cloner)
       : base(original, cloner) {
       variableValues = new Dictionary<string, IList>(original.variableValues);
@@ -143 +143 @@
 
     [Storable(Name = "VariableValues")]
-    protected Dictionary<string, IList> variableValues;
-
-    protected List<string> variableNames;
+    private Dictionary<string, IList> variableValues;
+
+    private List<string> variableNames;
     [Storable]
     public IEnumerable<string> VariableNames {
@@ -212 +212 @@
       set { throw new NotSupportedException(); }
     }
-    public virtual bool ReadOnly {
+    public bool ReadOnly {
       get { return true; }
     }
@@ -225 +225 @@
     }
 
-    public bool IsType<T>(int columnIndex) {
-      return variableValues[variableNames[columnIndex]] is IList<T>;
-    }
-
     public string GetValue(int rowIndex, int columnIndex) {
       return variableValues[variableNames[columnIndex]][rowIndex].ToString();
     }
-    public virtual bool SetValue(string value, int rowIndex, int columnIndex) {
+    public bool SetValue(string value, int rowIndex, int columnIndex) {
       throw new NotSupportedException();
     }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -149 +149 @@
     <Compile Include="Interfaces\Classification\IDiscriminantFunctionThresholdCalculator.cs" />
     <Compile Include="Interfaces\IDataAnalysisSolutionExporter.cs" />
-    <Compile Include="Interfaces\IDataset.cs" />
     <Compile Include="Interfaces\IDependencyCalculator.cs" />
     <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">