Changeset 14330 for branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour

Timestamp:

10/13/16 19:47:41 (8 years ago)

Author:

gkronber

Message:

#2650 Merged r14282:14322 from trunk to branch (fixing conflicts)

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (4 diffs)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs

@@ -36 +36 @@
   public sealed class NearestNeighbourModel : ClassificationModel, INearestNeighbourModel {
 
+    private readonly 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);