From cff63b65b6e64d2fe2348ebd2029b7a0e0139b72 Mon Sep 17 00:00:00 2001
From: yboucher <yann.boucher@etu.utc.fr>
Date: Sat, 5 Jun 2021 22:51:32 +0200
Subject: [PATCH] Fixed a bug with the GoL rulestring
---
models/gol_rulestring.json | 8 ++++----
src/interface.cpp | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/models/gol_rulestring.json b/models/gol_rulestring.json
index f0f5adf..32d5a60 100644
--- a/models/gol_rulestring.json
+++ b/models/gol_rulestring.json
@@ -18,15 +18,15 @@
}
],
"author": "JM",
- "date": "jeu. juin 3 2021",
- "desc": "Game of Life définit par une Totalistic rulestring",
+ "date": "sam. juin 5 2021",
+ "desc": "",
"neighborhood_data": {
"radius": 1
},
- "neighborhood_name": "Von Neumann",
+ "neighborhood_name": "Moore",
"title": "gameoflife_rulestring",
"transition_data": {
- "rule_string": "0,0:* ,1:[3]->1\n1,0:[0..1],1:* ->0\n1,0:[4..*],1:* ->0"
+ "rule_string": "0,0:* ,1:[3]->1\n1,1:[0..1],0:* ->0\n1,1:[4..*],0:* ->0"
},
"transition_name": "Totalistic rulestring"
}
diff --git a/src/interface.cpp b/src/interface.cpp
index ece3a2f..42dbff8 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -576,6 +576,8 @@ QJsonObject MainWindow::default_model() const
const char* json = R"(
{
"title" : "Game of Life",
+ "neighborhood_name" : "Moore",
+ "neighborhood_data" : {},
"transition_name" : "Game of Life",
"transition_data" : {},
"alphabet" : [
--
GitLab