From 3555f1e635b446c75379dd346bd5c8cbff226541 Mon Sep 17 00:00:00 2001 From: bbauvin <baptiste.bauvin@centrale-marseille.fr> Date: Tue, 17 Oct 2017 15:29:59 -0400 Subject: [PATCH] Cleared imports Fusion< --- Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py | 6 ++---- .../Fusion/Methods/EarlyFusionPackage/WeightedLinear.py | 7 +++---- .../Multiview/Fusion/Methods/LateFusion.py | 9 +++------ .../Multiview/Fusion/analyzeResults.py | 5 +---- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py index fc1d65b9..d0326b60 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py @@ -2,11 +2,9 @@ import numpy as np import logging import pkgutil -# from Methods import * import Methods -import MonoviewClassifiers - -from utils.Dataset import getV +from ... import MonoviewClassifiers +from ...utils.Dataset import getV # Author-Info __author__ = "Baptiste Bauvin" diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py index 5206ea41..b32c6319 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py @@ -1,8 +1,7 @@ -from ...Methods.EarlyFusion import EarlyFusionClassifier -import MonoviewClassifiers import numpy as np -import pkgutil -from sklearn.metrics import accuracy_score + +from ...Methods.EarlyFusion import EarlyFusionClassifier +from ..... import MonoviewClassifiers def genParamsSets(classificationKWARGS, randomState, nIter=1): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py index df9b88e9..5e970bd4 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py @@ -4,14 +4,11 @@ import numpy as np import itertools from joblib import Parallel, delayed -# from sklearn.multiclass import OneVsOneClassifier -# from sklearn.svm import SVC -import os import sys -from .... import MonoviewClassifiers -import Metrics -from utils.Dataset import getV +from .... import MonoviewClassifiers +from .... import Metrics +from ....utils.Dataset import getV def canProbasClassifier(classifierConfig): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py index 9142a30f..a11a899a 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py @@ -3,12 +3,9 @@ import numpy as np import matplotlib matplotlib.use('Agg') -import matplotlib.pyplot as plt import operator -from datetime import timedelta as hms -from Methods import * import Methods.LateFusion -import Metrics +from ... import Metrics # Author-Info __author__ = "Baptiste Bauvin" -- GitLab