Changeset 4563 for branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

10/06/10 21:38:31 (14 years ago)

Author:

mkommend

Message:

Adapted CrossValidation to use ISingleObjectiveDataAnalysisProblem (ticket #1199).

File:

• branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (7 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

@@ -73 +73 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       CrossValidation clone = (CrossValidation)base.Clone(cloner);
-      clone.DeregisterEvents();
+      clone.DeregisterEvents(); //not necessary
       clone.executionState = executionState;
       clone.executionTime = executionTime;
@@ -107 +107 @@
 
           if (algorithm != null) {
-            algorithm.StoreAlgorithmInEachRun = StoreAlgorithmInEachRun;
+            algorithm.StoreAlgorithmInEachRun = false;
             RegisterAlgorithmEvents();
             algorithm.Prepare(true);
@@ -121 +121 @@
 
     [Storable]
-    private IDataAnalysisProblem cachedProblem;
-    public IDataAnalysisProblem Problem {
+    private ISingleObjectiveDataAnalysisProblem problem;
+    public ISingleObjectiveDataAnalysisProblem Problem {
       get {
         if (algorithm == null)
           return null;
-        return (IDataAnalysisProblem)algorithm.Problem;
+        return (ISingleObjectiveDataAnalysisProblem)algorithm.Problem;
       }
       set {
@@ -133 +133 @@
         if (algorithm == null) throw new ArgumentNullException("Could not set a problem before an algorithm was set.");
         algorithm.Problem = value;
-        cachedProblem = value;
+        problem = value;
       }
     }
@@ -142 +142 @@
         if (value != null && !ProblemType.IsInstanceOfType(value))
           throw new ArgumentException("Only DataAnalysisProblems could be used for the cross validation.");
-        Problem = (IDataAnalysisProblem)value;
+        Problem = (ISingleObjectiveDataAnalysisProblem)value;
       }
     }
     public Type ProblemType {
-      get { return typeof(IDataAnalysisProblem); }
+      get { return typeof(ISingleObjectiveDataAnalysisProblem); }
     }
 
@@ -245 +245 @@
 
     public void Prepare() {
-      if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused) && (ExecutionState != ExecutionState.Stopped))
+      if (ExecutionState == ExecutionState.Started)
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
       clonedAlgorithms.Clear();
@@ -442 +442 @@
     }
     private void Algorithm_ProblemChanged(object sender, EventArgs e) {
-      if (algorithm.Problem != null && !(algorithm.Problem is IDataAnalysisProblem)) {
-        algorithm.Problem = cachedProblem;
+      if (algorithm.Problem != null && !(algorithm.Problem is ISingleObjectiveDataAnalysisProblem)) {
+        algorithm.Problem = problem;
         throw new ArgumentException("A cross validation algorithm can only contain DataAnalysisProblems.");
       }
-      cachedProblem = (IDataAnalysisProblem)algorithm.Problem;
+      problem = (ISingleObjectiveDataAnalysisProblem)algorithm.Problem;
       OnProblemChanged();
     }