[change]: swap rank and size in dimension
This commit is contained in:
+10
-10
@@ -27,11 +27,11 @@ TEST(dimension0){
|
|||||||
|
|
||||||
dimension *D = create_dim(5);
|
dimension *D = create_dim(5);
|
||||||
|
|
||||||
EXPECT_EQ(D->size,5);
|
EXPECT_EQ(D->rank,5);
|
||||||
|
|
||||||
free_dimension(D);
|
free_dimension(D);
|
||||||
}
|
}
|
||||||
TEST(rank){
|
TEST(size){
|
||||||
dimension *D=create_dim(4);
|
dimension *D=create_dim(4);
|
||||||
D->shape[0]=2;
|
D->shape[0]=2;
|
||||||
D->shape[1]=3;
|
D->shape[1]=3;
|
||||||
@@ -39,7 +39,7 @@ TEST(rank){
|
|||||||
D->shape[3]=6;
|
D->shape[3]=6;
|
||||||
|
|
||||||
updateRankDim(D);
|
updateRankDim(D);
|
||||||
EXPECT_EQ(D->rank, 180);
|
EXPECT_EQ(D->size, 180);
|
||||||
|
|
||||||
free_dimension(D);
|
free_dimension(D);
|
||||||
}
|
}
|
||||||
@@ -116,10 +116,10 @@ TEST(SubDimB){
|
|||||||
dimension *d_head2 = sub_minus_dim_head(D,2);
|
dimension *d_head2 = sub_minus_dim_head(D,2);
|
||||||
|
|
||||||
|
|
||||||
EXPECT_EQ(d_head2->rank, 12*23);
|
EXPECT_EQ(d_head2->size, 12*23);
|
||||||
|
|
||||||
dimension *d_tail2 = sub_minus_dim_tail(D,2);
|
dimension *d_tail2 = sub_minus_dim_tail(D,2);
|
||||||
EXPECT_EQ(d_tail2->rank, 15*26);
|
EXPECT_EQ(d_tail2->size, 15*26);
|
||||||
|
|
||||||
free_dimension(D);
|
free_dimension(D);
|
||||||
free(d_tail2);
|
free(d_tail2);
|
||||||
@@ -137,10 +137,10 @@ TEST(SubDim){
|
|||||||
dimension *d_head2 = sub_minus_dim_head(D,2);
|
dimension *d_head2 = sub_minus_dim_head(D,2);
|
||||||
|
|
||||||
|
|
||||||
EXPECT_EQ(d_head2->rank, 2*3);
|
EXPECT_EQ(d_head2->size, 2*3);
|
||||||
|
|
||||||
dimension *d_tail2 = sub_minus_dim_tail(D,2);
|
dimension *d_tail2 = sub_minus_dim_tail(D,2);
|
||||||
EXPECT_EQ(d_tail2->rank, 5*6);
|
EXPECT_EQ(d_tail2->size, 5*6);
|
||||||
|
|
||||||
free_dimension(D);
|
free_dimension(D);
|
||||||
free(d_tail2);
|
free(d_tail2);
|
||||||
@@ -159,7 +159,7 @@ TEST(Coord_linear){
|
|||||||
size_t line=255;
|
size_t line=255;
|
||||||
size_t *coord = CoordFromLin(line,D);
|
size_t *coord = CoordFromLin(line,D);
|
||||||
|
|
||||||
for(size_t i=0; i<D->size; ++i){
|
for(size_t i=0; i<D->rank; ++i){
|
||||||
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,7 +180,7 @@ TEST(signedCoord_linear){
|
|||||||
long line=-255;
|
long line=-255;
|
||||||
long *coord = signedCoordFromLin(line,D);
|
long *coord = signedCoordFromLin(line,D);
|
||||||
|
|
||||||
for(size_t i=0; i<D->size; ++i){
|
for(size_t i=0; i<D->rank; ++i){
|
||||||
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,7 +200,7 @@ TEST(signedCoord_linearSuccessif){
|
|||||||
for(long line=-4; line < 4; ++line){
|
for(long line=-4; line < 4; ++line){
|
||||||
long *coord = signedCoordFromLin(line,D);
|
long *coord = signedCoordFromLin(line,D);
|
||||||
|
|
||||||
for(size_t i=0; i<D->size; ++i){
|
for(size_t i=0; i<D->rank; ++i){
|
||||||
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
LOG("coo[%ld]=%ld\n",i,coord[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+402
-402
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user