Skip to content

Code quality fix - Collapsible "if" statements should be merged. #73

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

Open
faisal-hameed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Code quality fix - Collapsible "if" statements should be merged. #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions app/src/main/java/de/sopa/helper/LevelSolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ private boolean solve(Level level, int maxDepth, int currentDepth, List<Level> p
for (int column = 0; column < columns - 2; column++) {
gameFieldService.shiftLine(level, false, column, 1);

if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
if (currentDepth + 1 < highestHit)
return true;
if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
&& currentDepth + 1 < highestHit) {
return true;
}

gameFieldService.shiftLine(level, false, column, -2);

if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
if (currentDepth + 1 < highestHit)
return true;
if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
&& currentDepth + 1 < highestHit) {
return true;
}

// restore state
Expand All @@ -89,16 +89,16 @@ private boolean solve(Level level, int maxDepth, int currentDepth, List<Level> p
for (int row = 0; row < rows - 2; row++) {
gameFieldService.shiftLine(level, true, row, 1);

if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
if (currentDepth + 1 < highestHit)
return true;
if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
&& currentDepth + 1 < highestHit) {
return true;
}

gameFieldService.shiftLine(level, true, row, -2);

if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
if (currentDepth + 1 < highestHit)
return true;
if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
&& currentDepth + 1 < highestHit) {
return true;
}

// restore state
Expand Down