updated requierements and added all algorithms

Author: oliverchampion

requirements.txt

@@ -8,7 +8,7 @@ joblib
 dipy
 matplotlib
 scienceplots
-cvxpy
+cvxpy==1.6.1
 zenodo-get
 pytest
 tqdm

src/standardized/TCML_TechnionIIT_SLS.py

@@ -21,14 +21,14 @@ class TCML_TechnionIIT_SLS(OsipiBase):
     required_bvalues = 4
     required_thresholds = [0,0]  # Interval from "at least" to "at most", in case submissions allow a custom number of thresholds
     required_bounds = False
-    required_bounds_optional = True  # Bounds may not be required but are optional
+    required_bounds_optional = False  # Bounds may not be required but are optional
     required_initial_guess = False
     required_initial_guess_optional = True
     accepted_dimensions = 1  # Not sure how to define this for the number of accepted dimensions. Perhaps like the thresholds, at least and at most?
 
 
     # Supported inputs in the standardized class
-    supported_bounds = True
+    supported_bounds = False
     supported_initial_guess = True
     supported_thresholds = True
 
@@ -47,9 +47,10 @@ def __init__(self, bvalues=None, thresholds=None, bounds=None, initial_guess=Non
 
     def initialize(self, bounds, initial_guess, fitS0,thresholds):
         if bounds is None:
-            print('warning, no bounds were defined, so default bounds are used of ([0.0003, 0.001, 0.009, 0],[0.008, 0.5,0.04, 3])')
+            print('warning, only D* is bounded between 0.001 and 0.5)')
             self.bounds = ([0.0003, 0.001, 0.009, 0],[0.008, 0.5,0.04, 3])
         else:
+            print('warning, although bounds are given, only D* is bounded)')
             bounds=bounds
             self.bounds = bounds
         if initial_guess is None:

tests/IVIMmodels/unit_tests/algorithms.json

@@ -2,6 +2,8 @@
     "algorithms": [
         "TCML_TechnionIIT_lsqlm",
         "TCML_TechnionIIT_lsqtrf",
+        "TCML_TechnionIIT_lsqBOBYQA",
+        "TCML_TechnionIIT_SLS",
         "ASD_MemorialSloanKettering_QAMPER_IVIM",
         "ETP_SRI_LinearFitting",
         "IAR_LU_biexp",