flower-1.0.12

diff --git a/flower/matrix.cc b/flower/matrix.cc
index b95a4ab1f9ddc3ebdeef0fb6330bc72f886bff8f..63bd85a33c2b33dbc5ef91f277be74ba05f33ba9 100644 (file)
--- a/flower/matrix.cc
+++ b/flower/matrix.cc
@@ -9,24 +9,6 @@ Matrix::norm() const
     return sqrt(r);
 }
 
-//inline
-Real
-Matrix::operator()(int i,int j) const
-{
-    assert(i >= 0 && j >= 0);
-    assert(i < rows() && j < cols());
-    return dat->elem(i,j);
-}
-
-//inline
-Real &
-Matrix::operator()(int i, int j)
-{
-    assert(i >= 0 && j >= 0);
-    assert(i < rows() && j < cols());
-    return dat->elem(i,j);
-}
-
 void
 Matrix::fill(Real r)
 {

diff --git a/flower/matrix.hh b/flower/matrix.hh
index e092a5fbe67bf343f89ba1f208af779d1c5c9db8..5283dc71ef45df9d30588b6e26957167abba05b9 100644 (file)
--- a/flower/matrix.hh
+++ b/flower/matrix.hh
@@ -35,7 +35,7 @@ public:
     void unit() { set_diag(1.0); }
 
     void operator+=(const Matrix&m);
-        void operator-=(const Matrix&m);    
+    void operator-=(const Matrix&m);    
     void operator*=(Real a);
     void operator/=(Real a) { (*this) *= 1/a; }
     
@@ -74,10 +74,10 @@ public:
     void operator=(const Matrix&m);
 
     /// access an element
-    Real operator()(int i,int j) const;
+    Real operator()(int i,int j) const { return dat->elem(i,j); }
 
     /// access an element
-    Real &operator()(int i, int j);
+    Real &operator()(int i, int j) { return dat->elem(i,j); }
 
     /// Matrix multiply with vec (from right)
     Vector operator *(const Vector &v) const;