reorg classes

dream/simulation/GUI/Batches.py

@@ -33,5 +33,3 @@ class Simulation(DefaultSimulation):
       }
     return conf
 
-  def run(self, data):
-    return DefaultSimulation.run(self._preprocess(data))

dream/simulation/GUI/Default.py

@@ -217,6 +217,11 @@ class Simulation(object):
     """
     return json.loads(simulate_line_json(input_data=json.dumps(data)))
 
+  def _preprocess(self, data):
+    """Preprocess the data, for instance reading spreadsheet.
+    """
+    return data
+
   def run(self, data):
     """Run simulation and return result to the GUI.
     """

dream/simulation/GUI/Shifts.py

@@ -18,5 +18,3 @@ class Simulation(DefaultSimulation):
     # TODO
     return data
 
-  def run(self, data):
-    return DefaultSimulation.run(self._preprocess(data))