From bc6f72d43b1077631871157341587ecbbcf6984a Mon Sep 17 00:00:00 2001
From: tonynsyde <antonio.leo.polito@gmail.com>
Date: Mon, 14 Mar 2016 12:54:31 +0100
Subject: [PATCH] Prey and predators fixes
---
src/DLB/DLB.hpp | 2 +-
.../Distribution/Distribution_unit_tests.hpp | 158 +++++++++++-------
.../Distribution/parmetis_util.hpp | 3 -
src/Vector/vector_dist.hpp | 4 +-
src/dec_optimizer.hpp | 2 -
5 files changed, 104 insertions(+), 65 deletions(-)
diff --git a/src/DLB/DLB.hpp b/src/DLB/DLB.hpp
index e7e79552..848825d7 100644
--- a/src/DLB/DLB.hpp
+++ b/src/DLB/DLB.hpp
@@ -52,7 +52,7 @@ public:
//! Level of un-balance needed to trigger the re-balance
enum ThresholdLevel
{
- THRLD_LOW = 10, THRLD_MEDIUM = 20, THRLD_HIGH = 30
+ THRLD_LOW = 5, THRLD_MEDIUM = 7, THRLD_HIGH = 10
};
private:
diff --git a/src/Decomposition/Distribution/Distribution_unit_tests.hpp b/src/Decomposition/Distribution/Distribution_unit_tests.hpp
index d600a893..cdc570b5 100644
--- a/src/Decomposition/Distribution/Distribution_unit_tests.hpp
+++ b/src/Decomposition/Distribution/Distribution_unit_tests.hpp
@@ -126,7 +126,7 @@ struct animal
}
};
-const std::string animal::attributes::name[] = { "pos", "genre", "status", "time_a" };
+const std::string animal::attributes::name[] = { "pos", "genre", "status", "time_a", "j_repr" };
BOOST_AUTO_TEST_SUITE (Distribution_test)
@@ -622,22 +622,25 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_random_walk_2D )
}
-
BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
{
Vcluster & v_cl = *global_v_cluster;
- //time the animal stays alive without eating or reproducing
- size_t TIME_A = 5;
+ //time the animal stays alive without eating
+ size_t PRED_TIME_A = 5;
+
+ size_t PREY_TIME_A = 3;
size_t PREDATOR = 1, PREY = 0;
size_t ALIVE = 1, DEAD = 0;
+ size_t JUST_REPR = 1;
+
// Predators reproducing probability
float PRED_REPR = 0.1;
// Predators eating probability
- float PRED_EAT = 0.2;
+ float PRED_EAT = 0.5;
// Prey reproducing probability
float PREY_REPR = 0.1;
@@ -647,12 +650,15 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
std::srand(v_cl.getProcessUnitID());
std::default_random_engine eg;
std::uniform_real_distribution<float> ud(0.0f, 1.0f);
+ std::uniform_real_distribution<float> md(-1.0f, 1.0f);
+ std::uniform_real_distribution<float> uc(0.0f, 1.0f);
+ std::uniform_real_distribution<float> lc(0.0f, 1.0f);
- size_t k = 50000;
+ size_t k = 5000;
- print_test_v( "Testing 2D random walk vector k<=",k);
+ print_test_v( "Testing 2D prey and predators k<=",k);
- BOOST_TEST_CHECKPOINT( "Testing 2D random walk k=" << k );
+ BOOST_TEST_CHECKPOINT( "Testing 2D prey and predators k=" << k );
Box<2,float> box({0.0,0.0},{1.0,1.0});
@@ -683,26 +689,24 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
auto it = vd.getIterator();
- size_t c = 0;
while (it.isNext())
{
auto key = it.get();
- if(c % 3)
+ if(ud(eg) < 0.5 )
{
- vd.template getPos<animal::pos>(key)[0] = ud(eg);
- vd.template getPos<animal::pos>(key)[1] = ud(eg);
- vd.template getProp<animal::genre>(key) = 0; //prey
- vd.template getProp<animal::status>(key) = 1; //alive
- vd.template getProp<animal::time_a>(key) = TIME_A; //alive
+ vd.template getPos<animal::pos>(key)[0] = lc(eg);
+ vd.template getPos<animal::pos>(key)[1] = lc(eg);
+ vd.template getProp<animal::genre>(key) = PREY;
+ vd.template getProp<animal::status>(key) = ALIVE;
+ vd.template getProp<animal::time_a>(key) = PREY_TIME_A;
}else{
- vd.template getPos<animal::pos>(key)[0] = ud(eg);
- vd.template getPos<animal::pos>(key)[1] = ud(eg);
- vd.template getProp<animal::genre>(key) = 1; //predator
- vd.template getProp<animal::status>(key) = 1; //alive
- vd.template getProp<animal::time_a>(key) = TIME_A; //alive
+ vd.template getPos<animal::pos>(key)[0] = uc(eg);
+ vd.template getPos<animal::pos>(key)[1] = uc(eg);
+ vd.template getProp<animal::genre>(key) = PREDATOR;
+ vd.template getProp<animal::status>(key) = ALIVE;
+ vd.template getProp<animal::time_a>(key) = PRED_TIME_A;
}
++it;
- ++c;
}
vd.map();
@@ -713,24 +717,20 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
vd.map();
- vd.getDecomposition().write("dec_init");
- vd.getDecomposition().getDistribution().write("parmetis_random_walk_" + std::to_string(0) + ".vtk");
+ vd.getDecomposition().getDistribution().write("parmetis_prey_predators_" + std::to_string(0) + ".vtk");
vd.write("particles_", 0, NO_GHOST);
- // 10 step random walk
- for (size_t j = 0; j < 50; j++)
+ // 100 step random walk
+ for (size_t j = 0; j < 100; j++)
{
- std::cout << "Iteration " << (j+1) << "\n";
-
auto it = vd.getDomainIterator();
while (it.isNext())
{
auto key = it.get();
- vd.template getPos<animal::pos>(key)[0] += 0.01 * ud(eg);
- vd.template getPos<animal::pos>(key)[1] += 0.01 * ud(eg);
-
+ vd.template getPos<animal::pos>(key)[0] += 0.01 * md(eg);
+ vd.template getPos<animal::pos>(key)[1] += 0.01 * md(eg);
++it;
}
@@ -738,8 +738,10 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
/////// Interactions ///
+ // get ghosts
vd.ghost_get<0>();
+ // vector of dead animals
openfpm::vector<size_t> deads;
// get the cell list with a cutoff radius
@@ -761,48 +763,90 @@ BOOST_AUTO_TEST_CASE( Parmetis_distribution_test_prey_and_predators )
size_t gp = vd.getProp<animal::genre>(p);
size_t sp = vd.getProp<animal::status>(p);
- auto Np = NN.getIterator(NN.getCell(vd.getPos<0>(p)));
-
- while (Np.isNext())
+ if(sp == ALIVE)
{
- auto q = Np.get();
-
- size_t gq = vd.getProp<animal::genre>(q);
- size_t sq = vd.getProp<animal::status>(q);
-
- // repulsive
-
- Point<2,float> xq = vd.getPos<0>(q);
- Point<2,float> f = (xp - xq);
-
- float distance = f.norm();
-
- //if p is a fox and q a rabit and they are both alive then the fox eats the rabbit
- if (distance < 2*r_cut*sqrt(2) && sp == ALIVE)
+ if(gp == PREY)
{
- if(gp == PREDATOR && gq == PREY && sq == ALIVE)
+ vd.getProp<animal::time_a>(p)--;
+
+ if(vd.getProp<animal::time_a>(p) <= 0)
{
- vd.getProp<animal::status>(q) = DEAD;
- vd.getProp<animal::time_a>(q) = TIME_A;
+ vd.getProp<animal::status>(p) = DEAD;
}
- else if (gp == PREY && gq == PREY && sq != DEAD)
+ else if( ud(eg) < PREY_REPR )
{
vd.add();
- vd.getLastProp<animal::genre>() = 0;
+ vd.getLastPos<animal::pos>()[0] = vd.getPos<0>(p)[0];
+ vd.getLastPos<animal::pos>()[1] = vd.getPos<0>(p)[1];
+ vd.getLastProp<animal::genre>() = PREY;
+ vd.getLastProp<animal::status>() = ALIVE;
+ vd.getLastProp<animal::time_a>() = PREY_TIME_A;
}
}
+ else if(gp == PREDATOR)
+ {
+ vd.getProp<animal::time_a>(p)--;
- ++Np;
- }
+ if(vd.getProp<animal::time_a>(p) <= 0)
+ {
+ vd.getProp<animal::status>(p) = DEAD;
+ }
+ else
+ {
+ auto Np = NN.getIterator(NN.getCell(vd.getPos<0>(p)));
+
+ while (Np.isNext())
+ {
+ auto q = Np.get();
+
+ size_t gq = vd.getProp<animal::genre>(q);
+ size_t sq = vd.getProp<animal::status>(q);
+
+ Point<2,float> xq = vd.getPos<0>(q);
+ Point<2,float> f = (xp - xq);
+
+ float distance = f.norm();
+
+ if (distance < 2*r_cut*sqrt(2) && gq == PREY && sq == ALIVE)
+ {
+ if( ud(eg) < PRED_EAT )
+ {
+ vd.getProp<animal::status>(q) = DEAD;
+ vd.getProp<animal::time_a>(p) = PRED_TIME_A;
+
+ if( ud(eg) < PRED_REPR )
+ {
+ vd.add();
+ vd.getLastPos<animal::pos>()[0] = vd.getPos<0>(p)[0];
+ vd.getLastPos<animal::pos>()[1] = vd.getPos<0>(p)[1];
+ vd.getLastProp<animal::genre>() = PREDATOR;
+ vd.getLastProp<animal::status>() = ALIVE;
+ vd.getLastProp<animal::time_a>() = PRED_TIME_A;
+ }
+ }
+ }
+ ++Np;
+ }
+ }
+ }
- if(vd.getProp<animal::status>(p) == DEAD)
- {
- deads.add(p.getKey());
}
++it2;
}
+
+ auto it3 = vd.getIterator();
+ while (it3.isNext())
+ {
+ auto key = it3.get();
+ if(vd.getProp<animal::status>(key.getKey()) == DEAD)
+ {
+ deads.add(key.getKey());
+ }
+ ++it3;
+ }
+
vd.remove(deads, 0);
deads.resize(0);
diff --git a/src/Decomposition/Distribution/parmetis_util.hpp b/src/Decomposition/Distribution/parmetis_util.hpp
index 8b88af3d..8ff02042 100755
--- a/src/Decomposition/Distribution/parmetis_util.hpp
+++ b/src/Decomposition/Distribution/parmetis_util.hpp
@@ -88,8 +88,6 @@ struct Parmetis_graph
#define BALANCE_CC_O(c) c+1
/*! \brief Helper class to define Metis graph
- *
- * TODO Transform pointer to openfpm vector
*
* \tparam graph structure that store the graph
*
@@ -168,7 +166,6 @@ class Parmetis
// Add weight to vertex and migration cost
Mg.vwgt[j] = g.vertex(idx.id).template get<nm_v::computation>();
Mg.vsize[j] = g.vertex(idx.id).template get<nm_v::migration>();
- ;
// Calculate the starting point in the adjacency list
Mg.xadj[id] = prev;
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 6a42a87f..ffee66e7 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -1245,13 +1245,13 @@ public:
cdsm.setDimensions(dec.getDomain(), dec.getGrid().getSize(), 0);
- auto it = getDomainIterator();
-
for (size_t i = 0; i < dec.getNSubSubDomains(); i++)
{
dec.setSubSubDomainComputationCost(i, 0);
}
+ auto it = getDomainIterator();
+
while (it.isNext())
{
size_t v = cdsm.getCell(this->template getPos<0>(it.get()));
diff --git a/src/dec_optimizer.hpp b/src/dec_optimizer.hpp
index 0bc2472f..e8bc016c 100644
--- a/src/dec_optimizer.hpp
+++ b/src/dec_optimizer.hpp
@@ -686,8 +686,6 @@ public:
// new seed
key_seed = search_seed<p_id,p_sub>(graph,pr_id);
-
- std::cerr << "Key seed " << key_seed.to_string() << "\n";
}
}
};
--
GitLab