I'm done

rwb11001 · Apr 26, 2024 · b706129 · b706129
1 parent 5f4a9c4
commit b706129
Show file tree

Hide file tree

Showing 5 changed files with 315 additions and 117 deletions.
diff --git a/Band_Analysis.ipynb b/Band_Analysis.ipynb
diff --git a/PHM08_Analysis.ipynb b/PHM08_Analysis.ipynb
diff --git a/README.md b/README.md
diff --git a/fp.py b/fp.py
@@ -43,10 +43,16 @@ def get_aspect_ratio(ax):
 #  2 -> true negative
 #  3 -> false positive
 #  4 -> false negative
-def score_classifier(clf, x, y):
+def score_classifier(clf, x, y, cutoff = None):
     score = clf.score(x, y)
     (m, _) = x.shape
-    p = clf.predict(x)
+    if cutoff is None:
+        p = clf.predict(x)
+    else:
+        probs = clf.predict_proba(x)
+        cutoff_array = np.full_like(probs, cutoff)
+        p = np.greater(probs, cutoff_array)[:,1].astype(int)
+
     true_pos = 0
     true_neg = 0
     false_pos = 0

diff --git a/phm08.py b/phm08.py
@@ -96,15 +96,15 @@ class DataSplits:
         x_series = [self.series[i][0] for i in range(200, 218)]
         y_series = [self.series[i][1] for i in range(200, 218)]
         x_test = np.concatenate(x_series, axis = 0)
-        y_test = np.concatenate(x_series, axis = 0)
+        y_test = np.concatenate(y_series, axis = 0)
         return (x_test, y_test)
 
     # Returns all 200 series reserved for training.
     def get_train_data(self):
         x_series = [self.series[i][0] for i in range(0, 200)]
         y_series = [self.series[i][1] for i in range(0, 200)]
         x_test = np.concatenate(x_series, axis = 0)
-        y_test = np.concatenate(x_series, axis = 0)
+        y_test = np.concatenate(y_series, axis = 0)
         return (x_test, y_test)