Changeset 5659 for branches

Timestamp:

03/10/11 12:39:21 (14 years ago)

Author:

gkronber

Message:

#1418 fixed bugs in CrossValidation

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -105 +105 @@
           throw new InvalidOperationException("Changing the algorithm is only allowed if the CrossValidation is stopped or prepared.");
         if (algorithm != value) {
-          if (value != null && value.Problem != null && !(value.Problem is IDataAnalysisProblem<IDataAnalysisProblemData>))
+          if (value != null && value.Problem != null && !(value.Problem is IDataAnalysisProblem))
             throw new ArgumentException("Only algorithms with a DataAnalysisProblem could be used for the cross validation.");
           if (algorithm != null) DeregisterAlgorithmEvents();
@@ -126 +126 @@
 
     [Storable]
-    private IDataAnalysisProblem<IDataAnalysisProblemData> problem;
-    public IDataAnalysisProblem<IDataAnalysisProblemData> Problem {
+    private IDataAnalysisProblem problem;
+    public IDataAnalysisProblem Problem {
       get {
         if (algorithm == null)
           return null;
-        return (IDataAnalysisProblem<IDataAnalysisProblemData>)algorithm.Problem;
+        return (IDataAnalysisProblem)algorithm.Problem;
       }
       set {
@@ -147 +147 @@
         if (value != null && !ProblemType.IsInstanceOfType(value))
           throw new ArgumentException("Only DataAnalysisProblems could be used for the cross validation.");
-        Problem = (IDataAnalysisProblem<IDataAnalysisProblemData>)value;
+        Problem = (IDataAnalysisProblem)value;
       }
     }
     public Type ProblemType {
-      get { return typeof(IDataAnalysisProblem<IDataAnalysisProblemData>); }
+      get { return typeof(IDataAnalysisProblem); }
     }
 
@@ -270 +270 @@
             IAlgorithm clonedAlgorithm = (IAlgorithm)algorithm.Clone();
             clonedAlgorithm.Name = algorithm.Name + " Fold " + i;
-            IDataAnalysisProblem<IDataAnalysisProblemData> problem = clonedAlgorithm.Problem as IDataAnalysisProblem<IDataAnalysisProblemData>;
+            IDataAnalysisProblem problem = clonedAlgorithm.Problem as IDataAnalysisProblem;
             problem.ProblemData.TestPartitionEnd.Value = (i + 1) == Folds.Value ? SamplesEnd.Value : (i + 1) * testSamplesCount + SamplesStart.Value;
             problem.ProblemData.TestPartitionStart.Value = (i * testSamplesCount) + SamplesStart.Value;
@@ -431 +431 @@
     }
     private void Algorithm_ProblemChanged(object sender, EventArgs e) {
-      if (algorithm.Problem != null && !(algorithm.Problem is IDataAnalysisProblem<IDataAnalysisProblemData>)) {
+      if (algorithm.Problem != null && !(algorithm.Problem is IDataAnalysisProblem)) {
         algorithm.Problem = problem;
         throw new ArgumentException("A cross validation algorithm can only contain DataAnalysisProblems.");
       }
-      problem = (IDataAnalysisProblem<IDataAnalysisProblemData>)algorithm.Problem;
+      problem = (IDataAnalysisProblem)algorithm.Problem;
       OnProblemChanged();
     }