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

Fixing reference answer of Salary Calculator #2874

Closed
Closed
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e3cbf38
Adding approach change
jagdish-15 Nov 9, 2024
4a7811f
Fixing typo in filename
jagdish-15 Nov 9, 2024
e8d2787
Fixing style errors
jagdish-15 Nov 9, 2024
6152c10
Fixing style errors
jagdish-15 Nov 9, 2024
5d398d0
Fixing stle errors
jagdish-15 Nov 9, 2024
115a331
Fixing file names
jagdish-15 Nov 9, 2024
303523e
Adding approache to Queen-Attack
jagdish-15 Nov 9, 2024
80c4de0
Fixing style errors
jagdish-15 Nov 9, 2024
db87438
Fixing style errors
jagdish-15 Nov 9, 2024
e0f7eb5
Adding uuid for approach of queen-attack exercise
jagdish-15 Nov 14, 2024
d2c2451
Adding uuid for approach of change
jagdish-15 Nov 14, 2024
b3a98df
Adding snippet for approach of change
jagdish-15 Nov 14, 2024
e338ff2
Merge branch 'main' into add-approach-change
jagdish-15 Nov 14, 2024
2d683d8
Adding approache to Queen-Attack
jagdish-15 Nov 9, 2024
d19f7bf
Fixing style errors
jagdish-15 Nov 9, 2024
418ddb5
Fixing style errors
jagdish-15 Nov 9, 2024
c8acf18
Adding uuid for approach of queen-attack exercise
jagdish-15 Nov 14, 2024
9438325
Updating approach files
jagdish-15 Nov 15, 2024
fde837b
Fixing styling errors
jagdish-15 Nov 15, 2024
dd94b36
Fixing minor issues
jagdish-15 Nov 15, 2024
3c4e52d
Merging with latest changes
jagdish-15 Nov 15, 2024
31ace8a
Fixing styling issues
jagdish-15 Nov 15, 2024
3a0a219
Syncing with problem-specification
jagdish-15 Nov 15, 2024
7ec2960
Adding approach change
jagdish-15 Nov 9, 2024
404de05
Fixing typo in filename
jagdish-15 Nov 9, 2024
1aa6d9c
Fixing style errors
jagdish-15 Nov 9, 2024
2fbec2a
Fixing style errors
jagdish-15 Nov 9, 2024
c1d07e5
Fixing stle errors
jagdish-15 Nov 9, 2024
afee45a
Fixing file names
jagdish-15 Nov 9, 2024
d9694fa
Adding uuid for approach of change
jagdish-15 Nov 14, 2024
7aa412e
Adding snippet for approach of change
jagdish-15 Nov 14, 2024
f3eb007
Updating approach files
jagdish-15 Nov 15, 2024
0b5b6f2
Fixing styling errors
jagdish-15 Nov 15, 2024
2df72c4
Merge branch 'add-approach-change' of https://github.com/jagdish-15/j…
jagdish-15 Nov 18, 2024
2758bc3
Updating approaches for Change after feedback
jagdish-15 Nov 18, 2024
c0a46c6
Fixing styling issues for approache for Change
jagdish-15 Nov 18, 2024
5885dc8
Chnaging the introduction.md for consistancy
jagdish-15 Nov 18, 2024
25ad17e
Merge branch 'main' of https://github.com/jagdish-15/java
jagdish-15 Nov 19, 2024
239d916
Updating tests for Zipper to sync with the problem-specifications repo
jagdish-15 Nov 19, 2024
f76ad5d
Update exercises/practice/change/.approaches/dynamic-programming/cont…
jagdish-15 Nov 19, 2024
5db8204
Update exercises/practice/change/.approaches/dynamic-programming/cont…
jagdish-15 Nov 19, 2024
505a92d
Updating content for dynamic approach of change
jagdish-15 Nov 19, 2024
ddea7e4
Update exercises/practice/queen-attack/.approaches/introduction.md
jagdish-15 Nov 19, 2024
ec9e1e2
Update exercises/practice/queen-attack/.approaches/introduction.md
jagdish-15 Nov 19, 2024
a4d7438
Update exercises/practice/queen-attack/.approaches/simple-comparison/…
jagdish-15 Nov 19, 2024
d4f1b8e
Changing the name of the approach for queen-attack exercise and updat…
jagdish-15 Nov 19, 2024
3340b82
Updating introduction for approaches of queen-attack
jagdish-15 Nov 19, 2024
0715df7
Merge branch 'main' into add-approach-queen-attack
jagdish-15 Nov 23, 2024
7f4e980
Updating the approach for queen-attack after feedback
jagdish-15 Nov 23, 2024
b665c33
Merge branch 'add-approach-queen-attack' of https://github.com/jagdis…
jagdish-15 Nov 23, 2024
c6e7deb
Updating tests of Forth to sync with problem-specifications
jagdish-15 Nov 19, 2024
cd1e0c1
Updating tests for bob with problem-specifications
jagdish-15 Nov 19, 2024
f00cba6
Syncing docs, metadata and filepaths with problem-specifications
jagdish-15 Nov 19, 2024
1a859f1
Syncing unsynced docs and metadata
jagdish-15 Nov 20, 2024
39f0e69
Merge branch 'main' into add-approach-change
jagdish-15 Nov 23, 2024
2dea910
Updating content.md of dynamic approach of chnage exercise
jagdish-15 Nov 23, 2024
69a6b17
Merge branch 'add-approach-change'
jagdish-15 Nov 26, 2024
8f84ed2
Merge branch 'add-approach-queen-attack'
jagdish-15 Nov 26, 2024
a37af20
Merge branch 'main' of https://github.com/jagdish-15/java
jagdish-15 Nov 26, 2024
7ac1f15
Fixing consistancy issues in reference answer of Salary Calculator
jagdish-15 Nov 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ public int bonusMultiplier(int productsSold) {
return productsSold < 20 ? 10 : 13;
}

public double bonusForProductsSold (int productsSold) {
public double bonusForProductsSold(int productsSold) {
return productsSold * bonusMultiplier(productsSold);
}

public double finalSalary (int daysSkipped, int productsSold) {
public double finalSalary(int daysSkipped, int productsSold) {
double finalSalary = 1000.0 * salaryMultiplier(daysSkipped) + bonusForProductsSold(productsSold);
return finalSalary > 2000.0 ? 2000.0 : finalSalary;
}
Expand Down