Merge pull request #25 from VasudhaJha/feature/export-all-files

fix imports

genomap/genoMOI/genoMOI.py

@@ -6,15 +6,12 @@
 """
 
 from tensorflow.keras.optimizers import Adam
-from utils.ConvIDEC import ConvIDEC
-# from ConvIDEC import ConvIDEC
+from genomap.utils import ConvIDEC
 from sklearn.feature_selection import VarianceThreshold
 from genomap.genomap import construct_genomap
 import umap
-from utils.gTraj_utils import nearest_divisible_by_four
-# from gTraj_utils import nearest_divisible_by_four
-from utils.utils_MOI import *
-# from utils_MOI import * 
+from genomap.utils.gTraj_utils import nearest_divisible_by_four
+from genomap.utils.utils_MOI import *
 
 def compute_genoMOI(*arrays,n_clusters=None, colNum, rowNum):  
 

genomap/genoTraj/genoTraj.py

@@ -5,15 +5,16 @@
 @author: Windows
 """
 
-import phate
+from genomap.utils.class_discriminative_opt import ClassDiscriminative_OPT
+from genomap.genomap import construct_genomap
+from genomap.utils.gTraj_utils import compute_cluster_distances, nearest_divisible_by_four
+from genomap.utils import ConvIDEC
 import numpy as np
-from utils.class_discriminative_opt import ClassDiscriminative_OPT
+import phate
 import scipy
-from utils.gTraj_utils import compute_cluster_distances, nearest_divisible_by_four
-from tensorflow.keras.optimizers import Adam
-from utils.ConvIDEC import ConvIDEC
 from sklearn.feature_selection import VarianceThreshold
-from genomap.genomap import construct_genomap
+from tensorflow.keras.optimizers import Adam
+
 # from gTraj_utils import nearest_divisible_by_four
 
 def apply_genoTraj(data, y_pred):

genomap/genoVis/genoVis.py

@@ -6,12 +6,11 @@
 """
 
 from tensorflow.keras.optimizers import Adam
-from utils.ConvIDEC import ConvIDEC
+from genomap.utils import ConvIDEC
 from sklearn.feature_selection import VarianceThreshold
 from genomap.genomap import construct_genomap
 import umap
-# from gTraj_utils import nearest_divisible_by_four
-from utils.gTraj_utils import nearest_divisible_by_four
+from genomap.utils.gTraj_utils import nearest_divisible_by_four
 import scanpy as sc
 import numpy as np
 import pandas as pd

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="genomap",
-    version="1.0.6",
+    version="1.0.7",
     author="Md Tauhidul Islam",
     author_email="[email protected]",
     description="Genomap converts tabular gene expression data into spatially meaningful images.",