Changeset 750 for trunk/yat/regression

Timestamp:

Feb 17, 2007, 11:56:29 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #2. Continued adding GSL_error exceptions.

Location:

trunk/yat/regression

Files:

• MultiDimensional.cc (modified) (2 diffs)
• MultiDimensionalWeighted.cc (modified) (1 diff)

trunk/yat/regression/MultiDimensional.cc

@@ -23 +23 @@
 
 #include "MultiDimensional.h"
+#include "yat/utility/Exception.h"
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
@@ -59 +60 @@
     if (work_)
       gsl_multifit_linear_free(work_);
-    work_=gsl_multifit_linear_alloc(x.rows(),fit_parameters_.size());
-    gsl_multifit_linear(x.gsl_matrix_p(),y.gsl_vector_p(),
-                        fit_parameters_.gsl_vector_p(),
-                        covariance_.gsl_matrix_p(),&chisquare_,work_);
+    if (!(work_=gsl_multifit_linear_alloc(x.rows(),fit_parameters_.size())))
+      throw utility::GSL_error("MultiDimensional::fit failed to allocate memory");
+
+    int status = gsl_multifit_linear(x.gsl_matrix_p(), y.gsl_vector_p(),
+                                     fit_parameters_.gsl_vector_p(),
+                                     covariance_.gsl_matrix_p(), &chisquare_,
+                                     work_);
+    if (status)
+      throw utility::GSL_error(std::string("MultiDimensional::fit",status));
+
     s2_ = chisquare_/(x.rows()-x.columns());
   }

trunk/yat/regression/MultiDimensionalWeighted.cc

@@ -62 +62 @@
     if (work_)
       gsl_multifit_linear_free(work_);
-    work_=gsl_multifit_linear_alloc(x.rows(),fit_parameters_.size());
-    gsl_multifit_wlinear(x.gsl_matrix_p(),w.gsl_vector_p(),y.gsl_vector_p(),
-                         fit_parameters_.gsl_vector_p(),
-                         covariance_.gsl_matrix_p(),&chisquare_,work_);
+    if (!(work_=gsl_multifit_linear_alloc(x.rows(),fit_parameters_.size())))
+      throw utility::GSL_error("MultiDimensionalWeighted::fit failed to allocate memory");
+    int status = gsl_multifit_wlinear(x.gsl_matrix_p(), w.gsl_vector_p(),
+                                      y.gsl_vector_p(), 
+                                      fit_parameters_.gsl_vector_p(),
+                                      covariance_.gsl_matrix_p(), &chisquare_,
+                                      work_);
+    if (status)
+      throw utility::GSL_error(std::string("MultiDimensionalWeighted::fit",
+                                           status));
 
     statistics::AveragerWeighted aw;