From 83af645cd53d882b8caddba95f30b23a9aff5f59 Mon Sep 17 00:00:00 2001 From: ChrisFlam3 <52073715+ChrisFlam3@users.noreply.github.com> Date: Sat, 21 Dec 2019 04:24:29 +0100 Subject: [PATCH] project_update_21_12_19_04_24 --- simulation/.idea/artifacts/simulation.xml | 21 ++ simulation/.idea/compiler.xml | 23 ++ simulation/.idea/description.html | 2 + simulation/.idea/encodings.xml | 6 + simulation/.idea/gradle.xml | 4 + .../code_google_com_gwt_dnd_3_1_0.xml | 10 + ...pache_clerezza_ext_org_json_simple_0_4.xml | 11 + simulation/.idea/misc.xml | 9 + simulation/.idea/modules.xml | 8 + simulation/.idea/uiDesigner.xml | 125 +++++++++ simulation/.idea/vcs.xml | 7 + simulation/.idea/workspace.xml | 205 ++++++++++++++ .../out/artifacts/simulation/param.json | 10 + .../out/artifacts/simulation/simulation.html | 43 +++ .../out/artifacts/simulation/simulation.jnlp | 17 ++ .../META-INF/simulation.kotlin_module | Bin 0 -> 16 bytes .../production/simulation/control/sample.fxml | 55 ++++ simulation/param.json | 10 + simulation/readme.docx | Bin 0 -> 11894 bytes simulation/simulation.iml | 12 + simulation/src/control/Controller.java | 81 ++++++ simulation/src/control/Main.java | 52 ++++ simulation/src/control/sample.fxml | 55 ++++ simulation/src/simulation/Animal.java | 87 ++++++ simulation/src/simulation/Genotype.java | 120 ++++++++ simulation/src/simulation/GlobalStats.java | 77 +++++ simulation/src/simulation/Grass.java | 9 + simulation/src/simulation/Grid.java | 230 +++++++++++++++ simulation/src/simulation/IStateObserver.java | 8 + simulation/src/simulation/MapObject.java | 17 ++ simulation/src/simulation/Simulation.java | 262 ++++++++++++++++++ simulation/src/utils/Average.java | 39 +++ simulation/src/utils/Direction.java | 23 ++ simulation/src/utils/Vector2.java | 51 ++++ simulation/~$readme.docx | Bin 0 -> 162 bytes 35 files changed, 1689 insertions(+) create mode 100644 simulation/.idea/artifacts/simulation.xml create mode 100644 simulation/.idea/compiler.xml create mode 100644 simulation/.idea/description.html create mode 100644 simulation/.idea/encodings.xml create mode 100644 simulation/.idea/gradle.xml create mode 100644 simulation/.idea/libraries/code_google_com_gwt_dnd_3_1_0.xml create mode 100644 simulation/.idea/libraries/org_apache_clerezza_ext_org_json_simple_0_4.xml create mode 100644 simulation/.idea/misc.xml create mode 100644 simulation/.idea/modules.xml create mode 100644 simulation/.idea/uiDesigner.xml create mode 100644 simulation/.idea/vcs.xml create mode 100644 simulation/.idea/workspace.xml create mode 100644 simulation/out/artifacts/simulation/param.json create mode 100644 simulation/out/artifacts/simulation/simulation.html create mode 100644 simulation/out/artifacts/simulation/simulation.jnlp create mode 100644 simulation/out/production/simulation/META-INF/simulation.kotlin_module create mode 100644 simulation/out/production/simulation/control/sample.fxml create mode 100644 simulation/param.json create mode 100644 simulation/readme.docx create mode 100644 simulation/simulation.iml create mode 100644 simulation/src/control/Controller.java create mode 100644 simulation/src/control/Main.java create mode 100644 simulation/src/control/sample.fxml create mode 100644 simulation/src/simulation/Animal.java create mode 100644 simulation/src/simulation/Genotype.java create mode 100644 simulation/src/simulation/GlobalStats.java create mode 100644 simulation/src/simulation/Grass.java create mode 100644 simulation/src/simulation/Grid.java create mode 100644 simulation/src/simulation/IStateObserver.java create mode 100644 simulation/src/simulation/MapObject.java create mode 100644 simulation/src/simulation/Simulation.java create mode 100644 simulation/src/utils/Average.java create mode 100644 simulation/src/utils/Direction.java create mode 100644 simulation/src/utils/Vector2.java create mode 100644 simulation/~$readme.docx diff --git a/simulation/.idea/artifacts/simulation.xml b/simulation/.idea/artifacts/simulation.xml new file mode 100644 index 0000000..7be380f --- /dev/null +++ b/simulation/.idea/artifacts/simulation.xml @@ -0,0 +1,21 @@ + + + $PROJECT_DIR$/out/artifacts/simulation + + + + + + + + + + + + \ No newline at end of file diff --git a/simulation/.idea/compiler.xml b/simulation/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/simulation/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/simulation/.idea/description.html b/simulation/.idea/description.html new file mode 100644 index 0000000..cc10d56 --- /dev/null +++ b/simulation/.idea/description.html @@ -0,0 +1,2 @@ +Simple JavaFX 2.0 application that includes simple .fxml file with attached controller and Main class to quick start. Artifact to build JavaFX application is provided. + \ No newline at end of file diff --git a/simulation/.idea/encodings.xml b/simulation/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/simulation/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/simulation/.idea/gradle.xml b/simulation/.idea/gradle.xml new file mode 100644 index 0000000..3e3960b --- /dev/null +++ b/simulation/.idea/gradle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/simulation/.idea/libraries/code_google_com_gwt_dnd_3_1_0.xml b/simulation/.idea/libraries/code_google_com_gwt_dnd_3_1_0.xml new file mode 100644 index 0000000..d267213 --- /dev/null +++ b/simulation/.idea/libraries/code_google_com_gwt_dnd_3_1_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/simulation/.idea/libraries/org_apache_clerezza_ext_org_json_simple_0_4.xml b/simulation/.idea/libraries/org_apache_clerezza_ext_org_json_simple_0_4.xml new file mode 100644 index 0000000..d590ba7 --- /dev/null +++ b/simulation/.idea/libraries/org_apache_clerezza_ext_org_json_simple_0_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simulation/.idea/misc.xml b/simulation/.idea/misc.xml new file mode 100644 index 0000000..4e6e724 --- /dev/null +++ b/simulation/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/simulation/.idea/modules.xml b/simulation/.idea/modules.xml new file mode 100644 index 0000000..6f28692 --- /dev/null +++ b/simulation/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/simulation/.idea/uiDesigner.xml b/simulation/.idea/uiDesigner.xml new file mode 100644 index 0000000..3b00020 --- /dev/null +++ b/simulation/.idea/uiDesigner.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/simulation/.idea/vcs.xml b/simulation/.idea/vcs.xml new file mode 100644 index 0000000..def6a6a --- /dev/null +++ b/simulation/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/simulation/.idea/workspace.xml b/simulation/.idea/workspace.xml new file mode 100644 index 0000000..6d5d7bb --- /dev/null +++ b/simulation/.idea/workspace.xml @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1359379246138 + + + + + + + + \ No newline at end of file diff --git a/simulation/out/artifacts/simulation/param.json b/simulation/out/artifacts/simulation/param.json new file mode 100644 index 0000000..728dac0 --- /dev/null +++ b/simulation/out/artifacts/simulation/param.json @@ -0,0 +1,10 @@ +{ +"width":100, +"height":100, +"startEnergy":100.0, +"moveEnergy":1.0, +"plantEnergy":10.0, +"jungleRatio":0.1, +"mapNum": 4, +"startAnimalNum":5 +} \ No newline at end of file diff --git a/simulation/out/artifacts/simulation/simulation.html b/simulation/out/artifacts/simulation/simulation.html new file mode 100644 index 0000000..20a4c33 --- /dev/null +++ b/simulation/out/artifacts/simulation/simulation.html @@ -0,0 +1,43 @@ + + + + + + + +

Test page for simulation

+ Webstart: click to launch this app as webstart


+ + +
+ diff --git a/simulation/out/artifacts/simulation/simulation.jnlp b/simulation/out/artifacts/simulation/simulation.jnlp new file mode 100644 index 0000000..ed7e236 --- /dev/null +++ b/simulation/out/artifacts/simulation/simulation.jnlp @@ -0,0 +1,17 @@ + + + + simulation + Unknown + simulation + + + + + + + + + + + diff --git a/simulation/out/production/simulation/META-INF/simulation.kotlin_module b/simulation/out/production/simulation/META-INF/simulation.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..2983af70661ad375cc499ebc4da5a68ca46c532e GIT binary patch literal 16 RcmZQzU|?ooU|@t|egFVe02KfL literal 0 HcmV?d00001 diff --git a/simulation/out/production/simulation/control/sample.fxml b/simulation/out/production/simulation/control/sample.fxml new file mode 100644 index 0000000..d09871d --- /dev/null +++ b/simulation/out/production/simulation/control/sample.fxml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + +