Commit b82edfef authored by Arun Roy's avatar Arun Roy

Merged Manually and conflict resolved

parents d6f5741c 9391f65b
GENESIS-Tabelle: 12411-0001
Bevölkerung: Deutschland, Stichtag;
Fortschreibung des Bevölkerungsstandes;
Deutschland;
;Bevölkerungsstand
Date; Population
31.12.1950;50958125
31.12.1951;51434777
......
......@@ -7,7 +7,7 @@ class State():
Class for modeling a state in a finite state automaton.
"""
def __init__(self, name):
self.name = name
self.state = name
self.successors = {}
def set_successor(self, entry, successor):
......@@ -20,7 +20,7 @@ class State():
return self.successors.get(entry, self)
def __repr__(self):
return "State(name=%r)" % self.name
return "State(state=%r)" % self.state
class Automaton():
......@@ -52,7 +52,7 @@ class Automaton():
self._enter_state(entry)
def __get_state(self):
return self.__curr_state.name
return self.__curr_state.state
def __set_state(self, new_state):
self.__curr_state = self.states[new_state]
......
An Irish Airman Foresees His Death
I know that I shall meet my fate
Somewhere among the clouds above;
Those that I fight I do not hate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment