Marcel0123 commited on
Commit
169930a
·
verified ·
1 Parent(s): dd8abf2

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +9 -5
app.py CHANGED
@@ -136,6 +136,7 @@ def train_and_stream(test_size, model_name, params, epochs, pause_s):
136
  classes = np.unique(y_train)
137
  for e in range(1, int(epochs) + 1):
138
  clf.partial_fit(X_train_s, y_train, classes=classes)
 
139
  y_pred = clf.predict(X_test_s)
140
  acc = accuracy_score(y_test, y_pred)
141
  f1 = f1_score(y_test, y_pred, average="weighted")
@@ -155,14 +156,17 @@ def train_and_stream(test_size, model_name, params, epochs, pause_s):
155
  x=coords_test[:, 0], y=coords_test[:, 1], mode="markers",
156
  name="Test set", marker=dict(size=10, symbol="circle-open", line=dict(width=2))
157
  ))
 
158
  metrics_md = (
159
  f"### Metrieken (testset)\n"
160
  f"**Accuracy:** {acc:.3f} \n"
161
  f"**F1 (gewogen):** {f1:.3f} \n"
162
  f"**ROC AUC:** {auc:.3f}\n"
163
  )
164
- # stream: Plotly-dict + markdown-string
165
- yield fig_epoch.to_dict(), metrics_md
 
 
166
  if pause_s and float(pause_s) > 0:
167
  time.sleep(float(pause_s))
168
  return
@@ -186,16 +190,17 @@ def train_and_stream(test_size, model_name, params, epochs, pause_s):
186
  x=coords_test[:, 0], y=coords_test[:, 1], mode="markers",
187
  name="Test set", marker=dict(size=10, symbol="circle-open", line=dict(width=2)),
188
  ))
 
189
  metrics_md = (
190
  f"### Metrieken (testset)\n"
191
  f"**Accuracy:** {acc:.3f} \n"
192
  f"**F1 (gewogen):** {f1:.3f} \n"
193
  f"**ROC AUC:** {auc:.3f}\n"
194
  )
195
- return fig.to_dict(), metrics_md
196
 
197
  def preview_dataset():
198
- df, ycol = load_builtin_dataset()
199
  return df.head(10)
200
 
201
  def predict_row(model_name, params, row_index):
@@ -290,7 +295,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="purple", neutral_hue="slate"))
290
  rf_depth=None if int(rf_depth_v) == 0 else int(rf_depth_v),
291
  svm_c=float(svm_c_v),
292
  )
293
- # stream generator
294
  yield from train_and_stream(test_size_v, model_name_v, params, epochs_v, pause_v)
295
 
296
  demo.load(
 
136
  classes = np.unique(y_train)
137
  for e in range(1, int(epochs) + 1):
138
  clf.partial_fit(X_train_s, y_train, classes=classes)
139
+
140
  y_pred = clf.predict(X_test_s)
141
  acc = accuracy_score(y_test, y_pred)
142
  f1 = f1_score(y_test, y_pred, average="weighted")
 
156
  x=coords_test[:, 0], y=coords_test[:, 1], mode="markers",
157
  name="Test set", marker=dict(size=10, symbol="circle-open", line=dict(width=2))
158
  ))
159
+
160
  metrics_md = (
161
  f"### Metrieken (testset)\n"
162
  f"**Accuracy:** {acc:.3f} \n"
163
  f"**F1 (gewogen):** {f1:.3f} \n"
164
  f"**ROC AUC:** {auc:.3f}\n"
165
  )
166
+
167
+ # >>> Belangrijk: geef een **Figure**, geen dict
168
+ yield fig_epoch, metrics_md
169
+
170
  if pause_s and float(pause_s) > 0:
171
  time.sleep(float(pause_s))
172
  return
 
190
  x=coords_test[:, 0], y=coords_test[:, 1], mode="markers",
191
  name="Test set", marker=dict(size=10, symbol="circle-open", line=dict(width=2)),
192
  ))
193
+
194
  metrics_md = (
195
  f"### Metrieken (testset)\n"
196
  f"**Accuracy:** {acc:.3f} \n"
197
  f"**F1 (gewogen):** {f1:.3f} \n"
198
  f"**ROC AUC:** {auc:.3f}\n"
199
  )
200
+ return fig, metrics_md
201
 
202
  def preview_dataset():
203
+ df, _ = load_builtin_dataset()
204
  return df.head(10)
205
 
206
  def predict_row(model_name, params, row_index):
 
295
  rf_depth=None if int(rf_depth_v) == 0 else int(rf_depth_v),
296
  svm_c=float(svm_c_v),
297
  )
 
298
  yield from train_and_stream(test_size_v, model_name_v, params, epochs_v, pause_v)
299
 
300
  demo.load(