Skip to content

Update 6-conditional-statements.md #257

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.

Sign up for GitHub

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
Mar 1, 2022
Merged

Update 6-conditional-statements.md #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9f4aa5
Update 6-conditional-statements.md
wiljav Dec 24, 2020
7077129
Update 4-methods.md
wiljav Dec 25, 2020
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
18 changes: 9 additions & 9 deletions data/part-1/6-conditional-statements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,17 +1524,17 @@ if (number % 4 != 0) {

When a gift is given by a close relative or a family member, the amount of gift tax is determined by the following table (source [vero.fi](https://www.vero.fi/en/individuals/property/gifts/gift-tax-calculator/#gifttaxtables)):

| Value of gift | Tax at the lower limit | Tax rate(%) for exceeding part |
| -------------------- | ---------------------- | ------------------------------ |
| 5 000 -- 25 000 | 100 | 8 |
| 25 000 -- 55 000 |  1 700 | 10 |
| 55 000 -- 200 000 | 4 700 | 12 |
| 200 000 -- 1 000 000 | 22 100 | 15 |
| 1 000 000 -- | 142 100 | 17 |
| Value of gift | Tax at the lower limit | Tax rate(%) for exceeding part |
| -------------------- | ---------------------- | ------------------------------ |
| 5 000 -- 25 000 | 100 | 8 |
| 25 000 -- 55 000 | 1 700 | 10 |
| 55 000 -- 200 000 | 4 700 | 12 |
| 200 000 -- 1 000 000 | 22 100 | 15 |
| 1 000 000 -- | 142 100 | 17 |

<!-- Esimerkiksi 6000 euron lahjasta tulee maksaa veroa 180 euroa (100 + (6000-5000) * 0.08), ja 75000 euron lahjasta tulee maksaa veroa 7100 euroa (4700 + (75000-55000) * 0.12). -->

For example 6000€ gift implies 180€ of gift tax (100 + (6000-5000)_0.08), and 75000€ gift implies 7100€ of gift tax (4700 + (75000-55000) _ 0.12).
<!-- The formula used to calculate the gift tax is: (Tax at the lower limit + (Value of gift (€) - minimum value of gift (€)) * (Tax Rate (%) / 100) -->
For example 6000€ gift implies 180€ of gift tax (100 + (6000-5000) * 0.08), and 75000€ gift implies 7100€ of gift tax (4700 + (75000-55000) * 0.12).

<!-- Tee ohjelma, joka laskee lahjaveron lähimmiltä sukulaisilta annetulle lahjalle. Alla on muutama esimerkki ohjelman toiminnasta. -->

Expand Down
18 changes: 18 additions & 0 deletions data/part-2/4-methods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,24 @@ The sum of numbers 2 and 4 is 6

Write a method `public static void division(int numerator, int denominator)` that prints the result of the division of the numerator by the denominator. Keep in mind that the result of the division of the integers is an integer -- in this case we want the result to be a floating point number.

<!-- ```java
public static void main(String[] args) {
jakolasku(3, 5);
}
``` -->

```java
public static void main(String[] args) {
division(3, 5);
}
```

<sample-output>

0.6

</sample-output>

</programming-exercise>


Expand Down