Changeset 272

Timestamp:

Apr 14, 2005, 4:26:50 PM (18 years ago)

Author:

Peter

Message:

soft equal function added and equality and non-equality operators added

Location:

trunk/src

Files:

• matrix.cc (modified) (1 diff)
• matrix.h (modified) (2 diffs)

trunk/src/matrix.cc

@@ -112 +112 @@
   }
 
-
+  bool matrix::equal(const matrix& other, const double d) const
+  {
+    if (columns()!=other.columns() || rows()!=other.rows())
+      return false;
+    for (size_t i=0; i<rows(); i++) 
+      for (size_t j=0; j<columns(); j++) 
+        if ((*this)(i,j)>other(i,j)+d || (*this)(i,j)<other(i,j)-d )
+          return false;
+
+    return true;
+  }
 
   vector matrix::TEMP_col_return(size_t column) const

trunk/src/matrix.h

@@ -68 +68 @@
 
     ///
+    /// @return true if each element deviates less or equal than \a d
+    ///
+    bool equal(const matrix&, const double d=0) const;
+
+    ///
     /// Create a new copy of the internal GSL matrix.
     ///
@@ -200 +205 @@
     /// Comparison operator.
     ///
-    /// @return True if ... (to be defined) ... otherwise false.
-    ///
-    bool operator==( const matrix &other ) const;
+    /// @return True if all elements are equal otherwise False.
+    ///
+    inline bool operator==( const matrix& other ) const { return equal(other);}
 
     ///
     /// Comparison operator.
     ///
-    /// @return True if ... (to be defined) ... otherwise false.
-    ///
-    bool operator!=( const matrix &other ) const; 
+    /// @return False if all elements are equal otherwise True.
+    ///
+    inline bool operator!=( const matrix& other ) const {return !equal(other);}
 
     ///