Changeset 2687

Timestamp:

Feb 27, 2012, 12:49:01 PM (11 years ago)

Author:

Peter

Message:

remove stray whitespace

Location:

trunk/yat/utility

Files:

• Vector.cc (modified) (7 diffs)
• Vector.h (modified) (3 diffs)
• VectorBase.cc (modified) (3 diffs)
• VectorBase.h (modified) (7 diffs)
• VectorConstView.cc (modified) (3 diffs)
• VectorConstView.h (modified) (5 diffs)
• VectorMutable.cc (modified) (1 diff)
• VectorMutable.h (modified) (4 diffs)
• VectorView.cc (modified) (5 diffs)
• VectorView.h (modified) (7 diffs)

trunk/yat/utility/Vector.cc

@@ -104 +104 @@
       ss << "\nVector(std::istream&) data file error:\n"
          << "    File has inconsistent number of rows (" << nof_rows
-         << ") and columns (" << nof_columns 
+         << ") and columns (" << nof_columns
          << ").\n    Expected a row or column Vector.";
       throw IO_error(ss.str());
@@ -117 +117 @@
     // abort the program.
     for (size_t i=0; i<nof_rows; i++)
-      for (size_t j=0; j<nof_columns; j++) 
+      for (size_t j=0; j<nof_columns; j++)
         gsl_vector_set( vec_, n++, data_matrix[i][j] );
     const_vec_ = vec_;
@@ -138 +138 @@
       return *this;
     }
-    // indirect self assignment if begin <= other.begin() < end 
+    // indirect self assignment if begin <= other.begin() < end
     if (begin() <= other.begin() && other.begin()<end()) {
       if (size() != other.size()) {
@@ -146 +146 @@
       }
       return *this;
-    } 
+    }
     if (size()==other.size()){
       if (gsl_vector_memcpy(vec_, other.gsl_vector_p()))
@@ -157 +157 @@
     const_vec_ = vec_;
     return *this;
-  } 
+  }
 
 
@@ -184 +184 @@
 
 
-  void Vector::delete_allocated_memory(void) 
+  void Vector::delete_allocated_memory(void)
   {
     if (vec_)
@@ -222 +222 @@
   {
     return assign(other);
-  } 
+  }
 
 

trunk/yat/utility/Vector.h

@@ -45 +45 @@
 
   /**
-     @brief This is the yat interface to GSL vector. 
+     @brief This is the yat interface to GSL vector.
 
      \par File streams:
@@ -68 +68 @@
        \brief Allocates memory space for \a n elements, and sets all
        elements to \a init_value.
-       
+
        \throw GSL_error if memory allocation fails.
     */
@@ -112 +112 @@
        \return false
     */
-    bool isview(void) const; 
+    bool isview(void) const;
 
     /**

trunk/yat/utility/VectorBase.cc

@@ -176 +176 @@
     if (status) {
       gsl_permutation_free(p);
-      throw utility::GSL_error(std::string("sort_index(vector&,const VectorBase&)",status));      
+      throw utility::GSL_error(std::string("sort_index(vector&,const VectorBase&)",status));
     }
     std::vector<size_t> tmp(p->data,p->data+p->size);
@@ -184 +184 @@
 
 
-  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k, 
+  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k,
                             const VectorBase& invec)
   {
@@ -192 +192 @@
     gsl_sort_vector_smallest_index(&sort_index[0],k,invec.gsl_vector_p());
   }
-  
-  void sort_largest_index(std::vector<size_t>& sort_index, size_t k, 
+
+  void sort_largest_index(std::vector<size_t>& sort_index, size_t k,
                             const VectorBase& invec)
   {

trunk/yat/utility/VectorBase.h

@@ -40 +40 @@
 namespace yat {
 namespace utility {
-  
+
   class matrix;
   class Vector;
 
   /**
-     @brief This is the yat interface to GSL vector. 
+     @brief This is the yat interface to GSL vector.
 
      This is an interface class for vectors containing the const
@@ -109 +109 @@
        Check if the vector object is a view (sub-vector) to another
        vector.
-    
+
        \return True if the object is a view, false othwerwise.
      */
-    virtual bool isview(void) const=0; 
+    virtual bool isview(void) const=0;
 
     /**
@@ -243 +243 @@
      have been stored in that position if the VectorBase had been sorted
      in place. The first element of \a sort_index gives the index of the least
-     element in \a invec, and the last element of \a sort_index gives the 
-     index of the greatest element in \a invec . The VectorBase \a invec 
+     element in \a invec, and the last element of \a sort_index gives the
+     index of the greatest element in \a invec . The VectorBase \a invec
      is not changed.
 
@@ -251 +251 @@
   void sort_index(std::vector<size_t>& sort_index, const VectorBase& invec);
 
-  /** 
+  /**
       Similar to sort_index but creates a VectorBase with indices to
       the \a k smallest elements in \a invec.
@@ -257 +257 @@
      \relatesalso VectorBase
   */
-  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k, 
+  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k,
                            const VectorBase& invec);
 
-  /** 
+  /**
       Similar to sort_index but creates a VectorBase with indices to
       the \a k largest elements in \a invec.
@@ -266 +266 @@
      \relatesalso VectorBase
   */
-  void sort_largest_index(std::vector<size_t>& sort_index, size_t k, 
+  void sort_largest_index(std::vector<size_t>& sort_index, size_t k,
                           const VectorBase& invec);
 
@@ -285 +285 @@
      you, for example, want to print the VectorBase \a v with the
      elements separated by a ':', you do so by:
-     \verbatim 
-     s << setfill(':') << v; 
+     \verbatim
+     s << setfill(':') << v;
      \endverbatim
 

trunk/yat/utility/VectorConstView.cc

@@ -51 +51 @@
   {
     const_view_ = new gsl_vector_const_view(
-                   gsl_vector_const_subvector_with_stride(v.gsl_vector_p(), 
+                   gsl_vector_const_subvector_with_stride(v.gsl_vector_p(),
                                                           offset, stride,n));
     const_vec_ = &(const_view_->vector);
@@ -60 +60 @@
     : VectorBase(), const_view_(NULL)
   {
-    const_view_ = 
-      new gsl_vector_const_view(row ? 
+    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));
@@ -76 +76 @@
   void VectorConstView::copy(const VectorBase& other)
   {
-    const_view_ = 
-      new gsl_vector_const_view(gsl_vector_const_subvector(other.gsl_vector_p(), 
+    const_view_ =
+      new gsl_vector_const_view(gsl_vector_const_subvector(other.gsl_vector_p(),
                                                            0, other.size()));
     const_vec_ = &(const_view_->vector);

trunk/yat/utility/VectorConstView.h

@@ -40 +40 @@
 
   /**
-     @brief Read-only view. 
+     @brief Read-only view.
 
-     Wrapper to gsl_vector_const_view 
+     Wrapper to gsl_vector_const_view
 
      With this class you can create a view into const
      objects - either a vector or matrix. By design all functionality
      in this class is const to guarantee that the viewed object is not
-     modified. 
+     modified.
 
      \note that view vectors do not own the underlying data,
@@ -64 +64 @@
     /**
        \brief Copy a VectorBase
-    */ 
+    */
     explicit VectorConstView(const VectorBase& other);
 
@@ -83 +83 @@
     /**
        \brief Matrix row/column view constructor.
-       
-       Create a view into a row/column of a matrix. 
+
+       Create a view into a row/column of a matrix.
 
        \param m matrix to view into.
@@ -109 +109 @@
        \return true
     */
-    bool isview(void) const; 
+    bool isview(void) const;
 
   private:
@@ -119 +119 @@
     // because this pointer may be NULL.
     gsl_vector_const_view* const_view_;
-    
+
     // assignment not allowed
     VectorConstView& operator=(const VectorConstView&);

trunk/yat/utility/VectorMutable.cc

@@ -91 +91 @@
   {
     if (vec_)
-      return iterator(&(this->operator()(0))+vec_->stride*size(), 
+      return iterator(&(this->operator()(0))+vec_->stride*size(),
                             const_vec_->stride);
     return iterator(NULL, 1);

trunk/yat/utility/VectorMutable.h

@@ -31 +31 @@
 #include "StrideIterator.h"
 
+#include <gsl/gsl_vector.h>
+
 #include <cstddef> // size_t
-
-#include <gsl/gsl_vector.h>
 
 namespace theplu {
@@ -43 +43 @@
 
   /**
-     @brief This is the mutable interface to GSL vector. 
+     @brief This is the mutable interface to GSL vector.
 
      This class contains the mutable interface to vector classes.
@@ -126 +126 @@
        Check if the vector object is a view (sub-vector) to another
        vector.
-    
+
        \return True if the object is a view, false othwerwise.
-    
-     */
-    virtual bool isview(void) const=0; 
+
+     */
+    virtual bool isview(void) const=0;
 
     /**
@@ -226 +226 @@
      Randomly shuffles the elements in VectorMutable \a invec
   */
-  void shuffle(VectorMutable& invec); 
+  void shuffle(VectorMutable& invec);
 
   /**

trunk/yat/utility/VectorView.cc

@@ -44 +44 @@
     : VectorMutable()
   {
-    view_ = new gsl_vector_view(gsl_vector_subvector(other.gsl_vector_p(), 
+    view_ = new gsl_vector_view(gsl_vector_subvector(other.gsl_vector_p(),
                                                      0, other.size()));
     const_vec_ = vec_ = &(view_->vector);
-    
+
   }
 
@@ -61 +61 @@
     : VectorMutable()
   {
-    view_ = 
-      new gsl_vector_view(gsl_vector_subvector_with_stride(v.gsl_vector_p(), 
+    view_ =
+      new gsl_vector_view(gsl_vector_subvector_with_stride(v.gsl_vector_p(),
                                                            offset, stride,n));
     const_vec_ = vec_ = &(view_->vector);
@@ -101 +101 @@
     const_vec_ = vec_;
     return *this;
-  } 
+  }
 
 
@@ -122 +122 @@
   }
 
-  
+
   const VectorView& VectorView::operator=(const VectorBase& other )
   {
@@ -128 +128 @@
   }
 
-  
+
   void VectorView::delete_allocated_memory(void)
   {

trunk/yat/utility/VectorView.h

@@ -40 +40 @@
 
   /**
-     @brief This is the yat interface to gsl_vector_view. 
+     @brief This is the yat interface to gsl_vector_view.
 
      This class can be used to create a vector view into a Matrix or a
@@ -46 +46 @@
      data, i.e., the Matrix or VectorMutable that is viewed into. For
      that reason all constructors are taking non-const references to
-     disallow mutable views into a const objects. 
+     disallow mutable views into a const objects.
 
      The fact that there is no copy constructor with const argument,
@@ -93 +93 @@
        underlying data (Vector or Matrix) is deallocated VectorView is
        invalid.
-    */ 
+    */
     VectorView(VectorView& other);
 
@@ -128 +128 @@
     /// A VectorView view can be used as any VectorMutable with the
     /// difference that changes made to the view will also change the
-    /// object that is viewed. 
+    /// object that is viewed.
     ///
     /// @note If the object viewed by the view goes out of scope or is
@@ -144 +144 @@
        \return true
     */
-    bool isview(void) const; 
+    bool isview(void) const;
 
     /**
@@ -186 +186 @@
        proxy.
      */
-    struct proxy 
-    { 
+    struct proxy
+    {
       /// pointer to GSL vector keeping everything we need to create a
       /// new VectorMutable from a proxy.
@@ -200 +200 @@
 
     /**
-       conversion operator to private proxy class. 
+       conversion operator to private proxy class.
      */
     operator proxy();