diff --git a/buildingParameters/__init__.pyc b/buildingParameters/__init__.pyc deleted file mode 100644 index 81dba8a..0000000 Binary files a/buildingParameters/__init__.pyc and /dev/null differ diff --git a/mathlib/__init__.pyc b/mathlib/__init__.pyc deleted file mode 100644 index 43c10fb..0000000 Binary files a/mathlib/__init__.pyc and /dev/null differ diff --git a/spawners/__init__.pyc b/spawners/__init__.pyc deleted file mode 100644 index e1dba9a..0000000 Binary files a/spawners/__init__.pyc and /dev/null differ diff --git a/src/UserInterface/testInput.json b/src/UserInterface/testInput.json new file mode 100644 index 0000000..5b9223a --- /dev/null +++ b/src/UserInterface/testInput.json @@ -0,0 +1,30 @@ +{ + "PedestrianSimulator":{ + "version":0.1, + "date":{ + "day":9, + "month":10, + "year":2015 + }, + "data":{ + "timePropagationParameters":{ + "description":"", + "dt":{ + "value":0.001, + "description":"Time spacing [s]" + }, + "tmax":{ + "description":"Maximum propagation time [s]", + "value":10.0 + }, + "t":{ + "value":0.0, + "description":"Initial timing [s]" + } + } + + } + + } + +} \ No newline at end of file diff --git a/src/forces.pyc b/src/forces.pyc deleted file mode 100644 index 1f47ea1..0000000 Binary files a/src/forces.pyc and /dev/null differ diff --git a/src/parameters.pyc b/src/parameters.pyc deleted file mode 100644 index 8ed52bc..0000000 Binary files a/src/parameters.pyc and /dev/null differ diff --git a/src/userInterface.py b/src/userInterface.py new file mode 100644 index 0000000..1bc223c --- /dev/null +++ b/src/userInterface.py @@ -0,0 +1,56 @@ +#!/usr/bin/python + +import json +from pprint import pprint +import os +from msilib import Control +import numpy as np + + +class Reader(object): + + def setTimePropagationParameters(self): + tmax = self.__allData["PedestrianSimulator"][ + "data"]["timePropagationParameters"]["tmax"]["value"] + dt = self.__allData["PedestrianSimulator"][ + "data"]["timePropagationParameters"]["dt"]["value"] + time = np.linspace(0., tmax, int(tmax / dt) + 1) + self.__allData["PedestrianSimulator"]["data"][ + "timePropagationParameters"]["time"] = {} + self.__allData["PedestrianSimulator"]["data"][ + "timePropagationParameters"]["time"]["value"] = time + self.__allData["PedestrianSimulator"]["data"][ + "timePropagationParameters"]["time"]["description"] = "time grid" + + def Model(self): + self.readData() + self.setTimePropagationParameters() + + def Control(self): + pass + + def View(self): + print "so far:" + pprint(self.__allData) + + def __init__(self, inputFilename="UserInterface/testInput.json"): + print "Pedestrian Simulator started at", os.getcwd() + if inputFilename == None: + raise SystemExit("Not input file was specified!") + + self.__inputFilename = inputFilename + + self.Model() + self.View() + + def readData(self): + print "Reading input file ", self.__inputFilename + with open(self.__inputFilename) as data_file: + data = json.load(data_file) + + self.__allData = data + + +if __name__ == "__main__": + + R1 = Reader() diff --git a/src/vectors.pyc b/src/vectors.pyc deleted file mode 100644 index 756bfa9..0000000 Binary files a/src/vectors.pyc and /dev/null differ diff --git a/world/__init__.pyc b/world/__init__.pyc deleted file mode 100644 index a1057c6..0000000 Binary files a/world/__init__.pyc and /dev/null differ