Skip to content

Commit 2eb677a

Browse files
author
Jaime Céspedes Sisniega
authored
Merge pull request #259 from IFCA/fix-numpy-warning
Fix numpy warning in concept drift notebook examples
2 parents e56c04f + 813f290 commit 2eb677a

File tree

2 files changed

+68
-16
lines changed

2 files changed

+68
-16
lines changed

docs/source/examples/concept_drift/DDM_advance.ipynb

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
"from frouros.metrics.prequential_error import PrequentialError"
1616
],
1717
"metadata": {
18-
"collapsed": false
18+
"collapsed": false,
19+
"ExecuteTime": {
20+
"end_time": "2023-08-03T10:20:53.570552027Z",
21+
"start_time": "2023-08-03T10:20:52.101805211Z"
22+
}
1923
}
2024
},
2125
{
@@ -69,7 +73,11 @@
6973
"X_ref, y_ref, X_test, y_test = X[:split_idx], y[:split_idx], X[split_idx:], y[split_idx:].reshape(-1, 1)"
7074
],
7175
"metadata": {
72-
"collapsed": false
76+
"collapsed": false,
77+
"ExecuteTime": {
78+
"end_time": "2023-08-03T10:20:53.780330594Z",
79+
"start_time": "2023-08-03T10:20:53.576182448Z"
80+
}
7381
}
7482
},
7583
{
@@ -93,7 +101,11 @@
93101
")"
94102
],
95103
"metadata": {
96-
"collapsed": false
104+
"collapsed": false,
105+
"ExecuteTime": {
106+
"end_time": "2023-08-03T10:20:53.791824805Z",
107+
"start_time": "2023-08-03T10:20:53.783729817Z"
108+
}
97109
}
98110
},
99111
{
@@ -115,7 +127,11 @@
115127
")"
116128
],
117129
"metadata": {
118-
"collapsed": false
130+
"collapsed": false,
131+
"ExecuteTime": {
132+
"end_time": "2023-08-03T10:20:53.817945430Z",
133+
"start_time": "2023-08-03T10:20:53.792298397Z"
134+
}
119135
}
120136
},
121137
{
@@ -146,7 +162,11 @@
146162
"model.fit(X=X_ref, y=y_ref)"
147163
],
148164
"metadata": {
149-
"collapsed": false
165+
"collapsed": false,
166+
"ExecuteTime": {
167+
"end_time": "2023-08-03T10:20:53.885710194Z",
168+
"start_time": "2023-08-03T10:20:53.803561179Z"
169+
}
150170
}
151171
},
152172
{
@@ -172,7 +192,11 @@
172192
"]"
173193
],
174194
"metadata": {
175-
"collapsed": false
195+
"collapsed": false,
196+
"ExecuteTime": {
197+
"end_time": "2023-08-03T10:20:53.886420130Z",
198+
"start_time": "2023-08-03T10:20:53.874259123Z"
199+
}
176200
}
177201
},
178202
{
@@ -198,7 +222,7 @@
198222
],
199223
"source": [
200224
"def error_scorer(y_true, y_pred): # Error function\n",
201-
" return 1 - int(y_true == y_pred)\n",
225+
" return 1 - (y_true.item() == y_pred.item())\n",
202226
"\n",
203227
"estimator_name = DecisionTreeClassifier.__name__\n",
204228
"detector_name = f\"{estimator_name} + {DDM.__name__}\"\n",
@@ -233,7 +257,11 @@
233257
" idx_warning.append(i)"
234258
],
235259
"metadata": {
236-
"collapsed": false
260+
"collapsed": false,
261+
"ExecuteTime": {
262+
"end_time": "2023-08-03T10:20:55.472325704Z",
263+
"start_time": "2023-08-03T10:20:53.874561107Z"
264+
}
237265
}
238266
},
239267
{
@@ -324,7 +352,11 @@
324352
"plt.show()"
325353
],
326354
"metadata": {
327-
"collapsed": false
355+
"collapsed": false,
356+
"ExecuteTime": {
357+
"end_time": "2023-08-03T10:21:00.064313074Z",
358+
"start_time": "2023-08-03T10:20:55.479268046Z"
359+
}
328360
}
329361
},
330362
{

docs/source/examples/concept_drift/DDM_simple.ipynb

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
"cell_type": "code",
55
"execution_count": 1,
66
"metadata": {
7-
"collapsed": true
7+
"collapsed": true,
8+
"ExecuteTime": {
9+
"end_time": "2023-08-03T10:26:13.216424950Z",
10+
"start_time": "2023-08-03T10:26:12.464032816Z"
11+
}
812
},
913
"outputs": [],
1014
"source": [
@@ -43,7 +47,7 @@
4347
"name": "stderr",
4448
"output_type": "stream",
4549
"text": [
46-
"INFO:frouros:Trying to download data from https://nextcloud.ifca.es/index.php/s/2coqgBEpa82boLS/download to /tmp/tmpagpyvswq\n"
50+
"INFO:frouros:Trying to download data from https://nextcloud.ifca.es/index.php/s/2coqgBEpa82boLS/download to /tmp/tmpvrhnah8i\n"
4751
]
4852
}
4953
],
@@ -59,7 +63,11 @@
5963
"X_ref, y_ref, X_test, y_test = X[:split_idx], y[:split_idx].ravel(), X[split_idx:], y[split_idx:]"
6064
],
6165
"metadata": {
62-
"collapsed": false
66+
"collapsed": false,
67+
"ExecuteTime": {
68+
"end_time": "2023-08-03T10:26:14.629676415Z",
69+
"start_time": "2023-08-03T10:26:13.219694293Z"
70+
}
6371
}
6472
},
6573
{
@@ -90,7 +98,11 @@
9098
"pipeline.fit(X=X_ref, y=y_ref)"
9199
],
92100
"metadata": {
93-
"collapsed": false
101+
"collapsed": false,
102+
"ExecuteTime": {
103+
"end_time": "2023-08-03T10:26:14.746515595Z",
104+
"start_time": "2023-08-03T10:26:14.631972871Z"
105+
}
94106
}
95107
},
96108
{
@@ -105,7 +117,11 @@
105117
"detector = DDM(config=config)"
106118
],
107119
"metadata": {
108-
"collapsed": false
120+
"collapsed": false,
121+
"ExecuteTime": {
122+
"end_time": "2023-08-03T10:26:14.767517723Z",
123+
"start_time": "2023-08-03T10:26:14.717692323Z"
124+
}
109125
}
110126
},
111127
{
@@ -132,15 +148,19 @@
132148
"source": [
133149
"for i, (X, y) in enumerate(zip(X_test, y_test)):\n",
134150
" y_pred = pipeline.predict(X.reshape(1, -1))\n",
135-
" error = 1 - int(y_pred == y)\n",
151+
" error = 1 - (y_pred.item() == y.item())\n",
136152
" detector.update(value=error)\n",
137153
" status = detector.status\n",
138154
" if status[\"drift\"]:\n",
139155
" print(f\"Drift detected at index {i}\")\n",
140156
" break"
141157
],
142158
"metadata": {
143-
"collapsed": false
159+
"collapsed": false,
160+
"ExecuteTime": {
161+
"end_time": "2023-08-03T10:26:15.090283773Z",
162+
"start_time": "2023-08-03T10:26:14.762080041Z"
163+
}
144164
}
145165
},
146166
{

0 commit comments

Comments
 (0)