Complete fix for 3dim RefArray, ticket:4093

rfranke · OpenModelica-Hudson · commit a3b03f07d48f · 2016-11-03T15:03:47.000+01:00
This applies the fix of ea606a1 to five further occurences of the wrong index calculation.
diff --git a/SimulationRuntime/cpp/Include/Core/Math/Array.h b/SimulationRuntime/cpp/Include/Core/Math/Array.h
@@ -580,9 +580,9 @@ class RefArrayDim3 : public RefArray<T, size1*size2*size3>
    */
   virtual const T& operator()(const vector<size_t>& idx) const
   {
-    assert((size1*size2*size3) > (size3*(idx[0]-1 + size2*(idx[1]-1)) + idx[2]-1));
+    assert((size1*size2*size3) > (size3*(size2*(idx[0]-1) + (idx[1]-1)) + idx[2]-1));
     return *(RefArray<T, size1*size2*size3>::
-             _ref_array[size3*(idx[0]-1 + size2*(idx[1]-1)) + idx[2]-1]);
+             _ref_array[size3*(size2*(idx[0]-1) + (idx[1]-1)) + idx[2]-1]);
   }
 
   /**
@@ -591,9 +591,9 @@ class RefArrayDim3 : public RefArray<T, size1*size2*size3>
    */
   virtual T& operator()(const vector<size_t>& idx)
   {
-    assert((size1*size2*size3) > (size3*(idx[0]-1 + size2*(idx[1]-1)) + idx[2]-1));
+    assert((size1*size2*size3) > (size3*(size2*(idx[0]-1) + (idx[1]-1)) + idx[2]-1));
     return *(RefArray<T, size1*size2*size3>::
-             _ref_array[size3*(idx[0]-1 + size2*(idx[1]-1)) + idx[2]-1]);
+             _ref_array[size3*(size2*(idx[0]-1) + (idx[1]-1)) + idx[2]-1]);
   }
 
   /**
@@ -604,7 +604,7 @@ class RefArrayDim3 : public RefArray<T, size1*size2*size3>
    */
   inline virtual T& operator()(size_t i, size_t j, size_t k)
   {
-    assert((size1*size2*size3) > (size3*(i-1 + size2*(j-1)) + (k-1)));
+    assert((size1*size2*size3) > (size3*(size2*(i-1) + (j-1)) + (k-1)));
     return *(RefArray<T, size1*size2*size3>::
              _ref_array[size3*(size2*(i-1) + (j-1)) + (k-1)]);
   }

Original file line number	Diff line number	Diff line change
`@@ -580,9 +580,9 @@ class RefArrayDim3 : public RefArray<T, size1size2size3>`
`580`	`580`	`*/`
`581`	`581`	`virtual const T& operator()(const vector<size_t>& idx) const`
`582`	`582`	`{`
`583`		`- assert((size1size2size3) > (size3(idx[0]-1 + size2(idx[1]-1)) + idx[2]-1));`
	`583`	`+ assert((size1size2size3) > (size3(size2(idx[0]-1) + (idx[1]-1)) + idx[2]-1));`
`584`	`584`	`return (RefArray<T, size1size2*size3>::`
`585`		`- _ref_array[size3(idx[0]-1 + size2(idx[1]-1)) + idx[2]-1]);`
	`585`	`+ _ref_array[size3(size2(idx[0]-1) + (idx[1]-1)) + idx[2]-1]);`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`/**`
`@@ -591,9 +591,9 @@ class RefArrayDim3 : public RefArray<T, size1size2size3>`
`591`	`591`	`*/`
`592`	`592`	`virtual T& operator()(const vector<size_t>& idx)`
`593`	`593`	`{`
`594`		`- assert((size1size2size3) > (size3(idx[0]-1 + size2(idx[1]-1)) + idx[2]-1));`
	`594`	`+ assert((size1size2size3) > (size3(size2(idx[0]-1) + (idx[1]-1)) + idx[2]-1));`
`595`	`595`	`return (RefArray<T, size1size2*size3>::`
`596`		`- _ref_array[size3(idx[0]-1 + size2(idx[1]-1)) + idx[2]-1]);`
	`596`	`+ _ref_array[size3(size2(idx[0]-1) + (idx[1]-1)) + idx[2]-1]);`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`/**`
`@@ -604,7 +604,7 @@ class RefArrayDim3 : public RefArray<T, size1size2size3>`
`604`	`604`	`*/`
`605`	`605`	`inline virtual T& operator()(size_t i, size_t j, size_t k)`
`606`	`606`	`{`
`607`		`- assert((size1size2size3) > (size3(i-1 + size2(j-1)) + (k-1)));`
	`607`	`+ assert((size1size2size3) > (size3(size2(i-1) + (j-1)) + (k-1)));`
`608`	`608`	`return (RefArray<T, size1size2*size3>::`
`609`	`609`	`_ref_array[size3(size2(i-1) + (j-1)) + (k-1)]);`
`610`	`610`	`}`