diff --git a/pythonparser.py b/pythonparser.py index beafdf8fe03c09c2bf61a97e7bc620e9f952d578..bc2964eb36e46bc88d67e7858cf5dce9ca6e07ea 100644 --- a/pythonparser.py +++ b/pythonparser.py @@ -56,10 +56,12 @@ class Reset(Statement): def parseReset(node, code): #assume reset is modeType = newMode - print(str(node.targets[0])) - if ("mode" in str(node.targets[0].id)): - modeType = node.targets[0] - mode = node.value + if isinstance(node.value, ast.Attribute): + #print("resets " + str(node.value.value.id)) + #print("resets " + str(node.value.attr)) + if ("Mode" in str(node.value.value.id)): + modeType = str(node.value.value.id) + mode = str(node.value.attr) return Reset(ast.get_source_segment(code, node), mode, modeType) return Reset(ast.get_source_segment(code, node), None, None) @@ -160,7 +162,7 @@ if __name__ == "__main__": output_dict.update(input_json) - + #TODO: create graph! diff --git a/toythermomini.py b/toythermomini.py index f873f542626ea50e2b06944677dcc5e4dc7903fd..0423c8c84ddb00372658d640e9c30d39ea5e0904 100644 --- a/toythermomini.py +++ b/toythermomini.py @@ -18,20 +18,28 @@ class State: def controller(posx, posy, mode): - outstate = mode + outmode = mode #todo: how would this actually be given - if (state ==Modes.NormalA): - if posy<0 and posy>=-0.01: + if (mode ==Modes.NormalA): + if posy<0 and posy>=-0.0: posy=0 - outstate=Modes.NormalA - if posy>0 and posy==-0.01: + outmode=Modes.NormalA + if posy>10 and posy==-10: + posy=10 + outmode=Modes.NormalB + + if (mode ==Modes.NormalB): + if posy<0 and posy>=-0.0: posy=0 - outstate=Modes.NormalB + outmode=Modes.NormalA + if posy>10 and posy==-10: + posy=10 + outmode=Modes.NormalB - return outstate + return outmode #TODO: what is output?