Changeset 794

Timestamp:

07/20/10 22:57:13 (7 weeks ago)

Author:

confluence

Message:

added symmetry

Files:

• confluence/randombubble.py (modified) (4 diffs)

confluence/randombubble.py

@@ -5 +5 @@
 
 import random
+from copy import deepcopy
 from networkx import Graph, connected_components, draw
 
@@ -32 +33 @@
 
 class RandomRow(Row):
-    def __init__(self, row_index, selection):
+    def __init__(self, row_index, selection, symmetric):
         super(RandomRow, self).__init__(row_index)
-        self.balls = [Ball(random.choice(selection)) for b in range(self.num_balls())]
+        if symmetric:
+            startballs = [Ball(random.choice(selection)) for b in range(4)]
+            self.balls = startballs + list(reversed(deepcopy(startballs)[:self.num_balls()/2]))
+        else:
+            self.balls = [Ball(random.choice(selection)) for b in range(self.num_balls())]
 
 class BlankRow(Row):
@@ -43 +48 @@
 class Level(object):
     BALLS = range(8)
+    ASYM, SYM_HORIZ, SYM_BOTH = range(3)
 
-    def __init__(self, fill_rows, colours, density):
+    def __init__(self, fill_rows, colours, density, symmetry):
         self.rows = []
 
         selection = random.sample(self.BALLS, colours) + [None] * density
+        symmetric_rows = symmetry > 0
 
-        for row in range(fill_rows):
-            self.rows.append(RandomRow(row, selection))
+        if symmetry > 1:
+            for row in range((fill_rows + 1)/2):
+                self.rows.append(RandomRow(row, selection, symmetric_rows))
+            for rand_row in reversed(self.rows[:fill_rows/2]):
+                self.rows.append(deepcopy(rand_row))
+        else:
+            for row in range(fill_rows):
+                self.rows.append(RandomRow(row, selection, symmetric_rows))
 
         for row in range(fill_rows, 10):
@@ -99 +112 @@
             colours = kwargs.get("colours", random.randint(1,8))
             density = kwargs.get("density", random.randint(1,4))
-            level = Level(fill_rows, colours, density)
+            symmetry = kwargs.get("symmetry", random.randint(0,2))
+            level = Level(fill_rows, colours, density, symmetry)
             if level.valid():
                 self.levels.append(level)