Context Navigation

RealWorld

Timestamp:

09/20/18 15:56:23 (6 years ago)

Author:

gkronber

Message:

#2908: merged r15853,r15855,r16169 from trunk to stable

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk merged: 15853,15855,16169
stable/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.Instances.DataAnalysis merged: 15853,15855,16169

r15584	r16170
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class ChemicalOne : ResourceRegressionDataDescriptor {
	24	public ChemicalOne() : base("Chemical-I.csv") { }
24	25	public override string Name { get { return "Chemical-I"; } }
25	26	public override string Description { get { return ""; } }

r15584	r16170
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class Housing : ResourceRegressionDataDescriptor {
	24	public Housing() : base("Housing.csv") { }
24	25	public override string Name { get { return "Housing"; } }
25	26	public override string Description { get { return ""; } }

r15584	r16170
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25	25	public class Powermeter : ResourceRegressionDataDescriptor {
	26	public Powermeter() : base("Powermeter.txt") { }
26	27	public override string Name { get { return "Powermeter"; } }
27	28	public override string Description {

-                      r15584
+                      r16170
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
       descriptorList.Add(new ChemicalOne() { ResourceName = "Chemical-I.csv" });
       descriptorList.Add(new Housing() { ResourceName = "Housing.csv" });
       descriptorList.Add(new Tower() { ResourceName = "Tower.txt" });
       descriptorList.Add(new Powermeter() { ResourceName = "Powermeter.txt" });
       descriptorList.Add(new SARCOS() { ResourceName = "SARCOS - Inverse Dynamics.txt" });
+      descriptorList.Add(new ChemicalOne());
+      descriptorList.Add(new Housing());
+      descriptorList.Add(new Tower());
+      descriptorList.Add(new Powermeter());
+      descriptorList.Add(new SARCOS());
       return descriptorList;
+    }

r15584	r16170
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25	25	public class SARCOS : ResourceRegressionDataDescriptor {
	26	public SARCOS() : base("SARCOS - Inverse Dynamics.txt") { }
26	27	public override string Name { get { return "SARCOS - Inverse Dynamics"; } }
27	28	public override string Description {

r15584	r16170
24	24	namespace HeuristicLab.Problems.Instances.DataAnalysis {
25	25	public class Tower : ResourceRegressionDataDescriptor {
	26	public Tower() : base("Tower.txt") { }
26	27	public override string Name { get { return "Tower"; } }
27	28	public override string Description {

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