From ae28e882f6190f72b665607ea11ca38f6d8da0d4 Mon Sep 17 00:00:00 2001 From: szhan Date: Fri, 19 Apr 2024 11:32:16 +0100 Subject: [PATCH] Flatten dir, removing forward_backward --- lshmm/api.py | 10 ++++++++-- lshmm/{forward_backward => }/fb_diploid.py | 0 lshmm/{forward_backward => }/fb_haploid.py | 0 lshmm/forward_backward/__init__.py | 0 tests/test_API.py | 4 ++-- tests/test_API_multiallelic.py | 4 ++-- tests/test_LS_haploid_diploid.py | 4 ++-- 7 files changed, 14 insertions(+), 8 deletions(-) rename lshmm/{forward_backward => }/fb_diploid.py (100%) rename lshmm/{forward_backward => }/fb_haploid.py (100%) delete mode 100644 lshmm/forward_backward/__init__.py diff --git a/lshmm/api.py b/lshmm/api.py index 9fe1692..f6e7946 100644 --- a/lshmm/api.py +++ b/lshmm/api.py @@ -5,8 +5,14 @@ import numpy as np from . import core -from .forward_backward.fb_diploid import backward_ls_dip_loop, forward_ls_dip_loop -from .forward_backward.fb_haploid import backwards_ls_hap, forwards_ls_hap +from .fb_diploid import ( + backward_ls_dip_loop, + forward_ls_dip_loop, +) +from .fb_haploid import ( + backwards_ls_hap, + forwards_ls_hap, +) from .vit_diploid import ( backwards_viterbi_dip, forwards_viterbi_dip_low_mem, diff --git a/lshmm/forward_backward/fb_diploid.py b/lshmm/fb_diploid.py similarity index 100% rename from lshmm/forward_backward/fb_diploid.py rename to lshmm/fb_diploid.py diff --git a/lshmm/forward_backward/fb_haploid.py b/lshmm/fb_haploid.py similarity index 100% rename from lshmm/forward_backward/fb_haploid.py rename to lshmm/fb_haploid.py diff --git a/lshmm/forward_backward/__init__.py b/lshmm/forward_backward/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_API.py b/tests/test_API.py index 6b869ab..8a10979 100644 --- a/tests/test_API.py +++ b/tests/test_API.py @@ -8,8 +8,8 @@ import lshmm as ls import lshmm.core as core -import lshmm.forward_backward.fb_diploid as fbd -import lshmm.forward_backward.fb_haploid as fbh +import lshmm.fb_diploid as fbd +import lshmm.fb_haploid as fbh import lshmm.vit_diploid as vd import lshmm.vit_haploid as vh diff --git a/tests/test_API_multiallelic.py b/tests/test_API_multiallelic.py index 1add27e..31cf671 100644 --- a/tests/test_API_multiallelic.py +++ b/tests/test_API_multiallelic.py @@ -7,8 +7,8 @@ import lshmm as ls import lshmm.core as core -import lshmm.forward_backward.fb_diploid as fbd -import lshmm.forward_backward.fb_haploid as fbh +import lshmm.fb_diploid as fbd +import lshmm.fb_haploid as fbh import lshmm.vit_diploid as vd import lshmm.vit_haploid as vh diff --git a/tests/test_LS_haploid_diploid.py b/tests/test_LS_haploid_diploid.py index ae4ee9a..a83943a 100644 --- a/tests/test_LS_haploid_diploid.py +++ b/tests/test_LS_haploid_diploid.py @@ -8,8 +8,8 @@ import tskit import lshmm.core as core -import lshmm.forward_backward.fb_diploid as fbd -import lshmm.forward_backward.fb_haploid as fbh +import lshmm.fb_diploid as fbd +import lshmm.fb_haploid as fbh import lshmm.vit_diploid as vd import lshmm.vit_haploid as vh