Changeset 110 for trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.cc

Timestamp:

Jun 14, 2006, 12:03:40 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Updated parts of C++ tools.

File:

• trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.cc (modified) (10 diffs)

trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.cc

@@ -27 +27 @@
 
 #include <c++_tools/gslapi/vector.h>
+#include <c++_tools/gslapi/matrix.h>
 #include <c++_tools/utility/stl_utility.h>
+#include <c++_tools/utility/utility.h>
+
 
 #include <iostream>
 #include <sstream>
-#include <string>
 #include <vector>
 #include <utility>
@@ -41 +43 @@
 
 
-  vector::vector(void)
-    : v_(NULL), view_(NULL)
-  {
-  }
-
-
-
-  vector::vector(const size_t n,const double init_value)
-    : view_(NULL)
-  {
-    v_ = gsl_vector_alloc(n);
-    set_all(init_value);
-  }
-
-
-
-  vector::vector(const vector& other)
-    : view_(NULL)
-  {
-    v_ = other.TEMP_gsl_vector_copy();
-  }
-
-
-
   vector::vector(vector& v, size_t offset, size_t n, size_t stride)
-  {
+    : const_view_(NULL)
+  {
+    // Jari, exception handling needed here. Failure in setting up a
+    // proper gsl_vector_view is communicated by NULL pointer in the
+    // view structure (cf. GSL manual). How about GSL error state?
     view_ = new gsl_vector_view(gsl_vector_subvector_with_stride(v.v_,offset,
                                                                  stride,n));
@@ -74 +56 @@
 
 
-  vector::vector(gsl_vector* vec)
-    : v_(vec), view_(NULL)
-  {
-  }
-
-
-
-  vector::vector(std::istream& is) throw (utility::IO_error,std::exception)
+  vector::vector(const vector& v, size_t offset, size_t n, size_t stride)
     : view_(NULL)
+  {
+    // Jari, exception handling needed here. Failure in setting up a
+    // proper gsl_vector_view is communicated by NULL pointer in the
+    // view structure (cf. GSL manual). How about GSL error state?
+    const_view_ = new gsl_vector_const_view(
+                   gsl_vector_const_subvector_with_stride(v.v_,offset,stride,n));
+    v_ = const_cast<gsl_vector*>(&(const_view_->vector));
+  }
+
+
+
+  vector::vector(matrix& m, size_t i, bool row)
+    : const_view_(NULL)
+  {
+    view_=new gsl_vector_view(row ?
+                              gsl_matrix_row   (m.gsl_matrix_p(),i) :
+                              gsl_matrix_column(m.gsl_matrix_p(),i)  );
+    v_ = &(view_->vector);
+  }
+
+
+
+  vector::vector(const matrix& m, size_t i, bool row)
+    : view_(NULL)
+  {
+    const_view_ = new gsl_vector_const_view(row ?
+                                   gsl_matrix_const_row   (m.gsl_matrix_p(),i) :
+                                   gsl_matrix_const_column(m.gsl_matrix_p(),i) );
+    v_ = const_cast<gsl_vector*>(&(const_view_->vector));
+  }
+
+
+
+  vector::vector(std::istream& is, char sep) 
+    throw (utility::IO_error,std::exception)
+    : view_(NULL), const_view_(NULL)
   {
     // read the data file and store in stl vectors (dynamically
@@ -89 +100 @@
     u_int nof_columns=0;
     u_int nof_rows=0;
-    std::vector<double> v;
-    for (nof_rows = 0; utility::read_to_double(is, v); nof_rows++) {
-      // Ignoring empty lines
-      if (!v.size()) {
-        nof_rows--;
-        continue;
-      }
+    std::string line;
+    while(getline(is, line, '\n')) {
+      // Empty lines
+      if (!line.size())
+          continue;
+      nof_rows++;
+      
+      std::vector<double> v;
+      std::string element;
+      std::stringstream ss(line);
+      bool ok=true;
+      while(ok) {
+        if(sep=='\0')
+          ok=(ss>>element);
+        else 
+          ok=getline(ss, element, sep);
+        if(!ok)
+          break;        
+
+        if(utility::is_double(element)) {
+          v.push_back(atof(element.c_str()));
+        }
+        else if (!element.size() || utility::is_nan(element)) {
+          v.push_back(std::numeric_limits<double>::quiet_NaN());
+        }
+        else {
+          // Jari, this should be communicated with as an exception.
+          // std::cerr << "Warning: '" << element 
+          //           << "' is not an integer." << std::endl;
+        }
+      } 
+      if(sep!='\0' && line[line.size()-1]==sep) // add NaN for final separator
+          v.push_back(std::numeric_limits<double>::quiet_NaN());
       if (!nof_columns)
         nof_columns=v.size();
@@ -101 +138 @@
         std::ostringstream s;
         s << "vector::vector(std::istream&) data file error:\n"
-          << "    File has inconsistent number of rows (" << nof_rows+1
+          << "    File has inconsistent number of rows (" << nof_rows
           << ") and columns (" << nof_columns
           << ").\n    Expected a row or a column vector.";
-        std::string m=s.str();
-        throw utility::IO_error(m);
+        throw utility::IO_error(s.str());
       }
-      else if(v.size()!=nof_columns) {
+      else if (v.size()!=nof_columns) {
         std::ostringstream s;
         s << "vector::vector(std::istream&) data file error:\n"
-          << "    Line " << (nof_rows+1) << " has " << v.size()
+          << "    Line " << nof_rows << " has " << v.size()
           << " columns; expected " << nof_columns << " column.";
-        std::string m=s.str();
-        throw utility::IO_error(m);
+        throw utility::IO_error(s.str());
       }
       data_matrix.push_back(v);
@@ -134 +169 @@
     if (view_)
       delete view_;
+    else if (const_view_)
+      delete const_view_;
     else if (v_)
       gsl_vector_free(v_);
@@ -141 +178 @@
 
 
-  gsl_vector* vector::TEMP_gsl_vector_copy(void) const
+  gsl_vector* vector::create_gsl_vector_copy(void) const
   {
     gsl_vector* vec = gsl_vector_alloc(size());
@@ -172 +209 @@
     double sum = 0;
     for (size_t i=0; i<size(); i++)
-      sum += gsl_vector_get( v_, i );
+      sum += (*this)(i);
     return( sum );
   }  
-
-
-
-  double vector::operator*( const vector &other ) const
-  {
-    // Jari, check for gsl_support
-    double res = 0.0;;
-    for ( size_t i = 0; i < size(); ++i ) 
-      res += other[i] * (*this)[i];
-    return res;
-  }
-
-
-
-  vector vector::operator+(const vector &other) const
-  {
-    vector res(*this);
-    gsl_vector_add(res.v_,other.v_);
-    return res;
-  }
-
-
-
-  vector vector::operator-( const vector &other ) const
-  {
-    vector res( *this );
-    gsl_vector_sub(res.v_,other.v_);
-    return res;
-  }
-
-
 
   bool vector::operator==(const vector& a) const
@@ -219 +225 @@
 
 
+  double vector::operator*( const vector &other ) const
+  {
+    double res = 0.0;;
+    for ( size_t i = 0; i < size(); ++i ) 
+      res += other(i) * (*this)(i);
+    return res;
+  }
+
+
+
   const vector& vector::operator=( const vector& other )
   {
     if( this != &other ) {
-      if ( v_ )
+      if (view_)
+        delete view_;
+      else if (const_view_)
+        delete const_view_;
+      else if ( v_ )
         gsl_vector_free( v_ );
-      v_ = other.TEMP_gsl_vector_copy();
+      v_ = other.create_gsl_vector_copy();
     }
     return *this;
@@ -233 +253 @@
   std::ostream& operator<<(std::ostream& s, const vector& a)
   {
-    s.setf(std::ios::fixed);
+    s.setf(std::ios::dec);
     s.precision(12);
     for (size_t j = 0; j < a.size(); ++j) {