Skip to content

Commit 6dbb675

Browse files
committed
Remove unused recommended flags for databases.
1 parent 249a5a9 commit 6dbb675

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

rmgpy/data/base.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,13 @@ def __init__(self,
152152
name='',
153153
shortDesc='',
154154
longDesc='',
155-
recommended=False
156155
):
157156
self.entries = entries or {}
158157
self.top = top or []
159158
self.label = label
160159
self.name = name
161160
self.shortDesc = shortDesc
162161
self.longDesc = longDesc
163-
self.recommended = recommended
164162

165163
def load(self, path, local_context=None, global_context=None):
166164
"""
@@ -196,7 +194,6 @@ def load(self, path, local_context=None, global_context=None):
196194
local_context['name'] = self.name
197195
local_context['shortDesc'] = self.shortDesc
198196
local_context['longDesc'] = self.longDesc
199-
local_context['recommended'] = False
200197
# add in anything from the Class level dictionary.
201198
for key, value in Database.local_context.iteritems():
202199
local_context[key]=value
@@ -214,7 +211,6 @@ def load(self, path, local_context=None, global_context=None):
214211
self.name = local_context['name']
215212
self.shortDesc = local_context['shortDesc']
216213
self.longDesc = local_context['longDesc'].strip()
217-
self.recommended = local_context['recommended']
218214

219215
# Return the loaded database (to allow for Database().load() syntax)
220216
return self
@@ -263,7 +259,6 @@ def save(self, path):
263259
f.write('longDesc = u"""\n')
264260
f.write(self.longDesc.strip() + '\n')
265261
f.write('"""\n')
266-
f.write('recommended = {0}\n\n'.format(self.recommended))
267262

268263
for entry in entries:
269264
self.saveEntry(f, entry)

rmgpy/data/kinetics/depository.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ class KineticsDepository(Database):
111111
real reactant and product species (as in a kinetics library).
112112
"""
113113

114-
def __init__(self, label='', name='', shortDesc='', longDesc='', recommended=False):
115-
Database.__init__(self, label=label, name=name, shortDesc=shortDesc, longDesc=longDesc, recommended=recommended)
114+
def __init__(self, label='', name='', shortDesc='', longDesc=''):
115+
Database.__init__(self, label=label, name=name, shortDesc=shortDesc, longDesc=longDesc)
116116

117117
def __repr__(self):
118118
return '<KineticsDepository "{0}">'.format(self.label)

rmgpy/data/kinetics/family.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ def loadOld(self, path):
415415
for index, entry in enumerate(entries):
416416
entry.index = index + 1
417417

418-
self.rules = KineticsRules(label='{0}/rules'.format(self.label),
419-
recommended=True)
418+
self.rules = KineticsRules(label='{0}/rules'.format(self.label))
420419
self.rules.name = self.rules.label
421420
try:
422421
self.rules.loadOld(path, self.groups, numLabels=max(len(self.forwardTemplate.reactants), len(self.groups.top)))

rmgpy/data/kinetics/rules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class KineticsRules(Database):
6060
A class for working with a set of "rate rules" for a RMG kinetics family.
6161
"""
6262

63-
def __init__(self, label='', name='', shortDesc='', longDesc='', recommended=False):
64-
Database.__init__(self, label=label, name=name, shortDesc=shortDesc, longDesc=longDesc, recommended=recommended)
63+
def __init__(self, label='', name='', shortDesc='', longDesc=''):
64+
Database.__init__(self, label=label, name=name, shortDesc=shortDesc, longDesc=longDesc)
6565

6666
def __repr__(self):
6767
return '<KineticsRules "{0}">'.format(self.label)

0 commit comments

Comments
 (0)