amirTamer commited on
Commit
0e9040f
·
1 Parent(s): 5208bbd
Files changed (1) hide show
  1. app.py +6 -7
app.py CHANGED
@@ -15,12 +15,12 @@ def load_pickle_file(file_name):
15
  except Exception:
16
  return None
17
 
18
- print("Loading GNB model... (this might take a few seconds)")
19
  gnb_package = load_pickle_file("gnb_digit6_package.pkl")
20
  pca_multi = load_pickle_file("pcaMulti.pkl")
21
  rf_model = load_pickle_file("rf_hog_model.pkl")
22
  pca_multi = pca_multi['pca']
23
 
 
24
  if gnb_package is not None:
25
  gnb_binary_model = gnb_package["model"]
26
  pca = gnb_package["pca"]
@@ -52,7 +52,7 @@ svm_scaler = load_pickle_file("svmScaler.pkl")
52
 
53
 
54
 
55
- knn_binary_model = 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"]
@@ -135,12 +135,11 @@ def classify_binary_logreg(image):
135
  return "Logistic Regression Binary: Not 6"
136
 
137
 
138
- def classify_binary_knn(image):
139
- if knn_binary_model is None:
140
  return "KNN Binary model placeholder: model is not inserted yet."
141
-
142
  processed_image = preprocess_image(image, "KNN", "Binary")
143
- prediction = knn_binary_model.predict(processed_image)
144
 
145
  if prediction[0] == 1:
146
  return "KNN Binary: Is 6"
@@ -206,7 +205,7 @@ def predict_with_selected_model(image, model_choice, mode_choice):
206
  elif model_choice == "Logistic Regression":
207
  return classify_binary_logreg(image)
208
  elif model_choice == "KNN":
209
- return classify_binary_knn(image)
210
  else:
211
  return "Unknown binary model selected."
212
 
 
15
  except Exception:
16
  return None
17
 
 
18
  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"]
26
  pca = gnb_package["pca"]
 
52
 
53
 
54
 
55
+ knn_model = load_pickle_file('knn_hog_pca.pkl')
56
 
57
  gnb_multimode_model = load_pickle_file('gnbMulti.pkl')
58
  gnb_multimode_model = gnb_multimode_model["model"]
 
135
  return "Logistic Regression Binary: Not 6"
136
 
137
 
138
+ def classify_knn(image):
139
+ if knn_model is None:
140
  return "KNN Binary model placeholder: model is not inserted yet."
 
141
  processed_image = preprocess_image(image, "KNN", "Binary")
142
+ prediction = knn_model.predict(processed_image)
143
 
144
  if prediction[0] == 1:
145
  return "KNN Binary: Is 6"
 
205
  elif model_choice == "Logistic Regression":
206
  return classify_binary_logreg(image)
207
  elif model_choice == "KNN":
208
+ return classify_knn(image)
209
  else:
210
  return "Unknown binary model selected."
211