Updated to 1.6.2

giorgia-nadizar · Dec 28, 2024 · 647d035 · 647d035
1 parent a369c16
commit 647d035
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/genepro/node.py b/genepro/node.py
@@ -488,7 +488,7 @@ def _get_typical_repr(self, args: list, name: str) -> str:
         if name == 'between':
             if len(args) != 2:
                 raise ValueError("Invalid representation 'between' for len(args)!=2")
-            return '(' + args[0] + self.symb + args[1] + ')'
+            return '(' + '(' +  args[0] + ')' + self.symb + '(' + args[1] + ')' + ')'
         elif name == 'before':
             repr = self.symb + '('
             for arg in args:

diff --git a/genepro/node_impl.py b/genepro/node_impl.py
@@ -754,7 +754,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return Sigmoid(fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "1 / (1 + exp(-{}))".format(args[0])
+        return "(1 / (1 + exp(-({}))))".format(args[0])
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X, **kwargs)
@@ -910,8 +910,8 @@ def _get_args_repr(self, args):
         else:
             const_value = self.__const_value
         if float(const_value) == 1.0:
-            return "{}".format(self.symb)
-        return "{} * {}".format(const_value, self.symb)
+            return "({})".format(self.symb)
+        return "(({}) * ({}))".format(const_value, self.symb)
 
     def get_output(self, X, **kwargs):
         if not self.__const_value:
@@ -936,7 +936,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return UnprotectedDiv(fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "({} / {})".format(*args)
+        return "(({}) / ({}))".format(*args)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -955,7 +955,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return ExpPlus(fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "exp({} + {})".format(*args)
+        return "exp(({}) + ({}))".format(*args)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -972,7 +972,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return ExpTimes(fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "exp({} * {})".format(*args)
+        return "exp(({}) * ({}))".format(*args)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -1044,7 +1044,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return LogSlack(slack=self.slack, fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "log({} + {})".format(args[0], self.slack)
+        return "log(({}) + ({}))".format(args[0], self.slack)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -1066,7 +1066,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return SqrtSlack(slack=self.slack, fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "sqrt({} + {})".format(args[0], self.slack)
+        return "sqrt(({}) + ({}))".format(args[0], self.slack)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -1088,7 +1088,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return DivSlack(slack=self.slack, fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "({} / ({} + {}))".format(args[0], args[1], self.slack)
+        return "(({}) / (({}) + ({})))".format(args[0], args[1], self.slack)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -1110,7 +1110,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return AnalyticQuotient(slack=self.slack, fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "({} / sqrt({}^2 + {}))".format(args[0], args[1], self.slack)
+        return "(({}) / sqrt(({})**2 + ({})))".format(args[0], args[1], self.slack)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)
@@ -1130,7 +1130,7 @@ def create_new_empty_node(self, **kwargs) -> Node:
         return LogSquare(slack=self.slack, fix_properties=self.get_fix_properties(), **kwargs)
 
     def _get_args_repr(self, args):
-        return "log({}^2 + {})".format(args[0], self.slack)
+        return "log(({})**2 + ({}))".format(args[0], self.slack)
 
     def get_output(self, X, **kwargs):
         c_outs = self._get_child_outputs(X)

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='genepro',
-    version='1.6.1',
+    version='1.6.2',
     author='Marco Virgolin',
     author_email='marco.virgolin@cwi.nl',
     url='https://github.com/giorgia-nadizar/genepro',