From 9f3e859a469e44e3ea8380729f9b6fd7a32e9179 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Sat, 30 Dec 2017 13:33:57 +0100 Subject: [PATCH] Started a binary adder --- cards/1 | 4 ++-- cards/2 | 4 ++-- cards/3 | 6 ++++++ cards/4 | 6 ++++++ cards/5 | 6 ++++++ cards/6 | 6 ++++++ cards/7 | 6 ++++++ cards/8 | 6 ++++++ cards/9 | 6 ++++++ machine.py | 16 ++++++++++------ 10 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 cards/3 create mode 100644 cards/4 create mode 100644 cards/5 create mode 100644 cards/6 create mode 100644 cards/7 create mode 100644 cards/8 create mode 100644 cards/9 diff --git a/cards/1 b/cards/1 index 183e94a..af1adbb 100644 --- a/cards/1 +++ b/cards/1 @@ -1,6 +1,6 @@ -1 +0 1 2 1 0 -2 +0 diff --git a/cards/2 b/cards/2 index 7c2929b..1facc2c 100644 --- a/cards/2 +++ b/cards/2 @@ -1,6 +1,6 @@ +0 1 +3 1 0 1 -0 -0 diff --git a/cards/3 b/cards/3 new file mode 100644 index 0000000..66900f0 --- /dev/null +++ b/cards/3 @@ -0,0 +1,6 @@ +0 +1 +4 +1 +0 +2 diff --git a/cards/4 b/cards/4 new file mode 100644 index 0000000..2318f71 --- /dev/null +++ b/cards/4 @@ -0,0 +1,6 @@ +0 +1 +5 +1 +0 +3 diff --git a/cards/5 b/cards/5 new file mode 100644 index 0000000..c6d21e5 --- /dev/null +++ b/cards/5 @@ -0,0 +1,6 @@ +0 +1 +6 +1 +0 +4 diff --git a/cards/6 b/cards/6 new file mode 100644 index 0000000..db40e85 --- /dev/null +++ b/cards/6 @@ -0,0 +1,6 @@ +0 +1 +7 +1 +0 +5 diff --git a/cards/7 b/cards/7 new file mode 100644 index 0000000..5ffccd8 --- /dev/null +++ b/cards/7 @@ -0,0 +1,6 @@ +0 +1 +8 +1 +0 +6 diff --git a/cards/8 b/cards/8 new file mode 100644 index 0000000..4f7ac79 --- /dev/null +++ b/cards/8 @@ -0,0 +1,6 @@ +0 +1 +9 +1 +0 +7 diff --git a/cards/9 b/cards/9 new file mode 100644 index 0000000..aec159c --- /dev/null +++ b/cards/9 @@ -0,0 +1,6 @@ +1 +1 +8 +1 +0 +8 diff --git a/machine.py b/machine.py index 47d4e0b..a499bbf 100755 --- a/machine.py +++ b/machine.py @@ -16,7 +16,7 @@ class Register: else: return p + str(self.positive[self.pos]) - def read(self): + def read(self): if self.pos == 0: return self.zero elif self.pos < 0: @@ -51,12 +51,15 @@ class Card: with open("cards/" + str(self.number) ,'r') as f: for row in f: line.append(row[:-1]) - self.zero_write = bool(line[0]) - self.zero_move = bool(line[1]) + self.zero_write = bool(int(line[0])) + self.zero_move = bool(int(line[1])) self.zero_next = int(line[2]) - self.one_write = bool(line[3]) - self.one_move = bool(line[4]) + self.one_write = bool(int(line[3])) + self.one_move = bool(int(line[4])) self.one_next = int(line[5]) + def __str__(self): + return "Card number: " + str(self.number) + "\nIf 1 :\nMove: " + str(self.one_move) + "\nWrite: " + str(self.one_write) + "\nNext card: " + str(self.one_next) + "\nIf 0 :\nMove: " + str(self.zero_move) + "\nWrite: " + str(self.zero_write) + "\nNext card: " + str(self.zero_next) + '\n' + class Machine: def __init__(self): @@ -93,4 +96,5 @@ class Machine: turing = Machine() run = True while run: - run = turing.evolve() +# print (turing.card) + run = turing.evolve()