Merge remote-tracking branch 'upstream/master'

mcda.py

@@ -88,10 +88,9 @@ def choseProducts():
                 max = j
         prev = max
         for j in range(len(allProducts)):
-            if C[max] > 0.8:
+            if C[max] > 0.75:
                 if C[max] == C[j]:
                     products.append(allProducts[j])
-                    print(C[j])
                     number -= 1
                 if number == 0:
                     break
@@ -102,14 +101,8 @@ def choseProducts():
 def selectedSupply():
     products = choseProducts()
     supply = []
-    product = ['-', '-', 0, '-', '-']
     for i in range(len(products)):
-        product[0] = products[i].color
-        product[1] = products[i].shape
-        product[2] = products[i].mass
-        product[3] = products[i].size
-        supply.append(product)
-    product = ['-', '-', 0, '-', '-']
-    supply.append(product)
+        supply.append([products[i].color, products[i].shape, products[i].mass, products[i].size, '-'])
+    supply.append(['-', '-', 0, '-', '-'])
     print(supply)
     return supply