Changeset 18916

Timestamp:

12/03/14 13:37:06 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

File:

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

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

@@ -29 +29 @@
                 std::vector<CoverTreeNode*> children = byeNode->getAllChildren();
                 nodes.insert(nodes.begin(),children.begin(),children.end());
-                //std::cout << _numNodes << "\n";
                 delete byeNode;
-                //_numNodes--;
         }   
 }
 
+/*Methods*/
 std::vector<Covertree::CoverTreeNode*> Covertree::kNearestNodes(const Observation& p, const unsigned int& k) const{
         if(_root==NULL) return std::vector<CoverTreeNode*>();
@@ -82 +81 @@
         return kNN;
 }
-bool Covertree::insert_rec(const Observation& p,
-                        const std::vector<distNodePair>& Qi,
-                        const int& level)
-{
+bool Covertree::insert_rec(const Observation& p, const std::vector<distNodePair>& Qi, const int& level){
         std::vector<std::pair<double, CoverTreeNode*> > Qj;
         double sep = pow(base,level);
@@ -125 +121 @@
 }
 
-void Covertree::remove_rec(const Observation& p,
-                        std::map<int,std::vector<distNodePair> >& coverSets,
-                        int level,
-                        bool& multi)
-{
+void Covertree::remove_rec(const Observation& p, std::map<int,std::vector<distNodePair> >& coverSets, int level, bool& multi){
         std::vector<distNodePair>& Qi = coverSets[level];
         std::vector<distNodePair>& Qj = coverSets[level-1];
@@ -315 +307 @@
 }
 
-std::vector<Observation> Covertree::kNearestNeighbors(const Observation& p,
-                        const unsigned int& k) const
-{
+std::vector<Observation> Covertree::kNearestNeighbors(const Observation& p, const unsigned int& k) const{
         if(_root==NULL) return std::vector<Observation>();
         std::vector<CoverTreeNode*> v = kNearestNodes(p, k);
@@ -330 +320 @@
 }
 
-void Covertree::print() const
-{
+void Covertree::print() const{
         int d = _maxLevel-_minLevel+1;
         std::vector<CoverTreeNode*> Q;
@@ -477 +466 @@
         return true;
 }
-
-        /*Methods*/