Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
  • variant
2 results

Target

Select target project
No results found
Select Git revision
  • main
  • variant
2 results
Show changes

Commits on Source 7

100 files
+ 2178
61
Compare changes
  • Side-by-side
  • Inline

Files

Original line number Original line Diff line number Diff line
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<title>Test results - FirefighterBoardTest</title>
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
<script src="../js/report.js" type="text/javascript"></script>
</head>
<body>
<div id="content">
<h1>FirefighterBoardTest</h1>
<div class="breadcrumbs">
<a href="../index.html">all</a> &gt; 
<a href="../packages/model.html">model</a> &gt; FirefighterBoardTest</div>
<div id="summary">
<table>
<tr>
<td>
<div class="summaryGroup">
<table>
<tr>
<td>
<div class="infoBox" id="tests">
<div class="counter">4</div>
<p>tests</p>
</div>
</td>
<td>
<div class="infoBox" id="failures">
<div class="counter">0</div>
<p>failures</p>
</div>
</td>
<td>
<div class="infoBox" id="ignored">
<div class="counter">0</div>
<p>ignored</p>
</div>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.098s</div>
<p>duration</p>
</div>
</td>
</tr>
</table>
</div>
</td>
<td>
<div class="infoBox success" id="successRate">
<div class="percent">100%</div>
<p>successful</p>
</div>
</td>
</tr>
</table>
</div>
<div id="tabs">
<ul class="tabLinks">
<li>
<a href="#tab0">Tests</a>
</li>
</ul>
<div id="tab0" class="tab">
<h2>Tests</h2>
<table>
<thead>
<tr>
<th>Test</th>
<th>Duration</th>
<th>Result</th>
</tr>
</thead>
<tr>
<td class="success">testColumnCount()</td>
<td class="success">0.078s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testGetState_afterSet()</td>
<td class="success">0.016s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testRowCount()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testStepNumber()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
</table>
</div>
</div>
<div id="footer">
<p>
<div>
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label>
</div>Generated by 
<a href="http://www.gradle.org">Gradle 8.10.2</a> at 16 nov. 2024, 18:17:08</p>
</div>
</div>
</body>
</html>
Original line number Original line Diff line number Diff line

body {
    margin: 0;
    padding: 0;
    font-family: sans-serif;
    font-size: 12pt;
}

body, a, a:visited {
    color: #303030;
}

#content {
    padding-left: 50px;
    padding-right: 50px;
    padding-top: 30px;
    padding-bottom: 30px;
}

#content h1 {
    font-size: 160%;
    margin-bottom: 10px;
}

#footer {
    margin-top: 100px;
    font-size: 80%;
    white-space: nowrap;
}

#footer, #footer a {
    color: #a0a0a0;
}

#line-wrapping-toggle {
    vertical-align: middle;
}

#label-for-line-wrapping-toggle {
    vertical-align: middle;
}

ul {
    margin-left: 0;
}

h1, h2, h3 {
    white-space: nowrap;
}

h2 {
    font-size: 120%;
}

ul.tabLinks {
    padding-left: 0;
    padding-top: 10px;
    padding-bottom: 10px;
    overflow: auto;
    min-width: 800px;
    width: auto !important;
    width: 800px;
}

ul.tabLinks li {
    float: left;
    height: 100%;
    list-style: none;
    padding-left: 10px;
    padding-right: 10px;
    padding-top: 5px;
    padding-bottom: 5px;
    margin-bottom: 0;
    -moz-border-radius: 7px;
    border-radius: 7px;
    margin-right: 25px;
    border: solid 1px #d4d4d4;
    background-color: #f0f0f0;
}

ul.tabLinks li:hover {
    background-color: #fafafa;
}

ul.tabLinks li.selected {
    background-color: #c5f0f5;
    border-color: #c5f0f5;
}

ul.tabLinks a {
    font-size: 120%;
    display: block;
    outline: none;
    text-decoration: none;
    margin: 0;
    padding: 0;
}

ul.tabLinks li h2 {
    margin: 0;
    padding: 0;
}

div.tab {
}

div.selected {
    display: block;
}

div.deselected {
    display: none;
}

div.tab table {
    min-width: 350px;
    width: auto !important;
    width: 350px;
    border-collapse: collapse;
}

div.tab th, div.tab table {
    border-bottom: solid #d0d0d0 1px;
}

div.tab th {
    text-align: left;
    white-space: nowrap;
    padding-left: 6em;
}

div.tab th:first-child {
    padding-left: 0;
}

div.tab td {
    white-space: nowrap;
    padding-left: 6em;
    padding-top: 5px;
    padding-bottom: 5px;
}

div.tab td:first-child {
    padding-left: 0;
}

div.tab td.numeric, div.tab th.numeric {
    text-align: right;
}

span.code {
    display: inline-block;
    margin-top: 0em;
    margin-bottom: 1em;
}

span.code pre {
    font-size: 11pt;
    padding-top: 10px;
    padding-bottom: 10px;
    padding-left: 10px;
    padding-right: 10px;
    margin: 0;
    background-color: #f7f7f7;
    border: solid 1px #d0d0d0;
    min-width: 700px;
    width: auto !important;
    width: 700px;
}

span.wrapped pre {
    word-wrap: break-word;
    white-space: pre-wrap;
    word-break: break-all;
}

label.hidden {
    display: none;
}
 No newline at end of file
+84 −0
Original line number Original line Diff line number Diff line

#summary {
    margin-top: 30px;
    margin-bottom: 40px;
}

#summary table {
    border-collapse: collapse;
}

#summary td {
    vertical-align: top;
}

.breadcrumbs, .breadcrumbs a {
    color: #606060;
}

.infoBox {
    width: 110px;
    padding-top: 15px;
    padding-bottom: 15px;
    text-align: center;
}

.infoBox p {
    margin: 0;
}

.counter, .percent {
    font-size: 120%;
    font-weight: bold;
    margin-bottom: 8px;
}

#duration {
    width: 125px;
}

#successRate, .summaryGroup {
    border: solid 2px #d0d0d0;
    -moz-border-radius: 10px;
    border-radius: 10px;
}

#successRate {
    width: 140px;
    margin-left: 35px;
}

#successRate .percent {
    font-size: 180%;
}

.success, .success a {
    color: #008000;
}

div.success, #successRate.success {
    background-color: #bbd9bb;
    border-color: #008000;
}

.failures, .failures a {
    color: #b60808;
}

.skipped, .skipped a {
    color: #c09853;
}

div.failures, #successRate.failures {
    background-color: #ecdada;
    border-color: #b60808;
}

ul.linkList {
    padding-left: 0;
}

ul.linkList li {
    list-style: none;
    margin-bottom: 5px;
}
+133 −0
Original line number Original line Diff line number Diff line
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<title>Test results - Test Summary</title>
<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
<link href="css/style.css" rel="stylesheet" type="text/css"/>
<script src="js/report.js" type="text/javascript"></script>
</head>
<body>
<div id="content">
<h1>Test Summary</h1>
<div id="summary">
<table>
<tr>
<td>
<div class="summaryGroup">
<table>
<tr>
<td>
<div class="infoBox" id="tests">
<div class="counter">4</div>
<p>tests</p>
</div>
</td>
<td>
<div class="infoBox" id="failures">
<div class="counter">0</div>
<p>failures</p>
</div>
</td>
<td>
<div class="infoBox" id="ignored">
<div class="counter">0</div>
<p>ignored</p>
</div>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.098s</div>
<p>duration</p>
</div>
</td>
</tr>
</table>
</div>
</td>
<td>
<div class="infoBox success" id="successRate">
<div class="percent">100%</div>
<p>successful</p>
</div>
</td>
</tr>
</table>
</div>
<div id="tabs">
<ul class="tabLinks">
<li>
<a href="#tab0">Packages</a>
</li>
<li>
<a href="#tab1">Classes</a>
</li>
</ul>
<div id="tab0" class="tab">
<h2>Packages</h2>
<table>
<thead>
<tr>
<th>Package</th>
<th>Tests</th>
<th>Failures</th>
<th>Ignored</th>
<th>Duration</th>
<th>Success rate</th>
</tr>
</thead>
<tbody>
<tr>
<td class="success">
<a href="packages/model.html">model</a>
</td>
<td>4</td>
<td>0</td>
<td>0</td>
<td>0.098s</td>
<td class="success">100%</td>
</tr>
</tbody>
</table>
</div>
<div id="tab1" class="tab">
<h2>Classes</h2>
<table>
<thead>
<tr>
<th>Class</th>
<th>Tests</th>
<th>Failures</th>
<th>Ignored</th>
<th>Duration</th>
<th>Success rate</th>
</tr>
</thead>
<tbody>
<tr>
<td class="success">
<a href="classes/model.FirefighterBoardTest.html">model.FirefighterBoardTest</a>
</td>
<td>4</td>
<td>0</td>
<td>0</td>
<td>0.098s</td>
<td class="success">100%</td>
</tr>
</tbody>
</table>
</div>
</div>
<div id="footer">
<p>
<div>
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label>
</div>Generated by 
<a href="http://www.gradle.org">Gradle 8.10.2</a> at 16 nov. 2024, 18:17:08</p>
</div>
</div>
</body>
</html>
+194 −0
Original line number Original line Diff line number Diff line
(function (window, document) {
    "use strict";

    var tabs = {};

    function changeElementClass(element, classValue) {
        if (element.getAttribute("className")) {
            element.setAttribute("className", classValue);
        } else {
            element.setAttribute("class", classValue);
        }
    }

    function getClassAttribute(element) {
        if (element.getAttribute("className")) {
            return element.getAttribute("className");
        } else {
            return element.getAttribute("class");
        }
    }

    function addClass(element, classValue) {
        changeElementClass(element, getClassAttribute(element) + " " + classValue);
    }

    function removeClass(element, classValue) {
        changeElementClass(element, getClassAttribute(element).replace(classValue, ""));
    }

    function initTabs() {
        var container = document.getElementById("tabs");

        tabs.tabs = findTabs(container);
        tabs.titles = findTitles(tabs.tabs);
        tabs.headers = findHeaders(container);
        tabs.select = select;
        tabs.deselectAll = deselectAll;
        tabs.select(0);

        return true;
    }

    function getCheckBox() {
        return document.getElementById("line-wrapping-toggle");
    }

    function getLabelForCheckBox() {
        return document.getElementById("label-for-line-wrapping-toggle");
    }

    function findCodeBlocks() {
        var spans = document.getElementById("tabs").getElementsByTagName("span");
        var codeBlocks = [];
        for (var i = 0; i < spans.length; ++i) {
            if (spans[i].className.indexOf("code") >= 0) {
                codeBlocks.push(spans[i]);
            }
        }
        return codeBlocks;
    }

    function forAllCodeBlocks(operation) {
        var codeBlocks = findCodeBlocks();

        for (var i = 0; i < codeBlocks.length; ++i) {
            operation(codeBlocks[i], "wrapped");
        }
    }

    function toggleLineWrapping() {
        var checkBox = getCheckBox();

        if (checkBox.checked) {
            forAllCodeBlocks(addClass);
        } else {
            forAllCodeBlocks(removeClass);
        }
    }

    function initControls() {
        if (findCodeBlocks().length > 0) {
            var checkBox = getCheckBox();
            var label = getLabelForCheckBox();

            checkBox.onclick = toggleLineWrapping;
            checkBox.checked = false;

            removeClass(label, "hidden");
         }
    }

    function switchTab() {
        var id = this.id.substr(1);

        for (var i = 0; i < tabs.tabs.length; i++) {
            if (tabs.tabs[i].id === id) {
                tabs.select(i);
                break;
            }
        }

        return false;
    }

    function select(i) {
        this.deselectAll();

        changeElementClass(this.tabs[i], "tab selected");
        changeElementClass(this.headers[i], "selected");

        while (this.headers[i].firstChild) {
            this.headers[i].removeChild(this.headers[i].firstChild);
        }

        var h2 = document.createElement("H2");

        h2.appendChild(document.createTextNode(this.titles[i]));
        this.headers[i].appendChild(h2);
    }

    function deselectAll() {
        for (var i = 0; i < this.tabs.length; i++) {
            changeElementClass(this.tabs[i], "tab deselected");
            changeElementClass(this.headers[i], "deselected");

            while (this.headers[i].firstChild) {
                this.headers[i].removeChild(this.headers[i].firstChild);
            }

            var a = document.createElement("A");

            a.setAttribute("id", "ltab" + i);
            a.setAttribute("href", "#tab" + i);
            a.onclick = switchTab;
            a.appendChild(document.createTextNode(this.titles[i]));

            this.headers[i].appendChild(a);
        }
    }

    function findTabs(container) {
        return findChildElements(container, "DIV", "tab");
    }

    function findHeaders(container) {
        var owner = findChildElements(container, "UL", "tabLinks");
        return findChildElements(owner[0], "LI", null);
    }

    function findTitles(tabs) {
        var titles = [];

        for (var i = 0; i < tabs.length; i++) {
            var tab = tabs[i];
            var header = findChildElements(tab, "H2", null)[0];

            header.parentNode.removeChild(header);

            if (header.innerText) {
                titles.push(header.innerText);
            } else {
                titles.push(header.textContent);
            }
        }

        return titles;
    }

    function findChildElements(container, name, targetClass) {
        var elements = [];
        var children = container.childNodes;

        for (var i = 0; i < children.length; i++) {
            var child = children.item(i);

            if (child.nodeType === 1 && child.nodeName === name) {
                if (targetClass && child.className.indexOf(targetClass) < 0) {
                    continue;
                }

                elements.push(child);
            }
        }

        return elements;
    }

    // Entry point.

    window.onload = function() {
        initTabs();
        initControls();
    };
} (window, window.document));
 No newline at end of file
Original line number Original line Diff line number Diff line
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<title>Test results - Package model</title>
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
<script src="../js/report.js" type="text/javascript"></script>
</head>
<body>
<div id="content">
<h1>Package model</h1>
<div class="breadcrumbs">
<a href="../index.html">all</a> &gt; model</div>
<div id="summary">
<table>
<tr>
<td>
<div class="summaryGroup">
<table>
<tr>
<td>
<div class="infoBox" id="tests">
<div class="counter">4</div>
<p>tests</p>
</div>
</td>
<td>
<div class="infoBox" id="failures">
<div class="counter">0</div>
<p>failures</p>
</div>
</td>
<td>
<div class="infoBox" id="ignored">
<div class="counter">0</div>
<p>ignored</p>
</div>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.098s</div>
<p>duration</p>
</div>
</td>
</tr>
</table>
</div>
</td>
<td>
<div class="infoBox success" id="successRate">
<div class="percent">100%</div>
<p>successful</p>
</div>
</td>
</tr>
</table>
</div>
<div id="tabs">
<ul class="tabLinks">
<li>
<a href="#tab0">Classes</a>
</li>
</ul>
<div id="tab0" class="tab">
<h2>Classes</h2>
<table>
<thead>
<tr>
<th>Class</th>
<th>Tests</th>
<th>Failures</th>
<th>Ignored</th>
<th>Duration</th>
<th>Success rate</th>
</tr>
</thead>
<tr>
<td class="success">
<a href="../classes/model.FirefighterBoardTest.html">FirefighterBoardTest</a>
</td>
<td>4</td>
<td>0</td>
<td>0</td>
<td>0.098s</td>
<td class="success">100%</td>
</tr>
</table>
</div>
</div>
<div id="footer">
<p>
<div>
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label>
</div>Generated by 
<a href="http://www.gradle.org">Gradle 8.10.2</a> at 16 nov. 2024, 18:17:08</p>
</div>
</div>
</body>
</html>
+142 −0
Original line number Original line Diff line number Diff line
.background {
    -fx-background-color: #1d1d1d;
}

.label {
    -fx-font-size: 11pt;
    -fx-font-family: "Segoe UI Semibold";
    -fx-text-fill: white;
    -fx-opacity: 0.6;
}

.label-bright {
    -fx-font-size: 11pt;
    -fx-font-family: "Segoe UI Semibold";
    -fx-text-fill: white;
    -fx-opacity: 1;
}

.label-header {
    -fx-font-size: 32pt;
    -fx-font-family: "Segoe UI Light";
    -fx-text-fill: white;
    -fx-opacity: 1;
}

.table-view {
    -fx-base: #1d1d1d;
    -fx-control-inner-background: #1d1d1d;
    -fx-background-color: #1d1d1d;
    -fx-table-cell-border-color: transparent;
    -fx-table-header-border-color: transparent;
    -fx-padding: 5;
}

.table-view .column-header-background {
    -fx-background-color: transparent;
}

.table-view .column-header, .table-view .filler {
    -fx-border-width: 0 0 1 0;
    -fx-background-color: transparent;
    -fx-border-color: 
        transparent
        transparent
        derive(-fx-base, 80%) 
        transparent;
    -fx-border-insets: 0 10 1 0;
}

.table-view .column-header .label {
    -fx-font-size: 20pt;
    -fx-font-family: "Segoe UI Light";
    -fx-text-fill: white;
    -fx-alignment: center-left;
    -fx-opacity: 1;
}

.table-view:focused .table-row-cell:filled:focused:selected {
    -fx-background-color: -fx-focus-color;
}

.split-pane:horizontal > .split-pane-divider {
    -fx-border-color: transparent #1d1d1d transparent #1d1d1d;
    -fx-background-color: transparent, derive(#1d1d1d,20%);
}

.split-pane {
    -fx-padding: 1 0 0 0;
}

.menu-bar {
    -fx-background-color: derive(#1d1d1d,20%);
}

.context-menu {
    -fx-background-color: derive(#1d1d1d,50%);
}

.menu-bar .label {
    -fx-font-size: 14pt;
    -fx-font-family: "Segoe UI Light";
    -fx-text-fill: white;
    -fx-opacity: 0.9;
}

.menu .left-container {
    -fx-background-color: black;
}

.text-field {
    -fx-font-size: 12pt;
    -fx-font-family: "Segoe UI Semibold";
}

/* 
 * Metro style Push Button
 * Author: Pedro Duque Vieira
 * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
 */
.button {
    -fx-padding: 5 22 5 22;   
    -fx-border-color: #e2e2e2;
    -fx-border-width: 2;
    -fx-background-radius: 0;
    -fx-background-color: #1d1d1d;
    -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
    -fx-font-size: 11pt;
    -fx-text-fill: #d8d8d8;
    -fx-background-insets: 0 0 0 0, 0, 1, 2;
}

.button:hover {
    -fx-background-color: #3a3a3a;
}

.button:pressed, .button:default:hover:pressed {
  -fx-background-color: white;
  -fx-text-fill: #1d1d1d;
}

.button:focused {
    -fx-border-color: white, white;
    -fx-border-width: 1, 1;
    -fx-border-style: solid;
    -fx-border-radius: 0, 0;
    -fx-border-insets: 1 1 1 1, 0;
}

.button:disabled, .button:default:disabled {
    -fx-opacity: 0.4;
    -fx-background-color: #1d1d1d;
    -fx-text-fill: white;
}

.button:default {
    -fx-background-color: -fx-focus-color;
    -fx-text-fill: #ffffff;
}

.button:default:hover {
    -fx-background-color: derive(-fx-focus-color,30%);
}
 No newline at end of file
+40 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import view.FirefighterGrid?>

<?import javafx.scene.control.ToggleButton?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.Label?>
<HBox styleClass="background" stylesheets="@DarkTheme.css"
      xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
      fx:controller="controller.Controller">
  <VBox>
    <Separator maxHeight="-Infinity" maxWidth="-Infinity"
               prefHeight="24.0" prefWidth="200.0"/>
    <Label maxHeight="-Infinity" maxWidth="-Infinity" alignment="CENTER" prefHeight="24.0" prefWidth="200.0"
           text="Generation number"/>
    <Label fx:id="generationNumberLabel" alignment="CENTER" contentDisplay="TEXT_ONLY"
           maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="24.0" prefWidth="200.0"/>
    <Separator maxHeight="-Infinity" maxWidth="-Infinity"
               prefHeight="24.0" prefWidth="200.0"/>
    <Button fx:id="restartButton" maxHeight="-Infinity" maxWidth="-Infinity"
            mnemonicParsing="false" onAction="#restartButtonAction" prefHeight="24.0" prefWidth="200.0"
            text="Restart"/>
    <Button fx:id="oneStepButton" maxHeight="-Infinity" maxWidth="-Infinity"
            mnemonicParsing="false" onAction="#oneStepButtonAction" prefHeight="24.0" prefWidth="200.0"
            text="One step"/>
    <ToggleButton fx:id="playToggleButton" maxHeight="-Infinity" maxWidth="-Infinity"
                  mnemonicParsing="false" onAction="#playToggleButtonAction" prefHeight="24.0"
                  prefWidth="200.0" styleClass="button" text="Play"/>
    <ToggleButton fx:id="pauseToggleButton" maxHeight="-Infinity" maxWidth="-Infinity"
                  mnemonicParsing="false" onAction="#pauseToggleButtonAction" prefHeight="24.0"
                  prefWidth="200.0" styleClass="button" text="Pause"/>
  </VBox>
  <FirefighterGrid fx:id="grid"
                   xmlns="http://javafx.com/javafx"
                   xmlns:fx="http://javafx.com/fxml">
  </FirefighterGrid>
</HBox>
+251 −0
Original line number Original line Diff line number Diff line
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
#   firefighter start up script for POSIX generated by Gradle.
#
#   Important for running:
#
#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
#       noncompliant, but you have some other compliant shell such as ksh or
#       bash, then to run this script, type that shell name before the whole
#       command line, like:
#
#           ksh firefighter
#
#       Busybox and similar reduced shells will NOT work, because this script
#       requires all of these POSIX shell features:
#         * functions;
#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
#         * compound commands having a testable exit status, especially «case»;
#         * various built-in commands including «command», «set», and «ulimit».
#
#   Important for patching:
#
#   (2) This script targets any POSIX shell, so it avoids extensions provided
#       by Bash, Ksh, etc; in particular arrays are avoided.
#
#       The "traditional" practice of packing multiple parameters into a
#       space-separated string is a well documented source of bugs and security
#       problems, so this is (mostly) avoided, by progressively accumulating
#       options in "$@", and eventually passing that to Java.
#
#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
#       and FIREFIGHTER_OPTS) rely on word-splitting, this is performed explicitly;
#       see the in-line comments for details.
#
#       There are tweaks for specific operating systems such as AIX, CygWin,
#       Darwin, MinGW, and NonStop.
#
#   (3) This script is generated from the Groovy template
#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
#       within the Gradle project.
#
#       You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################

# Attempt to set APP_HOME

# Resolve links: $0 may be a link
app_path=$0

# Need this for daisy-chained symlinks.
while
    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
    [ -h "$app_path" ]
do
    ls=$( ls -ld "$app_path" )
    link=${ls#*' -> '}
    case $link in             #(
      /*)   app_path=$link ;; #(
      *)    app_path=$APP_HOME$link ;;
    esac
done

# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}.." > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

warn () {
    echo "$*"
} >&2

die () {
    echo
    echo "$*"
    echo
    exit 1
} >&2

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in                #(
  CYGWIN* )         cygwin=true  ;; #(
  Darwin* )         darwin=true  ;; #(
  MSYS* | MINGW* )  msys=true    ;; #(
  NONSTOP* )        nonstop=true ;;
esac

CLASSPATH=$APP_HOME/lib/firefighter.jar:$APP_HOME/lib/javafx-fxml-21-win.jar:$APP_HOME/lib/javafx-controls-21-win.jar:$APP_HOME/lib/javafx-graphics-21-win.jar:$APP_HOME/lib/javafx-base-21-win.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD=$JAVA_HOME/jre/sh/java
    else
        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
    fi
else
    JAVACMD=java
    if ! command -v java >/dev/null 2>&1
    then
        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
    fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
fi

# Collect all arguments for the java command, stacking in reverse order:
#   * args from the command line
#   * the main class name
#   * -classpath
#   * -D...appname settings
#   * --module-path (only if needed)
#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and FIREFIGHTER_OPTS environment variables.

# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    for arg do
        if
            case $arg in                                #(
              -*)   false ;;                            # don't mess with options #(
              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
                    [ -e "$t" ] ;;                      #(
              *)    false ;;
            esac
        then
            arg=$( cygpath --path --ignore --mixed "$arg" )
        fi
        # Roll the args list around exactly as many times as the number of
        # args, so each arg winds up back in the position where it started, but
        # possibly modified.
        #
        # NB: a `for` loop captures its iteration list before it begins, so
        # changing the positional parameters here affects neither the number of
        # iterations, nor the values presented in `arg`.
        shift                   # remove old arg
        set -- "$@" "$arg"      # push replacement arg
    done
fi


# Add default JVM options here. You can also use JAVA_OPTS and FIREFIGHTER_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Collect all arguments for the java command:
#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
#     and any embedded shellness will be escaped.
#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
#     treated as '${Hostname}' itself on the command line.

set -- \
        -classpath "$CLASSPATH" \
        app.SimulatorMain \
        "$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
    die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
#   set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#

eval "set -- $(
        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $FIREFIGHTER_OPTS" |
        xargs -n1 |
        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
        tr '\n' ' '
    )" '"$@"'

exec "$JAVACMD" "$@"
+94 −0
Original line number Original line Diff line number Diff line
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem      https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  firefighter startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%..

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and FIREFIGHTER_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\lib\firefighter.jar;%APP_HOME%\lib\javafx-fxml-21-win.jar;%APP_HOME%\lib\javafx-controls-21-win.jar;%APP_HOME%\lib\javafx-graphics-21-win.jar;%APP_HOME%\lib\javafx-base-21-win.jar


@rem Execute firefighter
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %FIREFIGHTER_OPTS%  -classpath "%CLASSPATH%" app.SimulatorMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable FIREFIGHTER_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%FIREFIGHTER_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
+183 −0
Original line number Original line Diff line number Diff line
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
##  firefighter start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
        PRG="$link"
    else
        PRG=`dirname "$PRG"`"/$link"
    fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/.." >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="firefighter"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and FIREFIGHTER_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
    echo "$*"
}

die () {
    echo
    echo "$*"
    echo
    exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
  CYGWIN* )
    cygwin=true
    ;;
  Darwin* )
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
esac

CLASSPATH=$APP_HOME/lib/firefighter-all.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
    fi
else
    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
            MAX_FD="$MAX_FD_LIMIT"
        fi
        ulimit -n $MAX_FD
        if [ $? -ne 0 ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option

        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=`expr $i + 1`
    done
    case $i in
        0) set -- ;;
        1) set -- "$args0" ;;
        2) set -- "$args0" "$args1" ;;
        3) set -- "$args0" "$args1" "$args2" ;;
        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
fi

# Escape application args
save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $FIREFIGHTER_OPTS -jar "\"$CLASSPATH\"" "$APP_ARGS"

exec "$JAVACMD" "$@"
 No newline at end of file
+84 −0
Original line number Original line Diff line number Diff line
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  firefighter startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%..

@rem Add default JVM options here. You can also use JAVA_OPTS and FIREFIGHTER_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\lib\firefighter-all.jar

@rem Execute firefighter
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %FIREFIGHTER_OPTS%  -jar "%CLASSPATH%" %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable FIREFIGHTER_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if  not "" == "%FIREFIGHTER_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
 No newline at end of file
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="model.FirefighterBoardTest" tests="4" skipped="0" failures="0" errors="0" timestamp="2024-11-16T17:17:08" hostname="DESKTOP-ETSE1TF" time="0.103">
  <properties/>
  <testcase name="testColumnCount()" classname="model.FirefighterBoardTest" time="0.078"/>
  <testcase name="testGetState_afterSet()" classname="model.FirefighterBoardTest" time="0.016"/>
  <testcase name="testRowCount()" classname="model.FirefighterBoardTest" time="0.002"/>
  <testcase name="testStepNumber()" classname="model.FirefighterBoardTest" time="0.002"/>
  <system-out><![CDATA[]]></system-out>
  <system-err><![CDATA[]]></system-err>
</testsuite>
+2 −0
Original line number Original line Diff line number Diff line
Manifest-Version: 1.0
+3 −0
Original line number Original line Diff line number Diff line
Manifest-Version: 1.0
Main-Class: app.SimulatorMain
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ import java.net.URL;


public class SimulatorApplication extends javafx.application.Application {
public class SimulatorApplication extends javafx.application.Application {
  private static final String VIEW_RESOURCE_PATH = "/view/view.fxml";
  private static final String VIEW_RESOURCE_PATH = "/view/view.fxml";
  private static final String APP_NAME = "Firefighter simulator";
  private static final String APP_NAME = "StandardFirefighter simulator";
  private static final int ROW_COUNT = 20;
  private static final int ROW_COUNT = 20;
  private static final int COLUMN_COUNT = 20;
  private static final int COLUMN_COUNT = 20;
  private static final int BOX_WIDTH = 50;
  private static final int BOX_WIDTH = 50;
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ import javafx.util.Duration;
import javafx.util.Pair;
import javafx.util.Pair;
import model.Board;
import model.Board;
import model.ModelElement;
import model.ModelElement;
import model.FirefighterBoard;
import model.FFBoard;
import util.Position;
import util.Position;
import view.Grid;
import view.Grid;
import view.ViewElement;
import view.ViewElement;
@@ -25,7 +25,25 @@ import java.util.List;
import static java.util.Objects.requireNonNull;
import static java.util.Objects.requireNonNull;


public class Controller {
public class Controller {
  public static String toString(ViewElement[][] matrice) {
    StringBuilder sb = new StringBuilder();


    for (int i = 0; i < matrice.length; i++) {
      sb.append("[ ");
      for (int j = 0; j < matrice[i].length; j++) {
        sb.append(matrice[i][j].toString());
        if (j < matrice[i].length - 1) {
          sb.append(", "); // Ajouter une virgule entre les éléments
        }
      }
      sb.append(" ]");
      if (i < matrice.length - 1) {
        sb.append("\n"); // Sauter une ligne entre les lignes de la matrice
      }
    }

    return sb.toString();
  }
  public static final int PERIOD_IN_MILLISECONDS = 50;
  public static final int PERIOD_IN_MILLISECONDS = 50;
  @FXML
  @FXML
  public Button restartButton;
  public Button restartButton;
@@ -54,8 +72,8 @@ public class Controller {
    pauseToggleButton.setSelected(true);
    pauseToggleButton.setSelected(true);
  }
  }


  private void setModel(FirefighterBoard firefighterBoard) {
  private void setModel(FFBoard FFBoard) {
    this.board = requireNonNull(firefighterBoard, "firefighter.model is null");
    this.board = requireNonNull(FFBoard, "firefighter.model is null");
  }
  }


  private void updateBoard(){
  private void updateBoard(){
@@ -78,15 +96,22 @@ public class Controller {
      for(int row = 0; row < rowCount; row++)
      for(int row = 0; row < rowCount; row++)
        viewElements[row][column] = getViewElement(board.getState(new Position(row, column)));
        viewElements[row][column] = getViewElement(board.getState(new Position(row, column)));
    grid.repaint(viewElements);
    grid.repaint(viewElements);
    System.out.println(toString(viewElements));
    updateGenerationLabel(board.stepNumber());
    updateGenerationLabel(board.stepNumber());
  }
  }


  private ViewElement getViewElement(List<ModelElement> squareState) {
  private ViewElement getViewElement(List<ModelElement> squareState) {
    if (squareState.contains(ModelElement.FIRE)){
    return ViewElement.FIRE;
  }
    if(squareState.contains(ModelElement.FIREFIGHTER)){
    if(squareState.contains(ModelElement.FIREFIGHTER)){
      return ViewElement.FIREFIGHTER;
      return ViewElement.FIREFIGHTER;
    }
    }
    if (squareState.contains(ModelElement.FIRE)){
    if(squareState.contains(ModelElement.CLOUD)){
      return ViewElement.FIRE;
      return ViewElement.CLOUD;
    }
    if (squareState.contains(ModelElement.MOUNTAIN)){
      return ViewElement.MOUNTAIN;
    }
    }
    return ViewElement.EMPTY;
    return ViewElement.EMPTY;
  }
  }
@@ -126,7 +151,7 @@ public class Controller {
  public void initialize(int squareWidth, int squareHeight, int columnCount,
  public void initialize(int squareWidth, int squareHeight, int columnCount,
                                int rowCount, int initialFireCount, int initialFirefighterCount) {
                                int rowCount, int initialFireCount, int initialFirefighterCount) {
    grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight);
    grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight);
    this.setModel(new FirefighterBoard(columnCount, rowCount, initialFireCount, initialFirefighterCount));
    this.setModel(new FFBoard(columnCount, rowCount, initialFireCount, initialFirefighterCount));
    repaintGrid();
    repaintGrid();
  }
  }


+12 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;

public interface Behavior {
    public List<Position> getNext(BoardData boardData);
    public default Boolean isLegalMove(){
        return true;
    }
}
+17 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;
import java.util.Map;

public interface BoardData {
    public List<List<Position>> getPositions();
    public void setPositions( List<List<Position>> Positions);
    public Map<Position, List<Position>> getNeighbors();
    public List<Position> getNeighbor(Position position);
    public int getStep();
    public void setStep(int step);
    public void initialize();

}
+28 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;
import util.TargetStrategy;

import java.util.ArrayList;
import java.util.List;

public class Cloud extends Element {

    public Cloud() {
            super(ModelElement.CLOUD,
                    new CloudBehavior(ModelElement.CLOUD));
    }

    @Override
    public List<Position> Update(BoardData boardData, List<Position> modifiedPositions) {
        List<Position> cloudPositions=boardData.getPositions().get(type.ordinal());
        List<Position> newCloudPositions=behavior.getNext(boardData);
        modifiedPositions.removeAll(cloudPositions);
        modifiedPositions.addAll(cloudPositions);
        modifiedPositions.removeAll(newCloudPositions);
        modifiedPositions.addAll(newCloudPositions);
        cloudPositions.clear();
        cloudPositions.addAll(newCloudPositions);
        return modifiedPositions;
    }
}
+47 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.ArrayList;
import java.util.List;
import java.util.Random;

public class CloudBehavior implements RemoverBehavior<ModelElement> {
    private ModelElement element;
    private ModelElement removedElement=ModelElement.FIRE;
    private Random random=new Random();
    public CloudBehavior(ModelElement modelElement) {
        this.element=modelElement;
    }

    @Override
    public List<Position> getNext(BoardData boardData) {
        List<Position> cloudPositions=boardData.getPositions().get(element.ordinal());
        List<Position> newCloudPositions=new ArrayList<>();
        for (Position cloudPosition:cloudPositions) {
            List<Position> newPossibleCloudPosition=boardData.getNeighbors().get(cloudPosition);
            Position newCloudPosition= newPossibleCloudPosition.get(random.nextInt(newPossibleCloudPosition.size()));
            newCloudPositions.add(newCloudPosition);
            remove(boardData,newCloudPosition);
        }
        return newCloudPositions;
    }


    @Override
    public ModelElement getElementToRemove() {
        return removedElement;
    }

    @Override
    public void removePartial(BoardData boardData,Position p) {
        List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
        firePositions.remove(p);
    }

    @Override
    public List<Position> remove(BoardData boardData, Position p) {
        removePartial(boardData,p);
        return List.of(p);
    }
}
+17 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.ArrayList;
import java.util.List;

public abstract class  Element {
    ModelElement type;
    Behavior behavior;
    List<ModelElement> obstacles;
    public Element(ModelElement type, Behavior behavior) {
        this.type = type;
        this.behavior = behavior;
    }
    public abstract List<Position> Update(BoardData board, List<Position> modifiedList);
}
+11 −0
Original line number Original line Diff line number Diff line
package model;

import java.util.ArrayList;
import java.util.List;

public abstract class FFBehavior implements Behavior {
    public ModelElement element;
    public FFBehavior(ModelElement element) {
        this.element = element;
    }
}
Original line number Original line Diff line number Diff line
package model;
package model;


import util.Position;
import util.Position;
import util.TargetStrategy;


import java.util.*;
import java.util.*;




public class FirefighterBoard implements Board<List<ModelElement>> {
public class FFBoard implements Board<List<ModelElement>> {
  private final int columnCount;
  private final int columnCount;
  private final int rowCount;
  private final int rowCount;
  private final int initialFireCount;
  private final int initialFireCount;
  private final int initialFirefighterCount;
  private final int initialFirefighterCount;
  private final TargetStrategy targetStrategy = new TargetStrategy();
  private final TargetStrategy targetStrategy = new TargetStrategy();
  private List<Position> firefighterPositions;
  private BoardData boardData;
  private Set<Position> firePositions;
  private Map<Position, List<Position>> neighbors = new HashMap();
  private final Position[][] positions;
  private final Position[][] positions;
  private int step = 0;
  private FFUpdater FFUpdater ;
  private final Random randomGenerator = new Random();
  private final Random randomGenerator = new Random();


  public FirefighterBoard(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount) {
  public FFBoard(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount) {
    boardData=new FFBoardData(columnCount,rowCount);
    FFUpdater=new FFUpdater();
    this.columnCount = columnCount;
    this.columnCount = columnCount;
    this.rowCount = rowCount;
    this.rowCount = rowCount;
    this.positions = new Position[rowCount][columnCount];
    this.positions = new Position[rowCount][columnCount];
@@ -32,7 +33,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
        if (column > 0) list.add(positions[row][column - 1]);
        if (column > 0) list.add(positions[row][column - 1]);
        if (row < rowCount - 1) list.add(positions[row + 1][column]);
        if (row < rowCount - 1) list.add(positions[row + 1][column]);
        if (column < columnCount - 1) list.add(positions[row][column + 1]);
        if (column < columnCount - 1) list.add(positions[row][column + 1]);
        neighbors.put(positions[row][column], list);
        boardData.getNeighbors().put(positions[row][column], list);
      }
      }
    this.initialFireCount = initialFireCount;
    this.initialFireCount = initialFireCount;
    this.initialFirefighterCount = initialFirefighterCount;
    this.initialFirefighterCount = initialFirefighterCount;
@@ -40,12 +41,14 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
  }
  }


  public void initializeElements() {
  public void initializeElements() {
    firefighterPositions = new ArrayList<>();
    boardData.initialize();
    firePositions = new HashSet<>();
    FFUpdater= new FFUpdater();
    for (int index = 0; index < initialFireCount; index++)
    for (int index = 0; index < initialFireCount; index++)
      firePositions.add(randomPosition());
      boardData.getPositions().get(ModelElement.FIRE.ordinal()).add(randomPosition());
    //for (int index = 0; index < initialFireCount; index++)
      //boardData.getPositions().get(ModelElement.CLOUD.ordinal()).add(randomPosition());
    for (int index = 0; index < initialFirefighterCount; index++)
    for (int index = 0; index < initialFirefighterCount; index++)
      firefighterPositions.add(randomPosition());
      boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal()).add(randomPosition());
  }
  }


  private Position randomPosition() {
  private Position randomPosition() {
@@ -54,10 +57,16 @@ public class FirefighterBoard implements Board<List<ModelElement>> {


  @Override
  @Override
  public List<ModelElement> getState(Position position) {
  public List<ModelElement> getState(Position position) {
    List<Position> firefighterPositions=boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
    List<Position> cloudPositions=boardData.getPositions().get(ModelElement.CLOUD.ordinal());
    List<Position> firePositions =boardData.getPositions().get(ModelElement.FIRE.ordinal());
    List<ModelElement> result = new ArrayList<>();
    List<ModelElement> result = new ArrayList<>();
    for (Position firefighterPosition : firefighterPositions)
    for (Position firefighterPosition : firefighterPositions)
      if (firefighterPosition.equals(position))
      if (firefighterPosition.equals(position))
        result.add(ModelElement.FIREFIGHTER);
        result.add(ModelElement.FIREFIGHTER);
    for (Position cloudPosition : cloudPositions)
      if (cloudPosition.equals(position))
        result.add(ModelElement.CLOUD);
    if (firePositions.contains(position))
    if (firePositions.contains(position))
      result.add(ModelElement.FIRE);
      result.add(ModelElement.FIRE);
    return result;
    return result;
@@ -74,74 +83,58 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
  }
  }


  public List<Position> updateToNextGeneration() {
  public List<Position> updateToNextGeneration() {
    List<Position> modifiedPositions = updateFirefighters();
    /*List<Position> modifiedPositions = updateFirefighters();
    modifiedPositions.addAll(updateFires());
    modifiedPositions.addAll(updateFires());
    step++;
    boardData.setStep(boardData.getStep()+1);
    return modifiedPositions;
    return modifiedPositions;*/
  }


  private List<Position> updateFires() {
    List<Position> modifiedPositions = FFUpdater.updateAll(boardData);
    List<Position> modifiedPositions = new ArrayList<>();
    boardData.setStep(boardData.getStep()+1);
    if (step % 2 == 0) {
      List<Position> newFirePositions = new ArrayList<>();
      for (Position fire : firePositions) {
        newFirePositions.addAll(neighbors.get(fire));
      }
      firePositions.addAll(newFirePositions);
      modifiedPositions.addAll(newFirePositions);
    }
    return modifiedPositions;
    return modifiedPositions;

  }
  }



  @Override
  @Override
  public int stepNumber() {
  public int stepNumber() {
    return step;
    return boardData.getStep();
  }
  }


  private List<Position> updateFirefighters() {
  private List<Position> updateFirefighters() {
    List<Position> modifiedPosition = new ArrayList<>();
    List<Position> modifiedPosition = new ArrayList<>();/*
    List<Position> firefighterPositions = boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
    List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
    List<Position> firefighterNewPositions = new ArrayList<>();
    List<Position> firefighterNewPositions = new ArrayList<>();
    for (Position firefighterPosition : firefighterPositions) {
    for (Position firefighterPosition : firefighterPositions) {
      Position newFirefighterPosition =
      Position newFirefighterPosition =
              targetStrategy.neighborClosestToFire(firefighterPosition,
              targetStrategy.neighborClosestToFire(firefighterPosition,
                      firePositions, neighbors);
                      firePositions, boardData.getNeighbors());
      firefighterNewPositions.add(newFirefighterPosition);
      firefighterNewPositions.add(newFirefighterPosition);
      extinguish(newFirefighterPosition);
      extinguish(newFirefighterPosition);
      modifiedPosition.add(firefighterPosition);
      modifiedPosition.add(firefighterPosition);
      modifiedPosition.add(newFirefighterPosition);
      modifiedPosition.add(newFirefighterPosition);
      List<Position> neighborFirePositions = neighbors.get(newFirefighterPosition).stream()
      List<Position> neighborFirePositions = boardData.getNeighbors().get(newFirefighterPosition).stream()
              .filter(firePositions::contains).toList();
              .filter(firePositions::contains).toList();
      for (Position firePosition : neighborFirePositions)
      for (Position firePosition : neighborFirePositions)
        extinguish(firePosition);
        extinguish(firePosition);
      modifiedPosition.addAll(neighborFirePositions);
      modifiedPosition.addAll(neighborFirePositions);
    }
    }
    firefighterPositions = firefighterNewPositions;
    firefighterPositions = firefighterNewPositions;*/
    return modifiedPosition;
    return modifiedPosition;
  }
  }


  @Override
  @Override
  public void reset() {
  public void reset() {
    step = 0;
    initializeElements();
    initializeElements();
  }
  }


  private void extinguish(Position position) {
    firePositions.remove(position);
  }



  @Override
  @Override
  public void setState(List<ModelElement> state, Position position) {
  public void setState(List<ModelElement> state, Position position) {
    firePositions.remove(position);
    for (ModelElement e:state) {
    for (; ; ) {
        boardData.getPositions().get(e.ordinal()).remove(position);
      if (!firefighterPositions.remove(position)) break;
    }
    for (ModelElement element : state) {
      switch (element) {
        case FIRE -> firePositions.add(position);
        case FIREFIGHTER -> firefighterPositions.add(position);
    }
    }
    for (ModelElement e:state) {
      boardData.getPositions().get(e.ordinal()).add(position);
    }
    }
  }
  }
}
}
 No newline at end of file
+65 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.*;

public class FFBoardData implements BoardData{
    private List<List<Position>> positions;
    private Map<Position, List<Position>> neighbors = new HashMap<Position, List<Position>>();
    private int step;
    private int columnCount,rowCount;

    public FFBoardData(int columnCount, int rowCount) {
        this.columnCount=columnCount;
        this.rowCount=rowCount;
        initialize();
    }
    public void initialize(){
        step=0;
        neighbors = new HashMap<Position, List<Position>>();
        Position[][] ps = new Position[rowCount][columnCount];
        for (int column = 0; column < columnCount; column++)
            for (int row = 0; row < rowCount; row++)
                ps[row][column] = new Position(row, column);
        for (int column = 0; column < columnCount; column++)
            for (int row = 0; row < rowCount; row++) {
                List<Position> list = new ArrayList<>();
                if (row > 0) list.add(ps[row - 1][column]);
                if (column > 0) list.add(ps[row][column - 1]);
                if (row < rowCount - 1) list.add(ps[row + 1][column]);
                if (column < columnCount - 1) list.add(ps[row][column + 1]);
                getNeighbors().put(ps[row][column], list);
            }
        positions = new ArrayList<>();
        for (int i = 0; i < ModelElement.values().length; i++) {
            positions.add(new ArrayList<>());
        }
    }

    public  List<List<Position>> getPositions() {
        return positions;
    }
    public  List<Position> getPositions(ModelElement modelElement) {
        return positions.get(modelElement.ordinal());
    }
    public void setPositions( List<List<Position>> Positions) {
        this.positions = Positions;
    }
    public Map<Position, List<Position>> getNeighbors() {
        return neighbors;
    }
    public List<Position> getNeighbor(Position position) {
        return neighbors.get(position);
    }

    @Override
    public int getStep() {
        return step;
    }

    @Override
    public void setStep(int step) {
        this.step=step;
    }
}
+27 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.ArrayList;
import java.util.List;

public class FFUpdater implements Updater {
    Element[] elements;

    public FFUpdater() {
        this.elements=new Element[ModelElement.values().length];
        for (int i = 0; i < ModelElement.values().length; i++) {
            this.elements[i]=ModelElement.values()[i].instanciate();
        }
    }

    @Override
    public List<Position> updateAll(BoardData boardData) {
        List<Position> modifiedList=new ArrayList<Position>();
        for (int i = 0; i < ModelElement.values().length; i++) {
            modifiedList=this.elements[i].Update(boardData,modifiedList);
            System.out.println(modifiedList.toString());
        }
        return modifiedList;
    }
}
+26 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.ArrayList;
import java.util.List;

public class Fire extends Element{

    public Fire() {
            super(ModelElement.FIRE,
                    new FireBehavior(ModelElement.FIRE));
    }

    @Override
    public List<Position> Update(BoardData boardData, List<Position> modifPositions) {
        List<Position> firePositions = boardData.getPositions().get(this.type.ordinal());
        List<Position> modifiedPositions = new ArrayList<Position>(modifPositions);
        List<Position> newFirePositions = behavior.getNext(boardData);
        firePositions.removeAll(newFirePositions);
        firePositions.addAll(newFirePositions);
        modifiedPositions.removeAll(newFirePositions);
        modifiedPositions.addAll(newFirePositions);
        return modifiedPositions;
    }
}
+29 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.ArrayList;
import java.util.List;

public class FireBehavior extends FFBehavior {


    public FireBehavior(ModelElement element) {
        super(element);
    }

    @Override
    public List<Position> getNext(BoardData boardData) {
        List<Position> firePositions = boardData.getPositions().get(element.ordinal());
        List<Position> newFirePositions = new ArrayList<>();
        if (boardData.getStep() % 2 == 0) {
            for (Position fire : firePositions) {
                for (Position neighbor:boardData.getNeighbors().get(fire)) {
                if (!newFirePositions.contains(neighbor))
                    newFirePositions.add(neighbor);
                }
            }
        }
        return newFirePositions;
    }
}
Original line number Original line Diff line number Diff line
package model;

import util.Position;
import util.TargetStrategy;

import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;

public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,RemoverBehavior<ModelElement> {
    List<ModelElement> obstacles=new ArrayList<>(List.of(ModelElement.MOUNTAIN));
    ModelElement removedElement=ModelElement.FIRE;
    TargetStrategy targetStrategy=new TargetStrategy();

    public FirefighterBehavior(ModelElement modelElement) {
        super(modelElement);
    }


    @Override
    public List<Position> getNext(BoardData boardData) {
        List<Position> firefighterPositions = boardData.getPositions().get(element.ordinal());
        List<Position> firePositions = new ArrayList<>(List.copyOf(boardData.getPositions().get(ModelElement.FIRE.ordinal())));
        List<Position> firefighterNewPositions = new ArrayList<>();
        for (Position firefighterPosition : firefighterPositions) {
            Position newFirefighterPosition = targetStrategy.neighborClosestToFire(firefighterPosition,firePositions, boardData.getNeighbors());
            firefighterNewPositions.add(newFirefighterPosition);
            firePositions.remove(newFirefighterPosition);
            firePositions.remove(boardData.getNeighbors().get(newFirefighterPosition));
        }
        return firefighterNewPositions;
    }
    public List<Position> remove(BoardData boardData,Position p){
        List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
        List<Position> neighborFirePositions = boardData.getNeighbors().get(p).stream()
                .filter(firePositions::contains).toList();
        removePartial(boardData,p);
        for (Position firePosition : neighborFirePositions)
            removePartial(boardData,firePosition);
        return neighborFirePositions;
    }

    @Override
    public Boolean isLegalMove() {
        return super.isLegalMove();
    }

    @Override
    public List<ModelElement> getObstacles() {
        return obstacles;
    }

    @Override
    public void removePartial(BoardData boardData,Position p) {
        List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
        firePositions.remove(p);
    }

    @Override
    public ModelElement getElementToRemove() {
        return removedElement;
    }
}
Original line number Original line Diff line number Diff line
package model;
package model;


import java.lang.reflect.InvocationTargetException;

public enum ModelElement {
public enum ModelElement {
  FIREFIGHTER, FIRE
  FIREFIGHTER(StandardFirefighter.class),
  FIRE(Fire.class),
  CLOUD(Cloud.class),
  MOUNTAIN(Mountain.class);

  public final Class<?> c;
  ModelElement(Class<?> c) {
    this.c=c;
    System.out.println(c);
  }
  public Element instanciate(){
    Object o=null;
    try {
      o = c.getDeclaredConstructor().newInstance();
      o = c.cast(o);
    } catch (InstantiationException e) {
      throw new RuntimeException(e);
    } catch (IllegalAccessException e) {
      throw new RuntimeException(e);
    } catch (InvocationTargetException e) {
      throw new RuntimeException(e);
    } catch (NoSuchMethodException e) {
      throw new RuntimeException(e);
    }
    return (Element) o;
  }
}
}
+18 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;

public class Mountain extends Element{

    public Mountain() {
            super(ModelElement.MOUNTAIN,
                    new NoBehavior(ModelElement.MOUNTAIN));
    }

    @Override
    public List<Position> Update(BoardData boardData, List<Position> modifPositions) {
        return modifPositions;
    }
}
+18 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;

public class NoBehavior extends FFBehavior {


    public NoBehavior(ModelElement element) {
        super(element);
    }

    @Override
    public List<Position> getNext(BoardData boardData) {
        return null;
    }
}
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;

public interface RemoverBehavior<E> extends Behavior {
    public void removePartial(BoardData boardData,Position p);
    public  List<Position> remove(BoardData boardData,Position p);

    public E getElementToRemove();
}
Original line number Original line Diff line number Diff line
package model;

import util.Position;
import util.TargetStrategy;

import java.util.ArrayList;
import java.util.List;

public class StandardFirefighter extends Element {

    private TargetStrategy targetStrategy=new TargetStrategy();

    public StandardFirefighter() {
            super(ModelElement.FIREFIGHTER,
                    new FirefighterBehavior(ModelElement.FIREFIGHTER));
    }

    @Override
    public List<Position> Update(BoardData boardData, List<Position> modifiedPositions) {
        /*
        List<Position> firefighterPositions = boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
        List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
        modifiedList =behavior.getNext(boardData,modifiedList);
        firePositions.removeAll(modifiedList);
        firefighterPositions.removeAll(modifiedList);
        firePositions.addAll(modifiedList);
        return modifiedList;*/
        List<Position> firefighterPositions = boardData.getPositions().get(type.ordinal());
        List<Position> firefighterNewPositions = behavior.getNext(boardData);
        List<Position> neighborFirePositions = new ArrayList<>();

        modifiedPositions.removeAll(firefighterPositions);
        modifiedPositions.removeAll(firefighterNewPositions);
        modifiedPositions.addAll(firefighterPositions);
        modifiedPositions.addAll(firefighterNewPositions);
        for (Position p :firefighterNewPositions) {
            neighborFirePositions.addAll(((RemoverBehavior)behavior).remove(boardData,p));
        }
        modifiedPositions.removeAll(neighborFirePositions);
        modifiedPositions.addAll(neighborFirePositions);
        boardData.getPositions().set(type.ordinal(),firefighterNewPositions);
        return modifiedPositions;
    }

    public void remove(BoardData boardData,Position p) {
        List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
        firePositions.remove(p);
    }
}
Original line number Original line Diff line number Diff line
package model;

import java.util.List;

public interface TangibleBehavior<E> extends Behavior {
    public List<E> getObstacles();
}
+11 −0
Original line number Original line Diff line number Diff line
package model;

import util.Position;

import java.util.List;

public interface Updater {

    public List<Position> updateAll(BoardData boardData);

}
Original line number Original line Diff line number Diff line
package model;
package util;


import util.Position;
import util.Position;


@@ -12,7 +12,7 @@ public class TargetStrategy {
     * @param targets positions that are targeted.
     * @param targets positions that are targeted.
     * @return the position next to the current position that is on the path to the closest target.
     * @return the position next to the current position that is on the path to the closest target.
     */
     */
    Position neighborClosestToFire(Position position, Collection<Position> targets,
    public Position neighborClosestToFire(Position position, Collection<Position> targets,
                                   Map<Position,List<Position>>neighbors) {
                                   Map<Position,List<Position>>neighbors) {
        Set<Position> seen = new HashSet<Position>();
        Set<Position> seen = new HashSet<Position>();
        HashMap<Position, Position> firstMove = new HashMap<Position, Position>();
        HashMap<Position, Position> firstMove = new HashMap<Position, Position>();
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ package view;
import javafx.scene.paint.Color;
import javafx.scene.paint.Color;


public enum ViewElement {
public enum ViewElement {
  FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE);
  FIREFIGHTER(Color.BLUE), FIRE(Color.RED),CLOUD(Color.GRAY) ,MOUNTAIN(Color.BROWN) , EMPTY(Color.WHITE);
  final Color color;
  final Color color;
  ViewElement(Color color) {
  ViewElement(Color color) {
    this.color = color;
    this.color = color;
Original line number Original line Diff line number Diff line
@@ -7,20 +7,20 @@ import java.util.List;


import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.*;


public class FirefighterBoardTest {
public class FFBoardTest {
  @Test
  @Test
  void testColumnCount(){
  void testColumnCount(){
    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
    Board<List<ModelElement>> board = new FFBoard(20, 10, 1, 3);
    assertThat(board.columnCount()).isEqualTo(20);
    assertThat(board.columnCount()).isEqualTo(20);
  }
  }
  @Test
  @Test
  void testRowCount(){
  void testRowCount(){
    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
    Board<List<ModelElement>> board = new FFBoard(20, 10, 1, 3);
    assertThat(board.rowCount()).isEqualTo(10);
    assertThat(board.rowCount()).isEqualTo(10);
  }
  }
  @Test
  @Test
  void testStepNumber(){
  void testStepNumber(){
    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
    Board<List<ModelElement>> board = new FFBoard(20, 10, 1, 3);
    for(int index = 0; index < 10; index++){
    for(int index = 0; index < 10; index++){
      assertThat(board.stepNumber()).isEqualTo(index);
      assertThat(board.stepNumber()).isEqualTo(index);
      board.updateToNextGeneration();
      board.updateToNextGeneration();
@@ -29,7 +29,7 @@ public class FirefighterBoardTest {
  }
  }
  @Test
  @Test
  void testGetState_afterSet(){
  void testGetState_afterSet(){
    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0);
    Board<List<ModelElement>> board = new FFBoard(20, 10, 0, 0);
    Position position = new Position(1,2);
    Position position = new Position(1,2);
    assertThat(board.getState(position)).isEmpty();
    assertThat(board.getState(position)).isEmpty();
    board.setState(List.of(ModelElement.FIRE), position);
    board.setState(List.of(ModelElement.FIRE), position);
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;


import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;


public class FirefighterGridTest {
public class StandardFirefighterGridTest {
  @Test
  @Test
  void testColumnCount(){
  void testColumnCount(){
    Grid<ViewElement> grid = new FirefighterGrid();
    Grid<ViewElement> grid = new FirefighterGrid();