simplify code and flake8

Author: dengdifan

ConfigSpace/read_and_write/pcs_new.py

@@ -420,24 +420,22 @@ def read(pcs_string, debug=False):
                             forbidden_value = int(tmp_list[2])
                         elif isinstance(hp, FloatHyperparameter):
                             forbidden_value = float(tmp_list[2])
+                        else:
+                            raise NotImplementedError
                         if forbidden_value < hp.lower or forbidden_value > hp.upper:
-                            # TODO alternatively we could raise an warning and ignore this
                             raise ValueError(f'forbidden_value is set out of the bound, it needs to'
                                              f' be set between [{hp.lower}, {hp.upper}]'
                                              f' but its value is {forbidden_value}')
                     elif isinstance(hp, (CategoricalHyperparameter, OrdinalHyperparameter)):
                         hp_values = hp.choices if isinstance(hp, CategoricalHyperparameter)\
                             else hp.sequence
-                        forbidden_value_in_hp_values = False
-                        for hp_value in hp_values:
-                            if str(hp_value) == tmp_list[2]:
-                                forbidden_value = hp_value
-                                forbidden_value_in_hp_values = True
-                                break
-                        if not forbidden_value_in_hp_values:
-                            raise ValueError(f'forbidden_value is set out of the bound, it needs to'
-                                             f' be set as one member of {hp_values}'
-                                             f' but its value is {forbidden_value}')
+                        forbidden_value_in_hp_values = tmp_list[2] in hp_values
+                        if forbidden_value_in_hp_values:
+                            forbidden_value = tmp_list[2]
+                        else:
+                            raise ValueError(f'forbidden_value is set out of the allowed value '
+                                             f'sets, it needs to be one member from {hp_values} '
+                                             f'but its value is {forbidden_value}')
                     else:
                         raise ValueError('Unsupported Hyperparamter sorts')
 

test/read_and_write/test_pcs_converter.py

@@ -415,8 +415,8 @@ def test_read_new_configuration_space_forbidden(self):
 
         cat_hp_str_forbidden = ForbiddenAndConjunction(ForbiddenEqualsClause(cat_hp_str, 'a'))
         ord_hp_float_forbidden = ForbiddenAndConjunction(ForbiddenEqualsClause(ord_hp_str, 'a'))
-        cs_with_forbidden.add_forbidden_clauses([int_hp_forbidden, float_hp_forbidden, cat_hp_str_forbidden,
-                                                ord_hp_float_forbidden])
+        cs_with_forbidden.add_forbidden_clauses([int_hp_forbidden, float_hp_forbidden,
+                                                 cat_hp_str_forbidden, ord_hp_float_forbidden])
 
         complex_cs = list()
         complex_cs.append("int_hp integer [0,50] [30]")