Changeset 1848 for trunk

Timestamp:

05/18/09 23:16:54 (16 years ago)

Author:

gkronber

Message:

Implemented #632 (Abort functionality for Operator SupportVectorCreator).

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.DataAnalysis;
+using System.Threading;
 
 namespace HeuristicLab.SupportVectorMachines {
   public class SupportVectorCreator : OperatorBase {
+    private Thread trainingThread;
+    private object locker = new object();
+    private bool abortRequested = false;
+
+    public override bool SupportsAbort {
+      get {
+        return true;
+      }
+    }
 
     public SupportVectorCreator()
@@ -50 +60 @@
       AddVariableInfo(new VariableInfo("SVMModel", "Represent the model learned by the SVM", typeof(SVMModel), VariableKind.New | VariableKind.Out));
       AddVariableInfo(new VariableInfo("SVMRangeTransform", "The applied transformation during the learning the model", typeof(SVMRangeTransform), VariableKind.New | VariableKind.Out));
+    }
 
+    public override void Abort() {
+      abortRequested = true;
+      lock (locker) {
+        if (trainingThread != null && trainingThread.ThreadState == ThreadState.Running) {
+          trainingThread.Abort();
+        }
+      }
     }
 
     public override IOperation Apply(IScope scope) {
+      abortRequested = false;
       Dataset dataset = GetVariableValue<Dataset>("Dataset", scope, true);
       ItemList<IntData> allowedFeatures = GetVariableValue<ItemList<IntData>>("AllowedFeatures", scope, true);
@@ -74 +93 @@
       SVM.RangeTransform rangeTransform = SVM.Scaling.DetermineRange(problem);
       SVM.Problem scaledProblem = SVM.Scaling.Scale(problem, rangeTransform);
-      SVM.Model model = SVM.Training.Train(scaledProblem, parameter);
 
-      //persist variables in scope
-      SVMModel modelData = new SVMModel();
-      modelData.Data = model;
-      scope.AddVariable(new Variable(scope.TranslateName("SVMModel"),modelData));
-      SVMRangeTransform rangeTransformData = new SVMRangeTransform();
-      rangeTransformData.Data = rangeTransform;
-      scope.AddVariable(new Variable(scope.TranslateName("SVMRangeTransform"),rangeTransformData));
-
+      SVM.Model model = StartTraining(scaledProblem, parameter);
+      if (!abortRequested) {
+        //persist variables in scope
+        SVMModel modelData = new SVMModel();
+        modelData.Data = model;
+        scope.AddVariable(new Variable(scope.TranslateName("SVMModel"), modelData));
+        SVMRangeTransform rangeTransformData = new SVMRangeTransform();
+        rangeTransformData.Data = rangeTransform;
+        scope.AddVariable(new Variable(scope.TranslateName("SVMRangeTransform"), rangeTransformData));
+      }
       return null;
     }
 
-    
+    private SVM.Model StartTraining(SVM.Problem scaledProblem, SVM.Parameter parameter) {
+      SVM.Model model = null;
+      lock (locker) {
+        if (!abortRequested) {
+          trainingThread = new Thread(() => {
+              model = SVM.Training.Train(scaledProblem, parameter);
+          });
+          trainingThread.Start();
+        }
+      }
+      trainingThread.Join();
+      trainingThread = null;
+      return model;
+    }
   }
 }