Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor changes and typo fixes #286

Merged
merged 35 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
df745a5
adding the links to all indexing materials
negin513 Jul 11, 2023
155c810
typo fix + remove a redundant example.
negin513 Jul 11, 2023
bb65245
Merge branch 'xarray-contrib:main' into main
negin513 Jun 6, 2024
3300d69
updates to indexing
negin513 Jun 6, 2024
19c97f4
updating advanced indexing
negin513 Jun 6, 2024
f25af4c
advanced indexing
negin513 Jun 6, 2024
9ff571a
update indexing redundancies
negin513 Jun 6, 2024
64d714c
adding excercise
negin513 Jun 6, 2024
8999e25
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 6, 2024
3287085
few fixes for build fail
negin513 Jun 6, 2024
5b68630
updating header
negin513 Jun 6, 2024
e7bd5c3
updating header
negin513 Jun 6, 2024
50385e9
Merge branch 'main' into indexing
scottyhq Jun 25, 2024
fd4e240
align with new exercise syntax
scottyhq Jun 25, 2024
473ac50
adding advanced indexing
negin513 Jul 1, 2024
f670605
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 1, 2024
2a5ffb2
add numpy advanced indexing
negin513 Jul 1, 2024
82d7bf1
update learning objectives
negin513 Jul 2, 2024
5e3ef9b
few minor updates and wording changes
negin513 Jul 2, 2024
7ff7a19
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
24462e4
update indexing docs
negin513 Jul 2, 2024
792fc33
quick merge conflict resolve
negin513 Jul 2, 2024
c22c825
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
11e2aa4
update docs
negin513 Jul 2, 2024
7d70d22
adding np.ix_
negin513 Jul 2, 2024
89459e5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
5f18954
fix merge
negin513 Jul 2, 2024
3081b36
typo fix
negin513 Jul 2, 2024
383eeae
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
87b22b6
quick typo fix
negin513 Jul 8, 2024
1d244ea
typo
negin513 Jul 8, 2024
5fff2dc
typo
negin513 Jul 8, 2024
f95e416
typo fix
negin513 Jul 8, 2024
2d4af43
Merge branch 'main' into indexing
negin513 Jul 8, 2024
921096f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion intermediate/01-high-level-computation-patterns.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
":class: dropdown\n",
"\n",
"```python\n",
"data.coarsen(lat=5, lon=5, boundary=\"trim\").reduce(np.mean).plot();\n",
"data.coarsen(lat=5, lon=5, boundary=\"trim\").reduce(np.ptp).plot();\n",
"```\n",
":::\n",
"::::"
Expand Down
10 changes: 6 additions & 4 deletions intermediate/indexing/advanced-indexing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"\n",
"ds = xr.tutorial.load_dataset(\"air_temperature\")\n",
"da_air = ds.air\n",
"ds"
"da_air"
]
},
{
Expand All @@ -171,7 +171,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"👆 please notice how the output of the indexing example above resulted in an array of size `3x4`"
"👆 Please note that the output shape in the example above is `4x3` because the latitude indexer selects 4 rows, and the longitude indexer selects 3 columns."
]
},
{
Expand Down Expand Up @@ -239,7 +239,9 @@
"To trigger vectorized indexing behavior, you will need to provide the selection dimensions with a new **shared** output dimension name. This means that the dimensions of both indexers must be the same, and the output will have the same dimension name as the indexers.\n",
"```\n",
"\n",
"Let's see how this works with an example. A researcher wants to find the nearest climate model grid cell to a collection of observation sites. She has the latitude and longitude of the observation sites as following:"
"Let's see how this works with an example:\n",
"\n",
"A researcher wants to find the nearest climate model grid cell to a collection of observation sites. They have the latitude and longitude of the observation sites as following:"
]
},
{
Expand All @@ -257,7 +259,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"If the researcher use the lists to index the DataArray, they will get the orthogonal indexing behavior, which is not what they wants."
"If the researcher use the lists to index the DataArray, they will get the orthogonal indexing behavior, which is not what they want."
]
},
{
Expand Down
Loading