Merge branch 'master' into jayascript-patch-1

Author: dbader

binary-search/README.md

@@ -1,3 +1,73 @@
-# How to Do a Binary Search in Python?
+# How to Do a Binary Search in Python
 
-Code snippets supplementing the [How to Do a Binary Search in Python?](https://realpython.com/binary-search-python/) article on [Real Python](https://realpython.com/).
+Code snippets supplementing the [How to Do a Binary Search in Python](https://realpython.com/binary-search-python/) article.
+
+## Usage
+
+### Download Sample Dataset
+
+To download a sample dataset for benchmarking, run the following script:
+
+```shell
+$ python download_imdb.py
+Fetching data from IMDb...
+Created "names.txt" and "sorted_names.txt"
+```
+
+### Benchmark
+
+**Note:** The hash-based search algorithm requires a separate data structure, so it's not included here. Feel free to treat it as an exercise.
+
+Find the index of Arnold Schwarzenegger in unsorted names using random search:
+
+```shell
+$ python benchmark.py -a random -f names.txt 'Arnold Schwarzenegger'
+Loading names...ok
+[1/10] Found at index=215 (21.68 s)
+[2/10] Found at index=215 (148.10 ms)
+[3/10] Found at index=215 (63.49 s)
+[4/10] Found at index=215 (15.93 s)
+[5/10] Found at index=215 (23.38 s)
+[6/10] Found at index=215 (60.98 s)
+[7/10] Found at index=215 (10.14 s)
+[8/10] Found at index=215 (15.81 s)
+[9/10] Found at index=215 (5.10 s)
+[10/10] Found at index=215 (13.36 s)
+best=148.10 ms, worst=63.49 s, avg=23.00 s, median=15.87 s
+```
+
+Find the index of Arnold Schwarzenegger in unsorted names using linear search:
+
+```shell
+$ python benchmark.py -a linear -f names.txt 'Arnold Schwarzenegger'
+Loading names...ok
+[1/10] Found at index=215 (30.95 µs)
+[2/10] Found at index=215 (26.86 µs)
+[3/10] Found at index=215 (26.26 µs)
+[4/10] Found at index=215 (26.55 µs)
+[5/10] Found at index=215 (26.24 µs)
+[6/10] Found at index=215 (25.88 µs)
+[7/10] Found at index=215 (25.77 µs)
+[8/10] Found at index=215 (25.89 µs)
+[9/10] Found at index=215 (25.91 µs)
+[10/10] Found at index=215 (25.99 µs)
+best=25.77 µs, worst=30.95 µs, avg=26.63 µs, median=26.11 µs
+```
+
+Find the index of Arnold Schwarzenegger in *sorted* names using binary search:
+
+```shell
+$ python benchmark.py -a binary -f sorted_names.txt 'Arnold Schwarzenegger'
+Loading names...ok
+[1/10] Found at index=782431 (18.82 µs)
+[2/10] Found at index=782431 (9.19 µs)
+[3/10] Found at index=782431 (11.08 µs)
+[4/10] Found at index=782431 (9.70 µs)
+[5/10] Found at index=782431 (10.14 µs)
+[6/10] Found at index=782431 (9.35 µs)
+[7/10] Found at index=782431 (9.42 µs)
+[8/10] Found at index=782431 (8.79 µs)
+[9/10] Found at index=782431 (8.66 µs)
+[10/10] Found at index=782431 (8.79 µs)
+best=8.66 µs, worst=18.82 µs, avg=10.39 µs, median=9.38 µs
+```

flask-connexion-rest-part-2/version_1/people.py

@@ -20,7 +20,7 @@ def read_all():
 
     # Serialize the data for the response
     person_schema = PersonSchema(many=True)
-    data = person_schema.dump(people).data
+    data = person_schema.dump(people)
     return data
 
 
@@ -40,7 +40,7 @@ def read_one(person_id):
 
         # Serialize the data for the response
         person_schema = PersonSchema()
-        data = person_schema.dump(person).data
+        data = person_schema.dump(person)
         return data
 
     # Otherwise, nope, didn't find that person
@@ -73,14 +73,14 @@ def create(person):
 
         # Create a person instance using the schema and the passed in person
         schema = PersonSchema()
-        new_person = schema.load(person, session=db.session).data
+        new_person = schema.load(person, session=db.session)
 
         # Add the person to the database
         db.session.add(new_person)
         db.session.commit()
 
         # Serialize and return the newly created person in the response
-        data = schema.dump(new_person).data
+        data = schema.dump(new_person)
 
         return data, 201
 
@@ -142,7 +142,7 @@ def update(person_id, person):
 
         # turn the passed in person into a db object
         schema = PersonSchema()
-        update = schema.load(person, session=db.session).data
+        update = schema.load(person, session=db.session)
 
         # Set the id to the person we want to update
         update.person_id = update_person.person_id
@@ -152,7 +152,7 @@ def update(person_id, person):
         db.session.commit()
 
         # return updated person in the response
-        data = schema.dump(update_person).data
+        data = schema.dump(update_person)
 
         return data, 200