From e9ba19e139116013440881c5d80b18f555b4da4c Mon Sep 17 00:00:00 2001 From: Berenger Bramas Date: Mon, 23 Nov 2015 19:36:31 +0100 Subject: [PATCH] update P2P exclusion test --- UTests/utestP2PExclusion.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/UTests/utestP2PExclusion.cpp b/UTests/utestP2PExclusion.cpp index ecf03d65..4317df66 100644 --- a/UTests/utestP2PExclusion.cpp +++ b/UTests/utestP2PExclusion.cpp @@ -40,11 +40,11 @@ class TestExclusion : public FUTester { for(int idxY = 0 ; idxY < Size ; ++idxY){ for(int idxZ = 0 ; idxZ < Size ; ++idxZ){ if(FP2PExclusion::GetShapeIdx(idxX,idxY,idxZ) == idxShape){ - for(int idxX_neig = FMath::Max(0,idxX-1) ; idxX_neig < FMath::Min(Size,idxX+1) ; ++idxX_neig){ - for(int idxY_neig = FMath::Max(0,idxY-1) ; idxY_neig < FMath::Min(Size,idxY+1) ; ++idxY_neig){ - for(int idxZ_neig = FMath::Max(0,idxZ-1) ; idxZ_neig < FMath::Min(Size,idxZ+1) ; ++idxZ_neig){ + for(int idxX_neig = FMath::Max(0,idxX-1) ; idxX_neig < FMath::Min(Size,idxX+2) ; ++idxX_neig){ + for(int idxY_neig = FMath::Max(0,idxY-1) ; idxY_neig < FMath::Min(Size,idxY+2) ; ++idxY_neig){ + for(int idxZ_neig = FMath::Max(0,idxZ-1) ; idxZ_neig < FMath::Min(Size,idxZ+2) ; ++idxZ_neig){ uassert(grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] == 0); - grid[grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig]] = 1; + grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] = 1; } } } @@ -69,7 +69,7 @@ class TestExclusion : public FUTester { for(int idxY_neig = FMath::Max(0,idxY-1) ; idxY_neig < idxY ; ++idxY_neig){ for(int idxZ_neig = FMath::Max(0,idxZ-1) ; idxZ_neig < idxZ ; ++idxZ_neig){ uassert(grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] == 0); - grid[grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig]] = 1; + grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] = 1; } } } @@ -89,16 +89,16 @@ class TestExclusion : public FUTester { for(int idxY = 0 ; idxY < Size ; ++idxY){ for(int idxZ = 0 ; idxZ < Size ; ++idxZ){ if(FP2PMiddleExclusion::GetShapeIdx(idxX,idxY,idxZ) == idxShape){ - for(int idxX_neig = FMath::Max(0,idxX-1) ; idxX_neig < FMath::Min(Size,idxX+1) ; ++idxX_neig){ - for(int idxY_neig = FMath::Max(0,idxY-1) ; idxY_neig < FMath::Min(Size,idxY+1) ; ++idxY_neig){ - for(int idxZ_neig = FMath::Max(0,idxZ-1) ; idxZ_neig < FMath::Min(Size,idxZ+1) ; ++idxZ_neig){ + for(int idxX_neig = FMath::Max(0,idxX-1) ; idxX_neig < FMath::Min(Size,idxX+2) ; ++idxX_neig){ + for(int idxY_neig = FMath::Max(0,idxY-1) ; idxY_neig < FMath::Min(Size,idxY+2) ; ++idxY_neig){ + for(int idxZ_neig = FMath::Max(0,idxZ-1) ; idxZ_neig < FMath::Min(Size,idxZ+2) ; ++idxZ_neig){ const int diffx = idxX_neig-idxX; const int diffy = idxY_neig-idxY; const int diffz = idxZ_neig-idxZ; const int idx = (diffx+1)*9 + (diffy+1)*3 + (diffz+1); - if(idx < 14){ + if(idx <= 14){ uassert(grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] == 0); - grid[grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig]] = 1; + grid[(idxX_neig*Size + idxY_neig)*Size + idxZ_neig] = 1; } } } -- 2.26.2