Merge pull request #84 from CardiacModelling/tweaks_to_message

Tweaks to message v2
CardiacModelling · Oct 9, 2024 · 7b511bb · 7b511bb
2 parents be00788 + 2950e9d
commit 7b511bb
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 112 deletions.
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ Congratulations!
 You landed at an altitude of 1309m.
   https://opentopomap.org/#marker=15/57.07019/-3.669487
 You are 31m from the nearest named hill top, "Ben Macdui",
-  ranked the 2d heighest in GB.
+  ranked the 2nd highest in GB.
   http://hillsummits.org.uk/htm_summit/518.htm
 ```
 

diff --git a/examples/fitting-with-nlopt.ipynb b/examples/fitting-with-nlopt.ipynb
diff --git a/examples/fitting-with-pints.ipynb b/examples/fitting-with-pints.ipynb
diff --git a/examples/fitting-with-scipy.ipynb b/examples/fitting-with-scipy.ipynb
diff --git a/nevis/_bng.py b/nevis/_bng.py
@@ -384,7 +384,7 @@ def by_name(name):
     @staticmethod
     def by_rank(rank):
         """
-        Return the hill with the given ``rank`` (rank 1 is heighest, then 2,
+        Return the hill with the given ``rank`` (rank 1 is highest, then 2,
         etc.).
         """
         if not Hill._hills:
@@ -428,11 +428,9 @@ def rank(self):
 
     @property
     def ranked(self):
-        s = str(self._rank)
-        if s[-1] in '123':
-            if not (self._rank > 10 and s[-2] == '1'):
-                return s + 'st' if s[-1] == '1' else s + 'd'
-        return s + 'th'
+        n = self._rank
+        return str(n) + {1: 'st', 2: 'nd', 3: 'rd'}.get(
+            4 if 10 <= n % 100 < 20 else n % 10, 'th')
 
     @property
     def summit(self):

diff --git a/nevis/_util.py b/nevis/_util.py
@@ -106,7 +106,7 @@ def print_result(x, y, z):
         else f'{round(distance / 1000, 1)}km'
     )
     print(f'You are {dm} from the nearest named hill top, "{hill.name}",')
-    print(f'  ranked the {hill.ranked} heighest in GB.')
+    print(f'  ranked the {hill.ranked} highest in GB.')
     photo = hill.photo()
     if photo:
         print('  ' + photo)