Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firefighter_LuisPARRA_YanisLOUNADI
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PARRA Luis
Firefighter_LuisPARRA_YanisLOUNADI
Commits
85d66f16
Commit
85d66f16
authored
1 year ago
by
plojolo
Browse files
Options
Downloads
Patches
Plain Diff
suppression de l'ancienne position des firefighter
parent
977c2822
No related branches found
No related tags found
No related merge requests found
Pipeline
#24853
failed
1 year ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/model/FirefighterBoard.java
+8
-5
8 additions, 5 deletions
src/main/java/model/FirefighterBoard.java
src/main/java/view/FirefighterGrid.java
+5
-5
5 additions, 5 deletions
src/main/java/view/FirefighterGrid.java
with
13 additions
and
10 deletions
src/main/java/model/FirefighterBoard.java
+
8
−
5
View file @
85d66f16
...
@@ -63,6 +63,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
...
@@ -63,6 +63,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public
List
<
Position
>
updateToNextGeneration
()
{
public
List
<
Position
>
updateToNextGeneration
()
{
List
<
Position
>
modifiedElements
;
modifiedElements
=
fireFighters
.
firefighterPositions
;
fireFighters
.
nextMove
();
fireFighters
.
nextMove
();
//System.out.println(fireFighters.firefighterPositions);
//System.out.println(fireFighters.firefighterPositions);
...
@@ -77,13 +80,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
...
@@ -77,13 +80,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
fire
.
nextMove
();
fire
.
nextMove
();
step
++;
step
++;
List
<
Position
>
result
=
new
ArrayList
<>();
result
.
addAll
(
fire
.
firePositions
);
result
.
addAll
(
fireFighters
.
firefighterPositions
);
result
.
addAll
(
cloud
.
cloudPositions
);
return
result
;
modifiedElements
.
addAll
(
fire
.
firePositions
);
modifiedElements
.
addAll
(
fireFighters
.
firefighterPositions
);
modifiedElements
.
addAll
(
cloud
.
cloudPositions
);
return
modifiedElements
;
}
}
@Override
@Override
...
...
This diff is collapsed.
Click to expand it.
src/main/java/view/FirefighterGrid.java
+
5
−
5
View file @
85d66f16
...
@@ -19,18 +19,18 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
...
@@ -19,18 +19,18 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
@Override
@Override
public
void
repaint
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
public
void
repaint
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
clear
();
clear
(
positionedElements
);
paint
(
positionedElements
);
paint
(
positionedElements
);
paintLines
();
paintLines
();
}
}
/*
private
void
clear
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
private
void
clear
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
for
(
Pair
<
Position
,
ViewElement
>
positionElement
:
positionedElements
)
{
for
(
Pair
<
Position
,
ViewElement
>
positionElement
:
positionedElements
)
{
Position
position
=
positionElement
.
getKey
();
Position
position
=
positionElement
.
getKey
();
clearSquare
(
position
.
row
(),
position
.
column
());
clearSquare
(
position
.
row
(),
position
.
column
());
}
}
}
}
*/
private
void
paint
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
private
void
paint
(
List
<
Pair
<
Position
,
ViewElement
>>
positionedElements
)
{
for
(
Pair
<
Position
,
ViewElement
>
pair
:
positionedElements
){
for
(
Pair
<
Position
,
ViewElement
>
pair
:
positionedElements
){
...
@@ -91,9 +91,9 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
...
@@ -91,9 +91,9 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
getGraphicsContext2D
().
setFill
(
color
);
getGraphicsContext2D
().
setFill
(
color
);
getGraphicsContext2D
().
fillRect
(
row
*
squareHeight
,
column
*
squareWidth
,
squareHeight
,
squareWidth
);
getGraphicsContext2D
().
fillRect
(
row
*
squareHeight
,
column
*
squareWidth
,
squareHeight
,
squareWidth
);
}
}
/*
private
void
clearSquare
(
int
row
,
int
column
){
private
void
clearSquare
(
int
row
,
int
column
){
getGraphicsContext2D
().
clearRect
(
row
*
squareHeight
,
column
*
squareWidth
,
squareHeight
,
squareWidth
);
getGraphicsContext2D
().
clearRect
(
row
*
squareHeight
,
column
*
squareWidth
,
squareHeight
,
squareWidth
);
}
}
*/
}
}
\ No newline at end of file
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