TableMerger Columns name conflict

CNIC-Proteomics · Mar 23, 2021 · 1eed622 · 1eed622
1 parent 08ee504
commit 1eed622
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/desktopApp/app/assets/files/tests/test17/CMM_PGC1a_ND.xlsx b/desktopApp/app/assets/files/tests/test17/CMM_PGC1a_ND.xlsx
diff --git a/desktopApp/app/assets/files/tests/test17/CMM_PGC1a_ND_log.txt b/desktopApp/app/assets/files/tests/test17/CMM_PGC1a_ND_log.txt
@@ -0,0 +1,10 @@
+03/23/2021 01:58:14 PM - INFO - start script: TableMerger.py -if C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx -id C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx -n 4
+03/23/2021 01:58:14 PM - INFO - Reading input file: C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx
+03/23/2021 01:58:18 PM - INFO - C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx was read
+03/23/2021 01:58:18 PM - INFO - Reading input file: C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx
+03/23/2021 01:58:36 PM - INFO - C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx was read
+03/23/2021 01:59:04 PM - INFO - start script: TableMerger.py -if C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx -id C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx -n 4
+03/23/2021 01:59:04 PM - INFO - Reading input file: C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx
+03/23/2021 01:59:05 PM - INFO - C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\Features_info_ND_Identification.xlsx was read
+03/23/2021 01:59:05 PM - INFO - Reading input file: C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx
+03/23/2021 01:59:27 PM - INFO - C:\Users\Rafael\CNIC\Metabolomica\TurboPutative_GitHub_TFM\desktopApp\app\assets\files\tests\test17\CMM_PGC1a_ND.xlsx was read
diff --git a/desktopApp/app/assets/files/tests/test17/Features_info_ND_Identification.xlsx b/desktopApp/app/assets/files/tests/test17/Features_info_ND_Identification.xlsx
diff --git a/desktopApp/app/src/pyModules/TableMerger.py b/desktopApp/app/src/pyModules/TableMerger.py
@@ -61,6 +61,8 @@ def openFile(infile, row):
         logging.info(f"ERROR: Cannot read file with {extension} extension")
         sys.exit(52)
 
+    df.dropna(axis=1, how='all', inplace=True)
+    df.dropna(axis=0, how='all', inplace=True)
 
     return df
 
@@ -446,6 +448,7 @@ def reMatch(feature_table_original, identification_table_original, merged_table,
     '''
 
     # Get unmatched rows of feature table
+    #pdb.set_trace()
     feature_table_unmatched = merged_table.loc[merged_table.loc[:, 'Name'].apply(lambda name: str(name) == 'nan'), feature_table_original.columns]
     feature_table_unmatched_restored = feature_table_unmatched.apply(massRestore, axis=1, args=(feature_table_original, n_digits))