Changeset 4536

Timestamp:

09/28/10 17:58:53 (14 years ago)

Author:

mkommend

Message:

Added provisional version of the cross validation (ticket #1199).

Location:

branches/HeuristicLab.Classification

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/AlgorithmResultsCollectionView.Designer.cs (added)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/AlgorithmResultsCollectionView.cs (added)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.Designer.cs (added)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs (added)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.resx (added)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (11 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/SingleObjectiveClassificationProblem.cs (modified) (2 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views.csproj

@@ -102 +102 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core.Views-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data.Views-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -113 +148 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CrossValidationView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CrossValidationView.Designer.cs">
+      <DependentUpon>CrossValidationView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="AlgorithmResultsCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="AlgorithmResultsCollectionView.Designer.cs">
+      <DependentUpon>AlgorithmResultsCollectionView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -120 +167 @@
     <None Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.frame" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CrossValidationView.resx">
+      <DependentUpon>CrossValidationView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.csproj">
+      <Project>{A8D5676D-9662-437A-B44D-ECB4046CDE12}</Project>
+      <Name>HeuristicLab.Algorithms.DataAnalysis-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -44 +46 @@
       Runs = new RunCollection();
 
-      algorithmTemplate = null;
+      algorithm = null;
       clonedAlgorithms = new ItemCollection<IAlgorithm>();
       RegisterClonedAlgorithmEvents();
@@ -56 +58 @@
 
     #region properties
-    private IAlgorithm algorithmTemplate;
-    public IAlgorithm AlgorithmTemplate {
-      get { return algorithmTemplate; }
+    private IAlgorithm algorithm;
+    public IAlgorithm Algorithm {
+      get { return algorithm; }
       set {
-        if (algorithmTemplate != value) {
+        if (algorithm != value) {
           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 (algorithmTemplate != null) DeregisterAlgorithmTemplateEvents();
-          algorithmTemplate = value;
-          if (algorithmTemplate != null) RegisterAlgorithmTemplateEvents();
-          OnAlgorithmTemplateChanged();
+          if (algorithm != null) DeregisterAlgorithmEvents();
+          algorithm = value;
+          algorithm.Prepare(true);
+          if (algorithm != null) RegisterAlgorithmEvents();
+          OnAlgorithmChanged();
         }
       }
     }
+    private IDataAnalysisProblem cachedProblem;
     public IDataAnalysisProblem Problem {
       get {
-        if (algorithmTemplate == null)
+        if (algorithm == null)
           return null;
-        return (IDataAnalysisProblem)algorithmTemplate.Problem;
-      }
-    }
+        return (IDataAnalysisProblem)algorithm.Problem;
+      }
+      set {
+        if (algorithm == null) throw new ArgumentNullException("Could not set a problem before an algorithm was set.");
+        algorithm.Problem = value;
+        cachedProblem = value;
+      }
+    }
+
     private ItemCollection<IAlgorithm> clonedAlgorithms;
     private ReadOnlyItemCollection<IAlgorithm> readOnlyClonedAlgorithms;
@@ -92 +102 @@
     private IntValue samplesStart;
     public IntValue SamplesStart {
-      get { return SamplesStart; }
+      get { return samplesStart; }
     }
     private IntValue samplesEnd;
     public IntValue SamplesEnd {
-      get { return SamplesEnd; }
+      get { return samplesEnd; }
     }
     private IntValue numberOfWorkers;
@@ -126 +136 @@
       }
     }
+    public override Image ItemImage {
+      get {
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePaused;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+      }
+    }
+
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime; }
+      get {
+        if (ExecutionState != ExecutionState.Stopped)
+          return executionTime + TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum());
+        else
+          return executionTime;
+      }
       private set {
         executionTime = value;
@@ -137 +162 @@
 
     public void Prepare() {
+      clonedAlgorithms.Clear();
       OnPrepared();
     }
@@ -144 +170 @@
     }
     public void Start() {
+      for (int i = 0; i < Folds.Value; i++) {
+        IAlgorithm clonedAlgorithm = (IAlgorithm)algorithm.Clone();
+        clonedAlgorithm.Name = algorithm.Name + " Fold " + i;
+        clonedAlgorithms.Add(clonedAlgorithm);
+      }
+      for (int i = 0; i < NumberOfWorkers.Value && i < clonedAlgorithms.Count; i++)
+        clonedAlgorithms.ElementAt(i).Start();
       OnStarted();
     }
@@ -154 +187 @@
 
     #region events
-    public event EventHandler AlgorithmTemplateChanged;
-    private void OnAlgorithmTemplateChanged() {
-      Prepare();
-      EventHandler handler = AlgorithmTemplateChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    private void RegisterAlgorithmTemplateEvents() {
-      algorithmTemplate.ProblemChanged += new EventHandler(algorithmTemplate_ProblemChanged);
-    }
-    private void DeregisterAlgorithmTemplateEvents() {
-      algorithmTemplate.ProblemChanged -= new EventHandler(algorithmTemplate_ProblemChanged);
-    }
-    private void algorithmTemplate_ProblemChanged(object sender, EventArgs e) {
+    public event EventHandler AlgorithmChanged;
+    private void OnAlgorithmChanged() {
+      EventHandler handler = AlgorithmChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+      OnProblemChanged();
+    }
+    private void RegisterAlgorithmEvents() {
+      algorithm.ProblemChanged += new EventHandler(Algorithm_ProblemChanged);
+    }
+    private void DeregisterAlgorithmEvents() {
+      algorithm.ProblemChanged -= new EventHandler(Algorithm_ProblemChanged);
+    }
+    private void Algorithm_ProblemChanged(object sender, EventArgs e) {
+      if (algorithm.Problem != null && !(algorithm.Problem is IDataAnalysisProblem)) {
+        algorithm.Problem = cachedProblem;
+        throw new ArgumentException("A cross validation algorithm can only contain DataAnalysisProblems.");
+      }
+      cachedProblem = (IDataAnalysisProblem)algorithm.Problem;
       SamplesStart.Value = 0;
-      SamplesEnd.Value = Problem.DataAnalysisProblemData.Dataset.Rows;
+      if (algorithm.Problem != null)
+        SamplesEnd.Value = Problem.DataAnalysisProblemData.Dataset.Rows;
+      else
+        SamplesEnd.Value = 0;
+      OnProblemChanged();
+    }
+    public event EventHandler ProblemChanged;
+    private void OnProblemChanged() {
+      EventHandler handler = ProblemChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -191 +238 @@
     }
     private void RegisterClonedAlgorithmEvents(IAlgorithm algorithm) {
+      algorithm.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Algorithm_ExceptionOccurred);
+      algorithm.ExecutionTimeChanged += new EventHandler(Algorithm_ExecutionTimeChanged);
       algorithm.Runs.ItemsAdded += new CollectionItemsChangedEventHandler<IRun>(Algorithm_Runs_Added);
       algorithm.Paused += new EventHandler(Algorithm_Paused);
@@ -196 +245 @@
     }
     private void DeregisterClonedAlgorithmEvents(IAlgorithm algorithm) {
+      algorithm.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Algorithm_ExceptionOccurred);
+      algorithm.ExecutionTimeChanged += new EventHandler(Algorithm_ExecutionTimeChanged);
       algorithm.Runs.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Algorithm_Runs_Added);
       algorithm.Paused -= new EventHandler(Algorithm_Paused);
       algorithm.Stopped -= new EventHandler(Algorithm_Stopped);
     }
+    private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      OnExceptionOccurred(e.Value);
+    }
+    private void Algorithm_ExecutionTimeChanged(object sender, EventArgs e) {
+      OnExecutionTimeChanged();
+    }
     private void Algorithm_Runs_Added(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       throw new NotImplementedException("TODO added finished run to actual results if the cross validation is running");
@@ -209 +266 @@
       throw new NotImplementedException("TODO stop the cross validation if all algorithms are stopped. and start remaining prepared algs");
     }
+
     public event EventHandler ExecutionStateChanged;
     private void OnExecutionStateChanged() {

branches/HeuristicLab.Classification/HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj

@@ -108 +108 @@
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
@@ -146 +147 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/SingleObjectiveClassificationProblem.cs

@@ -30 +30 @@
   [Item("Classification Problem", "Represents a classfication problem.")]
   [StorableClass]
-  public abstract class SingleObjectiveClassificationProblem<T, U> : SingleObjectiveProblem<T, U>
+  public abstract class SingleObjectiveClassificationProblem<T, U> : SingleObjectiveProblem<T, U>, IDataAnalysisProblem
     where T : class, ISingleObjectiveEvaluator
     where U : class, ISolutionCreator {
@@ -41 +41 @@
       get { return ClassificationProblemDataParameter.Value; }
       set { ClassificationProblemDataParameter.Value = value; }
+    }
+
+    DataAnalysisProblemData IDataAnalysisProblem.DataAnalysisProblemData {
+      get { return ClassificationProblemData; }
     }