Renamed dim to shape in cspan. Not 100% sure it will survive.

1 files changed, 13 insertions, 13 deletions

diff --git a/misc/tests/cspan_test.c b/misc/tests/cspan_test.c
index 044ce629..9e33467c 100644
--- a/misc/tests/cspan_test.c
+++ b/misc/tests/cspan_test.c
@@ -9,11 +9,11 @@ CTEST(cspan, subdim) {
     int array[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
     intspan3 m = cspan_md(array, 2, 2, 3);
     
-    for (size_t i = 0; i < m.dim[0]; ++i) {
+    for (size_t i = 0; i < m.shape[0]; ++i) {
         intspan2 sub_i = cspan_submd3(&m, i);
-        for (size_t j = 0; j < m.dim[1]; ++j) {
+        for (size_t j = 0; j < m.shape[1]; ++j) {
             intspan sub_i_j = cspan_submd2(&sub_i, j);
-            for (size_t k = 0; k < m.dim[2]; ++k) {
+            for (size_t k = 0; k < m.shape[2]; ++k) {
                ASSERT_EQ(*cspan_at(&sub_i_j, k), *cspan_at(&m, i, j, k));
             }
         }
@@ -25,8 +25,8 @@ CTEST(cspan, slice) {
     intspan2 m1 = cspan_md(array, 3, 4);
 
     size_t sum1 = 0;
-    for (size_t i = 0; i < m1.dim[0]; ++i) {
-        for (size_t j = 0; j < m1.dim[1]; ++j) {
+    for (size_t i = 0; i < m1.shape[0]; ++i) {
+        for (size_t j = 0; j < m1.shape[1]; ++j) {
             sum1 += *cspan_at(&m1, i, j);
         }
     }
@@ -34,8 +34,8 @@ CTEST(cspan, slice) {
     intspan2 m2 = cspan_slice(intspan2, &m1, {c_ALL}, {2,4});
 
     size_t sum2 = 0;
-    for (size_t i = 0; i < m2.dim[0]; ++i) {
-        for (size_t j = 0; j < m2.dim[1]; ++j) {
+    for (size_t i = 0; i < m2.shape[0]; ++i) {
+        for (size_t j = 0; j < m2.shape[1]; ++j) {
             sum2 += *cspan_at(&m2, i, j);
         }
     }
@@ -56,9 +56,9 @@ CTEST(cspan, slice2) {
         ms3 = cspan_slice(intspan3, &ms3, {1,4}, {3,7}, {20,24});
 
         size_t sum = 0;
-        for (size_t i = 0; i < ms3.dim[0]; ++i) {
-            for (size_t j = 0; j < ms3.dim[1]; ++j) {
-                for (size_t k = 0; k < ms3.dim[2]; ++k) {
+        for (size_t i = 0; i < ms3.shape[0]; ++i) {
+            for (size_t j = 0; j < ms3.shape[1]; ++j) {
+                for (size_t k = 0; k < ms3.shape[2]; ++k) {
                     sum += *cspan_at(&ms3, i, j, k);
                 }
             }
@@ -94,9 +94,9 @@ CTEST_SETUP(cspan_cube) {
 
     intspan3 ms3 = cspan_md(_self->stack.data, CUBE, CUBE, CUBE);
 
-    c_FORRANGE (i, 0, ms3.dim[0], TSIZE) {
-        c_FORRANGE (j, 0, ms3.dim[1], TSIZE) {
-            c_FORRANGE (k, 0, ms3.dim[2], TSIZE) {
+    c_FORRANGE (i, 0, ms3.shape[0], TSIZE) {
+        c_FORRANGE (j, 0, ms3.shape[1], TSIZE) {
+            c_FORRANGE (k, 0, ms3.shape[2], TSIZE) {
                 intspan3 tile = cspan_slice(intspan3, &ms3, {i, i + TSIZE}, {j, j + TSIZE}, {k, k + TSIZE});
                 Tiles_push(&_self->tiles, tile);
             }