Merge pull request #102 from silx-kit/hplc-exercise

Rework python/numpy part to change the exercise

Author: t20100

python/numpy/Exercise-HPLC.ipynb

@@ -21,7 +21,7 @@ def show(exercice_name):
     return function()
 
 
-def ex4_1():
+def ex3_1():
     """ Simple example of an element wise comparaison"""
     x = numpy.arange(10)
     y = numpy.arange(1, 11)
@@ -30,7 +30,7 @@ def ex4_1():
     return difference
 
 
-def ex4_2():
+def ex3_2():
     """ Simple way to compute the difference x[i+1]-x[i] for all the elements
     of the 1D array"""
     x = numpy.arange(10)
@@ -39,15 +39,15 @@ def ex4_2():
     return difference
 
 
-def ex5_1():
+def ex4_1():
     """Generate a 1D array of [1..99] then operate a binning 1 2 3 4 -> 1+2 3+4
     """
     data = numpy.arange(100) + 1
     binned = data[::2] + data[1::2]
     return data, binned
 
 
-def ex5_2():
+def ex4_2():
     """Generate a 2D array of [1..9999] then operate a 2x2 binning
     """
     data = numpy.arange(10000).reshape(100, 100)
@@ -56,7 +56,7 @@ def ex5_2():
     return data, binned
 
 
-def ex5_2_alt():
+def ex4_2_alt():
     """Generate a 2D array of [1..9999] then operate a 2x2 binning using numpy
     sum and moving the array to 4D
     """
@@ -69,7 +69,7 @@ def ex5_2_alt():
     return data, binned
 
 
-def ex6_inefficient_fill(height=1000, width=1000):
+def ex5_inefficient_fill(height=1000, width=1000):
     """Inefficient fill using 2 for loops"""
     data = numpy.zeros((height, width), dtype=numpy.float)
     for row in range(int(height)):
@@ -78,7 +78,7 @@ def ex6_inefficient_fill(height=1000, width=1000):
     return data
 
 
-def ex6_naive_fill(height=1000, width=1000):
+def ex5_naive_fill(height=1000, width=1000):
     """Fill using 2 for loops but pre-computing sin and cos"""
     width_sin = numpy.sin(numpy.arange(width))
     height_cos = numpy.cos(numpy.arange(height))
@@ -89,7 +89,7 @@ def ex6_naive_fill(height=1000, width=1000):
     return data
 
 
-def ex6_clever_fill(height=1000, width=1000):
+def ex5_clever_fill(height=1000, width=1000):
     """Fill using 2 outer products"""
     width_sin = numpy.sin(numpy.arange(width))
     height_cos = numpy.cos(numpy.arange(height))
@@ -98,22 +98,22 @@ def ex6_clever_fill(height=1000, width=1000):
     return cos_loop * sin_loop
 
 
-def ex6_practical_fill(height=1000, width=1000):
+def ex5_practical_fill(height=1000, width=1000):
     """Fill using meshgrid"""
     width_sin = numpy.sin(numpy.arange(width))
     height_cos = numpy.cos(numpy.arange(height))
     sin_loop, cos_loop = numpy.meshgrid(width_sin, height_cos)
     return sin_loop * cos_loop
 
 
-def ex6_optimized_fill(height=1000, width=1000):
+def ex5_optimized_fill(height=1000, width=1000):
     """Fill using outer product"""
     width_sin = numpy.sin(numpy.arange(width))
     height_cos = numpy.cos(numpy.arange(height))
     return numpy.outer(height_cos, width_sin)
 
 
-def ex6_atleast_2d_fill(height=1000, width=1000):
+def ex5_atleast_2d_fill(height=1000, width=1000):
     """Fill using atleast_2d and transpose"""
     sine = numpy.sin(numpy.arange(width))
     cosine = numpy.cos(numpy.arange(height))