Changeset 734 for trunk/yat

Timestamp:

Jan 6, 2007, 6:04:54 PM (16 years ago)

Author:

Peter

Message:

added vector*matrix and matrix*vector operators. fixes #18

Location:

trunk/yat/utility

Files:

• matrix.cc (modified) (1 diff)
• utility.cc (modified) (3 diffs)
• utility.h (modified) (4 diffs)

trunk/yat/utility/matrix.cc

@@ -359 +359 @@
 
 
-  const vector matrix::operator*(const vector&) const
-  {
-    std::cerr << "Not implemented:" << std::endl
-              << "   const vector matrix::operator*(const vector&) const"
-              << std::endl;
-    return vector(0);
-  }
-
-
   bool matrix::operator==(const matrix& other) const
   {

trunk/yat/utility/utility.cc

@@ -4 +4 @@
   Copyright (C) 2005 Jari Häkkinen, Markus Ringnér
   Copyright (C) 2006 Jari Häkkinen
+  Copyright (C) 2007 Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -24 +25 @@
 
 #include "utility.h"
+
+#include "matrix.h"
 #include "stl_utility.h"
 #include "vector.h"
@@ -116 +119 @@
 
 
+  vector operator*(const matrix& m, const vector& v)
+  {
+    utility::vector res(m.rows());
+    for (size_t i=0; i<res.size(); ++i)
+      res(i) = vector(m,i) * v;
+    return res;
+  }
+
+
+  vector operator*(const vector& v, const matrix& m)
+  {
+    utility::vector res(m.columns());
+    for (size_t i=0; i<res.size(); ++i)
+      res(i) = v * vector(m,i,false);
+    return res;
+  }
+
 }}} // end of namespace utility, yat and thep

trunk/yat/utility/utility.h

@@ -7 +7 @@
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2006 Jari Häkkinen
+  Copyright (C) 2007 Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -32 +33 @@
 ///
 
+#include "vector.h"
+
 #include <string>
 #include <utility>
@@ -40 +43 @@
 namespace utility {
 
-  class vector;
+  class matrix;
 
   ///
@@ -82 +85 @@
   void shuffle(vector& invec); 
 
+
+  /**
+     @brief matrix vector multiplication
+   */
+  vector operator*(const matrix&, const vector&);
+
+
+  /**
+     @brief matrix vector multiplication
+   */
+  vector operator*(const vector&, const matrix&);
+
 }}} // of namespace utility, yat, and theplu