Merge branch 'zopaUK-update-to-v3.7'

pauldambra · Feb 11, 2016 · 9b51950 · 9b51950
2 parents d00762b + 1f230c5
commit 9b51950
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Build/.semver b/Build/.semver
@@ -1,4 +1,4 @@
 :major: 1
-:minor: 1
+:minor: 2
 :patch: 0
 :special: ""
diff --git a/ModulusChecking/Resources/valacdos.txt b/ModulusChecking/Resources/valacdos.txt
@@ -86,6 +86,7 @@
 165901 166001 MOD11    0    0    6    5    4    3    2    7    6    5    4    3    2    1
 166050 167600 MOD11    0    0    6    5    4    3    2    7    6    5    4    3    2    1
 168600 168600 MOD11    0    0    0    0    0    0    2    7    6    5    4    3    2    1
+170000 179499 MOD11    0    0    4    2    7    9    2    7    6    5    4    3    2    1
 180002 180002 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1  14
 180005 180005 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1  14
 180009 180009 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1  14
@@ -208,6 +209,7 @@
 232939 232939 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
 233080 233080 MOD11    0    0    0    0    0    0    0    7    6    5    4    3    2    1
 233080 233080 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
+233142 233142 MOD10    2    1    2    1    2    1   30   36   24   20   16   12    8    4
 233171 233171 MOD11    0    0    0    0    0    0    0    7    6    5    4    3    2    1
 233171 233171 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
 233188 233188 MOD11    0    0    0    0    0    0    0    7    6    5    4    3    2    1
@@ -864,6 +866,7 @@
 600901 601360 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1
 601403 608028 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1
 608301 608301 MOD10    0    0    0    0    0    0    7    1    3    7    1    3    7    1
+608316 608316 MOD10    0    0    0    0    0    0    8    7    6    5    4    3    2    1
 609593 609593 MOD10    0    0    0    0    0    0    7    1    3    7    1    3    7    1
 609599 609599 MOD10    0    0    0    0    0    0    0    5    7    5    2    1    2    1
 640001 640001 MOD11    0    0    0    0    0    0    8    7    6    5    4    3    2    1
@@ -986,4 +989,4 @@
 983003 987000 MOD11    0    0    0    0    0    0    7    6    5    4    3    2    1    0
 983003 987000 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
 987004 989999 MOD11    0    0    0    0    0    0    7    6    5    4    3    2    1    0
-987004 989999 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
+987004 989999 DBLAL    2    1    2    1    2    1    2    1    2    1    2    1    2    1
diff --git a/ModulusCheckingTests/Loaders/ModulusWeightTests.cs b/ModulusCheckingTests/Loaders/ModulusWeightTests.cs
@@ -19,15 +19,15 @@ public void CanReadWeightFileResource()
         public void CanLoadWeightFileRows()
         {
             var modulusWeight = ModulusWeightTable.GetInstance;
-            Assert.AreEqual(989, modulusWeight.RuleMappings.Count());
+            Assert.AreEqual(992, modulusWeight.RuleMappings.Count());
         }   
 
         [Test]
         public void CanGetRuleMappings()
         {
             var modulusWeight = ModulusWeightTable.GetInstance;
             Assert.NotNull(modulusWeight.RuleMappings);
-            Assert.AreEqual(989, modulusWeight.RuleMappings.Count);
+            Assert.AreEqual(992, modulusWeight.RuleMappings.Count);
             Assert.IsInstanceOf<ModulusWeightMapping>(modulusWeight.RuleMappings.ElementAt(0));
         }
 

diff --git a/README.md b/README.md
@@ -39,4 +39,4 @@ NB the resource text files valacdos.txt and scsubtab.txt are produced and releas
 
 #### Vocalink Version
 
-Currently uses v3.3 of Vocalink Modulus Checking copied from their site on 2015-08-07
+Currently uses v3.7 of Vocalink Modulus Checking copied from their site on 2016-02-04