Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FirefighterStarter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
BELHACHEMI Mehdi
FirefighterStarter
Commits
05895e3b
Commit
05895e3b
authored
7 months ago
by
ASFOUR Mohamed
Browse files
Options
Downloads
Patches
Plain Diff
rajout des getter et setter dans FireFighter et Fire A.M
parent
b9dbcaec
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#38155
failed
7 months ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/main/java/model/Fire.java
+7
-0
7 additions, 0 deletions
src/main/java/model/Fire.java
src/main/java/model/FireFighter.java
+7
-0
7 additions, 0 deletions
src/main/java/model/FireFighter.java
src/main/java/model/FirefighterBoard.java
+5
-5
5 additions, 5 deletions
src/main/java/model/FirefighterBoard.java
with
19 additions
and
5 deletions
src/main/java/model/Fire.java
+
7
−
0
View file @
05895e3b
...
@@ -10,4 +10,11 @@ public class Fire {
...
@@ -10,4 +10,11 @@ public class Fire {
public
Fire
(
Position
position
){
public
Fire
(
Position
position
){
this
.
firePositions
=
position
;
this
.
firePositions
=
position
;
}
}
public
Position
getFirePositions
(){
return
this
.
firePositions
;
}
public
void
setFirePositions
(
Position
firePositions
){
this
.
firePositions
=
firePositions
;
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/model/FireFighter.java
+
7
−
0
View file @
05895e3b
...
@@ -10,6 +10,13 @@ public class FireFighter {
...
@@ -10,6 +10,13 @@ public class FireFighter {
public
FireFighter
(
Position
firefighterPositions
)
{
public
FireFighter
(
Position
firefighterPositions
)
{
this
.
firefighterPositions
=
firefighterPositions
;
this
.
firefighterPositions
=
firefighterPositions
;
}
}
public
void
setFirefighterPositions
(
Position
firefighterPositions
)
{
this
.
firefighterPositions
=
firefighterPositions
;
}
public
Position
getFirefighterPositions
()
{
return
firefighterPositions
;
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/model/FirefighterBoard.java
+
5
−
5
View file @
05895e3b
...
@@ -43,9 +43,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
...
@@ -43,9 +43,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
firefighter
=
new
ArrayList
<>();
firefighter
=
new
ArrayList
<>();
fire
=
new
HashSet
<>();
fire
=
new
HashSet
<>();
for
(
int
index
=
0
;
index
<
initialFireCount
;
index
++)
for
(
int
index
=
0
;
index
<
initialFireCount
;
index
++)
fire
.
add
(
randomPosition
());
fire
.
add
(
new
Fire
(
randomPosition
())
)
;
for
(
int
index
=
0
;
index
<
initialFirefighterCount
;
index
++)
for
(
int
index
=
0
;
index
<
initialFirefighterCount
;
index
++)
firefighter
.
add
(
randomPosition
());
firefighter
.
add
(
new
FireFighter
(
randomPosition
())
)
;
}
}
private
Position
randomPosition
()
{
private
Position
randomPosition
()
{
...
@@ -55,10 +55,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
...
@@ -55,10 +55,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
@Override
@Override
public
List
<
ModelElement
>
getState
(
Position
position
)
{
public
List
<
ModelElement
>
getState
(
Position
position
)
{
List
<
ModelElement
>
result
=
new
ArrayList
<>();
List
<
ModelElement
>
result
=
new
ArrayList
<>();
for
(
Position
firefighter
Position
:
firefighter
Positions
)
for
(
FireFighter
firefighter
:
firefighter
)
if
(
firefighterPosition
.
equals
(
position
))
if
(
firefighter
.
getFirefighter
Position
s
()
.
equals
(
position
))
result
.
add
(
ModelElement
.
FIREFIGHTER
);
result
.
add
(
ModelElement
.
FIREFIGHTER
);
if
(
fire
Positions
.
contains
(
position
))
if
(
fire
.
contains
(
position
))
result
.
add
(
ModelElement
.
FIRE
);
result
.
add
(
ModelElement
.
FIRE
);
return
result
;
return
result
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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