Changeset 12250

Timestamp:

05/16/12 11:03:15 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added Error calculation

Location:

issm/trunk-jpl/src/c/modules/Krigingx

Files:

• Krigingx.cpp (modified) (6 diffs)
• Krigingx.h (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

@@ -17 +17 @@
 #include "../../objects/Kriging/GaussianVariogram.h"
 /*FUNCTION Krigingx{{{*/
-int Krigingx(double** ppredictions,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){
+int Krigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){
 
         /*output*/
         double *predictions = NULL;
+        double *error       = NULL;
 
         /*Intermediaries*/
@@ -43 +44 @@
 
         /*Allocate output*/
-        predictions =(double*)xmalloc(n_interp*sizeof(double));
-        for(int i=0;i<n_interp;i++) predictions[i]=0;
+        predictions =(double*)xcalloc(n_interp,sizeof(double));
+        error       =(double*)xcalloc(n_interp,sizeof(double));
 
         /*Get output*/
@@ -65 +66 @@
                 gate.observations = observations;
                 gate.predictions  = predictions;
+                gate.error        = error;
                 gate.percent      = (double*)xcalloc(num,sizeof(double));
 
@@ -80 +82 @@
         delete observations;
         xfree((void**)&output);
-        *ppredictions=predictions;
+        *ppredictions = predictions;
+        *perror       = error;
         return 1;
 }/*}}}*/
@@ -107 +110 @@
         Observations *observations = gate->observations;
         double       *predictions  = gate->predictions;
+        double       *error        = gate->error;
         double       *percent      = gate->percent;
 
@@ -163 +167 @@
                 ratio=numerator/denominator;
 
-                predictions[idx]=0;
+                predictions[idx] = 0.;
+                error[idx]       = - numerator*numerator/denominator;
                 for(i=0;i<n_obs;i++) predictions[idx] += (gamma0[i]-ratio)*GinvZ[i];
+                for(i=0;i<n_obs;i++) error[idx] += gamma0[i]*GinvG0[i];
 
                 /*clean-up*/

issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.h

@@ -12 +12 @@
 class Variogram;
 
-int  Krigingx(double** ppredictions,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp,Options* options);
+int  Krigingx(double** ppredictions,double **perror,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp,Options* options);
 void ProcessVariogram(Variogram **pvariogram,Options* options);
 void GslSolve(double** pX,double* A,double* B,int n);
@@ -25 +25 @@
         Observations *observations;
         double       *predictions;
+        double       *error;
         double       *percent;
 }KrigingxThreadStruct;