Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
gitlab_dotsandboxes_exercise
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Andrews
gitlab_dotsandboxes_exercise
Commits
da330583
Commit
da330583
authored
3 years ago
by
Daniel Andrews
Browse files
Options
Downloads
Patches
Plain Diff
bugfix
parent
7bdbd0fb
Branches
1-fix-assignment-errors
main
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+212
-198
212 additions, 198 deletions
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
with
212 additions
and
198 deletions
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+
212
−
198
View file @
da330583
...
@@ -113,7 +113,11 @@ public class DotsAndBoxesGrid {
...
@@ -113,7 +113,11 @@ public class DotsAndBoxesGrid {
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
// FIXME: You'll need to fix this code (after writing a test first).
// FIXME: You'll need to fix this code (after writing a test first).
if
(
getHorizontal
(
x
,
y
)
&&
getVertical
(
x
,
y
)
&&
getHorizontal
(
x
,
y
+
1
)
&&
getVertical
(
x
+
1
,
y
))
{
return
true
;
return
true
;
}
else
{
return
false
;
}
}
}
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
...
@@ -132,7 +136,7 @@ public class DotsAndBoxesGrid {
...
@@ -132,7 +136,7 @@ public class DotsAndBoxesGrid {
* @param y
* @param y
* @return true if it completes a box
* @return true if it completes a box
*/
*/
public
boolean
drawHorizontal
(
int
x
,
int
y
,
int
player
)
{
public
boolean
drawHorizontal
(
int
x
,
int
y
,
int
player
)
throws
IllegalStateException
{
if
(
x
>=
width
-
1
||
x
<
0
)
{
if
(
x
>=
width
-
1
||
x
<
0
)
{
throw
new
IndexOutOfBoundsException
(
String
.
format
(
"x was %d, which is out of range. Range is 0 to %d"
,
x
,
width
-
1
));
throw
new
IndexOutOfBoundsException
(
String
.
format
(
"x was %d, which is out of range. Range is 0 to %d"
,
x
,
width
-
1
));
}
}
...
@@ -141,8 +145,13 @@ public class DotsAndBoxesGrid {
...
@@ -141,8 +145,13 @@ public class DotsAndBoxesGrid {
}
}
// FIXME: You need to throw an exception if the line was already drawn.
// FIXME: You need to throw an exception if the line was already drawn.
if
(
this
.
getHorizontal
(
x
,
y
))
{
throw
new
IllegalStateException
(
String
.
format
(
"This line has already been drawn."
));
}
else
{
this
.
horizontals
[
x
][
y
]
=
true
;
this
.
horizontals
[
x
][
y
]
=
true
;
}
// Try to claim the north or south boxes
// Try to claim the north or south boxes
boolean
claimN
=
claimBox
(
x
,
y
-
1
,
player
);
boolean
claimN
=
claimBox
(
x
,
y
-
1
,
player
);
...
@@ -163,7 +172,7 @@ public class DotsAndBoxesGrid {
...
@@ -163,7 +172,7 @@ public class DotsAndBoxesGrid {
* @param y
* @param y
* @return true if it completes a box
* @return true if it completes a box
*/
*/
public
boolean
drawVertical
(
int
x
,
int
y
,
int
player
)
{
public
boolean
drawVertical
(
int
x
,
int
y
,
int
player
)
throws
IllegalStateException
{
if
(
x
>=
width
||
x
<
0
)
{
if
(
x
>=
width
||
x
<
0
)
{
throw
new
IndexOutOfBoundsException
(
String
.
format
(
"x was %d, which is out of range. Range is 0 to %d"
,
x
,
width
));
throw
new
IndexOutOfBoundsException
(
String
.
format
(
"x was %d, which is out of range. Range is 0 to %d"
,
x
,
width
));
}
}
...
@@ -172,8 +181,13 @@ public class DotsAndBoxesGrid {
...
@@ -172,8 +181,13 @@ public class DotsAndBoxesGrid {
}
}
// You need to throw an exception if the line was already drawn.
// You need to throw an exception if the line was already drawn.
if
(
this
.
getVertical
(
x
,
y
))
{
throw
new
IllegalStateException
(
String
.
format
(
"This line has already been drawn."
));
}
else
{
this
.
verticals
[
x
][
y
]
=
true
;
this
.
verticals
[
x
][
y
]
=
true
;
}
// Try to claim the north or south boxes
// Try to claim the north or south boxes
boolean
claimE
=
claimBox
(
x
,
y
,
player
);
boolean
claimE
=
claimBox
(
x
,
y
,
player
);
boolean
claimW
=
claimBox
(
x
-
1
,
y
,
player
);
boolean
claimW
=
claimBox
(
x
-
1
,
y
,
player
);
...
...
This diff is collapsed.
Click to expand it.
Daniel Andrews
@dandre20
mentioned in issue
#1 (closed)
·
3 years ago
mentioned in issue
#1 (closed)
mentioned in issue #1
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment