amirTamer commited on
Commit
4b0fd5b
·
1 Parent(s): 14483b4
Files changed (1) hide show
  1. app.py +9 -4
app.py CHANGED
@@ -19,7 +19,7 @@ gnb_package = load_pickle_file("gnb_digit6_package.pkl")
19
  pca_multi = load_pickle_file("pcaMulti.pkl")
20
  rf_model = load_pickle_file("rf_hog_model.pkl")
21
  pca_multi = pca_multi['pca']
22
-
23
 
24
  if gnb_package is not None:
25
  gnb_binary_model = gnb_package["model"]
@@ -53,6 +53,7 @@ svm_scaler = load_pickle_file("svmScaler.pkl")
53
 
54
 
55
  knn_model_binary = load_pickle_file('knn_final_model.pkl')
 
56
 
57
  gnb_multimode_model = load_pickle_file('gnbMulti.pkl')
58
  gnb_multimode_model = gnb_multimode_model["model"]
@@ -60,7 +61,6 @@ dt_multimode_model = load_pickle_file('dt_Multi.pkl')
60
  dt_multimode_model = dt_multimode_model['model']
61
  svm_multimode_model = None
62
  logreg_multimode_model = load_pickle_file('multiLog2_hog.pkl')
63
- knn_multimode_model = None
64
 
65
 
66
 
@@ -88,6 +88,11 @@ def preprocess_image(image, model_choice, mode_choice):
88
  elif model_choice == "DT" or model_choice == "Logistic Regression":
89
  image_hog = image_hog.reshape(1, -1)
90
  return image_hog
 
 
 
 
 
91
 
92
 
93
  def classify_binary_gnb(image):
@@ -179,8 +184,8 @@ def classify_multimode_logreg(image):
179
 
180
  def classify_multimode_knn(image):
181
 
182
- processed_image = preprocess_image(image, "KNN", "Binary")
183
- prediction = knn_model.predict(processed_image)
184
  return "KNN Multimode prediction: " + str(prediction[0])
185
 
186
  def classify_rf(image):
 
19
  pca_multi = load_pickle_file("pcaMulti.pkl")
20
  rf_model = load_pickle_file("rf_hog_model.pkl")
21
  pca_multi = pca_multi['pca']
22
+ pca_KNN = load_pickle_file("knn_pca.pkl")
23
 
24
  if gnb_package is not None:
25
  gnb_binary_model = gnb_package["model"]
 
53
 
54
 
55
  knn_model_binary = load_pickle_file('knn_final_model.pkl')
56
+ knn_multi = load_pickle_file("knn_hog_pca.pkl")
57
 
58
  gnb_multimode_model = load_pickle_file('gnbMulti.pkl')
59
  gnb_multimode_model = gnb_multimode_model["model"]
 
61
  dt_multimode_model = dt_multimode_model['model']
62
  svm_multimode_model = None
63
  logreg_multimode_model = load_pickle_file('multiLog2_hog.pkl')
 
64
 
65
 
66
 
 
88
  elif model_choice == "DT" or model_choice == "Logistic Regression":
89
  image_hog = image_hog.reshape(1, -1)
90
  return image_hog
91
+ elif model_choice == "KNN":
92
+ image_hog = image_hog.reshape(1, -1)
93
+ image_pca = pca_KNN.transform(image_hog)
94
+ return image_pca
95
+
96
 
97
 
98
  def classify_binary_gnb(image):
 
184
 
185
  def classify_multimode_knn(image):
186
 
187
+ processed_image = preprocess_image(image, "KNN", "Multimode")
188
+ prediction = knn_multi.predict(processed_image)
189
  return "KNN Multimode prediction: " + str(prediction[0])
190
 
191
  def classify_rf(image):