Changeset 23755

Timestamp:

2014-12-12T08:38:49+01:00 (9 years ago)

Author:

niklwors

Message:

changed 3d array of cpp runtime to row-major order

File:

• trunk/SimulationRuntime/cpp/Include/Core/Math/Array.h (modified) (1 diff)

trunk/SimulationRuntime/cpp/Include/Core/Math/Array.h

@@ -583 +583 @@
   virtual T& operator()(vector<size_t> idx)
   {
-     return _real_array[(idx[2] - 1)*size2*size1 +   (idx[1] - 1)*size1 + (idx[0] - 1)];
+    //row-major order
+   return _real_array[(idx[2] - 1) + size3*((idx[1]-1)+size2*(idx[0]-1))];    
+     //column-major order
+    //return _real_array[(idx[2] - 1)*size2*size1 +   (idx[1] - 1)*size1 + (idx[0] - 1)];
   };
  inline virtual T& operator()(unsigned int i, unsigned int j, unsigned int k)
   {
-    return _real_array[(k - 1)*size2*size1 +   (j - 1)*size1 + (i - 1)];
+    //row-major order
+    return _real_array[(k - 1) + size3*((j-1)+size2*(i-1))];  
+    //column-major order
+    //return _real_array[(k - 1)*size2*size1 +   (j - 1)*size1 + (i - 1)];
   }