AtHeartEngineer/kami
1
0
Fork 0
mirror of https://github.com/JHUAPL/kami.git synced 2026-01-09 14:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

We can be a little less circumspect in the testing

Browse Source
This commit is contained in:
James P. Howard, II
2022-08-19 20:56:12 -04:00
parent 06e98b1f94
commit 85aede0721
8 changed files with 433 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/unit-kami-agent.cc
View File

@@ -31,10 +31,11 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
class TestAgent : public Agent {
public:
AgentID step(std::shared_ptr<Model> model) override {
AgentID step(shared_ptr<Model> model) override {
return get_agent_id();
}
};
@@ -61,7 +62,7 @@ TEST(Agent, get_agent_id) {
TEST(Agent, step) {
TestAgent agent_foo;
TestAgent agent_bar;
auto model_world = std::make_shared<TestModel>();
auto model_world = make_shared<TestModel>();
EXPECT_EQ(agent_foo.get_agent_id(), agent_foo.step(model_world));
EXPECT_NE(agent_bar.get_agent_id(), agent_foo.step(model_world));

29
test/unit-kami-model.cc
View File

@@ -34,17 +34,18 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
class TestAgent : public Agent {
public:
AgentID step(std::shared_ptr<Model> model) override {
AgentID step(shared_ptr<Model> model) override {
return get_agent_id();
}
};
class TestModel : public Model {
public:
std::shared_ptr<Model> step() {
shared_ptr<Model> step() {
return shared_from_this();
}
};
@@ -59,16 +60,16 @@ TEST(Model, DefaultConstructor) {
}
TEST(Model, set_population) {
auto model_foo = std::make_shared<TestModel>();
auto popul_foo = std::make_shared<Population>();
auto model_foo = make_shared<TestModel>();
auto popul_foo = make_shared<Population>();
auto popul_bar = model_foo->set_population(popul_foo);
EXPECT_EQ(popul_foo, popul_bar);
}
TEST(Model, get_population) {
auto model_foo = std::make_shared<TestModel>();
auto popul_foo = std::make_shared<Population>();
auto model_foo = make_shared<TestModel>();
auto popul_foo = make_shared<Population>();
auto popul_nul = model_foo->get_population();
@@ -81,16 +82,16 @@ TEST(Model, get_population) {
}
TEST(Model, set_scheduler) {
auto model_foo = std::make_shared<TestModel>();
auto sched_foo = std::make_shared<SequentialScheduler>();
auto model_foo = make_shared<TestModel>();
auto sched_foo = make_shared<SequentialScheduler>();
auto sched_bar = model_foo->set_scheduler(sched_foo);
EXPECT_EQ(sched_foo, sched_bar);
}
TEST(Model, get_scheduler) {
auto model_foo = std::make_shared<TestModel>();
auto sched_foo = std::make_shared<SequentialScheduler>();
auto model_foo = make_shared<TestModel>();
auto sched_foo = make_shared<SequentialScheduler>();
auto sched_nul = model_foo->get_scheduler();
EXPECT_FALSE(sched_nul);
@@ -104,16 +105,16 @@ TEST(Model, get_scheduler) {
}
TEST(Model, set_domain) {
auto model_foo = std::make_shared<TestModel>();
auto grid2_foo = std::make_shared<MultiGrid2D>(10, 10, true, true);
auto model_foo = make_shared<TestModel>();
auto grid2_foo = make_shared<MultiGrid2D>(10, 10, true, true);
auto grid2_bar = model_foo->set_domain(grid2_foo);
EXPECT_EQ(grid2_foo, grid2_bar);
}
TEST(Model, get_domain) {
auto model_foo = std::make_shared<TestModel>();
auto grid2_foo = std::make_shared<MultiGrid2D>(10, 10, true, true);
auto model_foo = make_shared<TestModel>();
auto grid2_foo = make_shared<MultiGrid2D>(10, 10, true, true);
auto grid2_nul = model_foo->get_domain();
EXPECT_FALSE(grid2_nul);

39
test/unit-kami-multigrid1d.cc
View File

@@ -35,6 +35,7 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
TEST(MultiGrid1D, DefaultConstructor) {
// There is really no way this can go wrong, but
@@ -238,7 +239,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = multigrid1d_foo.get_neighborhood(coord0, true);
EXPECT_TRUE(rval);
@@ -247,7 +248,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = multigrid1d_foo.get_neighborhood(coord1, true);
EXPECT_TRUE(rval);
@@ -256,7 +257,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1});
auto tval = unordered_set<GridCoord1D>({coord0, coord1});
auto rval = multigrid1d_foo.get_neighborhood(coord0, true);
EXPECT_TRUE(rval);
@@ -265,7 +266,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = multigrid1d_foo.get_neighborhood(coord1, true);
EXPECT_TRUE(rval);
@@ -274,7 +275,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord1, coord9});
auto rval = multigrid1d_foo.get_neighborhood(coord0, false);
EXPECT_TRUE(rval);
@@ -283,7 +284,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = multigrid1d_foo.get_neighborhood(coord1, false);
EXPECT_TRUE(rval);
@@ -292,7 +293,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord1});
auto tval = unordered_set<GridCoord1D>({coord1});
auto rval = multigrid1d_foo.get_neighborhood(coord0, false);
EXPECT_TRUE(rval);
@@ -301,7 +302,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = multigrid1d_foo.get_neighborhood(coord1, false);
EXPECT_TRUE(rval);
@@ -309,7 +310,7 @@ TEST(MultiGrid1D, get_neighborhood) {
}
{
MultiGrid1D multigrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_FALSE(rval);
@@ -317,7 +318,7 @@ TEST(MultiGrid1D, get_neighborhood) {
{
MultiGrid1D multigrid1d_foo(10, true);
multigrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -327,7 +328,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, true);
multigrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -337,7 +338,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, false);
multigrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1});
auto tval = unordered_set<GridCoord1D>({coord0, coord1});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -347,7 +348,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, false);
multigrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -357,7 +358,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, true);
multigrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord1, coord9});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -367,7 +368,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, true);
multigrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -377,7 +378,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, false);
multigrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord1});
auto tval = unordered_set<GridCoord1D>({coord1});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -387,7 +388,7 @@ TEST(MultiGrid1D, get_neighborhood) {
MultiGrid1D multigrid1d_foo(10, false);
multigrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = multigrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -440,7 +441,7 @@ TEST(MultiGrid1D, get_location_contents) {
static_cast<void>(multigrid1d_foo.add_agent(agent_id_bar, coord1));
static_cast<void>(multigrid1d_foo.add_agent(agent_id_baz, coord1));
auto tval = std::set<AgentID>({agent_id_foo, agent_id_bar, agent_id_baz});
auto tval = set<AgentID>({agent_id_foo, agent_id_bar, agent_id_baz});
auto rval = multigrid1d_foo.get_location_contents(coord1);
EXPECT_TRUE(rval);
@@ -452,7 +453,7 @@ TEST(MultiGrid1D, get_location_contents) {
static_cast<void>(multigrid1d_foo.add_agent(agent_id_bar, coord1));
static_cast<void>(multigrid1d_foo.add_agent(agent_id_baz, coord9));
auto tval = std::set<AgentID>({agent_id_foo, agent_id_bar});
auto tval = set<AgentID>({agent_id_foo, agent_id_bar});
auto rval = multigrid1d_foo.get_location_contents(coord1);
EXPECT_TRUE(rval);

349
test/unit-kami-multigrid2d.cc
View File

@@ -35,6 +35,7 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
TEST(MultiGrid2D, DefaultConstructor) {
// There is really no way this can go wrong, but
@@ -238,12 +239,12 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -252,11 +253,11 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -265,9 +266,9 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -276,11 +277,11 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -289,10 +290,10 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -301,10 +302,10 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -313,8 +314,8 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -323,8 +324,8 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -339,11 +340,11 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -353,11 +354,11 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -367,9 +368,9 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -379,11 +380,11 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -393,10 +394,10 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -406,10 +407,10 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -419,8 +420,8 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -430,10 +431,10 @@ TEST(MultiGrid2D, get_neighborhood_VonNeumann) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -448,15 +449,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -465,15 +466,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -482,10 +483,10 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -494,15 +495,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -511,14 +512,14 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -527,14 +528,14 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -543,9 +544,9 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -554,9 +555,9 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -571,15 +572,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
{
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -589,15 +590,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -607,10 +608,10 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -620,15 +621,15 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -638,14 +639,14 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -655,14 +656,14 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, true, true);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -672,9 +673,9 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -684,14 +685,14 @@ TEST(MultiGrid2D, get_neighborhood_Moore) {
MultiGrid2D multigrid2d_foo(10, 10, false, false);
multigrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto rval = multigrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);

39
test/unit-kami-population.cc
View File

@@ -30,6 +30,7 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
class TestAgent : public Agent {
private:
@@ -38,7 +39,7 @@ private:
public:
explicit TestAgent(int x) : _x(x) {};
AgentID step(std::shared_ptr<Model> model) override {
AgentID step(shared_ptr<Model> model) override {
return get_agent_id();
}
@@ -58,8 +59,8 @@ TEST(Population, DefaultConstructor) {
TEST(Population, add_agent) {
Population population_foo;
auto agent_foo = std::make_shared<TestAgent>(8675309);
auto agent_bar = std::make_shared<TestAgent>(1729);
auto agent_foo = make_shared<TestAgent>(8675309);
auto agent_bar = make_shared<TestAgent>(1729);
{
auto agent_id_baz = population_foo.add_agent(agent_foo);
@@ -78,8 +79,8 @@ TEST(Population, add_agent) {
}
TEST(Population, get_agent_by_id) {
auto agent_foo = std::make_shared<TestAgent>(8675309);
auto agent_bar = std::make_shared<TestAgent>(1729);
auto agent_foo = make_shared<TestAgent>(8675309);
auto agent_bar = make_shared<TestAgent>(1729);
{
Population population_foo;
@@ -87,7 +88,7 @@ TEST(Population, get_agent_by_id) {
auto agent_baz_opt = population_foo.get_agent_by_id(agent_foo->get_agent_id());
EXPECT_TRUE(agent_baz_opt);
auto agent_baz = std::dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
auto agent_baz = dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
EXPECT_EQ(agent_baz->getval(), 8675309);
}
{
@@ -104,13 +105,13 @@ TEST(Population, get_agent_by_id) {
auto agent_baz_opt = population_foo.get_agent_by_id(agent_foo->get_agent_id());
EXPECT_TRUE(agent_baz_opt);
auto agent_baz = std::dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
auto agent_baz = dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
EXPECT_EQ(agent_baz->getval(), 8675309);
auto agent_qux_opt = population_foo.get_agent_by_id(agent_bar->get_agent_id());
EXPECT_TRUE(agent_qux_opt);
auto agent_qux = std::dynamic_pointer_cast<TestAgent>(agent_qux_opt.value());
auto agent_qux = dynamic_pointer_cast<TestAgent>(agent_qux_opt.value());
EXPECT_EQ(agent_qux->getval(), 1729);
}
{
@@ -121,33 +122,33 @@ TEST(Population, get_agent_by_id) {
auto agent_qux_opt = population_foo.get_agent_by_id(agent_bar->get_agent_id());
EXPECT_TRUE(agent_qux_opt);
auto agent_qux = std::dynamic_pointer_cast<TestAgent>(agent_qux_opt.value());
auto agent_qux = dynamic_pointer_cast<TestAgent>(agent_qux_opt.value());
EXPECT_EQ(agent_qux->getval(), 1729);
auto agent_baz_opt = population_foo.get_agent_by_id(agent_foo->get_agent_id());
EXPECT_TRUE(agent_baz_opt);
auto agent_baz = std::dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
auto agent_baz = dynamic_pointer_cast<TestAgent>(agent_baz_opt.value());
EXPECT_EQ(agent_baz->getval(), 8675309);
}
}
TEST(Population, get_agent_list) {
auto agent_foo = std::make_shared<TestAgent>(8675309);
auto agent_bar = std::make_shared<TestAgent>(1729);
auto agent_baz = std::make_shared<TestAgent>(4104);
auto agent_qux = std::make_shared<TestAgent>(196);
auto agent_foo = make_shared<TestAgent>(8675309);
auto agent_bar = make_shared<TestAgent>(1729);
auto agent_baz = make_shared<TestAgent>(4104);
auto agent_qux = make_shared<TestAgent>(196);
{
Population population_foo;
auto tval = std::make_shared<std::vector<AgentID>>();
auto tval = make_shared<vector<AgentID>>();
auto rval = population_foo.get_agent_list();
EXPECT_EQ(*tval, *rval);
}
{
Population population_foo;
auto tval = std::make_shared<std::vector<AgentID>>();
auto tval = make_shared<vector<AgentID>>();
auto rval = population_foo.get_agent_list();
tval->push_back(agent_foo->get_agent_id());
@@ -158,8 +159,8 @@ TEST(Population, get_agent_list) {
static_cast<void>(population_foo.add_agent(agent_foo));
static_cast<void>(population_foo.add_agent(agent_bar));
auto tval = std::make_shared<std::vector<AgentID>>();
auto uval = std::make_shared<std::vector<AgentID>>();
auto tval = make_shared<vector<AgentID>>();
auto uval = make_shared<vector<AgentID>>();
auto rval = population_foo.get_agent_list();
tval->push_back(agent_foo->get_agent_id());
@@ -178,7 +179,7 @@ TEST(Population, get_agent_list) {
static_cast<void>(population_foo.add_agent(agent_baz));
static_cast<void>(population_foo.add_agent(agent_qux));
auto tval = std::make_shared<std::vector<AgentID>>();
auto tval = make_shared<vector<AgentID>>();
auto rval = population_foo.get_agent_list();
tval->push_back(agent_foo->get_agent_id());

39
test/unit-kami-sologrid1d.cc
View File

@@ -35,6 +35,7 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
TEST(SoloGrid1D, DefaultConstructor) {
// There is really no way this can go wrong, but
@@ -235,7 +236,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = sologrid1d_foo.get_neighborhood(coord0, true);
EXPECT_TRUE(rval);
@@ -244,7 +245,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = sologrid1d_foo.get_neighborhood(coord1, true);
EXPECT_TRUE(rval);
@@ -253,7 +254,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1});
auto tval = unordered_set<GridCoord1D>({coord0, coord1});
auto rval = sologrid1d_foo.get_neighborhood(coord0, true);
EXPECT_TRUE(rval);
@@ -262,7 +263,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = sologrid1d_foo.get_neighborhood(coord1, true);
EXPECT_TRUE(rval);
@@ -271,7 +272,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord1, coord9});
auto rval = sologrid1d_foo.get_neighborhood(coord0, false);
EXPECT_TRUE(rval);
@@ -280,7 +281,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = sologrid1d_foo.get_neighborhood(coord1, false);
EXPECT_TRUE(rval);
@@ -289,7 +290,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord1});
auto tval = unordered_set<GridCoord1D>({coord1});
auto rval = sologrid1d_foo.get_neighborhood(coord0, false);
EXPECT_TRUE(rval);
@@ -298,7 +299,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, false);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = sologrid1d_foo.get_neighborhood(coord1, false);
EXPECT_TRUE(rval);
@@ -306,7 +307,7 @@ TEST(SoloGrid1D, get_neighborhood) {
}
{
SoloGrid1D sologrid1d_foo(10, true);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_FALSE(rval);
@@ -314,7 +315,7 @@ TEST(SoloGrid1D, get_neighborhood) {
{
SoloGrid1D sologrid1d_foo(10, true);
sologrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord9});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -324,7 +325,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, true);
sologrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -334,7 +335,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, false);
sologrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1});
auto tval = unordered_set<GridCoord1D>({coord0, coord1});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -344,7 +345,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, false);
sologrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord1, coord2});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, true);
EXPECT_TRUE(rval);
@@ -354,7 +355,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, true);
sologrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord1, coord9});
auto tval = unordered_set<GridCoord1D>({coord1, coord9});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -364,7 +365,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, true);
sologrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -374,7 +375,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, false);
sologrid1d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord1D>({coord1});
auto tval = unordered_set<GridCoord1D>({coord1});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -384,7 +385,7 @@ TEST(SoloGrid1D, get_neighborhood) {
SoloGrid1D sologrid1d_foo(10, false);
sologrid1d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord1D>({coord0, coord2});
auto tval = unordered_set<GridCoord1D>({coord0, coord2});
auto rval = sologrid1d_foo.get_neighborhood(agent_id_foo, false);
EXPECT_TRUE(rval);
@@ -437,7 +438,7 @@ TEST(SoloGrid1D, get_location_contents) {
static_cast<void>(sologrid1d_foo.add_agent(agent_id_bar, coord1));
static_cast<void>(sologrid1d_foo.add_agent(agent_id_baz, coord1));
auto tval = std::set<AgentID>({agent_id_foo});
auto tval = set<AgentID>({agent_id_foo});
auto rval = sologrid1d_foo.get_location_contents(coord1);
EXPECT_TRUE(rval);
@@ -449,7 +450,7 @@ TEST(SoloGrid1D, get_location_contents) {
static_cast<void>(sologrid1d_foo.add_agent(agent_id_bar, coord1));
static_cast<void>(sologrid1d_foo.add_agent(agent_id_baz, coord9));
auto tval = std::set<AgentID>({agent_id_foo});
auto tval = set<AgentID>({agent_id_foo});
auto rval = sologrid1d_foo.get_location_contents(coord1);
EXPECT_TRUE(rval);

349
test/unit-kami-sologrid2d.cc
View File

@@ -35,6 +35,7 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
TEST(SoloGrid2D, DefaultConstructor) {
// There is really no way this can go wrong, but
@@ -235,12 +236,12 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -249,11 +250,11 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -262,9 +263,9 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -273,11 +274,11 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -286,10 +287,10 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -298,10 +299,10 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -310,8 +311,8 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -320,8 +321,8 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -336,11 +337,11 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{9, 0},
{0, 9},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -350,11 +351,11 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -364,9 +365,9 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -376,11 +377,11 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 2},
{2, 1},
{1, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -390,10 +391,10 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1},
{9, 0},
{0, 9}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -403,10 +404,10 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -416,8 +417,8 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -427,10 +428,10 @@ TEST(SoloGrid2D, get_neighborhood_VonNeumann) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{0, 1},
{1, 2},
{2, 1},
{1, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::VonNeumann);
EXPECT_TRUE(rval);
@@ -445,15 +446,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -462,15 +463,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -479,10 +480,10 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -491,15 +492,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord1, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -508,14 +509,14 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -524,14 +525,14 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -540,9 +541,9 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -551,9 +552,9 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, false, false);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(coord0, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -568,15 +569,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
{
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 1},
{0, 1},
{9, 0},
{1, 9},
{0, 9},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -586,15 +587,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -604,10 +605,10 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto tval = unordered_set<GridCoord2D>({{1, 1},
{0, 1},
{1, 0},
{0, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -617,15 +618,15 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0},
{2, 0},
{0, 1},
{1, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, true, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -635,14 +636,14 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto tval = unordered_set<GridCoord2D>({{9, 9},
{9, 1},
{1, 0},
{1, 1},
{0, 1},
{0, 9},
{1, 9},
{9, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -652,14 +653,14 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, true, true);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -669,9 +670,9 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord0);
auto tval = std::unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto tval = unordered_set<GridCoord2D>({{1, 0},
{1, 1},
{0, 1}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);
@@ -681,14 +682,14 @@ TEST(SoloGrid2D, get_neighborhood_Moore) {
SoloGrid2D sologrid2d_foo(10, 10, false, false);
sologrid2d_foo.add_agent(agent_id_foo, coord1);
auto tval = std::unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto tval = unordered_set<GridCoord2D>({{2, 2},
{2, 0},
{0, 1},
{0, 2},
{1, 2},
{0, 0},
{2, 1},
{1, 0}});
auto rval = sologrid2d_foo.get_neighborhood(agent_id_foo, false, GridNeighborhoodType::Moore);
EXPECT_TRUE(rval);

9
test/unit-kami-stagedagent.cc
View File

@@ -31,14 +31,15 @@
#include <gtest/gtest.h>
using namespace kami;
using namespace std;
class TestStagedAgent : public StagedAgent {
public:
AgentID advance(std::shared_ptr<Model> model) override {
AgentID advance(shared_ptr<Model> model) override {
return get_agent_id();
}
AgentID step(std::shared_ptr<Model> model) override {
AgentID step(shared_ptr<Model> model) override {
return get_agent_id();
}
};
@@ -65,7 +66,7 @@ TEST(StagedAgent, get_agent_id) {
TEST(StagedAgent, advance) {
TestStagedAgent agent_foo;
TestStagedAgent agent_bar;
auto model_world = std::make_shared<TestModel>();
auto model_world = make_shared<TestModel>();
EXPECT_EQ(agent_foo.get_agent_id(), agent_foo.advance(model_world));
EXPECT_NE(agent_bar.get_agent_id(), agent_foo.advance(model_world));
@@ -74,7 +75,7 @@ TEST(StagedAgent, advance) {
TEST(StagedAgent, step) {
TestStagedAgent agent_foo;
TestStagedAgent agent_bar;
auto model_world = std::make_shared<TestModel>();
auto model_world = make_shared<TestModel>();
EXPECT_EQ(agent_foo.get_agent_id(), agent_foo.step(model_world));
EXPECT_NE(agent_bar.get_agent_id(), agent_foo.step(model_world));