From 11043e233378fe27f830e97dc4c34b2f29f21486 Mon Sep 17 00:00:00 2001 From: "guillaume.bonabau" Date: Wed, 29 May 2024 10:15:34 +0200 Subject: [PATCH] moved rules.json in rule folder --- ressources/Rule/BlobRule.csv | 2 -- ressources/Rule/BlobRule.json | 17 +++++++++++++++++ ressources/Rule/ConwayRule.csv | 2 -- .../Rule/conwayRule.json | 0 ressources/Rule/cutsomrule.csv | 2 -- gasRule.json => ressources/Rule/gasRule.json | 0 src/backend/Simulator.java | 1 + 7 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 ressources/Rule/BlobRule.csv create mode 100644 ressources/Rule/BlobRule.json delete mode 100644 ressources/Rule/ConwayRule.csv rename conwayRule.json => ressources/Rule/conwayRule.json (100%) delete mode 100644 ressources/Rule/cutsomrule.csv rename gasRule.json => ressources/Rule/gasRule.json (100%) diff --git a/ressources/Rule/BlobRule.csv b/ressources/Rule/BlobRule.csv deleted file mode 100644 index 10f61a6..0000000 --- a/ressources/Rule/BlobRule.csv +++ /dev/null @@ -1,2 +0,0 @@ -1;3;5;8 -3;5;7; diff --git a/ressources/Rule/BlobRule.json b/ressources/Rule/BlobRule.json new file mode 100644 index 0000000..822a900 --- /dev/null +++ b/ressources/Rule/BlobRule.json @@ -0,0 +1,17 @@ +[{"cell": { + "value" : 1, + "color" : [167,237,139], + "conditionCountNear" : [3,5,7], + "conditionHighestNear" : [], + "ifValue" : 1, + "elseValue" : 0 +}}, +{"cell": { + "value" : 0, + "color" : [37,52,31], + "conditionCountNear" : [1,3,5,8], + "conditionHighestNear" : [], + "ifValue" : 1, + "elseValue" : 0 +}} +] \ No newline at end of file diff --git a/ressources/Rule/ConwayRule.csv b/ressources/Rule/ConwayRule.csv deleted file mode 100644 index 3563b76..0000000 --- a/ressources/Rule/ConwayRule.csv +++ /dev/null @@ -1,2 +0,0 @@ -2;3 -3 \ No newline at end of file diff --git a/conwayRule.json b/ressources/Rule/conwayRule.json similarity index 100% rename from conwayRule.json rename to ressources/Rule/conwayRule.json diff --git a/ressources/Rule/cutsomrule.csv b/ressources/Rule/cutsomrule.csv deleted file mode 100644 index e16241f..0000000 --- a/ressources/Rule/cutsomrule.csv +++ /dev/null @@ -1,2 +0,0 @@ -0;1;2;3;4 -3 \ No newline at end of file diff --git a/gasRule.json b/ressources/Rule/gasRule.json similarity index 100% rename from gasRule.json rename to ressources/Rule/gasRule.json diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index c36f1be..ee1f58c 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -1,3 +1,4 @@ + package backend; import java.io.FileNotFoundException; import java.io.FileReader;