Fix code style and small bugs

Author: Kate Noskova

gadma/cli/settings_storage.py

@@ -70,8 +70,8 @@ def _get_variable(cls, par_label, domain, engine="dadi"):
     """
     Returns correct variable from its label.
     If engine is `dadi` or `moments` then variable will be in `genetic` units
-    by default if othervise is not stated. If engine is something else (`momi2`)
-    then units are `physical` by default.
+    by default if othervise is not stated. If engine is something else
+    (`momi2`) then units are `physical` by default.
 
     If parameter label has `_phys` or `_gen` at the end then it is mark about
     the units. For example, engine is `dadi` but label is `nu_phys` that

gadma/code_generator/momi_generator.py

@@ -165,7 +165,7 @@ def print_data_reading(engine):
             ret_str = f"import gadma\n"
             ret_str += "data_holder = gadma.SFSDataHolder("
             ret_str += f"'{engine.data_holder.filename}')\n"
-            ret_str += "data = gadma.get_engine('momi')"\
+            ret_str += "data = gadma.get_engine('momi2')"\
                        ".read_data(data_holder)\n"
 
     if isinstance(engine.data_holder, VCFDataHolder):

tests/test_dem_model_structure.py

@@ -422,7 +422,7 @@ def build_model(init_struct, final_struct):
     def test_transform(self):
         for structure in BASE_TEST_STRUCTURES:
             for base_migs, base_sels, base_dom, base_dyns, base_symms, base_fracs, base_inbr in\
-                    list(itertools.product([False, True],repeat=6)):
+                    list(itertools.product([False, True],repeat=7)):
                 base_mig_masks = [None, self._generate_mig_mask(structure,
                                                                 base_symms)]
                 if len(structure) == 1 or not base_migs:
@@ -438,7 +438,7 @@ def test_transform(self):
                                                    frac_split=base_fracs,
                                                    has_inbr=base_inbr)
                     for new_migs, new_sels, new_dom, new_dyns, new_symms, new_fracs, new_inbr in\
-                            list(itertools.product([False, True],repeat=6)):
+                            list(itertools.product([False, True],repeat=7)):
                         new_mig_masks = [None, self._generate_mig_mask(
                             structure, new_symms)]
                         if len(structure) == 1 or not new_migs: