diff --git a/force_bdss/core/kpi_specification.py b/force_bdss/core/kpi_specification.py index 003229bf06e97deb229d9d35b0d68a65aae41f2c..933c7b3eefd26f9d950d0d38e1b4393ef678f4cc 100644 --- a/force_bdss/core/kpi_specification.py +++ b/force_bdss/core/kpi_specification.py @@ -8,4 +8,4 @@ class KPISpecification(HasStrictTraits): name = Identifier() #: The expected outcome of the procedure relative to this KPI. - objective = Enum("", "MINIMISE") + objective = Enum("MINIMISE", "MAXIMISE") diff --git a/force_bdss/core/tests/test_verifier.py b/force_bdss/core/tests/test_verifier.py index a2bc118d3a3ad8bcec33a3c572262e58bd6d08c1..5ad1290dc649be27bf9c366dcdef34b33d1ab83e 100644 --- a/force_bdss/core/tests/test_verifier.py +++ b/force_bdss/core/tests/test_verifier.py @@ -52,15 +52,13 @@ class TestVerifier(unittest.TestCase): wf = self.workflow mco_factory = self.plugin.mco_factories[0] wf.mco = mco_factory.create_model() - kpi = KPISpecification(name='', objective='') + kpi = KPISpecification(name='') wf.mco.kpis.append(kpi) errors = verify_workflow(wf) - - self.assertEqual(len(errors), 4) + self.assertEqual(len(errors), 3) self.assertEqual(errors[1].subject, wf.mco.kpis[0]) self.assertIn("KPI is not named", errors[1].local_error) - self.assertIn("KPI has no objective set", errors[2].local_error) def test_empty_execution_layer(self): wf = self.workflow diff --git a/force_bdss/core/verifier.py b/force_bdss/core/verifier.py index 6ddfee69475c4293620f1a7fa2bef1995b08070d..cf88e040ab1225f7b85a236445276950f8fb27f7 100644 --- a/force_bdss/core/verifier.py +++ b/force_bdss/core/verifier.py @@ -70,16 +70,12 @@ def _check_mco(workflow): global_error="Error in MCO parameter " "(Type: {})".format(factory_name))) - #: Check KPIs have names and optimisation objectives + #: Check KPIs have names for idx, kpi in enumerate(mco.kpis): if kpi.name == '': errors.append(VerifierError(subject=kpi, local_error="KPI is not named", global_error="A KPI has an error")) - if kpi.objective == '': - errors.append(VerifierError(subject=kpi, - local_error="KPI has no objective set", - global_error="A KPI has an error")) return errors