Changeset 8875 for branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

11/07/12 14:31:39 (12 years ago)

Author:

mkommend

Message:

#1942: Merged trunk changes into branch.

Location:

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.3/Classification/Data/UCI.zip (modified) (previous)
• 3.3/Classification/UCI/Iris.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Iris.cs)
• 3.3/Classification/UCI/Thyroid.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Thyroid.cs)
• 3.3/Classification/UCI/UCIInstanceProvider.cs (modified) (1 diff)
• 3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (1 diff)

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs

@@ -47 +47 @@
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      descriptorList.Add(new Iris());
       descriptorList.Add(new Mammography());
+      descriptorList.Add(new Thyroid());
       descriptorList.Add(new Wine());
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -147 +147 @@
     <Compile Include="Classification\ResourceClassificationDataDescriptor.cs" />
     <Compile Include="Classification\ResourceClassificationInstanceProvider.cs" />
+    <Compile Include="Classification\UCI\Iris.cs" />
     <Compile Include="Classification\UCI\Mammography.cs" />
+    <Compile Include="Classification\UCI\Thyroid.cs" />
     <Compile Include="Classification\UCI\UCIInstanceProvider.cs" />
     <Compile Include="Classification\UCI\Wine.cs" />