Changeset 14314 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

09/29/16 10:28:26 (8 years ago)

Author:

gkronber

Message:

#2653: added a separate lock object for the kdTree in NearestNeighbourModel

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs

@@ -36 +36 @@
   public sealed class NearestNeighbourModel : ClassificationModel, INearestNeighbourModel {
 
+    private object kdTreeLockObject = new object();
     private alglib.nearestneighbor.kdtree kdTree;
     public alglib.nearestneighbor.kdtree KDTree {
@@ -47 +48 @@
       }
     }
+
 
     public override IEnumerable<string> VariablesUsedForPrediction {
@@ -201 +203 @@
         }
         int numNeighbours;
-        lock (kdTree) { // gkronber: the following calls change the kdTree data structure
+        lock (kdTreeLockObject) { // gkronber: the following calls change the kdTree data structure
           numNeighbours = alglib.nearestneighbor.kdtreequeryknn(kdTree, x, k, false);
           alglib.nearestneighbor.kdtreequeryresultsdistances(kdTree, ref dists);
@@ -237 +239 @@
         }
         int numNeighbours;
-        lock (kdTree) {
+        lock (kdTreeLockObject) {
           // gkronber: the following calls change the kdTree data structure
           numNeighbours = alglib.nearestneighbor.kdtreequeryknn(kdTree, x, k, false);