Merge branch 'master' of https://github.com/gcallah/indras_net

models/bacteria.py

@@ -1,14 +1,14 @@
 """
-This is the model that stimulate the behavior
+This is the model that stimulates the behavior
 of bacterias according to toxin and nutrients level.
 """
 
-from indra.utils import get_props
 from indra.agent import Agent
 from indra.composite import Composite
-from indra.space import DEF_HEIGHT, DEF_WIDTH, distance
-from indra.env import Env
 from indra.display_methods import RED, GREEN, YELLOW
+from indra.env import Env
+from indra.space import DEF_HEIGHT, DEF_WIDTH, distance
+from indra.utils import get_props
 from random import randint
 import sys
 

models/coop.py

@@ -99,8 +99,7 @@ def exchange(coop_env):
 def distribute_coupons(agent):
     """
     Distribute coupons from central bank randomly to each babysitter.
-    Each babysitter's coupons are gaussian distributed based on extra_coupons
-    and extra_dev.
+    Coupons are gaussian distributed based on extra_coupons and extra_dev.
     """
 
     for i in range(4):

models/fashion.py

@@ -62,6 +62,9 @@
 
 
 def change_color(agent, society, opp_group):
+    """
+    change agent's DISPLAY_COLOR to its opposite color
+    """
     agent[DISPLAY_COLOR] = not agent[DISPLAY_COLOR]
     society.add_switch(agent, agent.primary_group(),
                        opp_group[str(agent.primary_group())])