Changeset 12251

Timestamp:

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

Author:

Mathieu Morlighem

Message:

Added Error calculation

Location:

issm/trunk-jpl/src/modules/Kriging

Files:

• Kriging.cpp (modified) (4 diffs)
• Kriging.h (modified) (1 diff)

issm/trunk-jpl/src/modules/Kriging/Kriging.cpp

@@ -13 +13 @@
         double  *y_interp     = NULL;
         double  *predictions  = NULL;
+        double  *error        = NULL;
         Options *options      = NULL;
         int      N_interp,M_interp,M,N,n_obs;
@@ -20 +21 @@
 
         /*checks on arguments on the matlab side: */
-        if (nrhs<NRHS || nlhs!=NLHS){
+        if (nrhs<NRHS || nlhs>NLHS){
                 KrigingUsage(); _error_("Kriging usage error");
         }
@@ -33 +34 @@
 
         /*Call x layer*/
-        Krigingx(&predictions,x,y,observations,n_obs,x_interp,y_interp,M_interp*N_interp,options);
+        Krigingx(&predictions,&error,x,y,observations,n_obs,x_interp,y_interp,M_interp*N_interp,options);
 
         /*Generate output Matlab Structures*/
-        WriteData(PREDICTIONS,predictions,M_interp,N_interp);
+        if(nlhs>=1) WriteData(PREDICTIONS,predictions,M_interp,N_interp);
+        if(nlhs==2) WriteData(ERROR,error,M_interp,N_interp);
 
         /*Free ressources: */
@@ -45 +47 @@
         xfree((void**)&y_interp);
         xfree((void**)&predictions);
+        xfree((void**)&error);
 
         /*end module: */

issm/trunk-jpl/src/modules/Kriging/Kriging.h

@@ -26 +26 @@
 /* serial output macros: */
 #define PREDICTIONS (mxArray**)&plhs[0]
+#define ERROR       (mxArray**)&plhs[1]
 
 /* serial arg counts: */
 #undef NLHS
-#define NLHS  1
+#define NLHS  2
 #undef NRHS
 #define NRHS  5