Skip to content

feat: update solutions to lc problem: No.1518 #1669

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

Merged
merged 2 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ node_modules/
/solution/bash_problem_readme_template.md
/solution/bash_problem_readme_template_en.md
/solution/0100-0199/0177.Nth Highest Salary/Solution.sql
/solution/0600-0699/0627.Swap Salary/Solution.sql
/solution/1400-1499/1454.Active Users/Solution.sql
/solution/1400-1499/1484.Group Sold Products By The Date/Solution.sql
/solution/1500-1599/1511.Customer Order Frequency/Solution.sql
Expand Down
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"solution/0600-0699/0610.Triangle Judgement/Solution.sql",
"solution/0600-0699/0618.Students Report By Geography/Solution.sql",
"solution/0600-0699/0626.Exchange Seats/Solution.sql",
"solution/0600-0699/0627.Swap Salary/Solution.sql",
"solution/1000-1099/1097.Game Play Analysis V/Solution.sql",
"solution/1000-1099/1098.Unpopular Books/Solution.sql",
"solution/1100-1199/1113.Reported Posts/Solution.sql",
Expand Down
36 changes: 22 additions & 14 deletions solution/1500-1599/1518.Water Bottles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ class Solution:
class Solution {
public int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
Expand All @@ -103,9 +102,8 @@ class Solution {
public:
int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
Expand All @@ -117,14 +115,25 @@ public:
```go
func numWaterBottles(numBottles int, numExchange int) int {
ans := numBottles
for numBottles >= numExchange {
for ; numBottles >= numExchange; ans++ {
numBottles -= (numExchange - 1)
ans++
}
return ans
}
```

### **TypeScript**

```ts
function numWaterBottles(numBottles: number, numExchange: number): number {
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return ans;
}
```

### **PHP**

```php
Expand All @@ -135,12 +144,12 @@ class Solution {
* @return Integer
*/
function numWaterBottles($numBottles, $numExchange) {
$sum = $numBottles;
$ans = $numBottles;
while ($numBottles >= $numExchange) {
$numBottles = $numBottles - $numExchange + 1;
$sum++;
$ans++;
}
return $sum;
return $ans;
}
}
```
Expand All @@ -154,12 +163,11 @@ class Solution {
* @return {number}
*/
var numWaterBottles = function (numBottles, numExchange) {
let sum = numBottles;
while (numBottles >= numExchange) {
numBottles = numBottles - numExchange + 1;
sum++;
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return sum;
return ans;
};
```

Expand Down
36 changes: 22 additions & 14 deletions solution/1500-1599/1518.Water Bottles/README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ class Solution:
class Solution {
public int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
Expand All @@ -75,9 +74,8 @@ class Solution {
public:
int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
Expand All @@ -89,14 +87,25 @@ public:
```go
func numWaterBottles(numBottles int, numExchange int) int {
ans := numBottles
for numBottles >= numExchange {
for ; numBottles >= numExchange; ans++ {
numBottles -= (numExchange - 1)
ans++
}
return ans
}
```

### **TypeScript**

```ts
function numWaterBottles(numBottles: number, numExchange: number): number {
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return ans;
}
```

### **PHP**

```php
Expand All @@ -107,12 +116,12 @@ class Solution {
* @return Integer
*/
function numWaterBottles($numBottles, $numExchange) {
$sum = $numBottles;
$ans = $numBottles;
while ($numBottles >= $numExchange) {
$numBottles = $numBottles - $numExchange + 1;
$sum++;
$ans++;
}
return $sum;
return $ans;
}
}
```
Expand All @@ -126,12 +135,11 @@ class Solution {
* @return {number}
*/
var numWaterBottles = function (numBottles, numExchange) {
let sum = numBottles;
while (numBottles >= numExchange) {
numBottles = numBottles - numExchange + 1;
sum++;
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return sum;
return ans;
};
```

Expand Down
19 changes: 9 additions & 10 deletions solution/1500-1599/1518.Water Bottles/Solution.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
class Solution {
public:
int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
class Solution {
public:
int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
}
return ans;
}
};
3 changes: 1 addition & 2 deletions solution/1500-1599/1518.Water Bottles/Solution.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
func numWaterBottles(numBottles int, numExchange int) int {
ans := numBottles
for numBottles >= numExchange {
for ; numBottles >= numExchange; ans++ {
numBottles -= (numExchange - 1)
ans++
}
return ans
}
17 changes: 8 additions & 9 deletions solution/1500-1599/1518.Water Bottles/Solution.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Solution {
public int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
while (numBottles >= numExchange) {
numBottles -= (numExchange - 1);
++ans;
}
return ans;
}
class Solution {
public int numWaterBottles(int numBottles, int numExchange) {
int ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= (numExchange - 1);
}
return ans;
}
}
9 changes: 4 additions & 5 deletions solution/1500-1599/1518.Water Bottles/Solution.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
* @return {number}
*/
var numWaterBottles = function (numBottles, numExchange) {
let sum = numBottles;
while (numBottles >= numExchange) {
numBottles = numBottles - numExchange + 1;
sum++;
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return sum;
return ans;
};
6 changes: 3 additions & 3 deletions solution/1500-1599/1518.Water Bottles/Solution.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class Solution {
* @return Integer
*/
function numWaterBottles($numBottles, $numExchange) {
$sum = $numBottles;
$ans = $numBottles;
while ($numBottles >= $numExchange) {
$numBottles = $numBottles - $numExchange + 1;
$sum++;
$ans++;
}
return $sum;
return $ans;
}
}
7 changes: 7 additions & 0 deletions solution/1500-1599/1518.Water Bottles/Solution.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
function numWaterBottles(numBottles: number, numExchange: number): number {
let ans = numBottles;
for (; numBottles >= numExchange; ++ans) {
numBottles -= numExchange - 1;
}
return ans;
}
4 changes: 2 additions & 2 deletions solution/1600-1699/1603.Design Parking System/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@ void parkingSystemFree(ParkingSystem* obj) {
public class ParkingSystem {

private List<int> cnt;

public ParkingSystem(int big, int medium, int small) {
cnt = new List<int>() {0 , big, medium, small};
}

public bool AddCar(int carType) {
if (cnt[carType] == 0) {
return false;
Expand Down
5 changes: 2 additions & 3 deletions solution/1600-1699/1603.Design Parking System/README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ void parkingSystemFree(ParkingSystem* obj) {
public class ParkingSystem {

private List<int> cnt;

public ParkingSystem(int big, int medium, int small) {
cnt = new List<int>() {0 , big, medium, small};
}

public bool AddCar(int carType) {
if (cnt[carType] == 0) {
return false;
Expand All @@ -268,7 +268,6 @@ public class ParkingSystem {
*/
```


### **...**

```
Expand Down
4 changes: 2 additions & 2 deletions solution/1600-1699/1603.Design Parking System/Solution.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
public class ParkingSystem {

private List<int> cnt;

public ParkingSystem(int big, int medium, int small) {
cnt = new List<int>() {0 , big, medium, small};
}

public bool AddCar(int carType) {
if (cnt[carType] == 0) {
return false;
Expand Down