Changeset 12225 for issm/trunk-jpl/src/c/objects/Kriging/Quadtree.h

Timestamp:

05/08/12 11:10:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

Better Quadtree with new fields (box center and length)

File:

• issm/trunk-jpl/src/c/objects/Kriging/Quadtree.h (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/Kriging/Quadtree.h

@@ -16 +16 @@
                 class QuadtreeBox: public Object{ 
                         public:
-                                int nbitems; // number of current vertices in the box
+                                int    nbitems; // number of current vertices in the box
+                                double xcenter; // x position of the center (double)
+                                double ycenter; // x position of the center (double)
+                                double length;  // width of the box
                                 union{
                                         QuadtreeBox *box[4];
@@ -23 +26 @@
 
                                 /*Object functions (Needed because the Quadtree uses a Container*/
-                                void    Echo()      {_error_("not implemented yet"); };
+                                void    Echo();
                                 void    DeepEcho()  {_error_("not implemented yet"); };
                                 int     Id()        {_error_("not implemented yet"); };
@@ -35 +38 @@
 
         public:
-                int          MaxDepth;      // maximum number of subdivision
-                QuadtreeBox *root;          // main box
-                long         NbQuadtreeBox; // total number of boxes
-                long         NbObs;         // number of points
+                int          MaxDepth;          // maximum number of subdivision
+                double       coordconversion;   // Coefficient to convert coordinates to integer
+                QuadtreeBox *root;              // main box
+                long         NbQuadtreeBox;     // total number of boxes
+                long         NbObs;             // number of points
 
                 Quadtree();
+                Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth_in);
                 ~Quadtree();
+                void         Add(Observation *observation);
+                void         DeepEcho(void);
                 void         Echo(void);
-                void         Add(Observation *observation);
-                void         QuadtreeColoring(double *A,int *xi,int *yi,int n);
-                QuadtreeBox *NewQuadtreeBox(void);
+                void         IntergerCoordinates(int *xi,int *yi,double x,double y);
+                QuadtreeBox *NewQuadtreeBox(double xcenter,double ycenter,double length);
+                QuadtreeBox *NewQuadtreeBox(QuadtreeBox* master,int index);
+                void         QuadtreeColoring(double *A,int xi,int yi);
 };
 #endif //_QUADTREEK_H