Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ASSEMENT 1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
simon.nutsey
ASSEMENT 1
Commits
c6fb9428
Commit
c6fb9428
authored
Nov 05, 2018
by
simon.nutsey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First Commit
parent
7805f22d
Pipeline
#234
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
13 deletions
+33
-13
AssessmentPartOne.java
src/AssessmentPartOne.java
+32
-12
AssessmentPartOneTest.java
src/AssessmentPartOneTest.java
+1
-1
No files found.
src/AssessmentPartOne.java
View file @
c6fb9428
...
...
@@ -7,26 +7,26 @@ public class AssessmentPartOne {
// Debug this method so it passes the unit test.
// Add comments beside any changes you make
if
(
num1
<
num2
)
if
(
num1
>
num2
)
//The symbol was < indicating that if 1 is smaller than 2. This has been changed to > instead
{
if
(
num3
>
num1
)
if
(
num3
>
num1
)
//If number 3 is bigger than 1
{
return
num3
;
return
num3
;
//Return number 3
}
else
else
//if number 3 is not bigger than number 1
{
return
num1
;
return
num1
;
//Return number 1
}
}
else
else
//
{
if
(
num3
>
num2
)
if
(
num3
>
num2
)
//If number 3 is bigger than number 2
{
return
num3
;
return
num3
;
//Return number 3
}
else
else
//
{
return
num2
return
num2
;
//Semicolon added to finish the line
}
}
}
...
...
@@ -42,10 +42,30 @@ public class AssessmentPartOne {
// You should comment your code explaining what each part does
int
sumOfSquares
=
0
;
int
SumOfSquares
=
0
;
int
Negativeint
=
-
1
;
//This is the number that will be return if range starts with a negative number
if
(
start
<
0
)
{
return
Negativeint
;
//If the number starts with a negative number it will return "-1"
}
if
(
end
-
start
==
1
)
{
return
Negativeint
;
//If the range has no inbetween numbers eg 1 2 it will return "-1"
}
if
(
start
>
end
)
{
return
Negativeint
;
//If the start int is bigger than the end int it will return "-1"
}
else
{
for
(
int
A
=
start
+
1
;
A
<
end
;
A
++)
//Loop used to add all the numbers beetween the first and last int
{
SumOfSquares
+=
A
;
//Adds the numbers in the range to the sum total
}
}
return
SumOfSquares
;
return
sumOfSquares
;
}
}
src/AssessmentPartOneTest.java
View file @
c6fb9428
...
...
@@ -40,5 +40,5 @@ class AssessmentPartOneTest {
})
void
testSumNumbersBetween
(
int
num1
,
int
num2
,
int
sum
)
{
assertEquals
(
sum
,
test
.
sumNumbersBetween
(
num1
,
num2
));
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment