NHSDigital
diff --git a/‎codonPython/nhsNumberGenerator.py‎
Lines changed: 3 additions & 2 deletions b/‎codonPython/nhsNumberGenerator.py‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎codonPython/tests/nhsNumberGenerator_test.py‎
Lines changed: 22 additions & 1 deletion b/‎codonPython/tests/nhsNumberGenerator_test.py‎
Lines changed: 22 additions & 1 deletion
@@ -1,4 +1,5 @@
 import random
+import numpy as np
 
 
 def nhsNumberGenerator(to_generate: int, random_state: int = None)->list:
@@ -40,9 +41,9 @@ def nhsNumberGenerator(to_generate: int, random_state: int = None)->list:
         number = random.randint(100000000, 999999999)
         digits = [int(digit) for digit in str(number)]
         # Apply weighting to digits
-        weighted_digits = [(10 - index) * digit for (index, digit) in enumerate(digits)]
+        weighted_digits = np.dot(np.array(digits), np.arange(10,1,-1))
         # Validity is based on the check digit, which can't be 10   
-        remainder = sum(weighted_digits) % 11
+        remainder = weighted_digits % 11
         check_digit = 11 - remainder
         if check_digit == 10:
             continue
 
@@ -5,7 +5,28 @@
 
 
 @pytest.mark.parametrize("to_generate, random_state, expected", [
-    (3, 42, [7865793030, 2195408316, 1268550922]),
+    (20, 42, [
+        7865793030,
+        2195408316,
+        1268550922,
+        8962337908,
+        3953104853,
+        3629506283,
+        3396707117,
+        2498277064,
+        8907799466,
+        2100533533,
+        8266005397,
+        8952859324,
+        6855828612,
+        1933498560,
+        7340365060,
+        5530351107,
+        1341263967,
+        1319945236,
+        2006045024,
+        3347607384
+        ]),
     (2, 1, [2442725096, 7111780027])
 ])
 def test_nhsNumberGenerator_BAU(to_generate, random_state, expected):