Merge pull request #96 from netZoo/devel

Devel

netZooPy/panda/panda.py

@@ -35,7 +35,6 @@ class Panda(object):
         precision  : 'double' computes the regulatory network in double precision (15 decimal digits)
                      'single' computes the regulatory network in single precision (7 decimal digits) which is fastaer, requires half the memory but less accurate.
                       
-
      Methods:
         return_panda_indegree: computes indegree of panda network, only if save_memory = False
         return_panda_outdegree: computes outdegree of panda network, only if save_memory = False
@@ -513,7 +512,7 @@ def gupdate_diagonal(diagonal_matrix, num, alpha, step):
             tfs = np.tile(self.unique_tfs, (len(self.gene_names), 1)).flatten()
             genes = np.repeat(self.gene_names,self.num_tfs)
             motif = self.motif_matrix_unnormalized.flatten(order='F')
-            force = self.motif_matrix.flatten(order='F')
+            force = motif_matrix.flatten(order='F')
             self.export_panda_results = pd.DataFrame({'tf':tfs, 'gene': genes,'motif': motif, 'force': force})
             #self.export_panda_results = np.column_stack((tfs,genes,motif,force))
         return motif_matrix