diff --git a/.DS_Store b/.DS_Store index 603d9d9..4f6eca8 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/BaseML/.DS_Store b/BaseML/.DS_Store new file mode 100644 index 0000000..bea0b23 Binary files /dev/null and b/BaseML/.DS_Store differ diff --git a/BaseML/GaussianNB.py b/BaseML/GaussianNB.py index 0b281ea..403adb7 100644 --- a/BaseML/GaussianNB.py +++ b/BaseML/GaussianNB.py @@ -3,7 +3,7 @@ import os from sklearn.metrics import accuracy_score, mean_squared_error -from sklearn.naive_bayes import GaussianNB +from sklearn.naive_bayes import GaussianNB as gauss class GaussianNB: @@ -11,7 +11,7 @@ def __init__(self ): self.cwd = os.path.dirname(os.getcwd()) # 获取当前文件的绝对路径 self.file_dirname = os.path.dirname(os.path.abspath(__file__)) - self.model = GaussianNB() + self.model = gauss() self.dataset_path = ' ' self.test_size = ' ' self.test_set = ' ' diff --git a/BaseML/KNN.py b/BaseML/KNNClassifier.py similarity index 100% rename from BaseML/KNN.py rename to BaseML/KNNClassifier.py diff --git a/BaseML/PCA.py b/BaseML/PCA.py index 2d685ed..de7e91c 100644 --- a/BaseML/PCA.py +++ b/BaseML/PCA.py @@ -1,4 +1,4 @@ -from sklearn.decomposition import PCA +from sklearn.decomposition import PCA as pca_reduction import os @@ -10,9 +10,9 @@ def __init__(self, self.cwd = os.path.dirname(os.getcwd()) # 获取当前文件的绝对路径 self.file_dirname = os.path.dirname(os.path.abspath(__file__)) - self.dataset = '' - self.x_train, self.x_test = 0, 0 - self.model = PCA(n_components=n_components) + self.dataset = None + # self.x_train, self.x_test = 0, 0 + self.model = pca_reduction(n_components=n_components) def train(self): self.model.fit(self.dataset) @@ -20,7 +20,7 @@ def train(self): # 返回所保留的n个成分各自的方差百分比,这里可以理解为单个变量方差贡献率。 def inference(self, data): - self.model.fit_transform(data) + self.model.transform(data) print(self.model.n_features_) print(self.model.n_samples_) diff --git a/BaseML/Perceptron.py b/BaseML/Perceptron.py index 88472bf..8a094df 100644 --- a/BaseML/Perceptron.py +++ b/BaseML/Perceptron.py @@ -1,4 +1,4 @@ -from sklearn.linear_model import Perceptron +from sklearn.linear_model import Perceptron as per import os @@ -11,7 +11,7 @@ def __init__(self self.file_dirname = os.path.dirname(os.path.abspath(__file__)) self.dataset = '' self.x_train, self.x_test = 0, 0 - self.model = Perceptron() + self.model = per() def train(self): self.model.fit(self.dataset) diff --git a/BaseML/__init__.py b/BaseML/__init__.py new file mode 100644 index 0000000..412a05e --- /dev/null +++ b/BaseML/__init__.py @@ -0,0 +1,17 @@ +from .CART import CART +from .KNNClassifier import KNN +from .PCA import PCA +from .Perceptron import Perceptron +from .AdaBoost import AdaBoost +from .GaussianNB import GaussianNB +from .SVM import SVM + + +__all__ = [ + 'CART', + 'SVM', + 'AdaBoost', + 'GaussianNB', + 'KNN', + 'PCA', + 'Perceptron']