Moaz715 commited on
Commit
d85c7af
·
1 Parent(s): bf0a882

hoping no errors

Browse files
Files changed (1) hide show
  1. app.py +10 -7
app.py CHANGED
@@ -94,22 +94,25 @@ logreg_multimode_model = load_pickle_file('multiLog2_hog.pkl')
94
 
95
 
96
  def preprocess_image(image, model_choice, mode_choice):
 
97
  image = np.array(image)
98
-
99
- #image = cv2.resize(image, (28, 28))
100
-
101
  image = image / 255.0
102
-
103
  image_hog = hog(
 
104
  image,
 
105
  **hog_params
106
  )
107
-
108
  if mode_choice == "Binary":
109
  if model_choice == "GNB" or model_choice == "KNN":
110
  image_hog = image_hog.reshape(1, -1)
111
  image_pca = pca.transform(image_hog)
112
  return image_pca
 
 
 
 
 
113
  else:
114
  image_hog = image_hog.reshape(1, -1)
115
  return image_hog
@@ -155,8 +158,8 @@ def classify_binary_dt(image):
155
 
156
  def classify_binary_svm(image):
157
  processed_image = preprocess_image(image, "SVM", "Binary")
158
- scaled = svm_scaler.transform(processed_image)
159
- prediction = svm_binary_model.predict(scaled)
160
 
161
  if prediction[0] == 1:
162
  return "SVM Binary: Is 6"
 
94
 
95
 
96
  def preprocess_image(image, model_choice, mode_choice):
97
+
98
  image = np.array(image)
 
 
 
99
  image = image / 255.0
 
100
  image_hog = hog(
101
+
102
  image,
103
+
104
  **hog_params
105
  )
 
106
  if mode_choice == "Binary":
107
  if model_choice == "GNB" or model_choice == "KNN":
108
  image_hog = image_hog.reshape(1, -1)
109
  image_pca = pca.transform(image_hog)
110
  return image_pca
111
+ elif model_choice == "SVM":
112
+ image_r = image.reshape(1,-1)
113
+ scaled_img = svm_scaler.transform(image_r)
114
+ svm_img_hog = hog(scaled_img, **hog_params)
115
+ return svm_img_hog
116
  else:
117
  image_hog = image_hog.reshape(1, -1)
118
  return image_hog
 
158
 
159
  def classify_binary_svm(image):
160
  processed_image = preprocess_image(image, "SVM", "Binary")
161
+ #scaled = svm_scaler.transform(processed_image)
162
+ prediction = svm_binary_model.predict(processed_image)
163
 
164
  if prediction[0] == 1:
165
  return "SVM Binary: Is 6"