Merge branch 'gh-pages' of github.com:dsten/data8assets into gh-pages

sammcveety · Apr 1, 2016 · 664cacc · 664cacc
2 parents a72dedb + bfa525d
commit 664cacc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/labs/lab10/lab10.ipynb b/labs/lab10/lab10.ipynb
@@ -244,7 +244,7 @@
    },
    "outputs": [],
    "source": [
-    "my_classifier = make_classifier(lyrics)"
+    "my_classifier = ..."
    ]
   },
   {

diff --git a/labs/lab10/tests/q31.py b/labs/lab10/tests/q31.py
@@ -6,14 +6,15 @@
       'cases': [
         {
           'code': r"""
-          >>> c = make_best_knn_classifier(lyrics.take(range(20)), lyrics.take(range(20, 25)))
+          >>> your_classifier = make_best_knn_classifier(lyrics.take(range(20)), lyrics.take(range(20, 25)))
           >>> import collections
           >>> # make_best_knn_classifier should return a function.
-          >>> isinstance(c, collections.Callable)
+          >>> isinstance(your_classifier, collections.Callable)
           True
-          >>> # It looks like your classifier doesn't behave like the correct
-          >>> # one does.
-          >>> c(lyrics.drop(0).row(30)) == 'Hip-hop'
+          >>> # It looks like your function doesn't produce classifiers that
+          >>> # behave as expected.
+          >>> expected_classifier = make_knn_classifier(lyrics.take(range(20)), 1)
+          >>> np.all(lyrics.drop(0).apply(your_classifier) == lyrics.drop(0).apply(expected_classifier))
           True
           """,
           'hidden': False,