From: <bao...@us...> - 2006-03-15 20:24:30
|
Revision: 20 Author: baoilleach Date: 2006-03-15 12:24:24 -0800 (Wed, 15 Mar 2006) ViewCVS: http://svn.sourceforge.net/cclib/?rev=20&view=rev Log Message: ----------- Corrected mispelling in logfile, and tidied up imports in g03parser Modified Paths: -------------- trunk/src/cclib/parser/g03parser.py trunk/src/cclib/parser/logfileparser.py Modified: trunk/src/cclib/parser/g03parser.py =================================================================== --- trunk/src/cclib/parser/g03parser.py 2006-03-15 20:18:56 UTC (rev 19) +++ trunk/src/cclib/parser/g03parser.py 2006-03-15 20:24:24 UTC (rev 20) @@ -17,7 +17,7 @@ Contributions (monetary as well as code :-) are encouraged. """ -import math,sys,logging,copy,re,os,time # How many of these are necessary? +import re,time import Numeric import random # For sometimes running the progress updater from logfileparser import Logfile # import the superclass @@ -398,7 +398,7 @@ # *** Overlap *** # ****** Overlap ****** self.logger.info("Creating attribute aooverlaps[x,y]") - import time; oldtime = time.time() + # oldtime = time.time() self.aooverlaps = Numeric.zeros( (self.nbasis,self.nbasis), "float") # Overlap integrals for basis fn#1 are in aooverlaps[0] base = 0 @@ -413,10 +413,10 @@ self.aooverlaps[i+base,base+j] = k base += 5 colmNames = inputfile.next() - self.logger.info("Took %f seconds" % (time.time()-oldtime)) + # self.logger.info("Took %f seconds" % (time.time()-oldtime)) if line[5:35]=="Molecular Orbital Coefficients" or line[5:41]=="Alpha Molecular Orbital Coefficients" or line[5:40]=="Beta Molecular Orbital Coefficients": - import time; oldtime = time.time() + # oldtime = time.time() if line[5:40]=="Beta Molecular Orbital Coefficients": beta = True # Need to add an extra dimension to self.mocoeffs @@ -450,7 +450,7 @@ self.mocoeffs[1,base:base+len(part)/10,i] = temp else: self.mocoeffs[base:base+len(part)/10,i] = temp - self.logger.info("Took %f seconds" % (time.time()-oldtime)) + # self.logger.info("Took %f seconds" % (time.time()-oldtime)) inputfile.close() Modified: trunk/src/cclib/parser/logfileparser.py =================================================================== --- trunk/src/cclib/parser/logfileparser.py 2006-03-15 20:18:56 UTC (rev 19) +++ trunk/src/cclib/parser/logfileparser.py 2006-03-15 20:24:24 UTC (rev 20) @@ -84,7 +84,7 @@ """ def __init__(self,filename,progress=None, loglevel=logging.INFO,logname="Log"): - """Initialise the logging object. + """Initialise the Logfile object. Typically called by subclasses in their own __init__ methods. """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |