Changeset 21:f55481ff4bb5

Timestamp:

12/20/10 02:38:11 (5 years ago)

Author:

Yashina Ksenia <ksenia_yashina@òÀæ>

Branch:

default

Message:

fixed reproduction near dish walls

File:

• bacteria.py (modified) (3 diffs)

bacteria.py

@@ -27 +27 @@
         return False
 
+    def check_dish_wall(self,position,radius,delta,bact_r):
+        if abs(position) > radius - (bact_r + delta):
+            return True
+        return False
+
     def move(self, bacteria, delta_t, radius, delta, bact_r):
-        if abs(self.position) > radius - (bact_r + delta):
+        if self.check_dish_wall(self.position,radius,delta,bact_r):
             self.velocity = self.velocity.angleToCoord(-(pi/2 -
                                                          self.velocity.angle()))
@@ -46 +51 @@
 
     def asexual(self, bacteria, delta_t, radius, delta, bact_r, full_lifetime):
-        if self.find_place_a(bacteria, delta, bact_r):
+        if self.find_place_a(bacteria, delta, bact_r)\
+           and not(self.check_dish_wall(self.position,radius,delta,2*bact_r)):
             pos1=self.position + vector.Vector(-(bact_r + 0.75*delta),0)
             vel1=vector.Vector(1,0).angleToCoord(self.velocity.angle())
@@ -62 +68 @@
                 full_lifetime):
         center = (self.position+other.position)*0.5
-        if self.find_place_s(other, bacteria, delta, bact_r):
-            center = (self.position + other.position)*0.5
+        if self.find_place_s(other, bacteria, delta, bact_r) and\
+           not(self.check_dish_wall(center,radius,delta,bact_r*(1+sqrt(2)))):
             bacteria.append(Bacteria(center +
                                      vector.Vector(-(bact_r*sqrt(2) + 0.75*delta),0),