cleaned up hipp and ehipp models and results

jpleet · Oct 25, 2020 · 481be13 · 481be13
1 parent 363f3d6
commit 481be13
Show file tree

Hide file tree

Showing 12 changed files with 674 additions and 446 deletions.
diff --git a/experiments/consumer-resource/evolving_hipp.ipynb b/experiments/consumer-resource/evolving_hipp.ipynb
diff --git a/experiments/consumer-resource/evolving_lotka_volterra.ipynb b/experiments/consumer-resource/evolving_lotka_volterra.ipynb
diff --git a/experiments/consumer-resource/hunt_interfer_predator_prey.ipynb b/experiments/consumer-resource/hunt_interfer_predator_prey.ipynb
diff --git a/figures/ehipp_population.png b/figures/ehipp_population.png
diff --git a/figures/ehipp_trait.png b/figures/ehipp_trait.png
diff --git a/figures/hipp_2000_5.png b/figures/hipp_2000_5.png
diff --git a/figures/hipp_2000_75.png b/figures/hipp_2000_75.png
diff --git a/figures/hipp_4000_5.png b/figures/hipp_4000_5.png
diff --git a/figures/hipp_4000_75.png b/figures/hipp_4000_75.png
diff --git a/iebm/simulation.py b/iebm/simulation.py
@@ -2,9 +2,9 @@
 import heapq
 from tqdm import tqdm
 
-import warnings
-warnings.filterwarnings("error")
-import traceback
+#import warnings
+#warnings.filterwarnings("error")
+#import traceback
 
 class Simulation():
     """ Base individual-level model. Creates a simulation with a given

diff --git a/iebm/traits/mutable_trait.py b/iebm/traits/mutable_trait.py
@@ -63,7 +63,7 @@ def get_value(self, actor_id):
         """
 
         actor_idx = self.population._get_actor_idx(actor_id)
-        if actor_idx in not None:
+        if actor_idx is not None:
             # return value at row number and trait column name
             return self.population.df[actor_idx, str(self)]
         else:

diff --git a/readme.md b/readme.md