Changeset 13656 for branches/WebJobManager/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

03/07/16 10:18:05 (8 years ago)

Author:

ascheibe

Message:

#2582 created branch for Hive Web Job Manager

Location:

branches/WebJobManager

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (13 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringModel.cs (modified) (2 diffs)

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

@@ -101 +101 @@
     [Storable]
     private IAlgorithm algorithm;
-    public IAlgorithm Algorithm {
+    public IAlgorithm Algorithm
+    {
       get { return algorithm; }
-      set {
+      set
+      {
         if (ExecutionState != ExecutionState.Prepared && ExecutionState != ExecutionState.Stopped)
           throw new InvalidOperationException("Changing the algorithm is only allowed if the CrossValidation is stopped or prepared.");
@@ -128 +130 @@
     [Storable]
     private IDataAnalysisProblem problem;
-    public IDataAnalysisProblem Problem {
-      get {
+    public IDataAnalysisProblem Problem
+    {
+      get
+      {
         if (algorithm == null)
           return null;
         return (IDataAnalysisProblem)algorithm.Problem;
       }
-      set {
+      set
+      {
         if (ExecutionState != ExecutionState.Prepared && ExecutionState != ExecutionState.Stopped)
           throw new InvalidOperationException("Changing the problem is only allowed if the CrossValidation is stopped or prepared.");
@@ -143 +148 @@
     }
 
-    IProblem IAlgorithm.Problem {
+    IProblem IAlgorithm.Problem
+    {
       get { return Problem; }
-      set {
+      set
+      {
         if (value != null && !ProblemType.IsInstanceOfType(value))
           throw new ArgumentException("Only DataAnalysisProblems could be used for the cross validation.");
@@ -151 +158 @@
       }
     }
-    public Type ProblemType {
+    public Type ProblemType
+    {
       get { return typeof(IDataAnalysisProblem); }
     }
@@ -158 +166 @@
     private ItemCollection<IAlgorithm> clonedAlgorithms;
 
-    public IEnumerable<IOptimizer> NestedOptimizers {
-      get {
+    public IEnumerable<IOptimizer> NestedOptimizers
+    {
+      get
+      {
         if (Algorithm == null) yield break;
         yield return Algorithm;
@@ -167 +177 @@
     [Storable]
     private ResultCollection results;
-    public ResultCollection Results {
+    public ResultCollection Results
+    {
       get { return results; }
     }
@@ -173 +184 @@
     [Storable]
     private IntValue folds;
-    public IntValue Folds {
+    public IntValue Folds
+    {
       get { return folds; }
     }
     [Storable]
     private IntValue samplesStart;
-    public IntValue SamplesStart {
+    public IntValue SamplesStart
+    {
       get { return samplesStart; }
     }
     [Storable]
     private IntValue samplesEnd;
-    public IntValue SamplesEnd {
+    public IntValue SamplesEnd
+    {
       get { return samplesEnd; }
     }
     [Storable]
     private IntValue numberOfWorkers;
-    public IntValue NumberOfWorkers {
+    public IntValue NumberOfWorkers
+    {
       get { return numberOfWorkers; }
     }
@@ -194 +209 @@
     [Storable]
     private bool storeAlgorithmInEachRun;
-    public bool StoreAlgorithmInEachRun {
+    public bool StoreAlgorithmInEachRun
+    {
       get { return storeAlgorithmInEachRun; }
-      set {
+      set
+      {
         if (storeAlgorithmInEachRun != value) {
           storeAlgorithmInEachRun = value;
@@ -208 +225 @@
     [Storable]
     private RunCollection runs;
-    public RunCollection Runs {
+    public RunCollection Runs
+    {
       get { return runs; }
     }
@@ -214 +232 @@
     [Storable]
     private ExecutionState executionState;
-    public ExecutionState ExecutionState {
+    public ExecutionState ExecutionState
+    {
       get { return executionState; }
-      private set {
+      private set
+      {
         if (executionState != value) {
           executionState = value;
@@ -224 +244 @@
       }
     }
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
-    }
-    public override Image ItemImage {
-      get {
+
+    public override Image ItemImage
+    {
+      get
+      {
         if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
         else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
@@ -237 +257 @@
     }
 
-    public TimeSpan ExecutionTime {
-      get {
+    public TimeSpan ExecutionTime
+    {
+      get
+      {
         if (ExecutionState != ExecutionState.Prepared)
           return TimeSpan.FromMilliseconds(clonedAlgorithms.Select(x => x.ExecutionTime.TotalMilliseconds).Sum());
@@ -589 +611 @@
     private void Algorithm_ExecutionStateChanged(object sender, EventArgs e) {
       switch (Algorithm.ExecutionState) {
-        case ExecutionState.Prepared: OnPrepared();
+        case ExecutionState.Prepared:
+          OnPrepared();
           break;
         case ExecutionState.Started: throw new InvalidOperationException("Algorithm template can not be started.");
         case ExecutionState.Paused: throw new InvalidOperationException("Algorithm template can not be paused.");
-        case ExecutionState.Stopped: OnStopped();
+        case ExecutionState.Stopped:
+          OnStopped();
           break;
       }

branches/WebJobManager/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringModel.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using HeuristicLab.Common;
@@ -35 +34 @@
   [Item("KMeansClusteringModel", "Represents a k-Means clustering model.")]
   public sealed class KMeansClusteringModel : NamedItem, IClusteringModel {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
-    }
+
 
     [Storable]
     private string[] allowedInputVariables;
-    public IEnumerable<string> AllowedInputVariables {
+    public IEnumerable<string> AllowedInputVariables
+    {
       get { return allowedInputVariables; }
     }
     [Storable]
     private List<double[]> centers;
-    public IEnumerable<double[]> Centers {
-      get {
+    public IEnumerable<double[]> Centers
+    {
+      get
+      {
         return centers.Select(x => (double[])x.Clone());
       }