daviddoji/numpy-100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25 from joeyfreund/patch-1

Browse Source 
Add alternative solution using matrix multiplication operator
This commit is contained in:
Nicolas P. Rougier 2016-10-01 19:12:11 +02:00 committed by GitHub
commit 44b5e1e940
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
100 Numpy exercises.ipynb
View File

@ -477,7 +477,10 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"Z = np.dot(np.ones((5,3)), np.ones((3,2)))\n", "Z = np.dot(np.ones((5,3)), np.ones((3,2)))\n",
"print(Z)" "print(Z)",
"\n\n",
"# Alternative solution, in Python 3.5 and above\n",
"Z = np.ones((5,3)) @ np.ones((3,2))"
] ]
}, },
{ {

4
100 Numpy exercises.md
View File

@ -208,6 +208,10 @@ color = np.dtype([("r", np.ubyte, 1),
```python ```python
Z = np.dot(np.ones((5,3)), np.ones((3,2))) Z = np.dot(np.ones((5,3)), np.ones((3,2)))
print(Z) print(Z)
# Alternative solution, in Python 3.5 and above
Z = np.ones((5,3)) @ np.ones((3,2))
print(Z)
``` ```
#### 25. Given a 1D array, negate all elements which are between 3 and 8, in place. (★☆☆) #### 25. Given a 1D array, negate all elements which are between 3 and 8, in place. (★☆☆)