cleaner defaults handling

grahamgower · Jan 21, 2021 · 4229c36 · 4229c36
1 parent 4848345
commit 4229c36
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/demes/demes.py b/demes/demes.py
@@ -1439,18 +1439,8 @@ def deme(
                 )
 
         # set default cloning and selfing rates
-        if "selfing_rate" in defaults:
-            selfing_rate = defaults["selfing_rate"]
-        elif "selfing_rate" in self.defaults:
-            selfing_rate = self.defaults["selfing_rate"]
-        else:
-            selfing_rate = None
-        if "cloning_rate" in defaults:
-            cloning_rate = defaults["cloning_rate"]
-        elif "cloning_rate" in self.defaults:
-            cloning_rate = self.defaults["cloning_rate"]
-        else:
-            cloning_rate = None
+        cloning_rate = defaults.get("cloning_rate", self.defaults.get("cloning_rate"))
+        selfing_rate = defaults.get("selfing_rate", self.defaults.get("cloning_rate"))
 
         # fill in all attributes of epochs
         for i in range(len(epochs)):

diff --git a/examples/cloning_example.yml b/examples/cloning_example.yml
@@ -2,7 +2,7 @@ description: An example demography to play around with cloning attributes.
 generation_time: 1
 time_units: generations
 defaults:
-- cloning_rate: 0.05
+  cloning_rate: 0.05
 demes:
   - id: root
     description: Root population
@@ -13,7 +13,7 @@ demes:
     description: Population with epochs and changing cloning rates
     ancestors: [root]
     defaults:
-    - cloning_rate: 0.2
+      cloning_rate: 0.2
     epochs:
     - initial_size: 1e4
       end_time: 500

diff --git a/examples/selfing_example.yml b/examples/selfing_example.yml
@@ -2,20 +2,20 @@ description: An example demography to play around with selfing attributes.
 generation_time: 1
 time_units: generations
 defaults:
-- selfing_rate: 0.05
+  selfing_rate: 0.05
 demes:
 - id: root
   description: Root population
   defaults:
-  - selfing_rate: 0.1
+    selfing_rate: 0.1
   epochs:
   - initial_size: 1e3
     end_time: 1000
 - id: pop1
   description: Population with epochs and changing selfing rates
   ancestors: [root]
   defaults:
-  - selfing_rate: 0.2
+    selfing_rate: 0.2
   epochs:
   - initial_size: 1e4
     end_time: 500

diff --git a/requirements.txt b/requirements.txt
@@ -13,4 +13,4 @@ ruamel.yaml==0.16.12
 sphinx==3.4.3
 sphinx_rtd_theme==0.5.0
 stdpopsim==0.1.2
-git+https://bitbucket.org/simongravel/[email protected].6#egg=moments
+git+https://bitbucket.org/simongravel/[email protected].8#egg=moments