Changeset 18919

Timestamp:

12/03/14 15:56:54 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: input argument is now the max depth level and not the max ditance

Location:

issm/trunk-jpl/src/c/classes/kriging

Files:

• Covertree.cpp (modified) (1 diff)
• Covertree.h (modified) (1 diff)
• Observations.cpp (modified) (3 diffs)

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

@@ -6 +6 @@
 
         /*Constructors/Destructors*/
-Covertree::Covertree(const double& maxDist,const std::vector<Observation>& points){
+Covertree::Covertree(int maxLevel,const std::vector<Observation>& points){
         this->base = 2.;
         _root=NULL;
         _numNodes=0;
-        _maxLevel=ceilf(log(maxDist)/log(base));
+        _maxLevel=maxLevel;//ceilf(log(maxDist)/log(base));
         _minLevel=_maxLevel-1;
         std::vector<Observation>::const_iterator it;

issm/trunk-jpl/src/c/classes/kriging/Covertree.h

@@ -89 +89 @@
          */
 
-        Covertree(const double& maxDist,
+        Covertree(int maxDist,
                                 const std::vector<Observation>& points=std::vector<Observation>()); 
         ~Covertree();

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

@@ -157 +157 @@
 void Observations::InitCovertree(IssmPDouble* observations_list,IssmPDouble* x,IssmPDouble* y,int n,Options* options){/*{{{*/
 
-    int maxdepth = 10;
+    int maxdepth = 20;
          _printf0_("Generating covertree with a maximum depth " <<  maxdepth <<"... ");
     this->covertree=new Covertree(maxdepth);
 
     for(int i=0;i<n;i++){
-                 if(i%1000) printf("progress = %g \n",double(i)/double(n)*100.);
                  this->covertree->insert(Observation(x[i],y[i],observations_list[i]));
     }
-
          _printf0_("done\n");
 }
@@ -619 +617 @@
 }/*}}}*/
 
-
 void Observations::ObservationList2(double **px,double **py,double **pobs,int* pnobs,double x_interp,double y_interp,double radius,int maxdata){/*{{{*/
     
@@ -630 +627 @@
 
          kNN=(this->covertree->kNearestNeighbors(observation, maxdata));
-         //cout << "kNN's size: " << kNN.size() << endl;
+         //cout << "kNN's size: " << kNN.size() << " (maxdata = " <<maxdata<<")"<<endl;
         
         //kNN is sort from closest to farthest neighbor