Changeset 18914

Timestamp:

12/03/14 12:01:11 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: not compiling on thwaites

Location:

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

Files:

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

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

@@ -2 +2 @@
 //#include <utility>
 #include <set>
+//#include <vector>
+#include <algorithm>
 
         /*Constructors/Destructors*/
@@ -192 +194 @@
                         Observation q = (*it)->getObservation();
                         double minDQ = 1.e+50;
-                        CoverTreeNode* minDQNode = nullptr;
+                        CoverTreeNode* minDQNode = NULL;
                         double sep = pow(base,i);
                         bool br=false;
@@ -220 +222 @@
                         //std::cout << " is level " << i << " parent of ";
                         //(*it)->getObservation().print();
-                        if (minDQNode != nullptr)
+                        if (minDQNode != NULL)
                          minDQNode->addChild(i,*it);
                 }

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

@@ -83 +83 @@
 double Observation::distance(const Observation& ob) const
 {
-        return std::sqrt( (std::pow( (ob.getXY().first - this->x), 2 ) + std::pow((ob.getXY().second - this->y), 2) ));
+        return std::sqrt( (std::pow( (ob.x - this->x), 2 ) + std::pow((ob.y - this->y), 2) ));
 }
 
-const std::pair<double, double>& Observation::getXY() const
-{
-        return std::make_pair(this->x, this->y);
-}
 bool Observation::operator==(const Observation& ob) const
 {
-        return (ob.getXY().first == this->x && ob.getXY().second == this->y && ob.value == this->value);
+        return (ob.x == this->x && ob.y == this->y && ob.value == this->value);
 }
 
 void Observation::WriteXYObs(const Observation& ob, double* px, double* py, double* pobs){
-    *px   = ob.getXY().first;
-    *py   = ob.getXY().second;
+    *px   = ob.x;
+    *py   = ob.y;
     *pobs = ob.value;
 }

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

@@ -25 +25 @@
                 /*Object virtual functions definitions*/
                 double  distance(const Observation& ob) const;
-                const   std::pair<double, double>& getXY() const;
 
                 void    Echo();