1414import re
1515import copy
1616import csv
17- from time import time
1817
1918from rmgpy .thermo import *
2019from rmgpy .kinetics import *
@@ -212,7 +211,8 @@ def obtainKineticsFamilyStatistics(FullDatabase, trialDir):
212211 as it would add non-exact rules to the rule count)
213212 """
214213 allFamilyNames = FullDatabase .kinetics .families .keys ()
215-
214+ allFamilyNames .sort () # Perform test on families alphabetically
215+
216216 familyCount = {}
217217
218218 for familyName in allFamilyNames :
@@ -240,6 +240,7 @@ def compareNIST(FullDatabase, trialDir):
240240
241241
242242 allFamilyNames = FullDatabase .kinetics .families .keys ()
243+ allFamilyNames .sort () # Perform test on families alphabetically
243244
244245 QDict = {}
245246
@@ -305,7 +306,7 @@ def leaveOneOut(FullDatabase, trialDir):
305306 os .makedirs (trialDir )
306307
307308 allFamilyNames = FullDatabase .kinetics .families .keys ()
308-
309+ allFamilyNames . sort () # Perform test on families alphabetically
309310 QDict = {}
310311
311312 for familyName in allFamilyNames :
@@ -314,16 +315,11 @@ def leaveOneOut(FullDatabase, trialDir):
314315 if len (family .rules .entries ) < 2 :
315316 print ' Skipping' , familyName , ': only has one rate rule...'
316317 else :
317-
318- start_time = time ()
319318 exactKinetics , approxKinetics = getKineticsLeaveOneOut (family )
320- end_time = time ()
321- time_taken = end_time - start_time
322- print "Time spent: {0:.2f} minutes" .format (time_taken / 60.0 )
323319 parityData = analyzeForParity (exactKinetics , approxKinetics , cutoff = 8.0 )
324320
325321 if len (parityData )< 2 :
326- print ' Skipping' , familyName , ': only one rate rule was calculated ...'
322+ print ' Skipping' , familyName , ': {} rate rules were compared ...' . format ( len ( parityData ))
327323 continue
328324 QDict [familyName ]= calculateQ (parityData )
329325 createParityPlot (parityData )
0 commit comments