Skip to content

Commit

Permalink
STYL: Update log messages to better reflect changes made by AIM-Harva…
Browse files Browse the repository at this point in the history
  • Loading branch information
JoostJM authored and fedorov committed Aug 23, 2017
1 parent e3642e1 commit 801a08e
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions radiomics/featureextractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ def __init__(self, *args, **kwargs):
self.logger.debug("Settings: %s", self.settings)

self._enabledImagetypes = {'Original': {}}
self.logger.info('inputImages set to %s', self._enabledImagetypes)
self.logger.info('Enabled image types: %s', self._enabledImagetypes)

self._enabledFeatures = {}
for featureClassName in self.getFeatureClassNames():
self._enabledFeatures[featureClassName] = []
self.logger.info('Enabled features: %s', self._enabledFeatures)

self._setTolerance()

Expand Down Expand Up @@ -135,7 +136,7 @@ def loadParams(self, paramsFile):
else:
self._enabledImagetypes = enabledImageTypes

self.logger.debug("Enabled input images: %s", self._enabledImagetypes)
self.logger.debug("Enabled image types: %s", self._enabledImagetypes)

if len(enabledFeatures) == 0:
self._enabledFeatures = {}
Expand All @@ -144,7 +145,7 @@ def loadParams(self, paramsFile):
else:
self._enabledFeatures = enabledFeatures

self.logger.debug("Enabled features: %s", enabledFeatures)
self.logger.debug("Enabled features: %s", self._enabledFeatures)

# Set default settings and update with and changed settings contained in kwargs
self.settings = self._getDefaultSettings()
Expand All @@ -156,16 +157,16 @@ def enableAllImageTypes(self):
"""
Enable all possible image types without any custom settings.
"""
self.logger.debug('Enabling all input image types')
self.logger.debug('Enabling all image types')
for imageType in getImageTypes():
self._enabledImagetypes[imageType] = {}
self.logger.debug('Enabled input images types: %s', self._enabledImagetypes)
self.logger.debug('Enabled images types: %s', self._enabledImagetypes)

def disableAllImageTypes(self):
"""
Disable all image types.
"""
self.logger.debug('Disabling all input image types')
self.logger.debug('Disabling all image types')
self._enabledImagetypes = {}

def enableImageTypeByName(self, imageType, enabled=True, customArgs=None):
Expand Down Expand Up @@ -201,20 +202,20 @@ def enableImageTypeByName(self, imageType, enabled=True, customArgs=None):
respectively).
"""
if imageType not in getImageTypes():
self.logger.warning('Input image type %s is not recognized', imageType)
self.logger.warning('Image type %s is not recognized', imageType)
return

if enabled:
if customArgs is None:
customArgs = {}
self.logger.debug('Enabling input image type %s (no additional custom settings)', imageType)
self.logger.debug('Enabling image type %s (no additional custom settings)', imageType)
else:
self.logger.debug('Enabling input image type %s (additional custom settings: %s)', imageType, customArgs)
self.logger.debug('Enabling image type %s (additional custom settings: %s)', imageType, customArgs)
self._enabledImagetypes[imageType] = customArgs
elif imageType in self._enabledImagetypes:
self.logger.debug('Disabling input image type %s', imageType)
self.logger.debug('Disabling image type %s', imageType)
del self._enabledImagetypes[imageType]
self.logger.debug('Enabled input images types: %s', self._enabledImagetypes)
self.logger.debug('Enabled images types: %s', self._enabledImagetypes)

def enableImageTypes(self, **enabledImagetypes):
"""
Expand All @@ -234,9 +235,9 @@ def enableImageTypes(self, **enabledImagetypes):
:param inputImages: dictionary, key is imagetype (original, wavelet or log) and value is custom settings
(dictionary)
"""
self.logger.debug('Updating enabled input images types with %s', enabledImagetypes)
self.logger.debug('Updating enabled images types with %s', enabledImagetypes)
self._enabledImagetypes.update(enabledImagetypes)
self.logger.debug('Enabled input images types: %s', self._enabledImagetypes)
self.logger.debug('Enabled images types: %s', self._enabledImagetypes)

def enableAllFeatures(self):
"""
Expand Down

0 comments on commit 801a08e

Please sign in to comment.