Merge pull request #157 from RWTH-EBC/156-not-working-pymoo-methods [PYPI-RELEASE]

156 not working pymoo methods

Author: HvanderStok

CHANGELOG.md

@@ -120,3 +120,6 @@
   - Improve loading of mat files #150
 - v0.5.4
   - Add support for wildcard patterns in variable names #154
+- v0.5.5
+  - Fix bug in pymoo optimization methods #156
+  - Change error for wrong variable names to a warning

ebcpy/__init__.py

@@ -8,4 +8,4 @@
 from .optimization import Optimizer
 
 
-__version__ = '0.5.4'
+__version__ = '0.5.5'

ebcpy/optimization.py

@@ -505,12 +505,15 @@ def _evaluate(self, x, out, *args, **kwargs):
             copy_termination = default_kwargs.pop("copy_termination")
             callback = default_kwargs.pop("callback")
             display = default_kwargs.pop("display")
-            
-            default_kwargs["sampling"] = get_sampling(name=default_kwargs["sampling"])
-            default_kwargs["selection"] = get_selection(name=default_kwargs["selection"])
-            default_kwargs["crossover"] = get_crossover(name=default_kwargs["crossover"])
-            default_kwargs["mutation"] = get_mutation(name=default_kwargs["mutation"])
-        
+
+            if "selection" in default_kwargs.keys():
+                default_kwargs["selection"] = get_selection(name=default_kwargs["selection"])
+            if "crossover" in default_kwargs.keys():
+                default_kwargs["crossover"] = get_crossover(name=default_kwargs["crossover"])
+            if "sampling" in default_kwargs.keys():
+                default_kwargs["sampling"] = get_sampling(name=default_kwargs["sampling"])
+            if "mutation" in default_kwargs.keys():
+                default_kwargs["mutation"] = get_mutation(name=default_kwargs["mutation"])
             algorithm = pymoo_algorithms[method.lower()](**default_kwargs)
 
             res = minimize(
@@ -586,13 +589,6 @@ def get_default_config(framework: str) -> dict:
                     }
         if framework.lower() == "pymoo":
             return {"n_gen": 1000,
-                    "pop_size": 50,
-                    "sampling": "real_random",
-                    "selection": "random",
-                    "crossover": "real_sbx",
-                    "mutation": "real_pm",
-                    "eliminate_duplicates": True,
-                    "n_offsprings": None,
                     "termination": None,
                     "seed": 1,
                     "verbose": False,

ebcpy/utils/__init__.py

@@ -7,6 +7,7 @@
 import re
 from pathlib import Path
 from typing import Union, List
+import warnings
 
 
 def setup_logger(name: str,
@@ -57,7 +58,7 @@ def get_names(all_names: list, patterns: Union[str, List[str]]) -> List[str]:
     without `*` must match exactly.  The matching is performed in two steps:
       1. Each pattern is translated to a regular expression if it contains `*`,
          otherwise used as a literal match.
-      2. Any pattern that matches no names in `all_names` raises a `KeyError`.
+      2. Any pattern that matches no names in `all_names` raises a warning.
 
     The returned list preserves the order of `all_names`.
 
@@ -88,7 +89,7 @@ def get_names(all_names: list, patterns: Union[str, List[str]]) -> List[str]:
                 unmatched.append(pat)
 
     if unmatched:
-        raise KeyError(
+        warnings.warn(
             "The following variable names/patterns are not in the given .mat file: "
             + ", ".join(unmatched)
         )

tests/test_utils.py

@@ -351,11 +351,11 @@ def test_matches(self):
 
     def test_errors(self):
         """
-        Patterns or literals that match nothing should raise KeyError.
+        Patterns or literals that match nothing should raise a warning.
         """
-        with self.assertRaises(KeyError):
+        with self.assertWarns(UserWarning):
             get_names(['alpha', 'beta'], 'unknown')
-        with self.assertRaises(KeyError):
+        with self.assertWarns(UserWarning):
             get_names(['x1', 'x2'], 'y*')