Cambios en recopiladores y analizador para permitir nuevos valores de salida

Analysis/MallTimes.py

@@ -183,4 +183,8 @@ dfA = pd.DataFrame(dataA, columns=columnsA)
 dfA.to_csv(name + 'G.csv')
 
 dfB = pd.DataFrame(dataB, columns=columnsB)
+
+#Poner en TC el valor real y en TH el necesario para la app
+cond = dfB.TH != 0
+dfB.loc[cond, ['TC', 'TH']] = dfB.loc[cond, ['TH', 'TC']].values
 dfB.to_csv(name + 'M.csv')

Analysis/iterTimes.py

@@ -117,7 +117,7 @@ if len(sys.argv) < 2:
 if len(sys.argv) >= 3:
     BaseDir = sys.argv[2]
     print("Searching in directory: "+ BaseDir)
-else:
+else: #FIXME
     BaseDir = sys.argv[2]
 
 if len(sys.argv) >= 4:

Analysis/joinDf.py

+import sys
+import glob
+import numpy as numpy
+import pandas as pd
+
+
+
+if len(sys.argv) < 3:
+    print("The files name is missing\nUsage: python3 joinDf.py resultsName1.csv resultsName2.csv csvOutName")
+    exit(1)
+
+if len(sys.argv) >= 4:
+  print("Csv name will be: " + sys.argv[3] + ".csv")
+  name = sys.argv[3]
+else:
+  name = "dataJOINED"
+
+df1 = pd.read_csv( sys.argv[1] )
+df2 = pd.read_csv( sys.argv[2] )
+frames = [df1, df2]
+df3 = pd.concat(frames)
+df3 = df3.drop(columns=df3.columns[0])
+
+df3.to_csv(name + '.csv')