Minor bugfix in joinDf which appeared if called multiple times with the same...

Minor bugfix in joinDf which appeared if called multiple times with the same df. Minor changes in MallTimes and CreateResizeDataframe.

Analysis/CreateResizeDataframe.py

@@ -34,6 +34,8 @@ class G_enum(Enum):
     #Malleability specific
     NP = 0
     NC = 1
+    #Iteration specific
+    IS_DYNAMIC = 11
 
 #columnsG = ["Total_Resizes", "Total_Groups", "Total_Stages", "Granularity", "SDR", "ADR", "DR", "Redistribution_Method", \
 #            "Redistribution_Strategy", "Spawn_Method", "Spawn_Strategy", "Groups", "FactorS", "Dist", "Stage_Types", "Stage_Times", \
@@ -105,3 +107,6 @@ create_resize_dataframe(dfG, dataM)
 dfM = pd.DataFrame(dataM, columns=columnsM)
 dfM.to_pickle(name + '.pkl')
 dfM.to_excel(name + '.xlsx')
+
+print(dfG)
+print(dfM)

Analysis/MallTimes.py

@@ -34,6 +34,8 @@ class G_enum(Enum):
     #Malleability specific
     NP = 0
     NC = 1
+    #Iteration specific
+    IS_DYNAMIC = 11
 
 
 columnsG = ["Total_Resizes", "Total_Groups", "Total_Stages", "Granularity", "SDR", "ADR", "DR", "Redistribution_Method", \
@@ -83,7 +85,7 @@ def record_config_line(lineS, dataG_it):
           G_enum.STAGE_TIMES.value, G_enum.STAGE_BYTES.value]
   for index in array_groups:
     dataG_it[index] = [None]*dataG_it[G_enum.TOTAL_GROUPS.value]
-  for group in range(dataG_it[G_enum.TOTAL_GROUPS.value]): #FIXME Modificar orden, Async Iters antes que T_iter. Asi es posible descubrir el tamanyo al crearlo
+  for group in range(dataG_it[G_enum.TOTAL_GROUPS.value]):
     dataG_it[G_enum.T_ITER.value][group] = []
 
   for index in array_resizes:
@@ -162,7 +164,7 @@ def record_multiple_times_line(lineS, dataG_it, group):
         dataG_it[index][group][i][stage] = get_value(lineS, i+offset_lines, False)
   else:
     total_iters = len(lineS)-offset_lines
-    for i in range(total_iters): #FIXME Modificar orden T_iter y Async_iters. Crear lista de total_iters aqui
+    for i in range(total_iters):
       dataG_it[index][group].append(get_value(lineS, i+offset_lines, False))
   
 #-----------------------------------------------

Analysis/joinDf.py

@@ -17,6 +17,5 @@ df1 = pd.read_pickle( sys.argv[1] )
 df2 = pd.read_pickle( sys.argv[2] )
 frames = [df1, df2]
 df3 = pd.concat(frames)
-df3 = df3.drop(columns=df3.columns[0])
 
 df3.to_pickle(name + '.pkl')