Changeset 18845


Ignore:
Timestamp:
11/25/14 08:58:28 (10 years ago)
Author:
Mathieu Morlighem
Message:

NEW: preparing files for covertree

Location:
issm/trunk-jpl/src/c
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r18825 r18845  
    856856                                        ./classes/kriging/Quadtree.h\
    857857                                        ./classes/kriging/Quadtree.cpp\
     858                                        ./classes/kriging/Covertree.h\
     859                                        ./classes/kriging/Covertree.cpp\
    858860                                        ./classes/kriging/Observation.h\
    859861                                        ./classes/kriging/Observation.cpp\

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

    r18521 r18845  
    2323
    2424#include "./Quadtree.h"
     25#include "./Covertree.h"
    2526#include "./Variogram.h"
    2627#include "../../toolkits/toolkits.h"
    … …  
    3132/*Object constructors and destructor*/
    3233Observations::Observations(){/*{{{*/
    33         this->quadtree = NULL;
     34        this->treetype  = 0;
     35        this->quadtree  = NULL;
     36        this->covertree = NULL;
    3437        return;
    3538}
    3639/*}}}*/
    3740Observations::Observations(IssmPDouble* observations_list,IssmPDouble* x,IssmPDouble* y,int n,Options* options){/*{{{*/
     41
     42        /*Check that there are observations*/
     43        if(n<=0) _error_("No observation found");
     44
     45        /*Get tree type*/
     46        options->Get(&this->treetype,"treetype",1);
     47        switch(this->treetype){
     48                case 1:
     49                        this->covertree = NULL;
     50                        this->InitQuadtree(observations_list,x,y,n,options);
     51                        break;
     52                case 2:
     53                        this->quadtree = NULL;
     54                        this->InitCovertree(observations_list,x,y,n,options);
     55                        break;
     56                default:
     57                        _error_("Tree type "<<this->treetype<<" not supported yet (1: quadtree, 2: covertree)");
     58        }
     59
     60
     61
     62}
     63/*}}}*/
     64Observations::~Observations(){/*{{{*/
     65        switch(this->treetype){
     66                case 1:
     67                        delete this->quadtree;
     68                        break;
     69                case 2:
     70                        delete this->covertree;
     71                        break;
     72                default:
     73                        _error_("Tree type "<<this->treetype<<" not supported yet (1: quadtree, 2: covertree)");
     74        }
     75        return;
     76}
     77/*}}}*/
     78
     79/*Initialize data structures*/
     80void Observations::InitQuadtree(IssmPDouble* observations_list,IssmPDouble* x,IssmPDouble* y,int n,Options* options){/*{{{*/
    3881
    3982        /*Intermediaries*/
    … …  
    4487        Observation *observation = NULL;
    4588
    46         /*Check that observations is not empty*/
    47         if(n==0) _error_("No observation found");
     89        /*Checks*/
     90        _assert_(n);
    4891
    4992        /*Get extrema*/
    … …  
    110153}
    111154/*}}}*/
    112 Observations::~Observations(){/*{{{*/
    113         delete quadtree;
    114         return;
     155void Observations::InitCovertree(IssmPDouble* observations_list,IssmPDouble* x,IssmPDouble* y,int n,Options* options){/*{{{*/
     156
     157        _error_("Not supported yet");
     158
    115159}
    116160/*}}}*/
    … …  
    510554void Observations::QuadtreeColoring(IssmPDouble* A,IssmPDouble *x,IssmPDouble *y,int n){/*{{{*/
    511555
     556        if(this->treetype!=1) _error_("Tree type is not quadtree");
    512557        int xi,yi,level;
    513558

  • issm/trunk-jpl/src/c/classes/kriging/Observations.h

    r15067 r18845  
    33
    44class Quadtree;
     5class Covertree;
    56class Variogram;
    67class Options;
    … …  
    1617
    1718        private:
    18                 Quadtree* quadtree;
     19                int        treetype;
     20                Quadtree*  quadtree;
     21                Covertree* covertree;
    1922
    2023        public:
    … …  
    2427                Observations(IssmDouble* observations_list,IssmDouble* x,IssmDouble* y,int n,Options* options);
    2528                ~Observations();
     29
     30                /*Initialize data structures*/
     31                void InitQuadtree(IssmDouble* observations_list,IssmDouble* x,IssmDouble* y,int n,Options* options);
     32                void InitCovertree(IssmDouble* observations_list,IssmDouble* x,IssmDouble* y,int n,Options* options);
    2633
    2734                /*Methods*/

  • issm/trunk-jpl/src/c/classes/kriging/krigingobjects.h

    r14996 r18845  
    1313#include "./PowerVariogram.h"
    1414#include "./Quadtree.h"
     15#include "./Covertree.h"
    1516#include "./Observation.h"
    1617#include "./Observations.h"
Note: See TracChangeset for help on using the changeset viewer.