Changeset 3:47083a0f01b2

Timestamp:

12/07/10 21:29:55 (5 years ago)

Author:

Smirnova Victoria

Branch:

default

Message:

Petri.py module 0.11

File:

• Petri.py (modified) (2 diffs)

Petri.py

@@ -1 +1 @@
 class Petri (object):
-    def __init__ (self, num, bacteria):
+    def __init__ (self, num, bacteria, radius):
         self.num=num
         self.bacteria=bacteria
+        self.radius=radius
+        
     def step (self, delta_t):
         for bact in self.bacteria:
             bact.lifetime-=delta_t
             if bact.lifetime <= 0:
-                bacteria.remove(bact)
+                self.bacteria.remove(bact)
                 self.num-=1
                 continue
@@ -13 +15 @@
             if collide==False:
                 if bact.reprod('a', env, p_max)==True:
-                    bact.asexual()
+                    bact.asexual(self.bacteria, self.delta_t, self.radius)
                     continue
-                bact.move(delta_t)
+                bact.move(self.delta_t, self.radius)
                 continue
             if bact.reprod('s', env)==True:
-                bact.sexual(collide)
+                bact.sexual(collide, self.bacteria, self.delta_t, self.radius)
                 continue
-            bact.collision(collide, delta_t)
+            bact.collision(collide, self.delta_t, self.radius)