Skip to content

Commit 3dc0200

Browse files
committed
[java] [student_grades] Extract method
1 parent fe10b6b commit 3dc0200

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

examples/java/java-student_grades-02_extract_method/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,8 @@ public StudentGradeCalculator(final int yearToCalculate) {
3131

3232
public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final boolean hasReachedMinimumClasses) {
3333
if (!examsGrades.isEmpty()) {
34-
float gradesSum = 0f;
35-
int gradesWeightSum = 0;
36-
37-
for (Pair<Integer, Float> examGrade : examsGrades) {
38-
gradesSum += (examGrade.first() * examGrade.second() / 100);
39-
gradesWeightSum += examGrade.first();
40-
}
34+
float gradesSum = gradesSum(examsGrades);
35+
int gradesWeightSum = gradesWeightSum(examsGrades);
4136

4237
if (gradesWeightSum == 100) {
4338
if (hasReachedMinimumClasses) {
@@ -59,6 +54,22 @@ public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final
5954
}
6055
}
6156

57+
private float gradesSum(List<Pair<Integer, Float>> examsGrades) {
58+
float gradesSum = 0f;
59+
for (Pair<Integer, Float> examGrade : examsGrades) {
60+
gradesSum += (examGrade.first() * examGrade.second() / 100);
61+
}
62+
return gradesSum;
63+
}
64+
65+
private int gradesWeightSum(List<Pair<Integer, Float>> examsGrades) {
66+
int gradesWeightSum = 0;
67+
for (Pair<Integer, Float> examGrade : examsGrades) {
68+
gradesWeightSum += examGrade.first();
69+
}
70+
return gradesWeightSum;
71+
}
72+
6273
private boolean hasToIncreaseOneExtraPoint() {
6374
boolean hasToIncreaseOneExtraPoint = false;
6475

0 commit comments

Comments
 (0)