From 6b8a17da0a37333dc1917e4ee7ce4e64090954b1 Mon Sep 17 00:00:00 2001 From: bbauvin <baptiste.bauvin@centrale-marseille.fr> Date: Wed, 18 Oct 2017 09:48:38 -0400 Subject: [PATCH] Trying to get imports to work --- Code/Exec.py | 2 +- .../ExecClassif.py | 23 +++++++++--------- .../Metrics/__init__.py | 0 .../Metrics/accuracy_score.py | 0 .../Metrics/f1_score.py | 0 .../Metrics/fbeta_score.py | 0 .../Metrics/hamming_loss.py | 0 .../Metrics/jaccard_similarity_score.py | 0 .../Metrics/log_loss.py | 0 .../Metrics/matthews_corrcoef.py | 0 .../Metrics/precision_score.py | 0 .../Metrics/recall_score.py | 0 .../Metrics/roc_auc_score.py | 0 .../Metrics/zero_one_loss.py | 0 .../Monoview/ExecClassifMonoView.py | 2 +- .../Monoview/ExecPlot.py | 2 +- .../Monoview/ExportResults.py | 2 +- .../Monoview/MonoviewUtils.py | 0 ...2016_08_19-CMV-MultiOmicDataset-RNASeq.csv | 0 .../2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv | 0 ...16_03_24-CMV-Caltech-HOG-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-HOG-LOG.log | 0 .../2016_03_24-CMV-Caltech-HOG-Report.csv | 0 .../2016_03_24-CMV-Caltech-HOG-Score.png | Bin .../2016_03_24-CMV-Caltech-HOG-Stats.csv | 0 .../2016_03_24-CMV-Caltech-HOG.csv | 0 .../2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv | 0 ...16_03_24-CMV-Caltech-HSV-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-HSV-LOG.log | 0 .../2016_03_24-CMV-Caltech-HSV-Report.csv | 0 .../2016_03_24-CMV-Caltech-HSV-Score.png | Bin .../2016_03_24-CMV-Caltech-HSV-Stats.csv | 0 .../2016_03_24-CMV-Caltech-HSV.csv | 0 .../2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv | 0 ...16_03_24-CMV-Caltech-RGB-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-RGB-LOG.log | 0 .../2016_03_24-CMV-Caltech-RGB-Report.csv | 0 .../2016_03_24-CMV-Caltech-RGB-Score.png | Bin .../2016_03_24-CMV-Caltech-RGB-Stats.csv | 0 .../2016_03_24-CMV-Caltech-RGB.csv | 0 .../2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv | 0 ...16_03_24-CMV-Caltech-RGB-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-RGB-LOG.log | 0 .../2016_03_24-CMV-Caltech-RGB-Report.csv | 0 .../2016_03_24-CMV-Caltech-RGB-Score.png | Bin .../2016_03_24-CMV-Caltech-RGB-Stats.csv | 0 .../2016_03_24-CMV-Caltech-RGB.csv | 0 ...2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv | 0 ...6_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-SIFT-LOG.log | 0 .../2016_03_24-CMV-Caltech-SIFT-Report.csv | 0 .../2016_03_24-CMV-Caltech-SIFT-Score.png | Bin .../2016_03_24-CMV-Caltech-SIFT-Stats.csv | 0 .../2016_03_24-CMV-Caltech-SIFT.csv | 0 ...2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv | 0 ...6_03_24-CMV-Caltech-SURF-ConfMatrixImg.png | Bin .../2016_03_24-CMV-Caltech-SURF-LOG.log | 0 .../2016_03_24-CMV-Caltech-SURF-Report.csv | 0 .../2016_03_24-CMV-Caltech-SURF-Score.png | Bin .../2016_03_24-CMV-Caltech-SURF-Stats.csv | 0 .../2016_03_24-CMV-Caltech-SURF.csv | 0 .../Monoview/__init__.py | 0 .../Monoview/analyzeResult.py | 0 .../Monoview/run.py | 0 .../MonoviewClassifiers/Adaboost.py | 0 .../MonoviewClassifiers/DecisionTree.py | 0 .../MonoviewClassifiers/KNN.py | 0 .../MonoviewClassifiers/RandomForest.py | 0 .../MonoviewClassifiers/SCM.py | 0 .../MonoviewClassifiers/SGD.py | 0 .../MonoviewClassifiers/SVMLinear.py | 0 .../MonoviewClassifiers/SVMPoly.py | 0 .../MonoviewClassifiers/SVMRBF.py | 0 .../MonoviewClassifiers/__init__.py | 0 .../Multiview/ExecMultiview.py | 15 +++++++++--- .../Multiview/Fusion/Fusion.py | 15 +++++++----- .../Multiview/Fusion/Methods/EarlyFusion.py | 0 .../EarlyFusionPackage/WeightedLinear.py | 0 .../Methods/EarlyFusionPackage/__init__.py | 0 .../Multiview/Fusion/Methods/LateFusion.py | 0 .../LateFusionPackage/BayesianInference.py | 4 +-- .../LateFusionPackage/MajorityVoting.py | 11 +++++---- .../Methods/LateFusionPackage/SCMForLinear.py | 6 ++--- .../Methods/LateFusionPackage/SVMForLinear.py | 7 +++--- .../LateFusionPackage/WeightedLinear.py | 7 +++--- .../Methods/LateFusionPackage/__init__.py | 0 .../Multiview/Fusion/Methods/__init__.py | 0 .../Multiview/Fusion/__init__.py | 0 .../Multiview/Fusion/analyzeResults.py | 2 +- .../Multiview/GetMultiviewDb.py | 0 .../Mumbo/Classifiers/DecisionTree.py | 0 .../Multiview/Mumbo/Classifiers/Kover.py | 0 .../Mumbo/Classifiers/ModifiedMulticlass.py | 0 .../Mumbo/Classifiers/SubSampling.py | 0 .../Multiview/Mumbo/Classifiers/__init__.py | 0 .../Multiview/Mumbo/Mumbo.py | 2 +- .../Multiview/Mumbo/__init__.py | 0 .../Multiview/Mumbo/analyzeResults.py | 1 - .../Multiview/__init__.py | 8 ++++++ .../Multiview/profile | Bin .../Multiview/res | 0 .../Multiview/run.py | 0 .../ResultAnalysis.py | 8 +++--- .../Versions.py | 0 .../__init__.py | 0 .../temp_scm_fusion | Bin .../test.png | Bin .../utils/Dataset.py | 0 .../utils/HyperParameterSearch.py | 0 .../utils/Transformations.py | 0 .../utils/__init__.py | 0 .../utils/execution.py | 0 .../Multiview/__init__.py | 7 ------ Code/__init__.py | 2 +- 114 files changed, 69 insertions(+), 57 deletions(-) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/ExecClassif.py (96%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/accuracy_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/f1_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/fbeta_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/hamming_loss.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/jaccard_similarity_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/log_loss.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/matthews_corrcoef.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/precision_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/recall_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/roc_auc_score.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Metrics/zero_one_loss.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/ExecClassifMonoView.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/ExecPlot.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/ExportResults.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/MonoviewUtils.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/2016_08_19-CMV-MultiOmicDataset-RNASeq.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrixImg.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-LOG.log (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Report.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Score.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Stats.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF.csv (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/analyzeResult.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Monoview/run.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/Adaboost.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/DecisionTree.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/KNN.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/RandomForest.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/SCM.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/SGD.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/SVMLinear.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/SVMPoly.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/SVMRBF.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/MonoviewClassifiers/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/ExecMultiview.py (87%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Fusion.py (93%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/EarlyFusion.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/EarlyFusionPackage/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusion.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py (98%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py (97%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py (98%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py (98%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/LateFusionPackage/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/Methods/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Fusion/analyzeResults.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/GetMultiviewDb.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Classifiers/DecisionTree.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Classifiers/Kover.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Classifiers/ModifiedMulticlass.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Classifiers/SubSampling.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Classifiers/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/Mumbo.py (99%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/Mumbo/analyzeResults.py (99%) create mode 100644 Code/MonoMultiViewClassifiers/Multiview/__init__.py rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/profile (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/res (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Multiview/run.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/ResultAnalysis.py (98%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/Versions.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/temp_scm_fusion (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/test.png (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/utils/Dataset.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/utils/HyperParameterSearch.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/utils/Transformations.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/utils/__init__.py (100%) rename Code/{MonoMutliViewClassifiers => MonoMultiViewClassifiers}/utils/execution.py (100%) delete mode 100644 Code/MonoMutliViewClassifiers/Multiview/__init__.py diff --git a/Code/Exec.py b/Code/Exec.py index f4a06d2f..77d1921f 100644 --- a/Code/Exec.py +++ b/Code/Exec.py @@ -1,5 +1,5 @@ import sys -from MonoMutliViewClassifiers import ExecClassif +from MonoMultiViewClassifiers import ExecClassif ExecClassif.execClassif(sys.argv[1:]) diff --git a/Code/MonoMutliViewClassifiers/ExecClassif.py b/Code/MonoMultiViewClassifiers/ExecClassif.py similarity index 96% rename from Code/MonoMutliViewClassifiers/ExecClassif.py rename to Code/MonoMultiViewClassifiers/ExecClassif.py index ed53a1f4..9e172a8c 100644 --- a/Code/MonoMutliViewClassifiers/ExecClassif.py +++ b/Code/MonoMultiViewClassifiers/ExecClassif.py @@ -2,7 +2,7 @@ import pkgutil # for TimeStamp in CSVFile import os import time -import sys +# import sys import logging import errno @@ -11,24 +11,24 @@ from joblib import Parallel, delayed import numpy as np import math import matplotlib +matplotlib.use('Agg') # Anti-Grain Geometry C++ library to make a raster (pixel) image of the figure import h5py # Import own modules from . import Multiview # import Metrics -import MonoviewClassifiers -from Multiview.ExecMultiview import ExecMultiview, ExecMultiview_multicore -from Monoview.ExecClassifMonoView import ExecMonoview, ExecMonoview_multicore -import Multiview.GetMultiviewDb as DB +from . import MonoviewClassifiers +from .Multiview.ExecMultiview import ExecMultiview, ExecMultiview_multicore +from .Monoview.ExecClassifMonoView import ExecMonoview, ExecMonoview_multicore +from .Multiview import GetMultiviewDb as DB from Versions import testVersions from ResultAnalysis import resultAnalysis, analyzeLabels, analyzeIterResults -from utils import execution, Dataset +from .utils import execution, Dataset # Author-Info __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype -# matplotlib.use('Agg') # Anti-Grain Geometry C++ library to make a raster (pixel) image of the figure def initBenchmark(args): @@ -37,11 +37,11 @@ def initBenchmark(args): args.FU_early_methods, args.CL_algos_monoview""" benchmark = {"Monoview": {}, "Multiview": {}} allMultiviewPackages = [name for _, name, isPackage - in pkgutil.iter_modules(['Multiview/']) if isPackage] + in pkgutil.iter_modules(['./MonoMultiViewClassifiers/Multiview/']) if isPackage] if args.CL_type == ["Benchmark"]: allMonoviewAlgos = [name for _, name, isPackage in - pkgutil.iter_modules(['MonoviewClassifiers']) + pkgutil.iter_modules(['./MonoMultiViewClassifiers/MonoviewClassifiers']) if (not isPackage)] benchmark["Monoview"] = allMonoviewAlgos benchmark["Multiview"] = dict((multiviewPackageName, "_") for multiviewPackageName in allMultiviewPackages) @@ -63,7 +63,7 @@ def initBenchmark(args): benchmark = multiviewModule.getBenchmark(benchmark, args=args) if "Monoview" in args.CL_type: if args.CL_algos_monoview == ['']: - benchmark["Monoview"] = [name for _, name, isPackage in pkgutil.iter_modules(["MonoviewClassifiers"]) + benchmark["Monoview"] = [name for _, name, isPackage in pkgutil.iter_modules(["./MonoMultiViewClassifiers/MonoviewClassifiers"]) if not isPackage] else: @@ -200,7 +200,6 @@ def classifyOneIter_multicore(LABELS_DICTIONARY, argumentDictionaries, nbCores, def classifyOneIter(LABELS_DICTIONARY, argumentDictionaries, nbCores, directory, args, classificationIndices, kFolds, randomState, hyperParamSearch, metrics, DATASET, viewsIndices, dataBaseTime, start, benchmark, views): - print classificationIndices[0] np.savetxt(directory + "train_indices.csv", classificationIndices[0], delimiter=",") resultsMonoview = [] @@ -318,7 +317,7 @@ def execClassif(arguments): metrics = [metric.split(":") for metric in args.CL_metrics] if metrics == [[""]]: metricsNames = [name for _, name, isPackage - in pkgutil.iter_modules(['Metrics']) if not isPackage and name != "log_loss"] + in pkgutil.iter_modules(['./MonoMultiViewClassifiers/Metrics']) if not isPackage and name != "log_loss"] metrics = [[metricName] for metricName in metricsNames] metrics = arangeMetrics(metrics, args.CL_metric_princ) for metricIndex, metric in enumerate(metrics): diff --git a/Code/MonoMutliViewClassifiers/Metrics/__init__.py b/Code/MonoMultiViewClassifiers/Metrics/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/__init__.py rename to Code/MonoMultiViewClassifiers/Metrics/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/accuracy_score.py b/Code/MonoMultiViewClassifiers/Metrics/accuracy_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/accuracy_score.py rename to Code/MonoMultiViewClassifiers/Metrics/accuracy_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/f1_score.py b/Code/MonoMultiViewClassifiers/Metrics/f1_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/f1_score.py rename to Code/MonoMultiViewClassifiers/Metrics/f1_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/fbeta_score.py b/Code/MonoMultiViewClassifiers/Metrics/fbeta_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/fbeta_score.py rename to Code/MonoMultiViewClassifiers/Metrics/fbeta_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/hamming_loss.py b/Code/MonoMultiViewClassifiers/Metrics/hamming_loss.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/hamming_loss.py rename to Code/MonoMultiViewClassifiers/Metrics/hamming_loss.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/jaccard_similarity_score.py b/Code/MonoMultiViewClassifiers/Metrics/jaccard_similarity_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/jaccard_similarity_score.py rename to Code/MonoMultiViewClassifiers/Metrics/jaccard_similarity_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/log_loss.py b/Code/MonoMultiViewClassifiers/Metrics/log_loss.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/log_loss.py rename to Code/MonoMultiViewClassifiers/Metrics/log_loss.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/matthews_corrcoef.py b/Code/MonoMultiViewClassifiers/Metrics/matthews_corrcoef.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/matthews_corrcoef.py rename to Code/MonoMultiViewClassifiers/Metrics/matthews_corrcoef.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/precision_score.py b/Code/MonoMultiViewClassifiers/Metrics/precision_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/precision_score.py rename to Code/MonoMultiViewClassifiers/Metrics/precision_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/recall_score.py b/Code/MonoMultiViewClassifiers/Metrics/recall_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/recall_score.py rename to Code/MonoMultiViewClassifiers/Metrics/recall_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/roc_auc_score.py b/Code/MonoMultiViewClassifiers/Metrics/roc_auc_score.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/roc_auc_score.py rename to Code/MonoMultiViewClassifiers/Metrics/roc_auc_score.py diff --git a/Code/MonoMutliViewClassifiers/Metrics/zero_one_loss.py b/Code/MonoMultiViewClassifiers/Metrics/zero_one_loss.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Metrics/zero_one_loss.py rename to Code/MonoMultiViewClassifiers/Metrics/zero_one_loss.py diff --git a/Code/MonoMutliViewClassifiers/Monoview/ExecClassifMonoView.py b/Code/MonoMultiViewClassifiers/Monoview/ExecClassifMonoView.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Monoview/ExecClassifMonoView.py rename to Code/MonoMultiViewClassifiers/Monoview/ExecClassifMonoView.py index f33b2be2..312f4fe4 100644 --- a/Code/MonoMutliViewClassifiers/Monoview/ExecClassifMonoView.py +++ b/Code/MonoMultiViewClassifiers/Monoview/ExecClassifMonoView.py @@ -15,7 +15,7 @@ import logging # To create Log-Files import h5py # Import own modules -import MonoviewClassifiers +from .. import MonoviewClassifiers from analyzeResult import execute from ..utils.Dataset import getValue, extractSubset diff --git a/Code/MonoMutliViewClassifiers/Monoview/ExecPlot.py b/Code/MonoMultiViewClassifiers/Monoview/ExecPlot.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Monoview/ExecPlot.py rename to Code/MonoMultiViewClassifiers/Monoview/ExecPlot.py index 97262a72..637cb4ed 100644 --- a/Code/MonoMutliViewClassifiers/Monoview/ExecPlot.py +++ b/Code/MonoMultiViewClassifiers/Monoview/ExecPlot.py @@ -8,7 +8,7 @@ import datetime # for TimeStamp in CSVFile import os # to geth path of the running script import matplotlib -matplotlib.use('Agg') +# matplotlib.use('Agg') # Import 3rd party modules import pandas as pd # for Series import numpy as np # for DataFrames diff --git a/Code/MonoMutliViewClassifiers/Monoview/ExportResults.py b/Code/MonoMultiViewClassifiers/Monoview/ExportResults.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Monoview/ExportResults.py rename to Code/MonoMultiViewClassifiers/Monoview/ExportResults.py index a3cb7117..7df50125 100644 --- a/Code/MonoMutliViewClassifiers/Monoview/ExportResults.py +++ b/Code/MonoMultiViewClassifiers/Monoview/ExportResults.py @@ -13,7 +13,7 @@ import matplotlib.pyplot as plt # for Plots from scipy.interpolate import interp1d # to Interpolate Data import matplotlib -matplotlib.use('Agg') +# matplotlib.use('Agg') from matplotlib.offsetbox import AnchoredOffsetbox, TextArea, HPacker # to generate the Annotations in plot from pylab import rcParams # to change size of plot from sklearn import metrics # For stastics on classification diff --git a/Code/MonoMutliViewClassifiers/Monoview/MonoviewUtils.py b/Code/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/MonoviewUtils.py rename to Code/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/2016_08_19-CMV-MultiOmicDataset-RNASeq.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/2016_08_19-CMV-MultiOmicDataset-RNASeq.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/2016_08_19-CMV-MultiOmicDataset-RNASeq.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/2016_08_19-CMV-MultiOmicDataset-RNASeq.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HOG-Cluster_20/2016_03_24-CMV-Caltech-HOG.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/HSV-Bins_[16,16,16]/2016_03_24-CMV-Caltech-HSV.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-3classes-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/RGB-Bins_16-CI_256/2016_03_24-CMV-Caltech-RGB.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SIFT-Cluster_35/2016_03_24-CMV-Caltech-SIFT.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrix.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrixImg.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrixImg.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrixImg.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-ConfMatrixImg.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-LOG.log b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-LOG.log similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-LOG.log rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-LOG.log diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Report.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Report.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Report.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Report.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Score.png b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Score.png similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Score.png rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Score.png diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Stats.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Stats.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Stats.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF-Stats.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF.csv b/Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF.csv similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF.csv rename to Code/MonoMultiViewClassifiers/Monoview/Results-ClassMonoView/SURF-Cluster_30/2016_03_24-CMV-Caltech-SURF.csv diff --git a/Code/MonoMutliViewClassifiers/Monoview/__init__.py b/Code/MonoMultiViewClassifiers/Monoview/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/__init__.py rename to Code/MonoMultiViewClassifiers/Monoview/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py b/Code/MonoMultiViewClassifiers/Monoview/analyzeResult.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/analyzeResult.py rename to Code/MonoMultiViewClassifiers/Monoview/analyzeResult.py diff --git a/Code/MonoMutliViewClassifiers/Monoview/run.py b/Code/MonoMultiViewClassifiers/Monoview/run.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Monoview/run.py rename to Code/MonoMultiViewClassifiers/Monoview/run.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/__init__.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/MonoviewClassifiers/__init__.py rename to Code/MonoMultiViewClassifiers/MonoviewClassifiers/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py b/Code/MonoMultiViewClassifiers/Multiview/ExecMultiview.py similarity index 87% rename from Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py rename to Code/MonoMultiViewClassifiers/Multiview/ExecMultiview.py index bdeb42cf..ef27e9f9 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py +++ b/Code/MonoMultiViewClassifiers/Multiview/ExecMultiview.py @@ -7,10 +7,11 @@ import os import logging import time import h5py +import imp from ..utils.Dataset import getShape from ..utils import HyperParameterSearch -import Multiview +# from . import * # Author-Info __author__ = "Baptiste Bauvin" @@ -50,10 +51,16 @@ def ExecMultiview(directory, DATASET, name, classificationIndices, KFolds, nbCor extractionTime = time.time() - t_start learningIndices, validationIndices = classificationIndices - classifierPackage = getattr(Multiview, CL_type) # Permet d'appeler un module avec une string - classifierModule = getattr(classifierPackage, CL_type) + packageDirectories = [entry for entry in os.listdir("MonoMultiViewClassifiers/Multiview/") if os.path.isdir("MonoMultiViewClassifiers/Multiview/"+entry)] + for packageDirectory in packageDirectories: + if packageDirectory == CL_type: + classifierModule = imp.load_source(CL_type, "MonoMultiViewClassifiers/Multiview/"+packageDirectory+"/"+CL_type+".py") + analysisModule = imp.load_source(CL_type, "MonoMultiViewClassifiers/Multiview/"+packageDirectory+"/analyzeResults.py") + import pdb; pdb.set_trace() + # classifierPackage = getattr(locals(), CL_type) # Permet d'appeler un module avec une string + # classifierModule = getattr(classifierPackage, CL_type) classifierClass = getattr(classifierModule, CL_type) - analysisModule = getattr(classifierPackage, "analyzeResults") + # analysisModule = getattr(classifierPackage, "analyzeResults") if hyperParamSearch != "None": classifier = HyperParameterSearch.searchBestSettings(DATASET, classifierModule, CL_type, metrics, learningIndices, KFolds, randomState, diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Fusion.py similarity index 93% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Fusion.py index d0326b60..c6442c56 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Fusion.py @@ -2,7 +2,10 @@ import numpy as np import logging import pkgutil +# from Methods import * +import pdb;pdb.set_trace() import Methods + from ... import MonoviewClassifiers from ...utils.Dataset import getV @@ -13,19 +16,19 @@ __status__ = "Prototype" # Production, Development, Prototype def getBenchmark(benchmark, args=None): fusionModulesNames = [name for _, name, isPackage - in pkgutil.iter_modules(['Multiview/Fusion/Methods']) if not isPackage] + in pkgutil.iter_modules(['./MonoMultiViewClassifiers/Multiview/Fusion/Methods']) if not isPackage] fusionModules = [getattr(Methods, fusionModulesName) for fusionModulesName in fusionModulesNames] fusionClassifiers = [getattr(fusionModule, fusionModulesName + "Classifier") for fusionModulesName, fusionModule in zip(fusionModulesNames, fusionModules)] fusionMethods = dict((fusionModulesName, [name for _, name, isPackage in pkgutil.iter_modules( - ["Multiview/Fusion/Methods/" + fusionModulesName + "Package"]) + ["./MonoMultiViewClassifiers/Multiview/Fusion/Methods/" + fusionModulesName + "Package"]) if not isPackage]) for fusionModulesName, fusionClasse in zip(fusionModulesNames, fusionClassifiers)) if args is None: allMonoviewAlgos = [name for _, name, isPackage in - pkgutil.iter_modules(['MonoviewClassifiers']) + pkgutil.iter_modules(['./MonoMultiViewClassifiers/MonoviewClassifiers']) if (not isPackage)] fusionMonoviewClassifiers = allMonoviewAlgos allFusionAlgos = {"Methods": fusionMethods, "Classifiers": fusionMonoviewClassifiers} @@ -42,7 +45,7 @@ def getBenchmark(benchmark, args=None): if args.FU_late_methods == [""]: benchmark["Multiview"]["Fusion"]["Methods"]["LateFusion"] = [name for _, name, isPackage in pkgutil.iter_modules([ - "Multiview/Fusion/Methods/LateFusionPackage"]) + "./MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage"]) if not isPackage] else: benchmark["Multiview"]["Fusion"]["Methods"]["LateFusion"] = args.FU_late_methods @@ -50,13 +53,13 @@ def getBenchmark(benchmark, args=None): if args.FU_early_methods == [""]: benchmark["Multiview"]["Fusion"]["Methods"]["EarlyFusion"] = [name for _, name, isPackage in pkgutil.iter_modules([ - "Multiview/Fusion/Methods/EarlyFusionPackage"]) + "./MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage"]) if not isPackage] else: benchmark["Multiview"]["Fusion"]["Methods"]["EarlyFusion"] = args.FU_early_methods if args.CL_algos_monoview == ['']: benchmark["Multiview"]["Fusion"]["Classifiers"] = [name for _, name, isPackage in - pkgutil.iter_modules(['MonoviewClassifiers']) + pkgutil.iter_modules(['./MonoMultiViewClassifiers/MonoviewClassifiers']) if (not isPackage) and (name != "SGD") and ( name[:3] != "SVM") and (name != "SCM")] diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/WeightedLinear.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusion.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusion.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py similarity index 98% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py index 7940938d..41f992b0 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/BayesianInference.py @@ -2,8 +2,8 @@ import numpy as np from sklearn.metrics import accuracy_score import pkgutil -from utils.Dataset import getV -import MonoviewClassifiers +from .....utils.Dataset import getV +from ..... import MonoviewClassifiers from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py similarity index 97% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py index 4f70dcde..77986387 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/MajorityVoting.py @@ -1,9 +1,10 @@ -from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig -import MonoviewClassifiers import numpy as np -from sklearn.metrics import accuracy_score -from utils.Dataset import getV -import pkgutil +# from sklearn.metrics import accuracy_score +# import pkgutil + +from .....utils.Dataset import getV +from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig +from ..... import MonoviewClassifiers def genParamsSets(classificationKWARGS, randomState, nIter=1): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py index 510e26a8..ad35ce1e 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SCMForLinear.py @@ -1,9 +1,6 @@ -from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig -import MonoviewClassifiers import numpy as np import pyscm from pyscm.utils import _pack_binary_bytes_to_ints -from utils.Dataset import getV import os import h5py from pyscm.binary_attributes.classifications.popcount import inplace_popcount_32, inplace_popcount_64 @@ -14,6 +11,9 @@ from sklearn.metrics import accuracy_score import itertools import pkgutil +from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig +from ..... import MonoviewClassifiers +from .....utils.Dataset import getV def genParamsSets(classificationKWARGS, randomState, nIter=1): nbView = classificationKWARGS["nbView"] diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py similarity index 98% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py index 5a0b23f9..8259b53c 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/SVMForLinear.py @@ -1,11 +1,12 @@ -from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig -import MonoviewClassifiers import numpy as np from sklearn.multiclass import OneVsOneClassifier from sklearn.svm import SVC -from utils.Dataset import getV import pkgutil +from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig +from .....utils.Dataset import getV +from ..... import MonoviewClassifiers + def genParamsSets(classificationKWARGS, randomState, nIter=1): paramsSets = [] diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py similarity index 98% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py index 7e03342f..24de1714 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/WeightedLinear.py @@ -1,10 +1,11 @@ -from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig -import MonoviewClassifiers import numpy as np from sklearn.metrics import accuracy_score -from utils.Dataset import getV import pkgutil +from ..... import MonoviewClassifiers +from ..LateFusion import LateFusionClassifier, getClassifiers, getConfig +from .....utils.Dataset import getV + def genParamsSets(classificationKWARGS, randomState, nIter=1): nbView = classificationKWARGS["nbView"] diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/Methods/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py b/Code/MonoMultiViewClassifiers/Multiview/Fusion/analyzeResults.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py rename to Code/MonoMultiViewClassifiers/Multiview/Fusion/analyzeResults.py index a11a899a..05526fdb 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/analyzeResults.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Fusion/analyzeResults.py @@ -2,7 +2,7 @@ from sklearn.metrics import precision_recall_fscore_support, accuracy_score, cla import numpy as np import matplotlib -matplotlib.use('Agg') +# matplotlib.use('Agg') import operator import Methods.LateFusion from ... import Metrics diff --git a/Code/MonoMutliViewClassifiers/Multiview/GetMultiviewDb.py b/Code/MonoMultiViewClassifiers/Multiview/GetMultiviewDb.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/GetMultiviewDb.py rename to Code/MonoMultiViewClassifiers/Multiview/GetMultiviewDb.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/Kover.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/Kover.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/Kover.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/Kover.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/ModifiedMulticlass.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/ModifiedMulticlass.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/ModifiedMulticlass.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/ModifiedMulticlass.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/SubSampling.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/SubSampling.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/SubSampling.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/SubSampling.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Mumbo.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/Mumbo.py index c79f4dec..b4cc4cb3 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/Mumbo.py @@ -19,7 +19,7 @@ __status__ = "Prototype" # Production, Development, Prototype def getBenchmark(benchmark, args=None): allAlgos = [name for _, name, isPackage in - pkgutil.iter_modules(['Multiview/Mumbo/Classifiers']) + pkgutil.iter_modules("./MonoMultiViewClassifiers/Multiview/Mumbo/Classifiers") if not isPackage and not name in ["SubSampling", "ModifiedMulticlass", "Kover"]] if args is None or args.MU_types != ['']: benchmark["Multiview"]["Mumbo"] = allAlgos diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/__init__.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/__init__.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/analyzeResults.py similarity index 99% rename from Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py rename to Code/MonoMultiViewClassifiers/Multiview/Mumbo/analyzeResults.py index 192ca3fd..d06276eb 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py +++ b/Code/MonoMultiViewClassifiers/Multiview/Mumbo/analyzeResults.py @@ -1,6 +1,5 @@ import numpy as np import matplotlib -matplotlib.use('Agg') import matplotlib.pyplot as plt import operator from datetime import timedelta as hms diff --git a/Code/MonoMultiViewClassifiers/Multiview/__init__.py b/Code/MonoMultiViewClassifiers/Multiview/__init__.py new file mode 100644 index 00000000..55fdc627 --- /dev/null +++ b/Code/MonoMultiViewClassifiers/Multiview/__init__.py @@ -0,0 +1,8 @@ +from . import GetMultiviewDb#, ExecMultiview, Mumbo, Fusion +# import pdb;pdb.set_trace() + +from . import ExecMultiview +from . import Mumbo +from . import Fusion + +__all__ = ['Fusion', 'Mumbo'] diff --git a/Code/MonoMutliViewClassifiers/Multiview/profile b/Code/MonoMultiViewClassifiers/Multiview/profile similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/profile rename to Code/MonoMultiViewClassifiers/Multiview/profile diff --git a/Code/MonoMutliViewClassifiers/Multiview/res b/Code/MonoMultiViewClassifiers/Multiview/res similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/res rename to Code/MonoMultiViewClassifiers/Multiview/res diff --git a/Code/MonoMutliViewClassifiers/Multiview/run.py b/Code/MonoMultiViewClassifiers/Multiview/run.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Multiview/run.py rename to Code/MonoMultiViewClassifiers/Multiview/run.py diff --git a/Code/MonoMutliViewClassifiers/ResultAnalysis.py b/Code/MonoMultiViewClassifiers/ResultAnalysis.py similarity index 98% rename from Code/MonoMutliViewClassifiers/ResultAnalysis.py rename to Code/MonoMultiViewClassifiers/ResultAnalysis.py index 19af768b..aa46938c 100644 --- a/Code/MonoMutliViewClassifiers/ResultAnalysis.py +++ b/Code/MonoMultiViewClassifiers/ResultAnalysis.py @@ -6,15 +6,15 @@ import logging # Import third party modules import matplotlib -matplotlib.use('Agg') +# matplotlib.use('Agg') import matplotlib.pyplot as plt import numpy as np -from matplotlib import cm +# from matplotlib import cm import matplotlib as mpl # Import own Modules -import Metrics -from utils.Transformations import signLabels +# import Metrics +# from utils.Transformations import signLabels # Author-Info __author__ = "Baptiste Bauvin" diff --git a/Code/MonoMutliViewClassifiers/Versions.py b/Code/MonoMultiViewClassifiers/Versions.py similarity index 100% rename from Code/MonoMutliViewClassifiers/Versions.py rename to Code/MonoMultiViewClassifiers/Versions.py diff --git a/Code/MonoMutliViewClassifiers/__init__.py b/Code/MonoMultiViewClassifiers/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/__init__.py rename to Code/MonoMultiViewClassifiers/__init__.py diff --git a/Code/MonoMutliViewClassifiers/temp_scm_fusion b/Code/MonoMultiViewClassifiers/temp_scm_fusion similarity index 100% rename from Code/MonoMutliViewClassifiers/temp_scm_fusion rename to Code/MonoMultiViewClassifiers/temp_scm_fusion diff --git a/Code/MonoMutliViewClassifiers/test.png b/Code/MonoMultiViewClassifiers/test.png similarity index 100% rename from Code/MonoMutliViewClassifiers/test.png rename to Code/MonoMultiViewClassifiers/test.png diff --git a/Code/MonoMutliViewClassifiers/utils/Dataset.py b/Code/MonoMultiViewClassifiers/utils/Dataset.py similarity index 100% rename from Code/MonoMutliViewClassifiers/utils/Dataset.py rename to Code/MonoMultiViewClassifiers/utils/Dataset.py diff --git a/Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py b/Code/MonoMultiViewClassifiers/utils/HyperParameterSearch.py similarity index 100% rename from Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py rename to Code/MonoMultiViewClassifiers/utils/HyperParameterSearch.py diff --git a/Code/MonoMutliViewClassifiers/utils/Transformations.py b/Code/MonoMultiViewClassifiers/utils/Transformations.py similarity index 100% rename from Code/MonoMutliViewClassifiers/utils/Transformations.py rename to Code/MonoMultiViewClassifiers/utils/Transformations.py diff --git a/Code/MonoMutliViewClassifiers/utils/__init__.py b/Code/MonoMultiViewClassifiers/utils/__init__.py similarity index 100% rename from Code/MonoMutliViewClassifiers/utils/__init__.py rename to Code/MonoMultiViewClassifiers/utils/__init__.py diff --git a/Code/MonoMutliViewClassifiers/utils/execution.py b/Code/MonoMultiViewClassifiers/utils/execution.py similarity index 100% rename from Code/MonoMutliViewClassifiers/utils/execution.py rename to Code/MonoMultiViewClassifiers/utils/execution.py diff --git a/Code/MonoMutliViewClassifiers/Multiview/__init__.py b/Code/MonoMutliViewClassifiers/Multiview/__init__.py deleted file mode 100644 index c08e3796..00000000 --- a/Code/MonoMutliViewClassifiers/Multiview/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from . import GetMultiviewDb, ExecMultiview, Mumbo, Fusion - -# from . import ExecMultiview -# from . import Mumbo -# from . import Fusion - -__all__ = ['Fusion', 'Mumbo'] diff --git a/Code/__init__.py b/Code/__init__.py index 01da5837..f080b245 100644 --- a/Code/__init__.py +++ b/Code/__init__.py @@ -1 +1 @@ -from . import MonoMutliViewClassifiers, Tests, Exec \ No newline at end of file +from . import MonoMultiViewClassifiers, Tests, Exec \ No newline at end of file -- GitLab