Changeset 1706

Timestamp:

Jan 8, 2009, 10:36:27 PM (15 years ago)

Author:

Peter

Message:

implementing swap function

Location:

trunk

Files:

• test/matrix_weighted_test.cc (modified) (4 diffs)
• yat/utility/MatrixWeighted.cc (modified) (3 diffs)
• yat/utility/MatrixWeighted.h (modified) (4 diffs)

trunk/test/matrix_weighted_test.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -32 +32 @@
 void test_constructor_const(test::Suite& suite);
 void test_constructor_matrix(test::Suite& suite);
+void test_swap(test::Suite& suite);
 
 int main(int argc, char* argv[])
@@ -40 +41 @@
   test_constructor_const(suite);
   test_constructor_matrix(suite);
+  test_swap(suite);
 
   suite.return_value();
@@ -92 +94 @@
 }
 
+void test_swap(test::Suite& suite)
+{
+  MatrixWeighted x(3,10);
+  MatrixWeighted y(0,0);
+  x.swap(y);
+  suite.add(x.columns()==0);
+  suite.add(x.rows()==0);
+  suite.add(y.columns()==10);
+  suite.add(y.rows()==3);
+}
 
+

trunk/yat/utility/MatrixWeighted.cc

@@ -6 +6 @@
   Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -167 +168 @@
 
 
+  void MatrixWeighted::swap(MatrixWeighted& other)
+  {
+    std::swap(vec_, other.vec_);
+    std::swap(columns_, other.columns_);
+  }
+
+
   void MatrixWeighted::resize(size_t rows, size_t columns)
   {
@@ -199 +207 @@
   }
 
+
+  void swap(MatrixWeighted& lhs, MatrixWeighted& rhs)
+  {
+    lhs.swap(rhs);
+  }
+
 }}} // of namespace utility, yat and thep

trunk/yat/utility/MatrixWeighted.h

@@ -9 +9 @@
   Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -114 +115 @@
     
     /**
-       \brief The istream constructor.
+       \brief constructor.
 
        Data is copied from \a other and weights are calculated using
@@ -210 +211 @@
 
     /**
+       \brief swap objects
+
+       Takes constant time. Invalidates iterators.
+     */
+    void swap(MatrixWeighted& other);
+
+    /**
        \brief Resize Matrix
 
@@ -258 +266 @@
      Takes constant time.
 
-     \throw std::runtime_error if the two matrices disagree in size.
+     \see MatrixWeighted::swap(MatrixWeighted&)
   */
   void swap(MatrixWeighted&, MatrixWeighted&);