@@ -263,7 +263,7 @@ def compareNIST(FullDatabase, trialDir):
263263 parityData = analyzeForParity (exactKinetics , approxKinetics , cutoff = 8.0 )
264264
265265 if len (parityData )< 2 :
266- print ' Skipping' , familyName , ': only one rate rule was calculated ...'
266+ print ' Skipping' , familyName , ': {} reactions were compared ...' . format ( len ( parityData ))
267267 continue
268268 QDict [familyName ]= calculateQ (parityData )
269269 createParityPlot (parityData )
@@ -358,7 +358,7 @@ def leaveOneOut(FullDatabase, trialDir):
358358 print 'Loading the RMG database...'
359359 FullDatabase = RMGDatabase ()
360360 FullDatabase .load (settings ['database.directory' ],
361- kineticsFamilies = [ 'Cyclic_Ether_Formation' ] ,
361+ kineticsFamilies = 'all' ,
362362 kineticsDepositories = 'all' ,
363363 thermoLibraries = ['primaryThermoLibrary' ], # Use just the primary thermo library, which contains necessary small molecular thermo
364364 reactionLibraries = [],
@@ -368,17 +368,22 @@ def leaveOneOut(FullDatabase, trialDir):
368368 for family in FullDatabase .kinetics .families .values ():
369369 family .addKineticsRulesFromTrainingSet (thermoDatabase = FullDatabase .thermo )
370370
371+ print '--------------------------------------------'
371372 print 'Obtaining statistics for the families...'
372373 obtainKineticsFamilyStatistics (FullDatabase , trialDir )
373374
375+ print '--------------------------------------------'
374376 print 'Performing the leave on out test on the kinetics families...'
375377 leaveOneOut (FullDatabase , trialDir )
376378
379+ print '--------------------------------------------'
380+ print 'Filling up the family rate rules by averaging... Expect larger number of rate rules in subsequent tests'
377381 # Fill in the rate rules by averaging when we are ready to compare real kinetics
378382 for family in FullDatabase .kinetics .families .values ():
379383 family .fillKineticsRulesByAveragingUp ()
380384
381385
386+ print '--------------------------------------------'
382387 print 'Evaluating the NIST Kinetics against the RMG estimates...'
383388 compareNIST (FullDatabase , trialDir )
384389
0 commit comments