Merge pull request #112 from fact-project/fix_111

Fix error in case of empty feature generation config, fixes #111

Author: maxnoe

aict_tools/__init__.py

@@ -1 +1 @@
-__version__ = '0.20.3'
+__version__ = '0.20.4'

aict_tools/configuration.py

@@ -24,32 +24,44 @@
 
 
 log = logging.getLogger(__name__)
+yaml = YAML(typ='safe')
 
 
-FeatureGenerationConfig = namedtuple(
+_feature_gen_config = namedtuple(
     'FeatureGenerationConfig',
-    ['needed_columns', 'features']
+    ['needed_columns', 'features'],
 )
 
-yaml = YAML(typ='safe')
 
+class FeatureGenerationConfig(_feature_gen_config):
+    '''
+    Stores the needed features and the expressions for the
+    feature generation
+    '''
 
-def print_supported_classifiers():
-    logging.info('Supported Classifiers:')
+    def __new__(cls, needed_columns, features):
+        if features is None:
+            log.warning('Feature generation config present but no features defined.')
+            features = {}
+        return super().__new__(cls, needed_columns, features)
+
+
+def print_models(filter_func=is_classifier):
     for name, module in sklearn_modules.items():
         for cls_name in dir(module):
             cls = getattr(module, cls_name)
-            if is_classifier(cls):
+            if filter_func(cls):
                 logging.info(name + '.' + cls.__name__)
 
 
+def print_supported_classifiers():
+    logging.info('Supported Classifiers:')
+    print_models(is_classifier)
+
+
 def print_supported_regressors():
     logging.info('Supported Regressors:')
-    for name, module in sklearn_modules.items():
-        for cls_name in dir(module):
-            cls = getattr(module, cls_name)
-            if is_regressor(cls):
-                logging.info(name + '.' + cls.__name__)
+    print_models(is_regressor)
 
 
 def load_regressor(config):
@@ -162,8 +174,8 @@ def __init__(self, config):
             raise ValueError('Source dependent features used: {}'.format(source_features))
 
         if gen_config:
-            self.features.extend(gen_config['features'].keys())
             self.feature_generation = FeatureGenerationConfig(**gen_config)
+            self.features.extend(self.feature_generation.features.keys())
         else:
             self.feature_generation = None
         self.features.sort()
@@ -230,8 +242,8 @@ def __init__(self, config):
         if len(source_features):
             raise ValueError('Source dependent features used: {}'.format(source_features))
         if gen_config:
-            self.features.extend(gen_config['features'].keys())
             self.feature_generation = FeatureGenerationConfig(**gen_config)
+            self.features.extend(self.feature_generation.features.keys())
         else:
             self.feature_generation = None
         self.features.sort()
@@ -275,8 +287,8 @@ def __init__(self, config):
         if len(source_features):
             raise ValueError('Source dependent features used: {}'.format(source_features))
         if gen_config:
-            self.features.extend(gen_config['features'].keys())
             self.feature_generation = FeatureGenerationConfig(**gen_config)
+            self.features.extend(self.feature_generation.features.keys())
         else:
             self.feature_generation = None
         self.features.sort()