Merge branch 'new_models' into 'dev'

New models See merge request research/medaka!400
nanoporetech · May 1, 2020 · f87da1d · f87da1d
2 parents 2828a41 + b217e6d
commit f87da1d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 5 deletions.
diff --git a/medaka/common.py b/medaka/common.py
diff --git a/medaka/data/r103_min_high_g360_model.hdf5 b/medaka/data/r103_min_high_g360_model.hdf5
diff --git a/medaka/data/r103_prom_high_g360_model.hdf5 b/medaka/data/r103_prom_high_g360_model.hdf5
diff --git a/medaka/data/r941_min_fast_g344_model.hdf5 b/medaka/data/r941_min_fast_g344_model.hdf5
diff --git a/medaka/data/r941_min_high_g360_model.hdf5 b/medaka/data/r941_min_high_g360_model.hdf5
diff --git a/medaka/data/r941_prom_fast_g344_model.hdf5 b/medaka/data/r941_prom_fast_g344_model.hdf5
diff --git a/medaka/data/r941_prom_high_g360_model.hdf5 b/medaka/data/r941_prom_high_g360_model.hdf5
diff --git a/medaka/features.py b/medaka/features.py
diff --git a/medaka/options.py b/medaka/options.py
@@ -19,19 +19,21 @@
 
 current_models = [
     # r9 consensus
-    'r941_min_high_g330', 'r941_min_high_g344', 'r941_min_high_g351',
-    'r941_prom_high_g330', 'r941_prom_high_g344', 'r941_prom_high_g351',
+    'r941_min_high_g344', 'r941_min_high_g351', 'r941_min_high_g360',
+    'r941_prom_high_g344', 'r941_prom_high_g360',
     # rle consensus
     'r941_min_high_g340_rle',
     # r10 consensus
-    'r103_min_high_g345',
+    'r103_min_high_g345', 'r103_min_high_g360', 'r103_prom_high_g360',
     # snp and variant
     'r941_prom_snp_g322', 'r941_prom_variant_g322',
     'r103_prom_snp_g3210', 'r103_prom_variant_g3210']
 archived_models = [
     # r9 consensus
-    'r941_min_fast_g303', 'r941_min_high_g303',
-    'r941_prom_fast_g303', 'r941_prom_high_g303',
+    'r941_min_fast_g303', 'r941_min_fast_g344',
+    'r941_min_high_g303', 'r941_min_high_g330',
+    'r941_prom_fast_g303', 'r941_prom_fast_g344',
+    'r941_prom_high_g303', 'r941_prom_high_g330',
     # r10 consensus
     'r10_min_high_g303', 'r10_min_high_g340',
     # snp and variant