Refs #8550. VectorColumn: sizeOfData() method.

mantidproject · Dec 5, 2013 · 2f3f48f · 2f3f48f
1 parent 3f4b415
commit 2f3f48f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h b/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
@@ -123,10 +123,17 @@ namespace DataObjects
       return false;
     }
 
-    /// Overall memory size taken by the column
+    /// Overall memory size taken by the column (bytes)
     virtual long int sizeOfData() const
     {
-      // TODO: implement
+      long int size(0);
+
+      for ( auto elemIt = m_data.begin(); elemIt != m_data.end(); ++elemIt )
+        size += elemIt->size() * sizeof(Type);
+      {
+      }
+
+      return size;
     }
 
     /// Create another copy of the column 

diff --git a/Code/Mantid/Framework/DataObjects/test/VectorColumnTest.h b/Code/Mantid/Framework/DataObjects/test/VectorColumnTest.h
@@ -91,6 +91,19 @@ class VectorColumnTest : public CxxTest::TestSuite
     TS_ASSERT_THROWS_NOTHING( col.print(2, s3) );
     TS_ASSERT( s3.str().empty() );
   }
+
+  void test_sizeOfData()
+  {
+    VectorColumnTestHelper<int> col;
+
+    col.resize(3);
+
+    col.read(0, "1,2,3");
+    col.read(1, "3,4,5");
+    col.read(2, "7,8,9,10");
+
+    TS_ASSERT_EQUALS( col.sizeOfData(), 10 * sizeof(int) );
+  }
 };