diff --git a/function.py b/function.py index 92d47bd..601716f 100644 --- a/function.py +++ b/function.py @@ -1,6 +1,5 @@ # function.py import numpy as np -from sklearn.preprocessing import StandardScaler """ 挑战说明: @@ -51,23 +50,24 @@ def classify0(inX, dataSet, labels,k=3): Returns: - int: 预测的分类标签。 """ - # 特征缩放 - scaler = StandardScaler() - dataSet_scaled = scaler.fit_transform(dataSet) - inX_scaled = scaler.transform(inX.reshape(1, -1)) + # 确保 k 不大于数据集的大小 + k = min(k, dataSet.shape[0]) - # KNN 分类 - dataSetSize = dataSet_scaled.shape[0] - diffMat = np.tile(inX_scaled, (dataSetSize, 1)) - dataSet_scaled + # 计算测试样本与每个训练样本之间的距离 + diffMat = np.tile(inX, (dataSet.shape[0], 1)) - dataSet sqDiffMat = diffMat ** 2 distances = np.sqrt(sqDiffMat.sum(axis=1)) + + # 对距离进行排序,并获取索引 sortedDistIndicies = distances.argsort() + # 选择距离最小的k个点 classCount = {} for i in range(k): voteIlabel = labels[sortedDistIndicies[i]] classCount[voteIlabel] = classCount.get(voteIlabel, 0) + 1 + # 多数投票 sortedClassCount = sorted(classCount.items(), key=lambda item: item[1], reverse=True) return sortedClassCount[0][0]