Changeset 737 for trunk/yat

Timestamp:

Jan 7, 2007, 2:48:38 PM (16 years ago)

Author:

Peter

Message:

moving vector matrix multiplication to matrix.h and matrix.cc

Location:

trunk/yat/utility

Files:

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

trunk/yat/utility/matrix.cc

@@ -437 +437 @@
   }
 
+
+  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;
+  }
+
 }}} // of namespace utility, yat and thep

trunk/yat/utility/matrix.h

@@ -420 +420 @@
   std::ostream& operator<< (std::ostream& s, const matrix&);
 
+  /**
+     @brief vector matrix multiplication
+   */
+  vector operator*(const matrix&, const vector&);
+
+  /**
+     @brief matrix vector multiplication
+   */
+  vector operator*(const vector&, const matrix&);
 
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/utility.cc

@@ -119 +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

@@ -33 +33 @@
 ///
 
-#include "vector.h"
-
 #include <string>
 #include <utility>
@@ -43 +41 @@
 namespace utility {
 
-  class matrix;
+  class vector;
 
   ///
@@ -86 +84 @@
 
 
-  /**
-     @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