Bugfixes for bounds and initial guesses

Author: IvanARashid

src/original/IAR_LundUniversity/ivim_fit_method_linear.py

@@ -83,13 +83,13 @@ def sivim_model(self, b, S0, f, D):
 
     def set_bounds(self, bounds):
         # Use this function for fits that uses curve_fit
-        if bounds == None:
+        if bounds is None:
             self.bounds = np.array([(0, 0, 0), (np.inf, 1, 0.004)])
         else:
-            self.bounds = np.array([(0, *bounds[0]), (np.inf, *bounds[1])])
+            self.bounds = np.array([bounds[0], bounds[1]])
 
     def set_initial_guess(self, initial_guess):
-        if initial_guess == None:
+        if initial_guess is None:
             self.initial_guess = (1, 0.2, 0.001)
         else:
             self.initial_guess = initial_guess

src/original/IAR_LundUniversity/ivim_fit_method_modified_mix.py

@@ -78,7 +78,7 @@ def __init__(self, gtab, bounds=None, maxiter=10, xtol=1e-8, rescale_units=False
         if gtab.bvals[-1] >= 10:
             self.bvals = gtab.bvals/1000
 
-        if bounds == None:
+        if bounds is None:
             # Bounds expressed as (lower bound, upper bound) for [f, D*, D].
             self.bounds = np.array([(0, 1), (5, 100), (0, 4)])
         elif (bounds[0][1] <= 1) or rescale_units: # Realistically, if mm2/s units are used, D* bound is <= 1

src/original/IAR_LundUniversity/ivim_fit_method_modified_topopro.py

@@ -76,7 +76,7 @@ def __init__(self, gtab, bounds=[[0, 0.005, 1e-5], [1, 0.1, 0.004]], \
         # and are thus not changed.
         if gtab.bvals[-1] >= 10:
             self.bvals = gtab.bvals/1000
-        if bounds == None:
+        if bounds is None:
             # Bounds expressed as (lower bound, upper bound) for [f, D*, D].
             self.bounds = np.array([(0, 1), (5, 100), (0, 4)])
         elif (bounds[0][1] <= 1) or rescale_units: # Realistically, if mm2/s units are used, D* bound is <= 1

src/original/IAR_LundUniversity/ivim_fit_method_segmented_2step.py

@@ -86,13 +86,13 @@ def ivim_signal(self, b, S0, f, D_star, D):
 
     def set_bounds(self, bounds):
         # Use this function for fits that uses curve_fit
-        if bounds == None:
+        if bounds is None:
             self.bounds = np.array([(0, 0, 0.005, 0), (np.inf, 1, 0.1, 0.004)])
         else:
-            self.bounds = np.array([(0, *bounds[0]), (np.inf, *bounds[1])])
+            self.bounds = np.array([bounds[0], bounds[1]])
 
     def set_initial_guess(self, initial_guess):
-        if initial_guess == None:
+        if initial_guess is None:
             self.initial_guess = (1, 0.2, 0.03, 0.001)
         else:
             self.initial_guess = initial_guess

src/original/IAR_LundUniversity/ivim_fit_method_segmented_3step.py

@@ -105,13 +105,13 @@ def ivim_signal(self, b, S0, f, D_star, D):
 
     def set_bounds(self, bounds):
         # Use this function for fits that uses curve_fit
-        if bounds == None:
+        if bounds is None:
             self.bounds = np.array([(0, 0, 0.005, 0), (np.inf, 1, 0.1, 0.004)])
         else:
-            self.bounds = np.array([(0, *bounds[0]), (np.inf, *bounds[1])])
+            self.bounds = np.array([bounds[0], bounds[1]])
 
     def set_initial_guess(self, initial_guess):
-        if initial_guess == None:
+        if initial_guess is None:
             self.initial_guess = (1, 0.2, 0.03, 0.001)
         else:
             self.initial_guess = initial_guess

src/original/IAR_LundUniversity/ivim_fit_method_sivim.py

@@ -77,13 +77,13 @@ def sivim_model(self, b, S0, f, D):
 
     def set_bounds(self, bounds):
         # Use this function for fits that uses curve_fit
-        if bounds == None:
+        if bounds is None:
             self.bounds = np.array([(0, 0, 0), (np.inf, 1, 0.004)])
         else:
-            self.bounds = np.array([(0, *bounds[0]), (np.inf, *bounds[1])])
+            self.bounds = np.array([bounds[0], bounds[1]])
 
     def set_initial_guess(self, initial_guess):
-        if initial_guess == None:
+        if initial_guess is None:
             self.initial_guess = (1, 0.2, 0.001)
         else:
             self.initial_guess = initial_guess

src/original/IAR_LundUniversity/ivim_fit_method_subtracted.py

@@ -93,13 +93,13 @@ def perfusion_signal(self, b, S0, D_star):
 
     def set_bounds(self, bounds):
         # Use this function for fits that uses curve_fit
-        if bounds == None:
+        if bounds is None:
             self.bounds = np.array([(0, 0, 0.005, 0), (np.inf, 1, 0.1, 0.004)])
         else:
-            self.bounds = np.array([(0, *bounds[0]), (np.inf, *bounds[1])])
+            self.bounds = np.array([bounds[0], bounds[1]])
 
     def set_initial_guess(self, initial_guess):
-        if initial_guess == None:
+        if initial_guess is None:
             self.initial_guess = (1, 0.2, 0.03, 0.001)
         else:
             self.initial_guess = initial_guess