statistics integrated

src/Environment.cpp

@@ -83,19 +83,14 @@ std::vector<Animal *> Environment::detectedNeighbors(Animal* a){
 void Environment::die() {
     // kill animal in the ecosystem at the end of the step
 
-    // first we identify the animals to remove (if any)
-    std::vector<Animal*>::iterator it = std::remove_if(animals.begin(), animals.end(), mustDie);
-
-    // then we update Statistics
-    for (std::vector<Animal*>::iterator iter = it; iter != animals.end(); ++iter) {
+    // first we update Statistics
+    for (std::vector<Animal*>::iterator iter = animals.begin(); iter != animals.end(); ++iter) {
         // All animal at the end of the vector at this step are going to die
         // Behaviours
-
+        if ((*iter)->getLife() <= 0){
             if ((*iter)->getIsMultiple()) {
-            cout << "In Environment::die(), isMultiple= " << (*iter)->getIsMultiple() << endl;
                 statistics.modifyData(multiple, false);
             } else {
-            cout << "In Environment::die(), not multiple so = " << (*iter)->getBehaviourName() << endl;
                 std::string behaviour = (*iter)->getBehaviourName();
                 statistics.modifyData(behaviour, false);
             }
@@ -106,6 +101,11 @@ void Environment::die() {
                 statistics.modifyData(element, false);
             }*/
         }
+    }
+
+    // then we identify the animals to remove (if any)
+    std::vector<Animal*>::iterator it = std::remove_if(animals.begin(), animals.end(), mustDie);
+
     // Finally, we delete the relevant animals
     animals.erase(it, animals.end());
 }