Changeset 11464 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine

Timestamp:

10/14/14 09:59:45 (10 years ago)

Author:

bburlacu

Message:

#2234: Moved lock object inside the GridSearch method. Added scaling for the svm partitions.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs

@@ -34 +34 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   public class SupportVectorMachineUtil {
-    private static readonly object locker = new object();
-
-
     /// <summary>
     /// Transforms <paramref name="problemData"/> into a data structure as needed by libSVM.
@@ -101 +98 @@
       var setters = parameterRanges.Keys.Select(GenerateSetter).ToList();
       var partitions = GenerateSvmPartitions(problemData, numberOfFolds, shuffleFolds);
+
+      var locker = new object(); // for thread synchronization
       Parallel.ForEach(crossProduct, new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism },
       parameterCombination => {
@@ -144 +143 @@
         var testRows = folds[i];
         var trainingSvmProblem = CreateSvmProblem(problemData.Dataset, targetVariable, problemData.AllowedInputVariables, trainingRows);
-        var testSvmProblem = CreateSvmProblem(problemData.Dataset, targetVariable, problemData.AllowedInputVariables, testRows);
-        partitions[i] = new Tuple<svm_problem, svm_problem>(trainingSvmProblem, testSvmProblem);
+        var rangeTransform = RangeTransform.Compute(trainingSvmProblem);
+        var testSvmProblem = rangeTransform.Scale(CreateSvmProblem(problemData.Dataset, targetVariable, problemData.AllowedInputVariables, testRows));
+        partitions[i] = new Tuple<svm_problem, svm_problem>(rangeTransform.Scale(trainingSvmProblem), testSvmProblem);
       }
       return partitions;