Flatten dir, removing forward_backward

szhan · Apr 19, 2024 · ae28e88 · ae28e88
1 parent ee017b4
commit ae28e88
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git 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 → lshmm/fb_diploid.py b/lshmm/forward_backward/fb_diploid.py → lshmm/fb_diploid.py
diff --git a/lshmm/forward_backward/fb_haploid.py → lshmm/fb_haploid.py b/lshmm/forward_backward/fb_haploid.py → lshmm/fb_haploid.py
diff --git a/lshmm/forward_backward/__init__.py b/lshmm/forward_backward/__init__.py
diff --git 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
@@ -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
@@ -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