Merge pull request #182 from daisybio/development

New version: 1.2.7

Author: PascalIversen

docs/conf.py

@@ -56,9 +56,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "1.2.6"
+version = "1.2.7"
 # The full version, including alpha/beta/rc tags.
-release = "1.2.6"
+release = "1.2.7"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

drevalpy/experiment.py

@@ -802,12 +802,12 @@ def randomize_train_predict(
         return
 
     cl_features_rand: FeatureDataset | None = None
-    if cl_features is not None:
+    if cl_features is not None and view in cl_features.view_names:
         cl_features_rand = cl_features.copy()
         cl_features_rand.randomize_features(view, randomization_type=randomization_type)  # type: ignore[union-attr]
 
     drug_features_rand: FeatureDataset | None = None
-    if drug_features is not None:
+    if drug_features is not None and view in drug_features.view_names:
         drug_features_rand = drug_features.copy()
         drug_features_rand.randomize_features(view, randomization_type=randomization_type)  # type: ignore[union-attr]
 

drevalpy/utils.py

@@ -305,7 +305,7 @@ def main(args) -> None:
         baselines = []
 
     # NaiveMeanEffectsPredictor is always run as it is needed for evaluation
-    if "NaiveMeanEffectsPredictor" not in args.baselines:
+    if "NaiveMeanEffectsPredictor" not in baselines:
         baselines.append(MODEL_FACTORY["NaiveMeanEffectsPredictor"])
 
     # TODO Allow for custom randomization tests maybe via config file

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "drevalpy"
-version = "1.2.6"
+version = "1.2.7"
 description = "Drug response evaluation of cancer cell line drug response models in a fair setting"
 authors = ["DrEvalPy development team"]
 license = "GPL-3.0"