Merge pull request #1906 from petrelharp/print_rates

g not f, closes #1905
tskit-dev · Nov 12, 2021 · 813f6c5 · 813f6c5
2 parents cdc5d99 + cb0ab60
commit 813f6c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/msprime/intervals.py b/msprime/intervals.py
@@ -337,7 +337,7 @@ def format_row(left, right, mid, span, rate):
                 f"{right:.10g}",
                 f"{mid:.10g}",
                 f"{span:.10g}",
-                f"{rate:.2f}",
+                f"{rate:.2g}",
             ]
 
         def format_slice(start, end):

diff --git a/tests/test_intervals.py b/tests/test_intervals.py
@@ -328,11 +328,22 @@ def test_str(self):
         ┌──────────────────────────────────┐
         │left  │right  │  mid│  span│  rate│
         ├──────────────────────────────────┤
-        │0     │10     │    5│    10│  0.10│
+        │0     │10     │    5│    10│   0.1│
         └──────────────────────────────────┘
         """
         assert textwrap.dedent(s) == str(rate_map)
 
+    def test_str_scinot(self):
+        rate_map = msprime.RateMap(position=[0, 10], rate=[0.000001])
+        s = """
+        ┌───────────────────────────────────┐
+        │left  │right  │  mid│  span│   rate│
+        ├───────────────────────────────────┤
+        │0     │10     │    5│    10│  1e-06│
+        └───────────────────────────────────┘
+        """
+        assert textwrap.dedent(s) == str(rate_map)
+
     def test_repr(self):
         rate_map = msprime.RateMap(position=[0, 10], rate=[0.1])
         s = "RateMap(position=array([ 0., 10.]), rate=array([0.1]))"