Removed classifiers and updated models accordingly.

Olcay Taner YILDIZ · Olcay Taner YILDIZ · commit 401d6faeeeb3 · 2024-09-03T18:43:58.000+03:00
diff --git a/Classification/Model/Ensemble/BaggingModel.py b/Classification/Model/Ensemble/BaggingModel.py
@@ -1,7 +1,7 @@
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.Model.DecisionTree.DecisionNode import DecisionNode
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.TreeEnsembleModel import TreeEnsembleModel
+from Classification.Model.Ensemble.TreeEnsembleModel import TreeEnsembleModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 
 
diff --git a/Classification/Model/Ensemble/RandomForestModel.py b/Classification/Model/Ensemble/RandomForestModel.py
@@ -1,7 +1,7 @@
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.Model.DecisionTree.DecisionNode import DecisionNode
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.TreeEnsembleModel import TreeEnsembleModel
+from Classification.Model.Ensemble.TreeEnsembleModel import TreeEnsembleModel
 from Classification.Parameter.RandomForestParameter import RandomForestParameter
 
 
diff --git a/Classification/Model/Ensemble/TreeEnsembleModel.py b/Classification/Model/Ensemble/TreeEnsembleModel.py
diff --git a/Classification/Model/Ensemble/__init__.py b/Classification/Model/Ensemble/__init__.py
diff --git a/Classification/Model/NeuralNetwork/AutoEncoderModel.py b/Classification/Model/NeuralNetwork/AutoEncoderModel.py
@@ -4,7 +4,7 @@
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.NeuralNetworkModel import NeuralNetworkModel
+from Classification.Model.NeuralNetwork.NeuralNetworkModel import NeuralNetworkModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.MultiLayerPerceptronParameter import MultiLayerPerceptronParameter
 import copy
diff --git a/Classification/Model/NeuralNetwork/DeepNetworkModel.py b/Classification/Model/NeuralNetwork/DeepNetworkModel.py
@@ -1,6 +1,6 @@
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.NeuralNetworkModel import NeuralNetworkModel
+from Classification.Model.NeuralNetwork.NeuralNetworkModel import NeuralNetworkModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.DeepNetworkParameter import DeepNetworkParameter
 from Math.Matrix import Matrix
diff --git a/Classification/Model/NeuralNetwork/LinearPerceptronModel.py b/Classification/Model/NeuralNetwork/LinearPerceptronModel.py
@@ -2,7 +2,7 @@
 
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.NeuralNetworkModel import NeuralNetworkModel
+from Classification.Model.NeuralNetwork.NeuralNetworkModel import NeuralNetworkModel
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
 import copy
 
diff --git a/Classification/Model/NeuralNetwork/MultiLayerPerceptronModel.py b/Classification/Model/NeuralNetwork/MultiLayerPerceptronModel.py
@@ -3,7 +3,7 @@
 
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.MultiLayerPerceptronParameter import MultiLayerPerceptronParameter
 import copy
diff --git a/Classification/Model/NeuralNetwork/NeuralNetworkModel.py b/Classification/Model/NeuralNetwork/NeuralNetworkModel.py
diff --git a/Classification/Model/NeuralNetwork/__init__.py b/Classification/Model/NeuralNetwork/__init__.py
diff --git a/Classification/Model/NonParametric/KnnInstance.py b/Classification/Model/NonParametric/KnnInstance.py
diff --git a/Classification/Model/NonParametric/KnnModel.py b/Classification/Model/NonParametric/KnnModel.py
@@ -5,7 +5,7 @@
 from Classification.Instance.CompositeInstance import CompositeInstance
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
-from Classification.Model.KnnInstance import KnnInstance
+from Classification.Model.NonParametric.KnnInstance import KnnInstance
 from Classification.Model.Model import Model
 from Classification.Parameter.KnnParameter import KnnParameter
 
diff --git a/Classification/Model/NonParametric/__init__.py b/Classification/Model/NonParametric/__init__.py
diff --git a/Classification/Model/Parametric/GaussianModel.py b/Classification/Model/Parametric/GaussianModel.py
diff --git a/Classification/Model/Parametric/KMeansModel.py b/Classification/Model/Parametric/KMeansModel.py
@@ -1,13 +1,11 @@
-from io import TextIOWrapper
-
 from Math.DiscreteDistribution import DiscreteDistribution
 
 from Classification.DistanceMetric.DistanceMetric import DistanceMetric
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.GaussianModel import GaussianModel
+from Classification.Model.Parametric.GaussianModel import GaussianModel
 from Classification.Parameter.KMeansParameter import KMeansParameter
 
 
diff --git a/Classification/Model/Parametric/LdaModel.py b/Classification/Model/Parametric/LdaModel.py
@@ -8,7 +8,7 @@
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.GaussianModel import GaussianModel
+from Classification.Model.Parametric.GaussianModel import GaussianModel
 from Classification.Parameter.Parameter import Parameter
 
 
diff --git a/Classification/Model/Parametric/NaiveBayesModel.py b/Classification/Model/Parametric/NaiveBayesModel.py
@@ -4,7 +4,7 @@
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.GaussianModel import GaussianModel
+from Classification.Model.Parametric.GaussianModel import GaussianModel
 import math
 
 from Classification.Parameter.Parameter import Parameter
diff --git a/Classification/Model/Parametric/QdaModel.py b/Classification/Model/Parametric/QdaModel.py
@@ -7,7 +7,7 @@
 from Classification.Instance.Instance import Instance
 from Classification.InstanceList.InstanceList import InstanceList
 from Classification.InstanceList.Partition import Partition
-from Classification.Model.LdaModel import LdaModel
+from Classification.Model.Parametric.LdaModel import LdaModel
 from Classification.Parameter.Parameter import Parameter
 
 
diff --git a/Classification/Model/Parametric/__init__.py b/Classification/Model/Parametric/__init__.py
diff --git a/test/Classifier/BaggingTest.py b/test/Classifier/BaggingTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from test.Classifier.ClassifierTest import ClassifierTest
 
diff --git a/test/Classifier/DeepNetworkTest.py b/test/Classifier/DeepNetworkTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.DeepNetworkModel import DeepNetworkModel
+from Classification.Model.NeuralNetwork.DeepNetworkModel import DeepNetworkModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.DeepNetworkParameter import DeepNetworkParameter
 from test.Classifier.ClassifierTest import ClassifierTest
diff --git a/test/Classifier/KMeansTest.py b/test/Classifier/KMeansTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.KMeansModel import KMeansModel
+from Classification.Model.Parametric.KMeansModel import KMeansModel
 from Classification.Parameter.KMeansParameter import KMeansParameter
 from test.Classifier.ClassifierTest import ClassifierTest
 
diff --git a/test/Classifier/KnnTest.py b/test/Classifier/KnnTest.py
@@ -1,7 +1,7 @@
 import unittest
 
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
-from Classification.Model.KnnModel import KnnModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
 from Classification.Parameter.KnnParameter import KnnParameter
 from test.Classifier.ClassifierTest import ClassifierTest
 
diff --git a/test/Classifier/LdaTest.py b/test/Classifier/LdaTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.LdaModel import LdaModel
+from Classification.Model.Parametric.LdaModel import LdaModel
 from test.Classifier.ClassifierTest import ClassifierTest
 
 
diff --git a/test/Classifier/LinearPerceptronTest.py b/test/Classifier/LinearPerceptronTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
 from test.Classifier.ClassifierTest import ClassifierTest
 
diff --git a/test/Classifier/MultiLayerPerceptronTest.py b/test/Classifier/MultiLayerPerceptronTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.MultiLayerPerceptronModel import MultiLayerPerceptronModel
+from Classification.Model.NeuralNetwork.MultiLayerPerceptronModel import MultiLayerPerceptronModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.MultiLayerPerceptronParameter import MultiLayerPerceptronParameter
 from test.Classifier.ClassifierTest import ClassifierTest
diff --git a/test/Classifier/NaiveBayesTest.py b/test/Classifier/NaiveBayesTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from test.Classifier.ClassifierTest import ClassifierTest
 
 
diff --git a/test/Classifier/QdaTest.py b/test/Classifier/QdaTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.QdaModel import QdaModel
+from Classification.Model.Parametric.QdaModel import QdaModel
 from test.Classifier.ClassifierTest import ClassifierTest
 
 
diff --git a/test/Classifier/RandomForestTest.py b/test/Classifier/RandomForestTest.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Classification.Model.RandomForestModel import RandomForestModel
+from Classification.Model.Ensemble.RandomForestModel import RandomForestModel
 from Classification.Parameter.RandomForestParameter import RandomForestParameter
 from test.Classifier.ClassifierTest import ClassifierTest
 
diff --git a/test/Experiment/BootstrapRunTest.py b/test/Experiment/BootstrapRunTest.py
@@ -3,13 +3,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.BootstrapRun import BootstrapRun
 from Classification.Experiment.Experiment import Experiment
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/Experiment/KFoldRunTest.py b/test/Experiment/KFoldRunTest.py
@@ -3,13 +3,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.Experiment import Experiment
 from Classification.Experiment.KFoldRun import KFoldRun
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/Experiment/MxKFoldRunTest.py b/test/Experiment/MxKFoldRunTest.py
@@ -3,13 +3,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.Experiment import Experiment
 from Classification.Experiment.MxKFoldRun import MxKFoldRun
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/Experiment/StratifiedKFoldRunTest.py b/test/Experiment/StratifiedKFoldRunTest.py
@@ -3,13 +3,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.Experiment import Experiment
 from Classification.Experiment.StratifiedKFoldRun import StratifiedKFoldRun
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/Experiment/StratifiedMxKFoldRunTest.py b/test/Experiment/StratifiedMxKFoldRunTest.py
@@ -3,13 +3,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.Experiment import Experiment
 from Classification.Experiment.StratifiedMxKFoldRun import StratifiedMxKFoldRun
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/FeatureSelection/SubSetSelectionTest.py b/test/FeatureSelection/SubSetSelectionTest.py
@@ -6,9 +6,9 @@
 from Classification.FeatureSelection.FloatingSelection import FloatingSelection
 from Classification.FeatureSelection.ForwardSelection import ForwardSelection
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.Parameter import Parameter
diff --git a/test/Filter/DiscreteToContinuousTest.py b/test/Filter/DiscreteToContinuousTest.py
@@ -3,8 +3,8 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Filter.DiscreteToContinuous import DiscreteToContinuous
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
diff --git a/test/Filter/DiscreteToIndexedTest.py b/test/Filter/DiscreteToIndexedTest.py
@@ -3,8 +3,8 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Filter.DiscreteToIndexed import DiscreteToIndexed
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
diff --git a/test/Filter/LaryToBinaryTest.py b/test/Filter/LaryToBinaryTest.py
@@ -3,8 +3,8 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Filter.LaryToBinary import LaryToBinary
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
diff --git a/test/Filter/NormalizeTest.py b/test/Filter/NormalizeTest.py
@@ -2,9 +2,9 @@
 
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Filter.Normalize import Normalize
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.MultiLayerPerceptronModel import MultiLayerPerceptronModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NeuralNetwork.MultiLayerPerceptronModel import MultiLayerPerceptronModel
 from Classification.Parameter.ActivationFunction import ActivationFunction
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
diff --git a/test/Filter/PcaTest.py b/test/Filter/PcaTest.py
@@ -2,8 +2,8 @@
 
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Filter.Pca import Pca
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
 from Classification.Parameter.KnnParameter import KnnParameter
 from Classification.Parameter.LinearPerceptronParameter import LinearPerceptronParameter
 from test.Classifier.ClassifierTest import ClassifierTest
diff --git a/test/StatisticalTest/Combined5x2FTest.py b/test/StatisticalTest/Combined5x2FTest.py
@@ -2,13 +2,13 @@
 from Classification.DistanceMetric.EuclidianDistance import EuclidianDistance
 from Classification.Experiment.Experiment import Experiment
 from Classification.Experiment.MxKFoldRun import MxKFoldRun
-from Classification.Model.BaggingModel import BaggingModel
+from Classification.Model.Ensemble.BaggingModel import BaggingModel
 from Classification.Model.DecisionTree.DecisionTree import DecisionTree
 from Classification.Model.DummyModel import DummyModel
-from Classification.Model.KnnModel import KnnModel
-from Classification.Model.LdaModel import LdaModel
-from Classification.Model.LinearPerceptronModel import LinearPerceptronModel
-from Classification.Model.NaiveBayesModel import NaiveBayesModel
+from Classification.Model.NonParametric.KnnModel import KnnModel
+from Classification.Model.Parametric.LdaModel import LdaModel
+from Classification.Model.NeuralNetwork.LinearPerceptronModel import LinearPerceptronModel
+from Classification.Model.Parametric.NaiveBayesModel import NaiveBayesModel
 from Classification.Parameter.BaggingParameter import BaggingParameter
 from Classification.Parameter.C45Parameter import C45Parameter
 from Classification.Parameter.KnnParameter import KnnParameter
diff --git a/test/StatisticalTest/Combined5x2tTest.py b/test/StatisticalTest/Combined5x2tTest.py
diff --git a/test/StatisticalTest/Paired5x2tTest.py b/test/StatisticalTest/Paired5x2tTest.py
diff --git a/test/StatisticalTest/PairedtTest.py b/test/StatisticalTest/PairedtTest.py
