update

src/python/getting-started/digit-recognizer/knn-python3.6.py

@@ -34,17 +34,29 @@ def saveResult(result, csvName):
         myWriter.writerow(["ImageId", "Label"]) # 设置表格的列名
         index = 0
         for i in result:
+<<<<<<< HEAD:src/python/getting-started/digit-recognizer/dr_knn_pandas-3.6.py
             tmp = [] # 列表,列表是可以改变长度的
             index = index+1
             tmp.append(index) # ImageId的数值
+=======
+            tmp = []
+            index = index + 1
+            tmp.append(index)
+>>>>>>> c557666d2213e02de23677bf53692e9ecf20b456:src/python/getting-started/digit-recognizer/knn-python3.6.py
             # tmp.append(i)
             tmp.append(int(i)) # 测试集的标签值
             myWriter.writerow(tmp)
 
 
 def knnClassify(trainData, trainLabel):
+<<<<<<< HEAD:src/python/getting-started/digit-recognizer/dr_knn_pandas-3.6.py
     knnClf = KNeighborsClassifier()   # default:k = 5,defined by yourself:KNeighborsClassifier(n_neighbors=10)
     knnClf.fit(trainData, ravel(trainLabel))# ravel Return a contiguous flattened array.
+=======
+    knnClf = KNeighborsClassifier(
+    )  # default:k = 5,defined by yourself:KNeighborsClassifier(n_neighbors=10)
+    knnClf.fit(trainData, ravel(trainLabel))  # ravel 
+>>>>>>> c557666d2213e02de23677bf53692e9ecf20b456:src/python/getting-started/digit-recognizer/knn-python3.6.py
     return knnClf
 
 

src/python/getting-started/digit-recognizer/svm-python3.6.py

@@ -215,7 +215,11 @@ def preDRSVM():
 if __name__ == '__main__':
     trainData, trainLabel, preData = opencsv()
     # 训练并保存模型
+<<<<<<< HEAD:src/python/getting-started/digit-recognizer/dr-python-3.6.py
      #trainDRSVM()
+=======
+    trainDRSVM()
+>>>>>>> c557666d2213e02de23677bf53692e9ecf20b456:src/python/getting-started/digit-recognizer/svm-python3.6.py
 
     # 分析数据
     analyse_data(trainData)