Changeset 18915

Timestamp:

12/03/14 12:06:52 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed covertree

File:

• issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/kriging/Observations.cpp

@@ -628 +628 @@
     Observation observation=Observation(x_interp,y_interp,0.);
     std::vector<Observation> kNN;
-    
-    /*If radius is not provided or is 0, return all observations*/
-    if(radius==0.)
-    {
-        kNN=(this->covertree->getRoot())->getObservations();
-    }
-    else
-    {
-        kNN=(this->covertree->kNearestNeighbors(observation, maxdata));
-                //cout << "kNN's size: " << kNN.size() << endl;
-                
-    }
+
+         kNN=(this->covertree->kNearestNeighbors(observation, maxdata));
+         //cout << "kNN's size: " << kNN.size() << endl;
         
         //kNN is sort from closest to farthest neighbor
@@ -645 +636 @@
         //deletes and resizes the kNN vector
         vector<Observation>::iterator it;
-        for (it = kNN.begin(); it != kNN.end(); ++it) {
-                //(*it).print();
-                //cout << "\n" << (*it).distance(observation) << endl;
-                if ((*it).distance(observation) > radius) {
-                        break;
-                }
-        }
-        kNN.erase(it, kNN.end());
+        if(radius>0.){
+                for (it = kNN.begin(); it != kNN.end(); ++it) {
+                        //(*it).print();
+                        //cout << "\n" << (*it).distance(observation) << endl;
+                        if ((*it).distance(observation) > radius) {
+                                break;
+                        }
+                }
+                kNN.erase(it, kNN.end());
+        }
     
         /*Allocate vectors*/
@@ -661 +654 @@
         /*Loop over all observations and fill in x, y and obs*/
         int i = 0;
-        for (it = kNN.begin(); it != kNN.end(); ++it) {
+        for(it = kNN.begin(); it != kNN.end(); ++it) {
                 (*it).WriteXYObs((*it), &x[i], &y[i], &obs[i]);
                 i++;
@@ -669 +662 @@
     *py=y;
     *pobs=obs;
-        *pnobs = kNN.size();
-}/*}}}*/
+         *pnobs = kNN.size();
+}/*}}}*/