Skip to content

Commit 95477b5

Browse files
authored
Merge branch 'master' into add-java-solution-spirale
2 parents a046504 + 4754c9c commit 95477b5

File tree

10 files changed

+283
-151
lines changed

10 files changed

+283
-151
lines changed

.github/workflows/build-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 30
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Use Node.js 20.x
16-
uses: actions/setup-node@v1
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: 20.x
1919
- uses: dart-lang/setup-dart@v1
2020

2121
- name: Cache node modules
22-
uses: actions/cache@v2
22+
uses: actions/cache@v4
2323
id: cache-node-modules
2424
with:
2525
path: node_modules

.github/workflows/prettier.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
with:
1717
# Make sure the actual branch is checked out when running on pull requests
1818
ref: ${{ github.head_ref }}

.github/workflows/test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
tests:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0 # Required to retrieve git history of Chromatic
2222
- name: Use Node.js 20.x
23-
uses: actions/setup-node@v1
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20.x
2626
- name: Cache node modules
27-
uses: actions/cache@v2
27+
uses: actions/cache@v4
2828
id: cache-node-modules
2929
with:
3030
path: node_modules
@@ -59,14 +59,14 @@ jobs:
5959
runs-on: ubuntu-latest
6060
timeout-minutes: 30
6161
steps:
62-
- uses: actions/checkout@v2
62+
- uses: actions/checkout@v4
6363
- name: Use Node.js 20.x
6464
uses: actions/setup-node@v1
6565
with:
6666
node-version: 20.x
6767

6868
- name: Cache node modules
69-
uses: actions/cache@v2
69+
uses: actions/cache@v4
7070
id: cache-node-modules
7171
with:
7272
path: node_modules

.github/workflows/update-usaco.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout usaco-guide
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v4
1111
with:
1212
fetch-depth: 0
1313
- name: Use Node.js 20.x
14-
uses: actions/setup-node@v1
14+
uses: actions/setup-node@v4
1515
with:
1616
node-version: 20.x
1717
- name: Checkout usaco-problems
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919
with:
2020
repository: ${{ github.repository_owner }}/usaco-problems
2121
path: usaco-problems

content/1_General/Running_Code_Locally.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ If you have installed `g++` as described
267267
This is usable with
268268
[GCC](https://en.wikipedia.org/wiki/GNU_Compiler_Collection). However, Mac OS X
269269
uses [Clang](https://en.wikipedia.org/wiki/Clang) while Windows uses
270-
[Microsoft Visual C++ (MVSC)](https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B)
270+
[Microsoft Visual C++ (MSVC)](https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B)
271271
by default. `<bits/stdc++.h>` is **not** a standard header file, so it will not
272272
work with the latter two. This is one of the reasons why you should **not** use
273273
`<bits/stdc++.h>` outside of competitive programming.

content/6_Advanced/Slope_Trick.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ fertilizer), so it's not too hard to guess that slope trick is applicable.
365365

366366
### Slow Solution
367367

368-
Let $dp[i][j]$ equal the number of ways to move dirt around the first $i$
368+
Let $dp[i][j]$ equal the minimum cost to move dirt around the first $i$
369369
flowerbeds such that the first $i-1$ flowerbeds all have the correct amount of
370370
dirt while the $i$-th flowerbed has $j$ extra units of dirt (or lacks $-j$ units
371371
of dirt if $j$ is negative). The answer will be $dp[N][0]$.

0 commit comments

Comments
 (0)