[py] Added Hispanic and Asiatic to protocols

bob/db/morph/protocol.py

@@ -141,11 +141,11 @@ class Protocol:
         """
 
         if self.name == "verification_fold1":
-            return["B", "W"]
+            return["A", "B", "H", "W"]
         if self.name == "verification_fold2":
-            return["B", "W"]
+            return["A", "B", "H", "W"]
         if self.name == "verification_fold3":
-            return["B", "W"]
+            return["A", "B", "H", "W"]
 
         logger.warning(
             f"The protocol '{self.name}' has no defined ethnicities. "

bob/db/morph/test.py

@@ -175,7 +175,7 @@ def test_verification_fold1_world():
 
     world_set = db.background_model_samples()
 
-    assert len(world_set) == 450
+    assert len(world_set) == 457
     _check_valid_samples(world_set)
 
 # -----------------------------------------------------------------------------
@@ -189,7 +189,7 @@ def test_verification_fold1_references_dev():
 
     _check_valid_samplesets(
         samplesets=references_sets_dev,
-        expected_length=12576//2, # 50% of multiple-images subjects
+        expected_length=13145//2, # 50% of multiple-images subjects
         expected_sample_count=1,
         match_sample_count_exactly=True,
     )
@@ -204,7 +204,7 @@ def test_verification_fold1_probes_dev():
 
     _check_valid_samplesets(
         samplesets=probes_set_dev,
-        expected_length=12576//2, # 50% of multiple-images subjects
+        expected_length=13145//2, # 50% of multiple-images subjects
         expected_sample_count=1,
         match_sample_count_exactly=False,
         is_probes=True,
@@ -221,7 +221,7 @@ def test_verification_fold1_references_eval():
 
     _check_valid_samplesets(
         samplesets=references_sets_eval,
-        expected_length=12576//2, # 50% of multiple-images subjects
+        expected_length=13145//2+1, # 50% of multiple-images subjects
         expected_sample_count=1,
         match_sample_count_exactly=True,
     )
@@ -236,7 +236,7 @@ def test_verification_fold1_probes_eval():
 
     _check_valid_samplesets(
         samplesets=probes_set_eval,
-        expected_length=12576//2, # 50% of multiple-images subjects
+        expected_length=13145//2+1, # 50% of multiple-images subjects
         expected_sample_count=1,
         match_sample_count_exactly=False,
         is_probes=True,
@@ -268,14 +268,14 @@ def test_verification_fold1_zprobes():
     zprobes_set = db.zprobes()
     _check_valid_samplesets(
         samplesets=zprobes_set,
-        expected_length=450,
+        expected_length=457,
         expected_sample_count=1,
     )
 
     zprobes_set_frac = db.zprobes(fraction=0.33)
     _check_valid_samplesets(
         samplesets=zprobes_set_frac,
-        expected_length=int(450*0.33),
+        expected_length=int(457*0.33),
         expected_sample_count=1,
     )
 
@@ -289,7 +289,7 @@ def test_verification_fold1_treferences():
     treferences_set = db.treferences(covariate="gender")
     _check_valid_samplesets(
         samplesets=treferences_set,
-        expected_length=450,
+        expected_length=457,
         expected_sample_count=1,
     )