Fix Genealogy Chart. Legend was also added to the chart

* #11

Author: Ezetowers

MLC/GUI/Experiment/QtCharts/GenealogyChart.py

@@ -1,16 +1,30 @@
+# -*- coding: utf-8 -*-
 import time
 
 from MLC.GUI.Experiment.QtCharts.QtChartWrapper import QtChartWrapper
+from MLC.Log.log import get_gui_logger
 from MLC.mlc_parameters.mlc_parameters import Config
 from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QColor
+from PyQt5.QtGui import QFont
+
+logger = get_gui_logger()
 
 
 class GenealogyChart(QtChartWrapper):
-    SWIM_LINE_COLORS = [Qt.cyan, Qt.magenta, Qt.gray, Qt.yellow]
-    INDIV_COLORS = [Qt.black, Qt.red, Qt.green, Qt.blue]
+    SWIM_LINE_COLORS = [QColor(159, 202, 230),
+                        QColor(241, 190, 169),
+                        QColor(244, 206, 116),
+                        QColor(174, 125, 184),
+                        QColor(119, 172, 48),
+                        QColor(121, 206, 242),
+                        QColor(220, 167, 177)]
+
+    INDIV_COLORS = [Qt.blue, Qt.red, Qt.black, Qt.darkYellow]
+    INDIV_LEGEND = ["Replication", "Mutation", "Crossover", "Elitism"]
 
     def __init__(self, mlc_local, experiment_name, generation, individual):
-        QtChartWrapper.__init__(self, False)
+        QtChartWrapper.__init__(self, show_legend=True)
         self._mlc_local = mlc_local
         self._indivs_per_gen = Config.get_instance().getint("POPULATION", "size")
         self._amount_generations = generation
@@ -21,6 +35,28 @@ def __init__(self, mlc_local, experiment_name, generation, individual):
         self._add_axis()
         self._add_swimming_lines()
         self._add_individuals()
+        self._add_title()
+        self._add_legend_markers()
+
+    def _add_legend_markers(self):
+        legend = self.get_legend()
+        # Hide all the legend of the Series added to this moment
+        for legend_marker in legend.markers():
+            legend_marker.setVisible(False)
+
+        # Add the evolution strategies as four empty curve in order to set the
+        # graphic legend
+        for index in xrange(len(GenealogyChart.INDIV_COLORS)):
+            self.add_line_curve(line_width=.7,
+                                color=GenealogyChart.INDIV_COLORS[index],
+                                legend=GenealogyChart.INDIV_LEGEND[index])
+
+    def _add_title(self):
+        chart_title = 'Generation N°{0} - Individual N°{1}'.format(self._amount_generations,
+                                                               self._indiv_index)
+        chart_font = QFont()
+        chart_font.setWeight(QFont.ExtraBold)
+        self.set_title(chart_title, chart_font)
 
     def _add_axis(self):
         # Set the object name to be able to retrieve it later
@@ -30,28 +66,30 @@ def _add_axis(self):
                        label_format='%g', tick_count=10)
 
         chart_view = self.get_widget()
-        chart_view.chart().axisX().setRange(0.5, self._amount_generations + 0.5)
+        chart_view.chart().axisX().setRange(0.9, self._amount_generations + 0.1)
         chart_view.chart().axisY().setRange(1, self._indivs_per_gen)
+        chart_view.chart().axisX().setGridLineVisible(False)
+        chart_view.chart().axisY().setGridLineVisible(False)
 
     def _add_swimming_lines(self):
         amount_colors = len(GenealogyChart.SWIM_LINE_COLORS)
         # TODO: Increase the marker size
         # when the individuals amount per generations decrease
-        marker_size = 3
+        marker_size = 4
 
-        for index in xrange(self._amount_generations + 1):
+        for index in xrange(self._amount_generations):
             self.add_scatter(marker_size=marker_size,
-                             color=GenealogyChart.SWIM_LINE_COLORS[index % amount_colors])
+                             color=GenealogyChart.SWIM_LINE_COLORS[(index - 1) % amount_colors])
 
-            for indiv_id in xrange(self._indivs_per_gen):
-                self.append_point(index, index, indiv_id)
+            for indiv_id in xrange(1, self._indivs_per_gen + 1):
+                self.append_point(index, index + 1, indiv_id)
 
     def _add_individuals(self):
+        logger.debug("[GENEALOGY_CHART] Looping through individuals")
         start_time = time.time()
         generations = [self._mlc_local.get_generation(self._experiment_name, i)
                        for i in xrange(1, self._amount_generations + 1)]
 
-        gen_method_points = [[], [], [], []]
         indivs_to_process = []
         new_indivs_to_process = [self._indiv_index]
 
@@ -64,19 +102,14 @@ def _add_individuals(self):
 
                 if gen != 0:
                     parents = generations[gen].get_parents()[indiv_id - 1]
-                    if type(parents) == list:
-                        for parent_index in range(len(parents)):
-                            new_indivs_to_process.append(parents[parent_index])
-                            self.add_line_curve(line_width=.3, color=GenealogyChart.INDIV_COLORS[gen_method - 1])
-                            self.append_point(self._next_curve, gen + 1, indiv_id)
-                            self.append_point(self._next_curve, gen, parents[parent_index])
-                            self._next_curve += 1
-                    else:
-                        new_indivs_to_process.append(parents)
-                        self.add_line_curve(line_width=.3, color=GenealogyChart.INDIV_COLORS[gen_method - 1])
+                    for parent_index in range(len(parents)):
+                        new_indivs_to_process.append(parents[parent_index])
+                        self.add_line_curve(line_width=.7,
+                                            color=GenealogyChart.INDIV_COLORS[gen_method - 1])
                         self.append_point(self._next_curve, gen + 1, indiv_id)
                         self.append_point(self._next_curve, gen, parents[parent_index])
                         self._next_curve += 1
 
         elapsed_time = time.time() - start_time
-        print elapsed_time
+        logger.debug("[GENEALOGY_CHART] Individuals added to chart. Time elapsed: {0}"
+                     .format(elapsed_time))

MLC/GUI/Experiment/QtCharts/QtChartWrapper.py

@@ -18,7 +18,6 @@ def __init__(self, show_legend=False):
             self._chart.legend().hide()
 
         self._view = QChartView(self._chart)
-        self._view.setRubberBand(QChartView.RectangleRubberBand)
         self._view.setRenderHint(QPainter.Antialiasing)
         self._view.setUpdatesEnabled(True)
 
@@ -83,8 +82,9 @@ def add_data(self, xdata, ydata, line_width=.1, color=None):
         curve.attachAxis(self._yaxis)
         return self._ncurves - 1
 
-    def add_line_curve(self, line_width=.1, color=None):
+    def add_line_curve(self, line_width=.1, color=None, legend=None):
         curve = QLineSeries()
+        curve.setName(legend)
         pen = curve.pen()
 
         if color is not None:
@@ -135,8 +135,8 @@ def get_widget(self):
         """
         return self._view
 
-    def repaint(self):
-        self._view.repaint()
+    def get_legend(self):
+        return self._chart.legend()
 
     def _series_to_polyline(self, xdata, ydata):
         """Convert series data to QPolygon(F) polyline