Changeset 21341 for issm/trunk/src/c/classes/kriging/Covertree.h

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/kriging/Covertree.h (modified) (5 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

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

@@ -25 +25 @@
                          * has itself as a child in a cover tree.
                          */
-                        std::vector<CoverTreeNode*> getChildren(int level) const;
                         void addChild(int level, CoverTreeNode* p);
-                        void removeChild(int level, CoverTreeNode* p);
                         void addObservation(const Observation& o);
-                        void removeObservation(const Observation& o);
-                        const std::vector<Observation>& getObservations() { return _observations; }
                         double distance(const CoverTreeNode& p) const;
                         bool   isSingle() const;
                         bool   hasObservation(const Observation& o) const;
+                        std::vector<CoverTreeNode*> getChildren(int level) const;
                         const Observation& getObservation() const;
+                        const std::vector<Observation>& getObservations() { return _observations; }
+                        void removeChild(int level, CoverTreeNode* p);
+                        void removeObservation(const Observation& o);
 
                         /**
@@ -51 +51 @@
         int            _minLevel;   //A level beneath which there are no more new nodes.
 
-        std::vector<CoverTreeNode*> kNearestNodes(const Observation& o, const unsigned int& k) const;
+        /* Finds the node in Q with the minimum distance to p. Returns a pair
+         * consisting of this node and the distance.  */
+        distNodePair distance(const Observation& p,const std::vector<CoverTreeNode*>& Q);
         /**
          * Recursive implementation of the insert algorithm (see paper).
@@ -57 +59 @@
         bool insert_rec(const Observation& p, const std::vector<distNodePair>& Qi,const int& level);
 
-        /* Finds the node in Q with the minimum distance to p. Returns a pair
-         * consisting of this node and the distance.  */
-        distNodePair distance(const Observation& p,const std::vector<CoverTreeNode*>& Q);
-
-
+        std::vector<CoverTreeNode*> kNearestNodes(const Observation& o, const unsigned int& k) const;
         void remove_rec(const Observation& p, std::map<int,std::vector<distNodePair> >& coverSets, int level, bool& multi);
 
@@ -80 +78 @@
 
         /**
+         * Insert newPoint into the cover tree. If newPoint is already present,
+         * (that is, newPoint==p for some p already in the tree), then the tree
+         * is unchanged. If p.distance(newPoint)==0.0 but newPoint!=p, then
+         * newPoint WILL be inserted and both points may be returned in k-nearest-
+         * neighbor searches.
+         */
+        void insert(const Observation& newObservation);
+
+        /**
          * Just for testing/debugging. Returns true iff the cover tree satisfies the
          * the covering tree invariants (every node in level i is greater than base^i
@@ -88 +95 @@
         bool isValidTree() const;
 
-        /**
-         * Insert newPoint into the cover tree. If newPoint is already present,
-         * (that is, newPoint==p for some p already in the tree), then the tree
-         * is unchanged. If p.distance(newPoint)==0.0 but newPoint!=p, then
-         * newPoint WILL be inserted and both points may be returned in k-nearest-
-         * neighbor searches.
-         */
-        void insert(const Observation& newObservation);
 
         /**

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr