Added new regexes to detect trace function.

Author: tmpoe

optimizer/traceHandler.py

@@ -217,8 +217,8 @@ def detect_format(self,line):
     #TODO
     #need more rule for spike timings and other
         pynn_rule=re.compile("# variable = [a-zA-Z]")
-        neuron_rule_time=re.compile("[0-9]*(.[0-9]*)?\s-?[0-9]*(.[0-9]*)?")
-        neuron_rule=re.compile("-?[0-9]*(.[0-9]*)?$|(-?[0-9]*(.[0-9]*)?\t)")
+        neuron_rule_time=re.compile("[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\s-?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?")
+        neuron_rule=re.compile("-?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$|(-?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\t)")
         spike_times_rule=re.compile("# variable = spikes")
         rules=[pynn_rule,neuron_rule_time,neuron_rule,spike_times_rule]
         result=[n!=None for n in [re.match(k,line) for k in rules ] ]