Added comments and made output name errors more sensible

force_bdss/core/verifier.py

@@ -11,7 +11,7 @@ class VerifierError(HasStrictTraits):
     subject = Any()
     #: An error message relevant to the local modelview
     local_error = Str()
-    #: An error message relevent to the overall workflow
+    #: An error message relevant to the overall workflow
     global_error = Str()
 
     def __init__(self, subject, global_error='', local_error=''):
@@ -53,6 +53,7 @@ def _check_mco(workflow):
             subject=mco,
             global_error="The MCO has no defined parameters"))
 
+    #: Check MCO parameters have names and types
     for idx, param in enumerate(mco.parameters):
         factory_name = param.factory.name
         if param.name == '':
@@ -69,6 +70,7 @@ def _check_mco(workflow):
                 global_error="Error in MCO parameter "
                              "(Type: {})".format(factory_name)))
 
+    #: Check KPIs have names and optimisation objectives
     for idx, kpi in enumerate(mco.kpis):
         if kpi.name == '':
             errors.append(VerifierError(subject=kpi,
@@ -151,10 +153,12 @@ def _check_data_source(data_source_model, layer_number):
             global_error="Missing input slot name assignment "
                          "in layer {}".format(layer_number)))
 
+    #: Check if any input slots are unnamed
     row_index_errors = []
     for idx, info in enumerate(data_source_model.input_slot_info):
         if info.name == '':
             row_index_errors.append(idx)
+
     if row_index_errors != []:
         err_no_string = multi_error_format(row_index_errors)
         if len(row_index_errors) == 1:
@@ -178,16 +182,18 @@ def _check_data_source(data_source_model, layer_number):
             global_error="Missing output slot name assignment "
                          "in layer {}".format(layer_number)))
 
+    #: Check if any datasources have all outputs unnamed
     row_index_errors = []
     for idx, info in enumerate(data_source_model.output_slot_info):
         if info.name == '':
             row_index_errors.append(idx)
-    err_no_string = multi_error_format(row_index_errors)
-    if len(row_index_errors) == 1:
-        errors.append(VerifierError(
+
+    if row_index_errors != []:
+        if len(row_index_errors) == len(data_source_model.output_slot_info):
+            errors.append(VerifierError(
                 subject=data_source_model,
-                local_error="Undefined name for output "
-                            "parameters {}".format(err_no_string),
+                local_error="Undefined names for all output "
+                            "parameters",
                 global_error="An output parameter is undefined in {}"
                              " (Layer {})".format(factory.name, layer_number)))