From 7a32f7a9ef8201439422238a841c1890761a7312 Mon Sep 17 00:00:00 2001
From: Yann Boucher <yann.boucher@etu.utc.fr>
Date: Tue, 8 Jun 2021 20:59:36 +0200
Subject: [PATCH] Support de Brain's Brain
---
.../Brain's Brain/disturbed_oscillators.json | 9 ++++
configurations/Brain's Brain/red_panda.json | 9 ++++
.../{ => Game of Life}/gravure.json | 0
models/brians_brain.json | 40 ++++++++++++++++
models/test2.json | 14 ------
models/test3.json | 17 -------
models/test_modele.json | 14 ------
models/test_modele3.json | 17 -------
patterns/Brain's Brain/oscillator.json | 48 +++++++++++++++++++
patterns/Life/oscillator_2.json | 38 +++++++++++++++
10 files changed, 144 insertions(+), 62 deletions(-)
create mode 100644 configurations/Brain's Brain/disturbed_oscillators.json
create mode 100644 configurations/Brain's Brain/red_panda.json
rename configurations/{ => Game of Life}/gravure.json (100%)
create mode 100644 models/brians_brain.json
delete mode 100644 models/test2.json
delete mode 100644 models/test3.json
delete mode 100644 models/test_modele.json
delete mode 100644 models/test_modele3.json
create mode 100644 patterns/Brain's Brain/oscillator.json
create mode 100644 patterns/Life/oscillator_2.json
diff --git a/configurations/Brain's Brain/disturbed_oscillators.json b/configurations/Brain's Brain/disturbed_oscillators.json
new file mode 100644
index 0000000..d074736
--- /dev/null
+++ b/configurations/Brain's Brain/disturbed_oscillators.json
@@ -0,0 +1,9 @@
+{
+ "data": "x = 49, y = 25\nbB$b2oB39bB$B2o40b2oB$2bB39bB2o$44bB7$7b14o$21b6o12b6o$27b3o8bo5b2o$30b5o2b2o7b2o$35b4o8b2o$37bob2o7bo$9bB27bo3b3o4bo$9b2oB25bo4bB2o3bo$8bB2o26bo4b2oB3bo$10bB26bo3bB2o4bo$37b2o4bB3b2o$38bo8bo$38b2o5b3o$39b6o!",
+ "height": 100,
+ "left": 19,
+ "model": "Brian's Brain",
+ "title": "Disturbed Oscillator",
+ "top": 20,
+ "width": 100
+}
diff --git a/configurations/Brain's Brain/red_panda.json b/configurations/Brain's Brain/red_panda.json
new file mode 100644
index 0000000..f592659
--- /dev/null
+++ b/configurations/Brain's Brain/red_panda.json
@@ -0,0 +1,9 @@
+{
+ "data": "x = 100, y = 98\n42b5o14bo2bo$42bo3b4o11b3o4bo$63bo$48b2o27bo$48b4o14b2o8b2o$75b2o$51b4o20b2o$51b4o13b2o$43b3o5b7o$45b2o5b7o$o52b6o$o53b6o5bo$17b2o36b5o4bo4bo$14b5o12b8o22b12o$15b4o11b12o18b14o$31b5o5b3o9bo4b15o$32b4o6b3o13b4o6b5o$33b2o6b4o2b4o2bo5b4o5b4o$32b2o6b6obob2o5b2o2b3o8bo$25bo5b2o6b5o3b3o2bo4b2ob4ob4o2bo$22b2o7b2o7b3ob4obob2o2bob3ob3o6bo$7b3o11bo10bo6b5ob7o2b2ob4o2bo6bo$6b4o9b2o7b5o6b22ob2o6b3o$7b2o9bo6b7o7bo2b2obob17obo4b4o$17bo18b2ob3o2b19obo$39b4ob2ob14obo2b2o$38b5ob16o2b7o$15b2o21b18obo3b6obo$14bo21bob7o5b6o6b6o$14bo20b10o5b6o5b6o$13b2o19b9ob2obob9o2bo2b2o2bo$13bo21b7o4b14o3b4o$35b5o4b9o3b5o3b4o$35bob3o4b5ob2o5b3o5bo$36b2ob2o3b8o6b3o28bo$31bo6bo5b9o4b2o3bo2bo21bo$30bo13bo2bo$32bo4bobo7b6o33bo$25bo2bo2b2obo16bo29b7o$35bo42b10o$38bo40b10o$81b8o$20b2o58b10o$32bo48b8o$81b8o$82b5o3$87b5o$85b8o$85b8o$7b2o76b8o$6bo57b3o4bo13b8o$4bo56b12o12b7o$15bo44b14o12b6o$61b13o12b9o$10b7o43b12o15b8o$8b9o43b8o2b3o16b6o$6b10o44b8o23b6o$4b10o47b8o22b7o$2b4o4b2o3bo46b7o23b6o$b3o10b2o44bob8o23b5o$bo5bo52b11o23b5o$43b2o14b12o25b3o$60b12o24b3o$7bo37b2ob2o7b2o3b10o$6b2o37b6o6b4o2b10o15b3o$2bo43b4o7b5o2b9o7b4o3b5o$24b2o22bo6bo2b6ob8o8b3o2b7o$15b2o26b4o7b3ob5o3b8o12b8o$13b5o25b4o7b9o5b6o13b6o$12b8o23b4o6bob3ob3o7b6o23bo$13b6o25b3o8b3o9bo2b5o22b3o$14b5o26bo21b4ob4o22b2o$16bo47b2o2b4o2bo24bo$63b5ob4o$63b5o$65b2o$76b4o$76b3o$76b3o$76bo2$99bo$98b2o$53b2o43b2o$52b4o42bo$49b8o$48b9o40b2o$46b11o39b2o$44b12o$44b11o$31bo13b8o$31bo13b8o43bo$46b7o$47b5o$48b4o$49b2o!",
+ "height": 100,
+ "left": 0,
+ "model": "Brian's Brain",
+ "title": "Red Panda",
+ "top": 0,
+ "width": 100
+}
diff --git a/configurations/gravure.json b/configurations/Game of Life/gravure.json
similarity index 100%
rename from configurations/gravure.json
rename to configurations/Game of Life/gravure.json
diff --git a/models/brians_brain.json b/models/brians_brain.json
new file mode 100644
index 0000000..a80f6ce
--- /dev/null
+++ b/models/brians_brain.json
@@ -0,0 +1,40 @@
+{
+ "alphabet": [
+ {
+ "color": [
+ 48,
+ 48,
+ 48
+ ],
+ "name": "Dead"
+ },
+ {
+ "color": [
+ 255,
+ 255,
+ 255
+ ],
+ "name": "Firing"
+ },
+ {
+ "color": [
+ 0,
+ 85,
+ 255
+ ],
+ "name": "Refractory"
+ }
+ ],
+ "author": "Yann",
+ "date": "mar. juin 8 2021",
+ "desc": "",
+ "neighborhood_data": {
+ "radius": 1
+ },
+ "neighborhood_name": "Moore",
+ "title": "Brian's Brain",
+ "transition_data": {
+ "rule_string": "1->2\n2->0\n0,1:[2]->1"
+ },
+ "transition_name": "Totalistic rulestring"
+}
diff --git a/models/test2.json b/models/test2.json
deleted file mode 100644
index 3d5db58..0000000
--- a/models/test2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alphabet": [
- ],
- "author": "JM",
- "date": "lun. mai 24 2021",
- "desc": "Desciprtion test 2",
- "neighborhood_data": {
- },
- "neighborhood_name": "Moore",
- "title": "Test_Gol_2",
- "transition_data": {
- },
- "transition_name": "Game of Life"
-}
diff --git a/models/test3.json b/models/test3.json
deleted file mode 100644
index ebcb1b9..0000000
--- a/models/test3.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "alphabet": [
- ],
- "author": "JM",
- "date": "lun. mai 24 2021",
- "desc": "aaa",
- "neighborhood_data": {
- "radius": 4
- },
- "neighborhood_name": "Von Neumann",
- "title": "test3",
- "transition_data": {
- "states": 4,
- "threshold": 3
- },
- "transition_name": "Circular"
-}
diff --git a/models/test_modele.json b/models/test_modele.json
deleted file mode 100644
index e8b9232..0000000
--- a/models/test_modele.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alphabet": [
- ],
- "author": "JM",
- "date": "lun. mai 24 2021",
- "desc": "Description test",
- "neighborhood_data": {
- },
- "neighborhood_name": "Von Neumann",
- "title": "Test_gol1",
- "transition_data": {
- },
- "transition_name": "Game of Life"
-}
diff --git a/models/test_modele3.json b/models/test_modele3.json
deleted file mode 100644
index 3cd27dc..0000000
--- a/models/test_modele3.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "alphabet": [
- ],
- "author": "JM",
- "date": "ven. mai 28 2021",
- "desc": "",
- "neighborhood_data": {
- "radius": 5
- },
- "neighborhood_name": "Von Neumann",
- "title": "test_modele3",
- "transition_data": {
- "states": 3,
- "threshold": 6
- },
- "transition_name": "Circular"
-}
diff --git a/patterns/Brain's Brain/oscillator.json b/patterns/Brain's Brain/oscillator.json
new file mode 100644
index 0000000..dc0d5be
--- /dev/null
+++ b/patterns/Brain's Brain/oscillator.json
@@ -0,0 +1,48 @@
+{
+ "author": "Yann",
+ "cells": [
+ {
+ "state": 2,
+ "x": 1,
+ "y": 0
+ },
+ {
+ "state": 1,
+ "x": 1,
+ "y": 1
+ },
+ {
+ "state": 1,
+ "x": 2,
+ "y": 1
+ },
+ {
+ "state": 2,
+ "x": 3,
+ "y": 1
+ },
+ {
+ "state": 2,
+ "x": 0,
+ "y": 2
+ },
+ {
+ "state": 1,
+ "x": 1,
+ "y": 2
+ },
+ {
+ "state": 1,
+ "x": 2,
+ "y": 2
+ },
+ {
+ "state": 2,
+ "x": 2,
+ "y": 3
+ }
+ ],
+ "date": "mar. juin 8 2021",
+ "desc": "Oscillateur",
+ "title": "brians_oscillator"
+}
diff --git a/patterns/Life/oscillator_2.json b/patterns/Life/oscillator_2.json
new file mode 100644
index 0000000..3b0b873
--- /dev/null
+++ b/patterns/Life/oscillator_2.json
@@ -0,0 +1,38 @@
+{
+ "author": "Yann",
+ "cells": [
+ {
+ "state": 1,
+ "x": 1,
+ "y": 0
+ },
+ {
+ "state": 1,
+ "x": 0,
+ "y": 1
+ },
+ {
+ "state": 1,
+ "x": 3,
+ "y": 1
+ },
+ {
+ "state": 1,
+ "x": 0,
+ "y": 2
+ },
+ {
+ "state": 1,
+ "x": 3,
+ "y": 2
+ },
+ {
+ "state": 1,
+ "x": 2,
+ "y": 3
+ }
+ ],
+ "date": "mar. juin 8 2021",
+ "desc": "Un oscillateur amusant",
+ "title": "Oscillateur 2"
+}
--
GitLab