Skip to content

Commit 0b16bfd

Browse files
committed
chore: change to if else statement in the logic
1 parent cb6ab71 commit 0b16bfd

1 file changed

Lines changed: 22 additions & 29 deletions

File tree

src/diffpy/srfit/fitbase/recipeorganizer.py

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,10 @@ def iterate_over_parameters(
274274
regexp = re.compile(pattern)
275275
if not fullnames:
276276
yield from self._iterpars_leafnames(regexp, pattern, recurse)
277-
return
278-
279-
yield from self._iterpars_fullnames(regexp, recurse=recurse, prefix="")
277+
else:
278+
yield from self._iterpars_fullnames(
279+
regexp, recurse=recurse, prefix=""
280+
)
280281

281282
def _iter_local_parameters(self, regexp, prefix=""):
282283
"""Iterate over local Parameters with matching names."""
@@ -290,7 +291,6 @@ def _iter_managed_parameter_containers(self):
290291
Parameters."""
291292
managed = self.__managed[:]
292293
managed.remove(self._parameters)
293-
294294
for managed_dict in managed:
295295
for obj in managed_dict.values():
296296
if hasattr(obj, "iterate_over_parameters"):
@@ -299,15 +299,12 @@ def _iter_managed_parameter_containers(self):
299299
def _iterpars_leafnames(self, regexp, pattern, recurse=True):
300300
"""Iterate over Parameters matched by leaf parameter names."""
301301
yield from self._iter_local_parameters(regexp)
302-
303-
if not recurse:
304-
return
305-
306-
for obj in self._iter_managed_parameter_containers():
307-
yield from obj.iterate_over_parameters(
308-
pattern=pattern,
309-
recurse=True,
310-
)
302+
if recurse:
303+
for obj in self._iter_managed_parameter_containers():
304+
yield from obj.iterate_over_parameters(
305+
pattern=pattern,
306+
recurse=True,
307+
)
311308

312309
def _iter_child_fullname_parameters(self, obj, regexp, prefix):
313310
"""Iterate over one child's Parameters with hierarchical
@@ -319,27 +316,23 @@ def _iter_child_fullname_parameters(self, obj, regexp, prefix):
319316
recurse=True,
320317
prefix=childprefix,
321318
)
322-
return
323-
324-
yield from obj.iterate_over_parameters(
325-
pattern=regexp.pattern,
326-
recurse=True,
327-
)
319+
else:
320+
yield from obj.iterate_over_parameters(
321+
pattern=regexp.pattern,
322+
recurse=True,
323+
)
328324

329325
def _iterpars_fullnames(self, regexp, recurse=True, prefix=""):
330326
"""Iterate over Parameters matched by hierarchical dotted
331327
names."""
332328
yield from self._iter_local_parameters(regexp, prefix=prefix)
333-
334-
if not recurse:
335-
return
336-
337-
for obj in self._iter_managed_parameter_containers():
338-
yield from self._iter_child_fullname_parameters(
339-
obj,
340-
regexp,
341-
prefix,
342-
)
329+
if recurse:
330+
for obj in self._iter_managed_parameter_containers():
331+
yield from self._iter_child_fullname_parameters(
332+
obj,
333+
regexp,
334+
prefix,
335+
)
343336

344337
@deprecated(iterPars_deprecation_msg)
345338
def iterPars(self, pattern="", recurse=True):

0 commit comments

Comments
 (0)