From 4969220bf9289b2ed74566902611d9cd952fd705 Mon Sep 17 00:00:00 2001
From: bbauvin <baptiste.bauvin@centrale-marseille.fr>
Date: Tue, 17 Oct 2017 15:28:13 -0400
Subject: [PATCH] Cleared imports Monoview Classifiers

---
 .../Monoview/analyzeResult.py                         |  4 ++--
 .../MonoviewClassifiers/Adaboost.py                   |  6 +++---
 .../MonoviewClassifiers/DecisionTree.py               |  5 +++--
 .../MonoviewClassifiers/KNN.py                        |  5 +++--
 .../MonoviewClassifiers/RandomForest.py               |  3 ++-
 .../MonoviewClassifiers/SCM.py                        | 11 ++++++-----
 .../MonoviewClassifiers/SGD.py                        |  5 +++--
 .../MonoviewClassifiers/SVMLinear.py                  |  6 ++++--
 .../MonoviewClassifiers/SVMPoly.py                    |  6 ++++--
 .../MonoviewClassifiers/SVMRBF.py                     |  6 ++++--
 10 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py b/Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py
index ac8439cd..998c3c86 100644
--- a/Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py
+++ b/Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py
@@ -1,8 +1,8 @@
 from datetime import timedelta as hms
 import numpy as np
 
-import MonoviewClassifiers
-import Metrics
+from .. import MonoviewClassifiers
+from .. import Metrics
 
 
 def getDBConfigString(name, feat, classificationIndices, shape, classLabelsNames, KFolds):
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
index f98ce9bd..cad2b46b 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
@@ -2,11 +2,11 @@ from sklearn.ensemble import AdaBoostClassifier
 from sklearn.pipeline import Pipeline
 from sklearn.model_selection import RandomizedSearchCV
 from sklearn.tree import DecisionTreeClassifier
-import Metrics
 from scipy.stats import randint
 import numpy as np
-import matplotlib.pyplot as plt
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py
index c680e81a..9b813c53 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py
@@ -1,10 +1,11 @@
 from sklearn.tree import DecisionTreeClassifier
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import randint
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
index 98c04d14..13b64567 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
@@ -1,10 +1,11 @@
 from sklearn.neighbors import KNeighborsClassifier
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import randint
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
index ba85738d..e8894f41 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
@@ -1,9 +1,10 @@
 from sklearn.ensemble import RandomForestClassifier
 from sklearn.pipeline import Pipeline
 from sklearn.model_selection import RandomizedSearchCV
-from .. import Metrics
 from scipy.stats import randint
 import numpy as np
+
+from .. import Metrics
 from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
index 0216cf64..567b2eb3 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
@@ -1,12 +1,13 @@
-import Metrics
 from pyscm.utils import _pack_binary_bytes_to_ints
 import pyscm
-from utils.Dataset import getShape
 import h5py
-from Multiview import GetMultiviewDb as DB
-from pyscm.binary_attributes.base import BaseBinaryAttributeList
+# from pyscm.binary_attributes.base import BaseBinaryAttributeList
 import os
-from utils.HyperParameterSearch import genHeatMaps
+
+# from ..Multiview import GetMultiviewDb as DB
+# from ..utils.Dataset import getShape
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
index 5ae8538a..8108688f 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
@@ -1,10 +1,11 @@
 from sklearn.linear_model import SGDClassifier
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import uniform
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
index c2c20ed1..348ac8f5 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
@@ -1,10 +1,12 @@
 from sklearn.svm import SVC
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import randint
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
+
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
index e092bde2..1a88ad27 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
@@ -1,10 +1,12 @@
 from sklearn.svm import SVC
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import randint
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
+
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
index 4846c9c4..d1d42eae 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
@@ -1,10 +1,12 @@
 from sklearn.svm import SVC
 from sklearn.pipeline import Pipeline  # Pipelining in classification
 from sklearn.model_selection import RandomizedSearchCV
-import Metrics
 from scipy.stats import randint
 import numpy as np
-from utils.HyperParameterSearch import genHeatMaps
+
+from .. import Metrics
+from ..utils.HyperParameterSearch import genHeatMaps
+
 
 # Author-Info
 __author__ = "Baptiste Bauvin"
-- 
GitLab