Merge branch 'master' of github.com:DessimozLab/HogProf

Author: cactuskid

src/HogProf/lshbuilder.py

@@ -336,7 +336,7 @@ def saver(self, i, q, retq, matq, l ):
                                 save_start = t.time()
                         else:
                             print(this_dataframe)
-                    else:
+                    else
                         print('wrapping up the run')
                         print('saving at :' , t.time() - global_time )
                         forest.index()

src/HogProf/profiler.py

@@ -364,7 +364,7 @@ def hog_query_sorted(self, hog_id=None, fam_id=None , k = 100  ):
 		sortedhogs = [(k, v) for k, v in hogdict.items()]
 		sortedhogs = sorted(student_tuples, key=lambda x: x[1])
 		sortedhogs = [ h[0] for h in sortehogs.reverse() ]
-		return hogdict
+		return hogdict , sortedhogs
 
 	def pull_hashes(self , hoglist):