Context Navigation

Changeset 8889

Timestamp:

11/12/12 09:26:00 (12 years ago)

Author:

sforsten

Message:

#1941: IUCIDataDescriptor to add more information about the datasets to the data, to distinguish between different version, as suggested by abeham

Location:

Files:

r8841	r8889
23	23	using System;
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25		public class Iris : IDataDescriptor {
	25	public class Iris : IUCIDataDescriptor {
26	26	public string Name { get { return "Iris"; } }
27	27	public string Description {
…	…
38	38	}
39	39	}
	40	public string Donor { get { return "M. Marshall"; } }
	41	public int Year { get { return 1988; } }
40	42	}
41	43	}

r7849	r8889
23	23	using System;
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25		public class Mammography : IDataDescriptor {
26		public string Name { get { return "mammography"; } }
	25	public class Mammography : IUCIDataDescriptor {
	26	public string Name { get { return "Mammography"; } }
27	27	public string Description {
28	28	get {
…	…
46	46	}
47	47	}
	48	public string Donor { get { return "M. Elter"; } }
	49	public int Year { get { return 2007; } }
48	50	}
49	51	}

r8841	r8889
23	23	using System;
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25		public class Thyroid : IDataDescriptor {
	25	public class Thyroid : IUCIDataDescriptor {
26	26	public string Name { get { return "Thyroid"; } }
27	27	public string Description {
…	…
39	39	}
40	40	}
	41	public string Donor { get { return "S. Aeberhard"; } }
	42	public int Year { get { return 1992; } }
41	43	}
42	44	}

-                      r8841
+                      r8889
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      List<IUCIDataDescriptor> descriptorList = new List<IUCIDataDescriptor>();
       descriptorList.Add(new Iris());
       descriptorList.Add(new Mammography());
 …
           foreach (var entry in entries.OrderBy(x => x)) {
             string prettyName = Path.GetFileNameWithoutExtension(entry);
+            IDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            IUCIDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
             if (desc != null) {
               yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);

r8595	r8889
23	23	using System;
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25		public class Wine : IDataDescriptor {
	25	public class Wine : IUCIDataDescriptor {
26	26	public string Name { get { return "Wine"; } }
27	27	public string Description {
…	…
51	51	}
52	52	}
	53	public string Donor { get { return "S. Aeberhard"; } }
	54	public int Year { get { return 1991; } }
53	55	}
54	56	}

r8885	r8889
121	121	<Compile Include="Classification\ResourceClassificationInstanceProvider.cs" />
122	122	<Compile Include="Classification\UCI\Iris.cs" />
	123	<Compile Include="Classification\UCI\IUCIDataDescriptor.cs" />
123	124	<Compile Include="Classification\UCI\Mammography.cs" />
124	125	<Compile Include="Classification\UCI\Thyroid.cs" />

Note: See TracChangeset for help on using the changeset viewer.