msasim 24.12.0__cp38-cp38-win_amd64.whl → 24.13.0__cp38-cp38-win_amd64.whl

msasim/sailfish.py

@@ -462,15 +462,16 @@ class Simulator:
     def set_replacement_model(
             self,
             model: _Sailfish.modelCode,
+            amino_model_file: pathlib.Path = None,
             model_parameters: List = None,
             gamma_parameters_alpha : float = 1.0,
-            gamma_parameters_catergories: int = 1,
+            gamma_parameters_categories: int = 1,
             invariant_sites_proportion: float = 0.0
         ) -> None:
         if not model:
             raise ValueError(f"please provide a substitution model from the the following list: {_Sailfish.modelCode}")
-        if int(gamma_parameters_catergories) != gamma_parameters_catergories:
-            raise ValueError(f"gamma_parameters_catergories has to be a positive int value: received value of {gamma_parameters_catergories}")
+        if int(gamma_parameters_categories) != gamma_parameters_categories:
+            raise ValueError(f"gamma_parameters_catergories has to be a positive int value: received value of {gamma_parameters_categories}")
         self._model_factory = _Sailfish.modelFactory(self._simProtocol._get_Sailfish_tree())
 
         self._model_factory.set_alphabet(self._alphabet)
@@ -478,6 +479,8 @@ class Simulator:
             if model_parameters:
                 raise ValueError(f"no model parameters are used in protein, recevied value of: {model_parameters}")
             self._model_factory.set_replacement_model(model)
+            if model == MODEL_CODES.CUSTOM and amino_model_file:
+                self._model_factory.set_amino_replacement_model_file(str(amino_model_file))
         else:
             if model == MODEL_CODES.NUCJC and model_parameters:
                 raise ValueError(f"no model parameters in JC model, recevied value of: {model_parameters}")
@@ -489,7 +492,7 @@ class Simulator:
             else:
                 self._model_factory.set_model_parameters(model_parameters)
 
-        self._model_factory.set_gamma_parameters(gamma_parameters_alpha, gamma_parameters_catergories)
+        self._model_factory.set_gamma_parameters(gamma_parameters_alpha, gamma_parameters_categories)
         self._model_factory.set_invariant_sites_proportion(invariant_sites_proportion)
         self._simulator.init_substitution_sim(self._model_factory)
 

{msasim-24.12.0.dist-info → msasim-24.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: msasim
-Version: 24.12.0
+Version: 24.13.0
 Summary: A fast MSA simulator
 Home-page: https://github.com/elyawy/Sailfish-backend
 Author: Elya Wygoda

msasim-24.13.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+_Sailfish.cp38-win_amd64.pyd,sha256=j3TOm4w4dJWi8gMk2GfNplIy_4XaJlXItFGij5MxETw,611840
+msasim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+msasim/sailfish.py,sha256=77kSpZ6ESwQhyePVcud_m5W3QlgrM5uqkp84YdxRyE4,26467
+msasim-24.13.0.dist-info/LICENSE,sha256=MgvumWWAhx44Y7XYvLMzqDUZv_Mn4nZLuC-EBl9E0l0,10483
+msasim-24.13.0.dist-info/METADATA,sha256=fbvNpvimJ7Dw6ttGJjiZI4jo8hPbfy2FByvam94LLxE,1522
+msasim-24.13.0.dist-info/WHEEL,sha256=rTcqimtzpX3smAWAhGmiRSWAxTY4PqYPNE-p4kscHDQ,99
+msasim-24.13.0.dist-info/top_level.txt,sha256=NS1ILx5V94Yyh_M7yDrrqbBPu1TL_zJuxhsI90YEJVY,17
+msasim-24.13.0.dist-info/RECORD,,

msasim-24.12.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-_Sailfish.cp38-win_amd64.pyd,sha256=zY0asthjGJK060sL8T0lttcx4DTpCb0aR3F0dftl0Gs,608768
-msasim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-msasim/sailfish.py,sha256=ElArIFObfW_1qc8no5Q0DKqTDwuF15lFibEVV0wUqzM,26261
-msasim-24.12.0.dist-info/LICENSE,sha256=MgvumWWAhx44Y7XYvLMzqDUZv_Mn4nZLuC-EBl9E0l0,10483
-msasim-24.12.0.dist-info/METADATA,sha256=95EV7J2PoOQ0yavAR20_fSxzndd82B_mzi04tAfOtrA,1522
-msasim-24.12.0.dist-info/WHEEL,sha256=rTcqimtzpX3smAWAhGmiRSWAxTY4PqYPNE-p4kscHDQ,99
-msasim-24.12.0.dist-info/top_level.txt,sha256=NS1ILx5V94Yyh_M7yDrrqbBPu1TL_zJuxhsI90YEJVY,17
-msasim-24.12.0.dist-info/RECORD,,