Changeset 14250

Timestamp:

01/15/13 11:40:54 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed issues when hmin~=0

File:

• issm/trunk-jpl/src/c/Container/Observations.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Container/Observations.cpp

@@ -150 +150 @@
                 if(i==0){
                         hmin2 = h2;
-                        index = i;
+                        index = indices[i];
                 }
                 else{
                         if(h2<hmin2){
                                 hmin2 = h2;
-                                index = i;
+                                index = indices[i];
                         }
                 }
@@ -161 +161 @@
 
         /*Assign output pointer*/
-        if(!nobs){
+        if(index>=0){
+                observation=dynamic_cast<Observation*>(this->GetObjectByOffset(index));
+                *px=observation->x;
+                *py=observation->y;
+                *pobs=observation->value;
+        }
+        else{
+
                 *px=UNDEF;
                 *py=UNDEF;
                 *pobs=UNDEF;
-        }
-        else{
-                observation=dynamic_cast<Observation*>(this->GetObjectByOffset(indices[index]));
-                *px=observation->x;
-                *py=observation->y;
-                *pobs=observation->value;
         }
         xDelete<int>(indices);