git ch0;10;1cMerge branch 'main' of github.com:rhayes777/PyAutoFit

Author: Jammy2211

autofit/mapper/model_object.py

@@ -296,6 +296,8 @@ def dict(self) -> dict:
             type_ = "tuple_prior"
         elif isinstance(self, Array):
             type_ = "array"
+        elif isinstance(self, Constant):
+            type_ = "constant"
         else:
             raise AssertionError(
                 f"{self.__class__.__name__} cannot be serialised to dict"

autofit/mapper/prior/constant.py

@@ -3,7 +3,11 @@
 from autofit.mapper.model_object import ModelObject
 
 
-class Constant(ModelObject, Number):
+class Constant(float, ModelObject):
+    def __new__(cls, value: float, id_=None):
+        obj = super().__new__(cls, value)
+        return obj
+
     def __init__(self, value: float, id_=None):
         """
         Represents a constant value in a model.
@@ -18,63 +22,27 @@ def __init__(self, value: float, id_=None):
         value
             The constant value.
         """
-        super().__init__(
-            id_=id_,
-        )
+        if isinstance(value, Constant):
+            value = value.value
+
+        ModelObject.__init__(self, id_=id_)
         self.value = value
 
     def __str__(self):
         return str(self.value)
 
     def __eq__(self, other):
-        if isinstance(other, (int, float)):
-            return self.value == other
-        return super().__eq__(other)
+        if isinstance(other, ModelObject):
+            return ModelObject.__eq__(self, other)
+        return self.value == other
+
+    def __ne__(self, other):
+        if isinstance(other, ModelObject):
+            return ModelObject.__ne__(self, other)
+        return self.value != other
 
     def __hash__(self):
         return hash(self.id)
 
     def dict(self):
         return {"type": "Constant", "value": self.value}
-
-    def __add__(self, other):
-        return self.value + other
-
-    def __sub__(self, other):
-        return self.value - other
-
-    def __mul__(self, other):
-        return self.value * other
-
-    def __truediv__(self, other):
-        return self.value / other
-
-    def __pow__(self, other):
-        return self.value**other
-
-    def __radd__(self, other):
-        return other + self.value
-
-    def __rsub__(self, other):
-        return other - self.value
-
-    def __rmul__(self, other):
-        return other * self.value
-
-    def __rtruediv__(self, other):
-        return other / self.value
-
-    def __rpow__(self, other):
-        return other**self.value
-
-    def __lt__(self, other):
-        return self.value < other
-
-    def __le__(self, other):
-        return self.value <= other
-
-    def __gt__(self, other):
-        return self.value > other
-
-    def __ge__(self, other):
-        return self.value >= other

autofit/mapper/prior/tuple_prior.py

@@ -51,21 +51,17 @@ def instance_tuples(self):
         instances: [(String, instance)]
             A list of instances
         """
-        return list(
-            sorted(
+        return [
+            (key, value.value if isinstance(value, Constant) else value)
+            for key, value in sorted(
                 [
                     (key, value)
                     for key, value in self.__dict__.items()
                     if key != "id" and isinstance(value, (int, float))
-                ]
-                + [
-                    (key, value.value)
-                    for key, value in self.__dict__.items()
-                    if isinstance(value, Constant)
                 ],
                 key=lambda tup: tup[0],
             )
-        )
+        ]
 
     def value_for_arguments(self, arguments):
         """

test_autofit/mapper/test_constant.py

@@ -167,3 +167,21 @@ def test_model_with_constants():
     assert instance.centre == 1.0
     assert isinstance(instance.centre, float)
     assert not isinstance(instance.centre, Constant)
+
+
+def test_as_float():
+    constant = af.Constant(1.0)
+    assert float(constant) == 1.0
+
+    constant_2 = af.Constant(2.0)
+    assert float(constant_2) == 2.0
+
+    assert constant.id != constant_2.id
+
+    assert isinstance(float(constant), float)
+
+
+def test_is_instance():
+    constant = af.Constant(1.0)
+
+    assert isinstance(constant, float)