Louis BECQUEY

Renamed some descriptors to match the paper

...@@ -397,7 +397,7 @@ class Chain: ...@@ -397,7 +397,7 @@ class Chain:
397 df['paired'] = paired 397 df['paired'] = paired
398 df['pair_type_LW'] = pair_type_LW 398 df['pair_type_LW'] = pair_type_LW
399 df['pair_type_DSSR'] = pair_type_DSSR 399 df['pair_type_DSSR'] = pair_type_DSSR
400 - df['Ninteract'] = interacts 400 + df['nb_interact'] = interacts
401 df = df.drop(['C5prime_xyz', 'P_xyz', 'nt_id'], axis=1) # remove now useless descriptors 401 df = df.drop(['C5prime_xyz', 'P_xyz', 'nt_id'], axis=1) # remove now useless descriptors
402 402
403 if self.reversed: 403 if self.reversed:
...@@ -545,7 +545,7 @@ class Chain: ...@@ -545,7 +545,7 @@ class Chain:
545 point[9,i] = temp_freqs[3, i] 545 point[9,i] = temp_freqs[3, i]
546 point[10,i] = temp_freqs[4, i] 546 point[10,i] = temp_freqs[4, i]
547 547
548 - self.data = pd.concat([self.data, pd.DataFrame(point.T, columns=["position","is_A","is_C","is_G","is_U","is_other","freq_A","freq_C","freq_G","freq_U","freq_other"])], axis=1) 548 + self.data = pd.concat([self.data, pd.DataFrame(point.T, columns=["nt_position","is_A","is_C","is_G","is_U","is_other","freq_A","freq_C","freq_G","freq_U","freq_other"])], axis=1)
549 # reorder columns: 549 # reorder columns:
550 cols = [ # 1D structure descriptors 550 cols = [ # 1D structure descriptors
551 'index_chain','nt_resnum','position', 551 'index_chain','nt_resnum','position',
...@@ -554,7 +554,7 @@ class Chain: ...@@ -554,7 +554,7 @@ class Chain:
554 'freq_A','freq_C','freq_G','freq_U','freq_other', 554 'freq_A','freq_C','freq_G','freq_U','freq_other',
555 555
556 # 2D structure descriptors 556 # 2D structure descriptors
557 - 'dbn','paired','Ninteract', 557 + 'dbn','paired','nb_interact',
558 'pair_type_LW','pair_type_DSSR', 558 'pair_type_LW','pair_type_DSSR',
559 559
560 # 3D strcuture descriptors 560 # 3D strcuture descriptors
......