Commit d451495

committed

[java] [student_grades] Replace Control Flag With Break Refactoring (refactor)

1 parent 763967a commit d451495Copy full SHA for d451495

File tree

1 file changed

+20

-20

lines changed

examples/java/java-student_grades-04_replace_control_flag/src/main/java/tv/codely/student_grades
- StudentGradeCalculator.java

1 file changed

+20

-20

lines changed

`‎examples/java/java-student_grades-04_replace_control_flag/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java‎`

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,26 +30,27 @@ public StudentGradeCalculator(final int yearToCalculate) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final boolean hasReachedMinimumClasses) {`
`33`		`- if (examsGrades.isEmpty()) {`
	`33`	`+ boolean hasNotDoneAnyExam = examsGrades.isEmpty();`
	`34`	`+ if (hasNotDoneAnyExam) {`
`34`	`35`	`return 0f;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`if (!hasReachedMinimumClasses) {`
`38`	`39`	`return 0f;`
`39`	`40`	`}`
`40`	`41`
`41`		`- ensureGradesWeightSumIs100percent(examsGrades);`
`42`		`-`
`43`		`- float gradesSum = gradesSum(examsGrades);`
	`42`	`+ ensureGradesWeightsIsValid(examsGrades);`
`44`	`43`
`45`	`44`	`if (hasToIncreaseOneExtraPoint()) {`
`46`		`- return Float.min(10f, gradesSum + 1);`
	`45`	`+ float increasedGrade = gradesSum(examsGrades) + 1;`
	`46`	`+`
	`47`	`+ return Float.min(10f, increasedGrade);`
`47`	`48`	`}`
`48`	`49`
`49`		`- return gradesSum;`
	`50`	`+ return gradesSum(examsGrades);`
`50`	`51`	`}`
`51`	`52`
`52`		`- private void ensureGradesWeightSumIs100percent(List<Pair<Integer, Float>> examsGrades) {`
	`53`	`+ private void ensureGradesWeightsIsValid(List<Pair<Integer, Float>> examsGrades) {`
`53`	`54`	`int gradesWeightSum = gradesWeightSum(examsGrades);`
`54`	`55`
`55`	`56`	`if (gradesWeightSum > 100) {`
`@@ -72,22 +73,21 @@ private int gradesWeightSum(List<Pair<Integer, Float>> examsGrades) {`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`private boolean hasToIncreaseOneExtraPoint() {`
`75`		`- boolean hasToIncreaseOneExtraPoint = false;`
`76`		`-`
`77`	`76`	`for (Map.Entry<Integer, List<Pair<String, Boolean>>> yearlyTeachers : allYearsTeachers.entrySet()) {`
`78`		`- if (!(yearToCalculate != yearlyTeachers.getKey())) {`
`79`		`- List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();`
`80`		`-`
`81`		`- for (Pair<String, Boolean> teacher : teachers) {`
`82`		`- if (teacher.second() != true) {`
`83`		`- continue;`
`84`		`- }`
`85`		`- hasToIncreaseOneExtraPoint = true;`
`86`		`- }`
`87`		`- } else {`
	`77`	`+ if (yearToCalculate != yearlyTeachers.getKey()) {`
`88`	`78`	`continue;`
`89`	`79`	`}`
	`80`	`+`
	`81`	`+ List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();`
	`82`	`+`
	`83`	`+ for (Pair<String, Boolean> teacher : teachers) {`
	`84`	`+ Boolean isBenevolent = teacher.second();`
	`85`	`+ if (isBenevolent) {`
	`86`	`+ return true;`
	`87`	`+ }`
	`88`	`+ }`
`90`	`89`	`}`
`91`		`- return hasToIncreaseOneExtraPoint;`
	`90`	`+`
	`91`	`+ return false;`
`92`	`92`	`}`
`93`	`93`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d451495

File tree

1 file changed

1 file changed

`‎examples/java/java-student_grades-04_replace_control_flag/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java‎`

0 commit comments