phylogenie 2.0.12__tar.gz → 2.0.14__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of phylogenie might be problematic. Click here for more details.

Files changed (27) hide show
  1. {phylogenie-2.0.12 → phylogenie-2.0.14}/PKG-INFO +1 -1
  2. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/__init__.py +6 -0
  3. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/__init__.py +8 -0
  4. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/treesimulator/gillespie.py +4 -2
  5. {phylogenie-2.0.12 → phylogenie-2.0.14}/pyproject.toml +1 -1
  6. {phylogenie-2.0.12 → phylogenie-2.0.14}/LICENSE.txt +0 -0
  7. {phylogenie-2.0.12 → phylogenie-2.0.14}/README.md +0 -0
  8. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/alisim.py +0 -0
  9. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/configs.py +0 -0
  10. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/dataset.py +0 -0
  11. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/factories.py +0 -0
  12. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/trees.py +0 -0
  13. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/generators/typeguards.py +0 -0
  14. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/io.py +0 -0
  15. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/main.py +0 -0
  16. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/msa.py +0 -0
  17. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/py.typed +0 -0
  18. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/skyline/__init__.py +0 -0
  19. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/skyline/matrix.py +0 -0
  20. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/skyline/parameter.py +0 -0
  21. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/skyline/vector.py +0 -0
  22. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/tree.py +0 -0
  23. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/treesimulator/__init__.py +0 -0
  24. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/treesimulator/events.py +0 -0
  25. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/treesimulator/model.py +0 -0
  26. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/typeguards.py +0 -0
  27. {phylogenie-2.0.12 → phylogenie-2.0.14}/phylogenie/typings.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: phylogenie
3
- Version: 2.0.12
3
+ Version: 2.0.14
4
4
  Summary: Generate phylogenetic datasets with minimal setup effort
5
5
  Author: Gabriele Marino
6
6
  Author-email: gabmarino.8601@gmail.com
@@ -8,6 +8,9 @@ from phylogenie.generators import (
8
8
  DatasetGeneratorConfig,
9
9
  EpidemiologicalTreeDatasetGenerator,
10
10
  FBDTreeDatasetGenerator,
11
+ SkylineMatrixModel,
12
+ SkylineParameterModel,
13
+ SkylineVectorModel,
11
14
  TreeDatasetGeneratorConfig,
12
15
  )
13
16
  from phylogenie.io import load_fasta, load_newick
@@ -48,13 +51,16 @@ __all__ = [
48
51
  "FBDTreeDatasetGenerator",
49
52
  "SkylineMatrix",
50
53
  "SkylineMatrixCoercible",
54
+ "SkylineMatrixModel",
51
55
  "skyline_matrix",
52
56
  "SkylineParameter",
53
57
  "SkylineParameterLike",
58
+ "SkylineParameterModel",
54
59
  "skyline_parameter",
55
60
  "SkylineVector",
56
61
  "SkylineVectorCoercible",
57
62
  "SkylineVectorLike",
63
+ "SkylineVectorModel",
58
64
  "skyline_vector",
59
65
  "Tree",
60
66
  "TreeDatasetGeneratorConfig",
@@ -3,6 +3,11 @@ from typing import Annotated
3
3
  from pydantic import Field
4
4
 
5
5
  from phylogenie.generators.alisim import AliSimDatasetGenerator
6
+ from phylogenie.generators.configs import (
7
+ SkylineMatrixModel,
8
+ SkylineParameterModel,
9
+ SkylineVectorModel,
10
+ )
6
11
  from phylogenie.generators.dataset import DatasetGenerator
7
12
  from phylogenie.generators.trees import (
8
13
  BDEITreeDatasetGenerator,
@@ -29,4 +34,7 @@ __all__ = [
29
34
  "BDTreeDatasetGenerator",
30
35
  "BDEITreeDatasetGenerator",
31
36
  "BDSSTreeDatasetGenerator",
37
+ "SkylineMatrixModel",
38
+ "SkylineParameterModel",
39
+ "SkylineVectorModel",
32
40
  ]
@@ -60,9 +60,11 @@ def simulate_tree(
60
60
  if not any(rates):
61
61
  break
62
62
 
63
- current_time += rng.exponential(1 / sum(rates))
64
- if current_time >= max_time:
63
+ time_step = rng.exponential(1 / sum(rates))
64
+ if current_time + time_step >= max_time:
65
+ current_time = max_time
65
66
  break
67
+ current_time += time_step
66
68
 
67
69
  if current_time >= next_change_time:
68
70
  current_time = next_change_time
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "phylogenie"
3
- version = "2.0.12"
3
+ version = "2.0.14"
4
4
  description = "Generate phylogenetic datasets with minimal setup effort"
5
5
  authors = ["Gabriele Marino <gabmarino.8601@gmail.com>"]
6
6
  readme = "README.md"
File without changes
File without changes