Merge pull request #10 from jbussemaker/dev

Merge dev

Author: jbussemaker

.github/workflows/tests_basic.yml

@@ -5,9 +5,9 @@ name: Basic Tests
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
 
 jobs:
   test:

sb_arch_opt/problems/assignment.py

@@ -75,9 +75,16 @@ def _get_n_valid_discrete(self) -> int:
 
     def _is_conditionally_active(self) -> List[bool]:
         _, is_act_all = self.all_discrete_x
-        if is_act_all is None:
-            raise RuntimeError(f'_is_conditionally_active not implemented for {self.__class__.__name__}')
-        return list(np.any(~is_act_all, axis=0))
+        if is_act_all is not None:
+            return list(np.any(~is_act_all, axis=0))
+
+        if isinstance(self._problem, MultiAssignmentProblem):
+            dv_cond = []
+            for assignment_manager in self._problem.assignment_managers:
+                dv_cond += [dv.conditionally_active for dv in assignment_manager.design_vars]
+            return dv_cond
+
+        return [dv.conditionally_active for dv in self._problem.assignment_manager.design_vars]
 
     def _gen_all_discrete_x(self) -> Optional[Tuple[np.ndarray, np.ndarray]]:
         if isinstance(self._problem, AnalyticalProblemBase):

sb_arch_opt/tests/problems/test_assignment.py

@@ -29,13 +29,17 @@ def test_partitioning():
     Partitioning().print_stats()
     run_test_hierarchy(PartitioningCovering(), 1.71)
 
+    _ = PartitioningCovering().is_conditionally_active
+
 
 @check_dependency()
 def test_unordered():
     run_test_hierarchy(UnordNonReplComb(), 2.55)
     UnordNonReplCombLarge().print_stats()
     UnorderedComb().print_stats()
 
+    _ = UnorderedComb().is_conditionally_active
+
 
 @check_dependency()
 def test_assign_enc_gnc():
@@ -49,8 +53,4 @@ def test_assign_enc_gnc():
         assert problem.get_n_valid_discrete() == n_valid
 
         x_all, _ = problem.all_discrete_x
-        if x_all is not None:
-            _ = problem.is_conditionally_active
-        else:
-            with pytest.raises(RuntimeError):
-                _ = problem.is_conditionally_active
+        _ = problem.is_conditionally_active