From 80f9a1c57218b084f963f37545515687f770f6d9 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Fri, 10 May 2019 17:52:50 -0500
Subject: [PATCH] Fixed issue affecting systems with long polymers where
update_splines previously used float16 to obtain unique beads; now rounding
to nearest 1/10th nt
---
mrdna/segmentmodel.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/mrdna/segmentmodel.py b/mrdna/segmentmodel.py
index 9434d4b..cfacf7a 100644
--- a/mrdna/segmentmodel.py
+++ b/mrdna/segmentmodel.py
@@ -1811,12 +1811,10 @@ class SegmentModel(ArbdModel):
beads_contours = get_beads_and_contour_positions(s)
contours = [c for b,c in beads_contours]
- contours = np.array(contours, dtype=np.float16) # deliberately use low precision
- contours,ids1 = np.unique(contours, return_index=True)
+ contour_idx = np.array( np.array(contours)*s.num_nt * 10, dtype=np.int )
+ contour_idx,ids1 = np.unique(contour_idx, return_index=True)
beads_contours = [beads_contours[i] for i in ids1]
- assert( np.any( (contours[:-1] - contours[1:])**2 >= 1e-8 ) )
-
## TODO: keep closest beads beyond +-1.5 if there are fewer than 2 beads
tmp = []
dist = 1
--
GitLab