removed gridSize from the template arguments

- not needed and code much cleaner
some minor changes
new test-cases
This commit is contained in:
2016-01-25 15:53:12 +01:00
parent 9947dced15
commit 5aedce47f1
16 changed files with 167 additions and 66 deletions

View File

@@ -8,7 +8,7 @@
TEST(Grid, add) {
Grid<20, GP> grid;
Grid<GP> grid(20);
ASSERT_EQ(0, grid.add(GP()));
ASSERT_EQ(1, grid.add(GP()));
ASSERT_EQ(2, grid.add(GP()));
@@ -28,7 +28,7 @@ TEST(Grid, add) {
TEST(Grid, BBox) {
Grid<20, GP> grid;
Grid<GP> grid(20);
int idx = grid.add(GP(40,40,40));
ASSERT_EQ(30, grid.getBBox(idx).getMin().x);
ASSERT_EQ(50, grid.getBBox(idx).getMax().x);
@@ -40,7 +40,7 @@ TEST(Grid, BBox) {
TEST(Grid, connectBiDir) {
Grid<1, GP> grid;
Grid<GP> grid(1);
int idx1 = grid.add(GP( 0, 0, 0));
int idx2 = grid.add(GP( 0, 1, 0));
@@ -68,7 +68,7 @@ TEST(Grid, connectBiDir) {
TEST(Grid, disconnectBiDir) {
Grid<1, GP> grid;
Grid<GP> grid(1);
int idx1 = grid.add(GP( 0, 0, 0));
int idx2 = grid.add(GP( 0, 1, 0));
@@ -111,7 +111,7 @@ TEST(Grid, disconnectBiDir) {
TEST(Grid, uid) {
Grid<20, GP> grid;
Grid<GP> grid(20);
GP gp(20,40,60);
uint64_t uid = grid.getUID(gp);
@@ -125,7 +125,7 @@ TEST(Grid, uid) {
TEST(Grid, remove) {
Grid<1, GP> grid;
Grid<GP> grid(1);
GP gp1( 0, 0, 0);
GP gp2( 0, 1, 0);
@@ -162,7 +162,7 @@ TEST(Grid, remove) {
TEST(Grid, neighborIter) {
Grid<1, GP> grid;
Grid<GP> grid(1);
int idx1 = grid.add(GP( 0, 0, 0));
int idx2 = grid.add(GP( 0, 1, 0));
@@ -183,7 +183,7 @@ TEST(Grid, neighborIter) {
TEST(Grid, bbox) {
Grid<1, GP> grid;
Grid<GP> grid(1);
grid.add(GP( 0, 0, 0));
grid.add(GP( 0, 1, 0));
@@ -206,7 +206,7 @@ TEST(Grid, bbox) {
TEST(Grid, nearest) {
Grid<20, GP> grid;
Grid<GP> grid(20);
GP c1(20,20,20);
GP c2(40,40,40);