Individual as dictionary implementation

Author: Julian Blank

pymoo/model/individual.py

@@ -1,48 +1,28 @@
 import copy
 
+from pymoo.util.dynamic_dict import DynamicDict
 
-class Individual:
 
-    def __init__(self, X=None, F=None, CV=None, G=None, feasible=None, **kwargs) -> None:
-        self.X = X
-        self.F = F
-        self.CV = CV
-        self.G = G
-        self.feasible = feasible
-        self.data = kwargs
-        self.attr = set(self.__dict__.keys())
+class Individual(DynamicDict):
 
     def has(self, key):
-        return key in self.attr or key in self.data
+        return key in self
 
-    def set(self, key, value):
-        if key in self.attr:
-            self.__dict__[key] = value
+    def set(self, key, val):
+        self[key] = val
+
+    def copy(self, deep=False):
+        if not deep:
+            d = dict(**self.__dict__)
         else:
-            self.data[key] = value
-        return self
+            d = copy.deepcopy(**self.__dict__)
 
-    def copy(self):
-        ind = copy.copy(self)
-        ind.data = self.data.copy()
+        ind = Individual(**d)
         return ind
 
     def get(self, *keys):
-
-        def _get(key):
-            if key in self.data:
-                return self.data[key]
-            elif key in self.attr:
-                return self.__dict__[key]
-            else:
-                return None
-
-        ret = []
-
-        for key in keys:
-            ret.append(_get(key))
-
-        if len(ret) == 1:
-            return ret[0]
+        if len(keys) == 1:
+            key, = keys
+            return super().get(key)
         else:
-            return tuple(ret)
+            return tuple([super().get(key) for key in keys])

pymoo/model/plot.py

@@ -172,6 +172,8 @@ def show(self, **kwargs):
             plt.show(**kwargs)
             plt.close()
 
+        return self
+
     def save(self, fname, **kwargs):
         self.plot_if_not_done_yet()
         set_if_none(kwargs, "bbox_inches", "tight")

pymoo/model/population.py

@@ -7,8 +7,6 @@
 
 class Population(np.ndarray):
 
-    individual = None
-
     def __new__(cls, n_individuals=0, individual=None):
 
         # the default individual if not specific otherwise

pymoo/util/dynamic_dict.py

@@ -0,0 +1,29 @@
+
+class DynamicDict(dict):
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    def __setitem__(self, key, value):
+        super(DynamicDict, self).__setitem__(key, value)
+        self.__dict__.update({key: value})
+
+    def __delitem__(self, key):
+        super(DynamicDict, self).__delitem__(key)
+        del self.__dict__[key]
+
+    def __getattr__(self, attr):
+        return self.get(attr)
+
+    def __setattr__(self, key, value):
+        self.__setitem__(key, value)
+
+    def __delattr__(self, item):
+        self.__delitem__(item)
+
+    def __getstate__(self):
+        return self
+
+    def __setstate__(self, state):
+        self.update(state)
+        self.__dict__ = self

pymoo/util/nds/non_dominated_sorting.py

@@ -6,9 +6,9 @@
 
 class NonDominatedSorting:
 
-    def __init__(self, epsilon=0.0, method="fast_non_dominated_sort") -> None:
+    def __init__(self, epsilon=None, method="fast_non_dominated_sort") -> None:
         super().__init__()
-        self.epsilon = float(epsilon)
+        self.epsilon = epsilon
         self.method = method
 
     def do(self, F, return_rank=False, only_non_dominated_front=False, n_stop_if_ranked=None, **kwargs):
@@ -18,7 +18,12 @@ def do(self, F, return_rank=False, only_non_dominated_front=False, n_stop_if_ran
         if n_stop_if_ranked is None:
             n_stop_if_ranked = int(1e8)
         func = load_function(self.method)
-        fronts = func(F, epsilon=self.epsilon, **kwargs)
+
+        # set the epsilon if it should be set
+        if self.epsilon is not None:
+            kwargs["epsilon"] = float(self.epsilon)
+
+        fronts = func(F, **kwargs)
 
         # convert to numpy array for each front and filter by n_stop_if_ranked if desired
         _fronts = []

pymoo/version.py

@@ -1 +1 @@
-__version__ = "0.4.2.dev"
+__version__ = "0.4.2.rc1"