Merge branch 'master' of github.com:MicrosoftResearch/Azimuth

Author: nfusi

azimuth/features/featurization.py

@@ -455,8 +455,6 @@ def nucleotide_features(s, order, max_index_to_use, prefix="", feature_type='all
 
     index_dependent = []
     index_independent = []
-    # index_independent = ['%s_pi.Order%d_P%d' % (prefix, order,i) for i in range(len(features_pos_independent))]
-    #index_dependent = ['%s_pd.Order%d_P%d' % (prefix, order, i) for i in range(len(features_pos_dependent))]
 
     for position in range(0, len(s)-order+1, 1):
         for l in alphabet:
@@ -475,6 +473,10 @@ def nucleotide_features(s, order, max_index_to_use, prefix="", feature_type='all
         assert index_independent[alphabet.index(nucl)] == '%s%s' % (prefix, nucl)
 
 
+    #index_independent = ['%s_pi.Order%d_P%d' % (prefix, order,i) for i in range(len(features_pos_independent))]
+    #index_dependent = ['%s_pd.Order%d_P%d' % (prefix, order, i) for i in range(len(features_pos_dependent))]
+
+
     if np.any(np.isnan(features_pos_dependent)):
         raise Exception("found nan features in features_pos_dependent")
     if np.any(np.isnan(features_pos_independent)):