Changeset 750

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

Files:

• random/random.cc (modified) (5 diffs)
• regression/MultiDimensional.cc (modified) (2 diffs)
• regression/MultiDimensionalWeighted.cc (modified) (1 diff)
• utility/Exception.h (modified) (2 diffs)

trunk/yat/random/random.cc

@@ -39 +39 @@
       // support rng/seed changes through environment vars
     if (!gsl_rng_env_setup())
-      throw utility::GSL_error("RNG: unknown generator");
+      throw utility::GSL_error("RNG::RNG unknown generator");
     if (!(rng_=gsl_rng_alloc(gsl_rng_default)))
-      throw utility::GSL_error("RNG: failed to allocate memory");
+      throw utility::GSL_error("RNG::RNG failed to allocate memory");
   }
 
@@ -110 +110 @@
   {
     if (!(rng_ = gsl_rng_clone(rng->rng())))
-      throw utility::GSL_error("RNG_state: failed to allocate memory");
+      throw utility::GSL_error("RNG_state::RNG_state failed to allocate memory");
   }
   
@@ -152 +152 @@
     delete p;
     if (!gen_)
-      throw utility::GSL_error("DiscreteGeneral: failed to setup generator.");
+      throw utility::GSL_error("DiscreteGeneral::DiscreteGeneral failed to setup generator.");
   }
 
@@ -174 +174 @@
   {
     if (range_>rng_->max()) {
-      std::stringstream ss("DiscreteUniform: ");
+      std::stringstream ss("DiscreteUniform::DiscreteUniform: ");
       ss << n << " is too large for RNG " << rng_->name();
       throw utility::GSL_error(ss.str());
@@ -193 +193 @@
     // underlying RNG
     if (n>rng_->max()) {
-      std::stringstream ss("DiscreteUniform::op(): ");
+      std::stringstream ss("DiscreteUniform::operator(u_long): ");
       ss << n << " is too large for RNG " << rng_->name();
       throw utility::GSL_error(ss.str());

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;

trunk/yat/utility/Exception.h

@@ -29 +29 @@
 #include <string>
 
+#include <gsl/gsl_errno.h>
+
 namespace theplu {
 namespace yat {
@@ -48 +50 @@
     */
     inline GSL_error(std::string message) throw()
-      : std::runtime_error("IO_error: " + message) {}
+      : std::runtime_error("GSL_error: " + message) {}
+
+    inline GSL_error(std::string message, int gsl_status) throw()
+      : std::runtime_error("GSL_error: " + message + gsl_strerror(gsl_status)) {}
   };