phylogenie 2.0.8__tar.gz → 2.0.9__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.
Files changed (27) hide show
  1. {phylogenie-2.0.8 → phylogenie-2.0.9}/PKG-INFO +1 -1
  2. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/dataset.py +8 -6
  3. {phylogenie-2.0.8 → phylogenie-2.0.9}/pyproject.toml +1 -1
  4. {phylogenie-2.0.8 → phylogenie-2.0.9}/LICENSE.txt +0 -0
  5. {phylogenie-2.0.8 → phylogenie-2.0.9}/README.md +0 -0
  6. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/__init__.py +0 -0
  7. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/__init__.py +0 -0
  8. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/alisim.py +0 -0
  9. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/configs.py +0 -0
  10. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/factories.py +0 -0
  11. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/trees.py +0 -0
  12. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/generators/typeguards.py +0 -0
  13. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/io.py +0 -0
  14. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/main.py +0 -0
  15. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/msa.py +0 -0
  16. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/py.typed +0 -0
  17. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/skyline/__init__.py +0 -0
  18. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/skyline/matrix.py +0 -0
  19. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/skyline/parameter.py +0 -0
  20. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/skyline/vector.py +0 -0
  21. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/tree.py +0 -0
  22. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/treesimulator/__init__.py +0 -0
  23. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/treesimulator/events.py +0 -0
  24. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/treesimulator/gillespie.py +0 -0
  25. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/treesimulator/model.py +0 -0
  26. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/typeguards.py +0 -0
  27. {phylogenie-2.0.8 → phylogenie-2.0.9}/phylogenie/typings.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: phylogenie
3
- Version: 2.0.8
3
+ Version: 2.0.9
4
4
  Summary: Generate phylogenetic datasets with minimal setup effort
5
5
  Author: Gabriele Marino
6
6
  Author-email: gabmarino.8601@gmail.com
@@ -41,19 +41,21 @@ class DatasetGenerator(ABC, cfg.StrictBaseModel):
41
41
  self._generate_one(filename=filename, rng=default_rng(seed), data=data)
42
42
 
43
43
  def _generate(self, rng: Generator, n_samples: int, output_dir: str) -> None:
44
- data_dir = os.path.join(output_dir, DATA_DIRNAME)
45
- if os.path.exists(data_dir):
46
- print(f"Output directory {data_dir} already exists. Skipping.")
47
- return
48
- os.makedirs(data_dir)
49
-
50
44
  data: list[dict[str, Any]] = [{} for _ in range(n_samples)]
51
45
  if self.context is not None:
46
+ data_dir = os.path.join(output_dir, DATA_DIRNAME)
52
47
  for d, (k, v) in product(data, self.context.items()):
53
48
  args = v.model_extra if v.model_extra is not None else {}
54
49
  d[k] = np.array(getattr(rng, v.type)(**args)).tolist()
55
50
  df = pd.DataFrame([{"file_id": str(i), **d} for i, d in enumerate(data)])
56
51
  df.to_csv(os.path.join(output_dir, METADATA_FILENAME), index=False)
52
+ else:
53
+ data_dir = output_dir
54
+
55
+ if os.path.exists(data_dir):
56
+ print(f"Output directory {data_dir} already exists. Skipping.")
57
+ return
58
+ os.makedirs(data_dir)
57
59
 
58
60
  joblib.Parallel(n_jobs=self.n_jobs)(
59
61
  joblib.delayed(self.generate_one)(
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "phylogenie"
3
- version = "2.0.8"
3
+ version = "2.0.9"
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
File without changes
File without changes