Context Navigation

Changeset 7025 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

11/21/11 16:23:48 (13 years ago)

Author:

sforsten

Message:

#1669: benchmark problems of Nguyen, Korns and Keijzer from http://groups.csail.mit.edu/EVO-DesignOpt/GPBenchmarks/ have been added. The benchmark problems from http://www.vanillamodeling.com/ have been adapted to the ones from Vladislavleva.

Not all benchmarks are working correctly so far, but they will be tested soon.

Location:

Files:

-                      r6968
+                      r7025
 #endregion
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
       ProblemData = problemData;
+    }
-    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
-      throw new System.NotImplementedException();
+    }
-    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
-      return ApplicationManager.Manager.GetInstances<IClassificationBenchmarkProblemDataGenerator>();
+    }
+  }
+}

-                      r6968
+                      r7025
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
       ProblemData = problemData;
+    }
-    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
-      throw new System.NotImplementedException();
+    }
-    public override System.Collections.Generic.IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
-      return ApplicationManager.Manager.GetInstances<IClusteringBenchmarkProblemDataGenerator>();
+    }
+  }
+}

-                      r6968
+                      r7025
 using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 …
     IDataAnalysisProblemData IDataAnalysisProblem.ProblemData {
       get { return ProblemData; }
+      set { ProblemData = (T)value; }
+    }
     public T ProblemData {
 …
     public abstract void ImportProblemDataFromFile(string fileName);
-    public abstract void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
-    public abstract IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
+  }
+}

-                      r6968
+                      r7025
 #endregion
-using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
       ProblemData = problemData;
+    }
-    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
-      return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
+    }
-    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
-      if (!(benchmarkGenerator is IRegressionBenchmarkProblemDataGenerator)) {
-        throw new ArgumentException("BenchmarkGenerator is not an IRegressionBenchmarkProblemDataGenerator.");
+      }
-      IDataAnalysisProblemData problemData = benchmarkGenerator.GenerateProblemData();
-      if (problemData is IRegressionProblemData)
-        ProblemData = (IRegressionProblemData)problemData;
-      else
-        throw new InvalidCastException("ProblemDataGenerator didn't return an IRegressionProblemData.");
+    }
+  }
+}

-                      r6968
+                      r7025
 #endregion
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
       ProblemData = problemData;
+    }
-    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
-      throw new System.NotImplementedException();
+    }
-    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
-      return ApplicationManager.Manager.GetInstances<ITimeSeriesBenchmarkProblemDataGenerator>();
+    }
+  }
+}

-                      r6968
+                      r7025
 using System;
-using System.Collections.Generic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 …
   public interface IDataAnalysisProblem : IProblem {
     IParameter ProblemDataParameter { get; }
     IDataAnalysisProblemData ProblemData { get; }
+    IDataAnalysisProblemData ProblemData { get; set; }
     event EventHandler ProblemDataChanged;
     void ImportProblemDataFromFile(string fileName);
-    void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
-    IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
+  }

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