Merge branch 'develop' into long_conditions

Author: dweindl

petab/v1/parameters.py

@@ -332,9 +332,8 @@ def append_overrides(overrides):
         if not model.has_entity_with_id(p):
             parameter_ids[p] = None
 
-    # remove parameters that occur in the condition table and are overridden
-    #  for ALL conditions
-    for p in condition_df.columns[~condition_df.isnull().any()]:
+    # parameters that are overridden via the condition table are not allowed
+    for p in condition_df.columns:
         try:
             del parameter_ids[p]
         except KeyError:

petab/v2/lint.py

@@ -770,19 +770,12 @@ def append_overrides(overrides):
         if not problem.model.has_entity_with_id(str(p))
     )
 
-    # remove parameters that occur in the condition table and are overridden
-    #  for ALL conditions
-    if problem.condition_df is not None:
-        ...
-        # FIXME: update to v2 -- we need to check for each value type
-        #   separately?!
-        # for p in problem.condition_df.columns[
-        #     ~problem.condition_df.isnull().any()
-        # ]:
-        #     try:
-        #         parameter_ids.remove(p)
-        #     except KeyError:
-        #         pass
+    # parameters that are overridden via the condition table are not allowed
+    for p in problem.condition_df[TARGET_ID].unique():
+        try:
+            parameter_ids.remove(p)
+        except KeyError:
+            pass
 
     return parameter_ids