Changeset 751 for trunk/yat/utility/SVD.cc

Timestamp:

Feb 17, 2007, 1:25:36 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Addresses #2. Continued adding GSL_error exceptions.

File:

• trunk/yat/utility/SVD.cc (modified) (3 diffs)

trunk/yat/utility/SVD.cc

@@ -23 +23 @@
 
 #include "SVD.h"
+#include <sstream>
 
 namespace theplu {
@@ -40 +41 @@
 
 
-  int SVD::decompose(SVDalgorithm algo)
+  void SVD::decompose(SVDalgorithm algo)
   {
+    int status=0;
     switch (algo) {
-        case GolubReinsch:
-          return golub_reinsch();
-        case ModifiedGolubReinsch:
-          return modified_golub_reinsch();
-        case Jacobi:
-          return jacobi();
+    case GolubReinsch:
+      status=golub_reinsch();
+      break;
+    case ModifiedGolubReinsch:
+      status=modified_golub_reinsch();
+      break;
+    case Jacobi:
+      status=jacobi();
+      break;
+    default:
+      std::stringstream ss("SVD::decompose ");
+      ss << algo << " is not a valid SVDalgorithm";
+      throw GSL_error(ss.str());
     }
-    // Jari, the program should never end up here, return values should be
-    // something different from normal GSL return values, or maybe
-    // throw an exception.
-    return 0;
+    if (status)
+      throw utility::GSL_error(std::string("SVD::decompose",status));
   }
 
@@ -88 +95 @@
 
 
-  int SVD::solve(const utility::vector& b, utility::vector& x)
+  void SVD::solve(const utility::vector& b, utility::vector& x)
   {
-    return gsl_linalg_SV_solve(U_.gsl_matrix_p(), V_.gsl_matrix_p(), 
-                               s_.gsl_vector_p(), b.gsl_vector_p(),
-                               x.gsl_vector_p());
+    int status=gsl_linalg_SV_solve(U_.gsl_matrix_p(), V_.gsl_matrix_p(), 
+                                   s_.gsl_vector_p(), b.gsl_vector_p(),
+                                   x.gsl_vector_p());
+    if (status)
+      throw utility::GSL_error(std::string("SVD::solve",status));
   }