Skip to content

Commit aed89ac

Browse files
yanglbmeyanglbme
authored
feat: update solutions to lc problem: No.1518 (doocs#1669)
No.1518.Water Bottles
1 parent 2dcbfc9 commit aed89ac

File tree

13 files changed

+83
-65
lines changed

13 files changed

+83
-65
lines changed

‎.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ node_modules/
1414
/solution/bash_problem_readme_template.md
1515
/solution/bash_problem_readme_template_en.md
1616
/solution/0100-0199/0177.Nth Highest Salary/Solution.sql
17-
/solution/0600-0699/0627.Swap Salary/Solution.sql
1817
/solution/1400-1499/1454.Active Users/Solution.sql
1918
/solution/1400-1499/1484.Group Sold Products By The Date/Solution.sql
2019
/solution/1500-1599/1511.Customer Order Frequency/Solution.sql

‎.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"solution/0600-0699/0610.Triangle Judgement/Solution.sql",
2020
"solution/0600-0699/0618.Students Report By Geography/Solution.sql",
2121
"solution/0600-0699/0626.Exchange Seats/Solution.sql",
22+
"solution/0600-0699/0627.Swap Salary/Solution.sql",
2223
"solution/1000-1099/1097.Game Play Analysis V/Solution.sql",
2324
"solution/1000-1099/1098.Unpopular Books/Solution.sql",
2425
"solution/1100-1199/1113.Reported Posts/Solution.sql",

‎solution/1500-1599/1518.Water Bottles/README.md

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ class Solution:
8787
class Solution {
8888
public int numWaterBottles(int numBottles, int numExchange) {
8989
int ans = numBottles;
90-
while (numBottles >= numExchange) {
90+
for (; numBottles >= numExchange; ++ans) {
9191
numBottles -= (numExchange - 1);
92-
++ans;
9392
}
9493
return ans;
9594
}
@@ -103,9 +102,8 @@ class Solution {
103102
public:
104103
int numWaterBottles(int numBottles, int numExchange) {
105104
int ans = numBottles;
106-
while (numBottles >= numExchange) {
105+
for (; numBottles >= numExchange; ++ans) {
107106
numBottles -= (numExchange - 1);
108-
++ans;
109107
}
110108
return ans;
111109
}
@@ -117,14 +115,25 @@ public:
117115
```go
118116
func numWaterBottles(numBottles int, numExchange int) int {
119117
ans := numBottles
120-
for numBottles >= numExchange {
118+
for ; numBottles >= numExchange; ans++ {
121119
numBottles -= (numExchange - 1)
122-
ans++
123120
}
124121
return ans
125122
}
126123
```
127124

125+
### **TypeScript**
126+
127+
```ts
128+
function numWaterBottles(numBottles: number, numExchange: number): number {
129+
let ans = numBottles;
130+
for (; numBottles >= numExchange; ++ans) {
131+
numBottles -= numExchange - 1;
132+
}
133+
return ans;
134+
}
135+
```
136+
128137
### **PHP**
129138

130139
```php
@@ -135,12 +144,12 @@ class Solution {
135144
* @return Integer
136145
*/
137146
function numWaterBottles($numBottles, $numExchange) {
138-
$sum = $numBottles;
147+
$ans = $numBottles;
139148
while ($numBottles >= $numExchange) {
140149
$numBottles = $numBottles - $numExchange + 1;
141-
$sum++;
150+
$ans++;
142151
}
143-
return $sum;
152+
return $ans;
144153
}
145154
}
146155
```
@@ -154,12 +163,11 @@ class Solution {
154163
* @return {number}
155164
*/
156165
var numWaterBottles = function (numBottles, numExchange) {
157-
let sum = numBottles;
158-
while (numBottles >= numExchange) {
159-
numBottles = numBottles - numExchange + 1;
160-
sum++;
166+
let ans = numBottles;
167+
for (; numBottles >= numExchange; ++ans) {
168+
numBottles -= numExchange - 1;
161169
}
162-
return sum;
170+
return ans;
163171
};
164172
```
165173

‎solution/1500-1599/1518.Water Bottles/README_EN.md

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ class Solution:
5959
class Solution {
6060
public int numWaterBottles(int numBottles, int numExchange) {
6161
int ans = numBottles;
62-
while (numBottles >= numExchange) {
62+
for (; numBottles >= numExchange; ++ans) {
6363
numBottles -= (numExchange - 1);
64-
++ans;
6564
}
6665
return ans;
6766
}
@@ -75,9 +74,8 @@ class Solution {
7574
public:
7675
int numWaterBottles(int numBottles, int numExchange) {
7776
int ans = numBottles;
78-
while (numBottles >= numExchange) {
77+
for (; numBottles >= numExchange; ++ans) {
7978
numBottles -= (numExchange - 1);
80-
++ans;
8179
}
8280
return ans;
8381
}
@@ -89,14 +87,25 @@ public:
8987
```go
9088
func numWaterBottles(numBottles int, numExchange int) int {
9189
ans := numBottles
92-
for numBottles >= numExchange {
90+
for ; numBottles >= numExchange; ans++ {
9391
numBottles -= (numExchange - 1)
94-
ans++
9592
}
9693
return ans
9794
}
9895
```
9996

97+
### **TypeScript**
98+
99+
```ts
100+
function numWaterBottles(numBottles: number, numExchange: number): number {
101+
let ans = numBottles;
102+
for (; numBottles >= numExchange; ++ans) {
103+
numBottles -= numExchange - 1;
104+
}
105+
return ans;
106+
}
107+
```
108+
100109
### **PHP**
101110

102111
```php
@@ -107,12 +116,12 @@ class Solution {
107116
* @return Integer
108117
*/
109118
function numWaterBottles($numBottles, $numExchange) {
110-
$sum = $numBottles;
119+
$ans = $numBottles;
111120
while ($numBottles >= $numExchange) {
112121
$numBottles = $numBottles - $numExchange + 1;
113-
$sum++;
122+
$ans++;
114123
}
115-
return $sum;
124+
return $ans;
116125
}
117126
}
118127
```
@@ -126,12 +135,11 @@ class Solution {
126135
* @return {number}
127136
*/
128137
var numWaterBottles = function (numBottles, numExchange) {
129-
let sum = numBottles;
130-
while (numBottles >= numExchange) {
131-
numBottles = numBottles - numExchange + 1;
132-
sum++;
138+
let ans = numBottles;
139+
for (; numBottles >= numExchange; ++ans) {
140+
numBottles -= numExchange - 1;
133141
}
134-
return sum;
142+
return ans;
135143
};
136144
```
137145

‎solution/1500-1599/1518.Water Bottles/Solution.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
class Solution {
2-
public:
3-
int numWaterBottles(int numBottles, int numExchange) {
4-
int ans = numBottles;
5-
while (numBottles >= numExchange) {
6-
numBottles -= (numExchange - 1);
7-
++ans;
8-
}
9-
return ans;
10-
}
1+
class Solution {
2+
public:
3+
int numWaterBottles(int numBottles, int numExchange) {
4+
int ans = numBottles;
5+
for (; numBottles >= numExchange; ++ans) {
6+
numBottles -= (numExchange - 1);
7+
}
8+
return ans;
9+
}
1110
};

‎solution/1500-1599/1518.Water Bottles/Solution.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
func numWaterBottles(numBottles int, numExchange int) int {
22
ans := numBottles
3-
for numBottles >= numExchange {
3+
for ; numBottles >= numExchange; ans++ {
44
numBottles -= (numExchange - 1)
5-
ans++
65
}
76
return ans
87
}

‎solution/1500-1599/1518.Water Bottles/Solution.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
class Solution {
2-
public int numWaterBottles(int numBottles, int numExchange) {
3-
int ans = numBottles;
4-
while (numBottles >= numExchange) {
5-
numBottles -= (numExchange - 1);
6-
++ans;
7-
}
8-
return ans;
9-
}
1+
class Solution {
2+
public int numWaterBottles(int numBottles, int numExchange) {
3+
int ans = numBottles;
4+
for (; numBottles >= numExchange; ++ans) {
5+
numBottles -= (numExchange - 1);
6+
}
7+
return ans;
8+
}
109
}

‎solution/1500-1599/1518.Water Bottles/Solution.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
* @return {number}
55
*/
66
var numWaterBottles = function (numBottles, numExchange) {
7-
let sum = numBottles;
8-
while (numBottles >= numExchange) {
9-
numBottles = numBottles - numExchange + 1;
10-
sum++;
7+
let ans = numBottles;
8+
for (; numBottles >= numExchange; ++ans) {
9+
numBottles -= numExchange - 1;
1110
}
12-
return sum;
11+
return ans;
1312
};

‎solution/1500-1599/1518.Water Bottles/Solution.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ class Solution {
55
* @return Integer
66
*/
77
function numWaterBottles($numBottles, $numExchange) {
8-
$sum = $numBottles;
8+
$ans = $numBottles;
99
while ($numBottles >= $numExchange) {
1010
$numBottles = $numBottles - $numExchange + 1;
11-
$sum++;
11+
$ans++;
1212
}
13-
return $sum;
13+
return $ans;
1414
}
1515
}

‎solution/1500-1599/1518.Water Bottles/Solution.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
function numWaterBottles(numBottles: number, numExchange: number): number {
2+
let ans = numBottles;
3+
for (; numBottles >= numExchange; ++ans) {
4+
numBottles -= numExchange - 1;
5+
}
6+
return ans;
7+
}

0 commit comments

Comments
 (0)