Merge pull request #364 from JoostJM/imagetype-bug

Update the validation rule for image types

radiomics/schemas/paramSchema.yaml

@@ -133,13 +133,7 @@ mapping:
 
   imageType:
     type: map
+    func: checkImageType
+    matching-rule: 'any'
     mapping:
-      # possible image types, it's value is a dictionary (holding image type specific settings) that follows the rules
-      # as in 'setting'
-      Original: *settings
-      LoG: *settings
-      Wavelet: *settings
-      Square: *settings
-      SquareRoot: *settings
-      Logarithm: *settings
-      Exponential: *settings
+       regex;(.+): *settings

radiomics/schemas/schemaFuncs.py

@@ -1,9 +1,10 @@
 import pywt
 import six
 
-from radiomics import getFeatureClasses
+from radiomics import getFeatureClasses, getImageTypes
 
 featureClasses = getFeatureClasses()
+imageTypes = getImageTypes()
 
 def checkWavelet(value, rule_obj, path):
   if not isinstance(value, six.string_types):
@@ -66,3 +67,16 @@ def checkFeatureClass(value, rule_obj, path):
         raise ValueError('Feature Class %s contains unrecognized features: %s' % (className, str(unrecognizedFeatures)))
 
   return True
+
+
+def checkImageType(value, rule_obj, path):
+  global imageTypes
+  if value is None:
+    raise TypeError('imageType dictionary cannot be None value')
+
+  for im_type in value:
+    if im_type not in imageTypes:
+      raise ValueError('Image Type %s is not recognized. Available image types are %s' %
+                       (im_type, imageTypes))
+
+  return True