1.1 --- a/utils/flowmon/plot.py	Tue May 12 14:58:13 2009 +0100
     1.2 +++ b/utils/flowmon/plot.py	Wed May 13 14:35:25 2009 +0100
     1.3 @@ -1,3 +1,4 @@
     1.4 +import sys
     1.5  from optparse import OptionParser
     1.6  import pylab
     1.7  try:
     1.8 @@ -46,7 +47,10 @@
     1.9      def __init__(self, results_el):
    1.10          self.cpu_time = float(results_el.attrib['cpu-time'])
    1.11          self.run_number = int(results_el.attrib['run-number'])
    1.12 -        self.enable_monitor = {"True": True, "False": False} [results_el.attrib['enable-monitor']]
    1.13 +        self.enable_monitor = {"1": True,
    1.14 +                               "True": True,
    1.15 +                               "0": False,
    1.16 +                               "False": False} [results_el.attrib['enable-monitor']]
    1.17          self.max_memory = long(results_el.attrib['max-memory'])
    1.18          self.num_nodes_side = int(results_el.attrib['num-nodes-side'])
    1.19  
    1.20 @@ -61,11 +65,16 @@
    1.21              file_obj = bz2.BZ2File(fname)
    1.22          else:
    1.23              file_obj = open(fname)
    1.24 -        tree.parse(file_obj)
    1.25 -        for elem in tree.getroot():
    1.26 -            if elem.tag == 'simulation':
    1.27 +
    1.28 +        print "Reading XML file ",
    1.29 +        sys.stdout.flush()        
    1.30 +        for event, elem in ElementTree.iterparse(file_obj):
    1.31 +            if event == "end" and elem.tag == 'simulation':
    1.32                  self.simulations.append(SimulationResults(elem))
    1.33 -
    1.34 +                elem.clear() # won't need this any more
    1.35 +                sys.stdout.write(".")
    1.36 +                sys.stdout.flush()
    1.37 +        print " done."
    1.38  
    1.39  def main():
    1.40      parser = OptionParser()
    1.41 @@ -83,7 +92,7 @@
    1.42  
    1.43      num_nodes_list = []
    1.44  
    1.45 -    for num_nodes_side in range(3,11):
    1.46 +    for num_nodes_side in range(3,21):
    1.47  
    1.48          num_nodes_list.append(num_nodes_side*num_nodes_side)
    1.49