diff --git a/.gitignore b/.gitignore index 8a57b516d785835db0f24624fd3dd5a85a522cc1..5671e56980439c206317b89fab45256139a07999 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,8 @@ target #output files -*.csv -*.png +src/main/resources/*.csv +src/main/resources/*.png # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/outputToGraph.py b/outputToGraph.py index a39d9c8e1612ba3740a4ecb1014f52537b6a3b5d..c872c8eb9c552fcf5cf179c25a4cbac692dfdf1c 100644 --- a/outputToGraph.py +++ b/outputToGraph.py @@ -53,7 +53,7 @@ def make_diagram(filename): def run_java_jar(filename): import subprocess - subprocess.call(['java', '-jar', filename]) + subprocess.call(['java', '-jar',"--enable-preview", filename]) def copy_to_output_folder(filename): diff --git a/src/main/java/agents/states/SEIRSState.java b/src/main/java/agents/states/SEIRSState.java index 966453fa1ab5a0aa596474a32a48cb4ac560e163..34bde7ddd6b1a6ac6deb6a4b2b93c951200b87fa 100644 --- a/src/main/java/agents/states/SEIRSState.java +++ b/src/main/java/agents/states/SEIRSState.java @@ -1,6 +1,5 @@ package agents.states; -import agents.seirs.CyclicSEIRSAgent; import agents.seirs.SEIRSAgent; public abstract class SEIRSState { diff --git a/src/main/resources/output.png b/src/main/resources/output.png index 1d20c171776fa6ac52b3a67ff3a37291c362c6b2..5e7cdf00725107ea0c5b20b6ef6f2d7b66652287 100644 Binary files a/src/main/resources/output.png and b/src/main/resources/output.png differ diff --git a/src/main/resources/parameters.yaml b/src/main/resources/parameters.yaml index 7e7cfa90d8f5ea7146d02d3af7b0cf1ec5bb9654..10385d74094ca86c9982e3347bb5d240eb9bda0a 100644 --- a/src/main/resources/parameters.yaml +++ b/src/main/resources/parameters.yaml @@ -14,4 +14,4 @@ wrappingWorld : true synchronousMode: false timeBetweenCycles: 0 infectionStacks : false -threePhased : true \ No newline at end of file +threePhased : false \ No newline at end of file