Move new master to old typos #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Typo fix (rsokl#141) * Fixed dict.fromkeys typo in Module 4, pep-8 compliant * Fixed multiple typos in Module 2 and Module 3 Module 2 Understanding the Modulo Operator, Reading Comprehension Solutions CHANGE FROM: If `n` is an integer, then 2 will divide into it evenly, and thus there is no remainder. CHANGE TO: If `n` is an even integer, then 2 will divide into it evenly, and thus there is no remainder. Module 2 Data Structures (Part II): Dictionaries, Reading Comprehension Solutions CHANGE FROM: >>> get_maxes(dict(a=1, b=2,c= 2, d=1)) CHANGE TO: >>> get_maxes(dict(a=1, b=2, c=2, d=1)) Module 3 Fixed links from "docs.scipy.org/doc/numpy/" to "numpy.org/doc/stable/" Module 3 "Vectorized" Operations, Reading Comprehension Solutions CHANGE FROM: # top-left top-right bottom-left bottom-right >>> x[:2, :2] + x[:2, -2:] + x[-2:, :2] + x[-2:, -2:] array([[20, 24], [36, 40]]) CHANGE TO: # top-left top-right bottom-left bottom-right >>> np.array([[np.sum(x[:2, :2]), np.sum(x[:2, 2:])], [np.sum(x[2:, :2]), np.sum(x[2:, 2:])]]) array([[10, 18], [42, 50]]) Module 3 "Vectorized" Operations, Reading Comprehension: Basic Sequential Functions CHANGE FROM: Thus a (32,32,3) array would be a 32x32 RBG image. CHANGE TO: Thus a (32,32,3) array would be a 32x32 RGB image. Module 3 Array Broadcasting, Reading Comprehension Solutions MOVE "Broadcast Compatibility: Solution" section to BEFORE "Basic Broadcasting: Solution" ADD <!-- #region --> and <!-- #endregion --> to moved section Module 3 Array Broadcasting, Reading Comprehension: Basic Broadcasting III CHANGE FROM: Thus a (32,32,3) array would be a 32x32 RBG image. CHANGE TO: Thus a (32,32,3) array would be a 32x32 RGB image. Module 3 Introduction to Basic and Advanced Indexing: Reading Comprehension: Ellipsis QUESTION ABOUT: Given a N-dimensional array, x, index into x such that you axis entry-0 of axis-0 QUESTION: "such that you axis"? Should it be "such that you access"? Module 3 Introduction to Basic and Advanced Indexing: Reading Comprehension Augmenting Array Data In-Place IN: >>> np.log(x[1:3], out=x[1:3]) >>> y += 3 REMOVE: (duplicate from rsokl#4, not relevant and not in solution) >>> y += 3 Module 3 Introduction to Basic and Advanced Indexing: Reading Comprehension Augmenting Array Data In-Place IN rsokl#7: CHANGE FROM: >>> y = y + 2 CHANGE TO (match answer key, and is already same question #3 asks): >>> x = np.square(x) Module 3 Introduction to Basic and Advanced Indexing: Reading Comprehension Augmenting Array Data In-Place AFTER rsokl#9, APPEND: ```python >>> np.square(y, out=y) ``` (answer is in Solutions, problem is missing) Module 3 Introduction to Basic and Advanced Indexing: Reading Comprehension Solutions: Assignment via advanced indexing Problem does not match solution. CHANGE FROM: Replace the diagonal elements of `x` with `(-1, -2, -3, -4)`, and add `1` to all values in `x` that are greater than `0.8`. CHANGE TO: Replace the diagonal elements of `x` with `(0, 1, 2, 3)`, and add `1` to all values in `x` that are greater than `0.8`. * Updated old scipy.org links to numpy.org links * Update Python/Module3_IntroducingNumpy/VectorizedOperations.md Co-Authored-By: Ryan Soklaski <ryan.soklaski@gmail.com> * Fixed typo "axis" to "access" in Module 3 * Added Patrick O'Shea to Contributors Co-authored-by: Ryan Soklaski <ryan.soklaski@gmail.com>
Sync fork with rskol master
* updated sam github link * Added section on versioning * add mention of Anaconda (also formatting) * addressed changes * small fixes and changes * Apply suggestions from code review Co-authored-by: Ryan Soklaski <ryan.soklaski@gmail.com> * Update Python/Module1_GettingStartedWithPython/GettingStartedWithPython.md Co-authored-by: Ryan Soklaski <ryan.soklaski@gmail.com> * clarified compatability * Update Python/Module1_GettingStartedWithPython/GettingStartedWithPython.md Co-authored-by: Ryan Soklaski <ryan.soklaski@gmail.com> Co-authored-by: Ryan Soklaski <ryan.soklaski@gmail.com>
* add clipping to square-distance calculation * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> * Update Python/Module3_IntroducingNumpy/Broadcasting.md Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com> Co-authored-by: David Mascharka <davidmascharka@users.noreply.github.com>
* add callouts to warn about jedi incompatibility * line not lines
* Jupyter Notebooks: fix typos; fix broken plot * Update discussion of IDEs and improve formatting * Recommend PyLance extension instead of pyright. Closes rsokl#162 * update changelog and copyright date * add discussion board link * one line per sentence * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module5_OddsAndEnds/Writing_Good_Code.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> * Update Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> Co-authored-by: Petar Griggs <petargriggs@gmail.com>
* add type-annotated completions in jupyter; closes rsokl#136 * Update Python/Module5_OddsAndEnds/Writing_Good_Code.md Co-authored-by: Petar Griggs <petargriggs@gmail.com> Co-authored-by: Petar Griggs <petargriggs@gmail.com>
Upgrade backend
Co-authored-by: Petar Griggs <petargriggs@gmail.com>
Code format discussion
Fix typo in functions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Github "remote rebasing" of typos branch to work on more typos.