Merge branch 'maliciousNode' into develop

# Conflicts:
#	DAS/shape.py

DAS/shape.py

@@ -28,7 +28,7 @@ class Shape:
     def __repr__(self):
         """Returns a printable representation of the shape"""
         shastr = ""
-        shastr += "-bsrn-"+str(self.nbCols)
+        shastr += "bsrn-"+str(self.nbCols)
         shastr += "-bsrk-"+str(self.nbColsK)
         shastr += "-bscn-"+str(self.nbRows)
         shastr += "-bsck-"+str(self.nbRowsK)

DAS/visualizor.py

@@ -63,7 +63,7 @@ class Visualizor:
     def __get_attrbs__(self, result):
         text = str(result.shape).split("-")
         d = dict()
-        for i in range(1, len(text), 2):
+        for i in range(0, len(text), 2):
             d[text[i]] = text[i + 1]
         return d