Merge branch 'master' of https://github.com/joelgrus/data-science-fro…

…m-scratch

README.md

@@ -38,7 +38,7 @@ If you are on Windows, it's [potentially more complicated](https://stackoverflow
 4. [Linear Algebra](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/linear_algebra.py)
 5. [Statistics](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/statistics.py)
 6. [Probability](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/probability.py)
-7. [Hypothesis and Inference](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/hypothesis_and_inference.py)
+7. [Hypothesis and Inference](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/inference.py)
 8. [Gradient Descent](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/gradient_descent.py)
 9. [Getting Data](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/getting_data.py)
 10. [Working With Data](https://github.com/joelgrus/data-science-from-scratch/blob/master/scratch/working_with_data.py)

scratch/crash_course_in_python.py

@@ -714,12 +714,12 @@ def ugly_function(value: int, operation: Union[str, int, float, bool]) -> int:
     ...
 
 def total(xs: list) -> float:
-    return sum(total)
+    return sum(xs)
 
 from typing import List  # note capital L
 
 def total(xs: List[float]) -> float:
-    return sum(total)
+    return sum(xs)
 
 # This is how to type-annotate variables when you define them.
 # But this is unnecessary; it's "obvious" x is an int.
@@ -769,4 +769,3 @@ def comma_repeater(s: str, n: int) -> str:
 
 def total(xs: Numbers) -> Number:
     return sum(xs)
-