Merge pull request #52 from MilesCranmer/deepsource-fix-147c2d73

Refactor unnecessary `else` / `elif` when `if` block has a `return` statement

pysr/export_jax.py

@@ -55,21 +55,19 @@ def sympy2jaxtext(expr, parameters, symbols_in):
     if issubclass(expr.func, sympy.Float):
         parameters.append(float(expr))
         return f"parameters[{len(parameters) - 1}]"
-    elif issubclass(expr.func, sympy.Integer):
+    if issubclass(expr.func, sympy.Integer):
         return f"{int(expr)}"
-    elif issubclass(expr.func, sympy.Symbol):
+    if issubclass(expr.func, sympy.Symbol):
         return (
             f"X[:, {[i for i in range(len(symbols_in)) if symbols_in[i] == expr][0]}]"
         )
-    else:
-        _func = _jnp_func_lookup[expr.func]
-        args = [sympy2jaxtext(arg, parameters, symbols_in) for arg in expr.args]
-        if _func == MUL:
-            return " * ".join(["(" + arg + ")" for arg in args])
-        elif _func == ADD:
-            return " + ".join(["(" + arg + ")" for arg in args])
-        else:
-            return f'{_func}({", ".join(args)})'
+    _func = _jnp_func_lookup[expr.func]
+    args = [sympy2jaxtext(arg, parameters, symbols_in) for arg in expr.args]
+    if _func == MUL:
+        return " * ".join(["(" + arg + ")" for arg in args])
+    if _func == ADD:
+        return " + ".join(["(" + arg + ")" for arg in args])
+    return f'{_func}({", ".join(args)})'
 
 
 jax_initialized = False

pysr/sr.py

@@ -643,10 +643,9 @@ def _make_hyperparams_julia_str(
     def tuple_fix(ops):
         if len(ops) > 1:
             return ", ".join(ops)
-        elif len(ops) == 0:
+        if len(ops) == 0:
             return ""
-        else:
-            return ops[0] + ","
+        return ops[0] + ","
 
     def_hyperparams += f"""\n
 plus=(+)
@@ -1024,8 +1023,7 @@ def get_hof(
 
     if multioutput:
         return ret_outputs
-    else:
-        return ret_outputs[0]
+    return ret_outputs[0]
 
 
 def best_row(equations=None):
@@ -1036,8 +1034,7 @@ def best_row(equations=None):
         equations = get_hof()
     if isinstance(equations, list):
         return [eq.iloc[np.argmax(eq["score"])] for eq in equations]
-    else:
-        return equations.iloc[np.argmax(equations["score"])]
+    return equations.iloc[np.argmax(equations["score"])]
 
 
 def best_tex(equations=None):
@@ -1050,8 +1047,7 @@ def best_tex(equations=None):
         return [
             sympy.latex(best_row(eq)["sympy_format"].simplify()) for eq in equations
         ]
-    else:
-        return sympy.latex(best_row(equations)["sympy_format"].simplify())
+    return sympy.latex(best_row(equations)["sympy_format"].simplify())
 
 
 def best(equations=None):
@@ -1062,8 +1058,7 @@ def best(equations=None):
         equations = get_hof()
     if isinstance(equations, list):
         return [best_row(eq)["sympy_format"].simplify() for eq in equations]
-    else:
-        return best_row(equations)["sympy_format"].simplify()
+    return best_row(equations)["sympy_format"].simplify()
 
 
 def best_callable(equations=None):
@@ -1074,8 +1069,7 @@ def best_callable(equations=None):
         equations = get_hof()
     if isinstance(equations, list):
         return [best_row(eq)["lambda_format"] for eq in equations]
-    else:
-        return best_row(equations)["lambda_format"]
+    return best_row(equations)["lambda_format"]
 
 
 def _escape_filename(filename):
@@ -1113,5 +1107,4 @@ class CallableEquation(object):
     def __call__(self, X):
         if self._selection is not None:
             return self._lambda(*X[:, self._selection].T)
-        else:
-            return self._lambda(*X.T)
+        return self._lambda(*X.T)