wip

Author: levibyte

libs/__pycache__/optimizer.cpython-36.pyc

@@ -50,7 +50,7 @@ def optimize(self):
     def optimize2(self):
         gens_max=10
         survivors_factor=3
-        max_iterations=1000
+        max_iterations=100
 
         gens = {self.initial_fitness:self.data}
 
@@ -91,12 +91,12 @@ def optimize2(self):
                 random.seed(time.clock())
                 b = random.randint(0,len(winners)-1)
                 #print("-----crossover winner{} winner{}".format(a,b))
-                #gen1 = winners[a]
-                #gen2 = winners[b]
-                #gen = self.controller.merge(gen1,gen2)
-                gen = winners[random.randint(0,len(winners)-1)]
+                gen1 = winners[a]
+                gen2 = winners[b]
+                gen = self.controller.merge(gen1,gen2)
+                #gen = winners[random.randint(0,len(winners)-1)]
                 self.controller.set_data(copy.deepcopy(gen))
-                self.controller.add_change()
+                #self.controller.add_change()
                 fitness = self.controller.calc_intersections()
                 gens[fitness] = copy.deepcopy(self.controller.get_placement())
                 #print("-->crossover {} {}".format(g,fitness))

libs/__pycache__/placement.cpython-36.pyc

@@ -19,7 +19,7 @@ def create_rand_color(self):
         return Color(randint(0,255),randint(0,255),randint(0,255))
 
     def create_layers(self):
-        self.layers = [ [ Node("Node{}{}".format(i,j),self.create_rand_color()) for j in range(randint(2,self.nodes_max)) ] for i in range(self.layers_max) ]
+        self.layers = [ [ Node("({},{})".format(i,j),self.create_rand_color()) for j in range(randint(2,self.nodes_max)) ] for i in range(self.layers_max) ]
 
     def create_connections(self):
         i = 0

libs/__pycache__/placement_controller.cpython-36.pyc

@@ -98,7 +98,7 @@ def merge(self,nodes1,nodes2):
 
 
     def merge_columns(self,col1,col2):
-        in_first = set(col1)
+        in_first = set(col1[:len(col1)])
         in_second = set(col2)
         in_second_but_not_in_first = in_second - in_first
         result = col1 + list(in_second_but_not_in_first)

libs/__pycache__/renderer.cpython-36.pyc

@@ -8,9 +8,9 @@
 from PyQt4.QtCore import *
 
 initial_settings = {
-    'num_layers' : 21,
-    'max_nodes_in_layer' : 13,
-    'min_node_connection' : 0,
+    'num_layers' : 6,
+    'max_nodes_in_layer' : 6,
+    'min_node_connection' : 1,
     'max_node_connection' : 1,
 }
 
@@ -19,17 +19,24 @@ class Canvas(QWidget):
     def __init__(self, controller, *args, **kwargs):
         super(Canvas, self).__init__(*args, **kwargs)
         self.controller = controller
-        self.tx = 50
-        self.ty = 50
-        self.dx = 10
-        self.dy = 10
+        self.tx = 100
+        self.ty = 100
+        self.dx = 50
+        self.dy = 50
         #create placement
         self.placement = Placement(**initial_settings)
 
         #set 
         self.controller.set_data(self.placement.get_data())
         self.nodes = self.controller.get_placement()
 
+    def keyPressEvent(self, event):
+        self.placement = Placement(**initial_settings)
+        self.controller.set_data(self.placement.get_data())
+        self.nodes = self.controller.get_placement()
+        QWidget.repaint(self)
+        
+
     def mouseReleaseEvent(self, event):
         #optimize placement, using placement controller
         optimizer = Optimizer(self.placement,self.controller)
@@ -77,13 +84,15 @@ def draw_node(self,i,j,node):
         p.setRenderHint(QPainter.Antialiasing)
 
         r = QRect(self.tx*i+self.dx,self.ty*j+self.dy,20,20)
-        outer, inner = Qt.gray, color        
+        outer, inner = Qt.black, color        
         p.fillRect(r, QBrush(inner))
         pen = QPen(outer)
         pen.setWidth(1)
         p.setPen(pen)
         p.drawRect(r)
 
+        p.drawText(self.tx*i+self.dx,self.ty*j+self.dy,node.get_name())
+        
     def draw_connection(self,i,j,node):
         di,dj = self.controller.find_ij(node)
         #print("drawing connection from (){}{} to ({}){}{}".format(i,j,node.get_name(),di,dj))