fuzzy-dl-owl2 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

fuzzy_dl_owl2/fuzzydl/milp/expression.py

@@ -25,7 +25,9 @@ class Expression:
     def __init__(self, v: typing.Union[list[Variable], set[Variable]]) -> None: ...
 
     def __init__(self, *args) -> None:
-        if len(args) == 1:
+        if len(args) == 0:
+            self.__expression_init_1(0)
+        elif len(args) == 1:
             if isinstance(args[0], constants.NUMBER):
                 self.__expression_init_1(*args)
             elif isinstance(args[0], Expression):
@@ -182,5 +184,5 @@ class Expression:
             elif n == -1.0:
                 parts.append(f"- {term.get_var()}")
             else:
-                parts.append(f"{n} {term.get_var()}")
+                parts.append(f"{'+ ' if n >= 0 else '- '}{n} {term.get_var()}")
         return " ".join(parts)

fuzzy_dl_owl2/fuzzydl/milp/milp_helper.py

@@ -492,7 +492,7 @@ class MILPHelper:
         for v1 in to_process:
             name: str = str(v1)
             for old_value, new_value in zip(old_values, new_values):
-                if name not in old_value:
+                if old_value not in name:
                     continue
                 name2: str = name.replace(old_value, new_value, 1)
                 v2: Variable = self.get_variable(name2)
@@ -539,7 +539,8 @@ class MILPHelper:
             return self.__get_ordered_permutation_1(*args)
         elif len(args) == 2:
             assert isinstance(args[1], list) and all(
-                isinstance(a, Variable) for a in args[1]
+                isinstance(a, list) and all(isinstance(ai, Variable) for ai in a)
+                for a in args[1]
             )
             return self.__get_ordered_permutation_2(*args)
         else:

fuzzy_dl_owl2/fuzzydl/milp/variable.py

@@ -76,6 +76,9 @@ class Variable:
     def __ne__(self, value: object) -> bool:
         return not (self == value)
 
+    def __hash__(self) -> int:
+        return hash(str(self))
+
     def __repr__(self) -> str:
         return str(self)
 

fuzzy_dl_owl2/fuzzydl/modifier/triangular_modifier.py

@@ -45,7 +45,7 @@ class TriangularModifier(Modifier):
         self._c = value
 
     def clone(self) -> typing.Self:
-        return TriangularModifier(self.name, self.c)
+        return TriangularModifier(self.name, self.a, self.b, self.c)
 
     def compute_name(self) -> str:
         return f"triangular-modifier({self.a}, {self.b}, {self.c})"