Fix more test blowups

PyRoute/StatCalculation.py

@@ -236,6 +236,10 @@ def add_pop_to_sophont(self, stats, star):
             soph_code = sophont[0:4]
             soph_pct = sophont[4:]
 
+            if 1 < len(soph_pct) and '(' == soph_code[0]:
+                soph_code = sophont[0:6]
+                soph_pct = sophont[6:]
+
             if soph_pct == 'A':
                 default_soph = soph_code
                 continue

PyRoute/TradeCodes.py

@@ -132,7 +132,7 @@ def _preprocess_initial_codes(self, initial_codes):
             if 7 < len(raw) and '(' == raw[0] and ')' == raw[-2]:  # Let older-style sophont codes through
                 codes.append(raw)
                 continue
-            if 2 == len(raw):
+            if 2 == len(raw) and ('W' == raw[1] or raw[1].isdigit()):
                 if 'C' == raw[0]:  # Compact chirper population
                     pop = raw[1]
                     codes.append('Chir' + pop)

Tests/testDeltaReduce.py

@@ -317,7 +317,7 @@ def test_star_having_no_sector_attribute(self):
         delta[sector.name] = sector
 
         reducer = DeltaReduce(delta, args)
-        reducer.is_initial_state_uninteresting()
+        reducer.is_initial_state_uninteresting(reraise=True)
 
     def test_population_balance_over_two_sectors(self):
         args = self._make_args_no_line()
@@ -334,7 +334,7 @@ def test_population_balance_over_two_sectors(self):
         self.assertEqual(2, len(delta), "Should only be two sectors in dictionary")
 
         reducer = DeltaReduce(delta, args, args.interestingline, args.interestingtype)
-        reducer.is_initial_state_uninteresting()
+        reducer.is_initial_state_uninteresting(reraise=True)
 
     def test_pax_and_trade_balance_over_reft_sector(self):
         args = self._make_args_no_line()
@@ -345,7 +345,7 @@ def test_pax_and_trade_balance_over_reft_sector(self):
         delta[sector.name] = sector
 
         reducer = DeltaReduce(delta, args, args.interestingline, args.interestingtype)
-        reducer.is_initial_state_uninteresting()
+        reducer.is_initial_state_uninteresting(reraise=True)
 
     def _make_args(self):
         args = argparse.ArgumentParser(description='PyRoute input minimiser.')

Tests/testDeltaStar.py

@@ -137,7 +137,7 @@ def test_reduce_capitals(self):
             ("2123 Medurma              A9D7954-C An Cs Hi                             { 3 }  (G8E+1) [7C3A]      -  - 100 0  ImDv G0 V                                                     ",
              "2123 Medurma              A9D7954-C An Hi                                 { 3 }  (G8E+1) [7C3A]      -  - 100 0  ImDv G0 V                                                    "),
             ("2118 Capital              A586A98-F Hi Cx (Syleans)5                     { 4 }  (H9G+4) [AE5F] BEFG  NW - 605 15 ImSy G2 V           Xb:1916 Xb:2021 Xb:2115 Xb:2216 Xb:2218",
-             "2118 Capital              A586A98-F (Syleans)5 Hi                         { 4 }  (H9G+4) [AE5F] BEFG NW - 605 15 ImSy G2 V           Xb:1916 Xb:2021 Xb:2115 Xb:2216 Xb:2218  ")
+             "2118 Capital              A586A98-F (Syle)5 Hi                            { 4 }  (H9G+4) [AE5F] BEFG NW - 605 15 ImSy G2 V           Xb:1916 Xb:2021 Xb:2115 Xb:2216 Xb:2218  ")
         ]
 
         for chunk in check_list:

Tests/testDeltaStarReduction.py

@@ -24,7 +24,7 @@ def test_drop_trade_codes_on_existing(self):
     def test_reduce_routes_on_none(self):
         src = "0216 Ambemshan            A5457BC-B Ag Cp Pi Pz (Cassilldans) { 4 }  (D6E+5) [AB8E] BCDF NS A 913 10 ImDa M3 V M6 V"
 
-        exp = "0216 Ambemshan            A5457BC-B (Cassilldans) Ag Cp Pi Pz             { 4 }  (D6E+5) [AB8E] BCDF NS A 913 10 ImDa M3 V M6 V                                               "
+        exp = "0216 Ambemshan            A5457BC-B (Cass)W Ag Cp Pi Pz                   { 4 }  (D6E+5) [AB8E] BCDF NS A 913 10 ImDa M3 V M6 V                                               "
         actual = DeltaStar.reduce(src, drop_routes=True)
 
         self.assertEqual(exp, actual)
@@ -104,7 +104,7 @@ def test_canonicalisation_of_dagudashaag_1722(self):
 
     def test_canonicalisation_of_dagudashaag_2124(self):
         src = "2123 Medurma              A9D7954-C Hi An Cs Di(Miyavine) Asla1 S'mr0     { 3 }  (G8E+1) [7C3A] BEF  -  - 823 12 ImDv G0 V            Xb:1823 Xb:1926 Xb:2223 Xb:2225 Xb:2322"
-        exp = "2123 Medurma              A9D7954-C An Asla1 Cs Di(Miyavine) Hi S'mr0     { 3 }  (G8E+1) [7C3A] BEF  -  - 823 12 ImDv G0 V           Xb:1823 Xb:1926 Xb:2223 Xb:2225 Xb:2322  "
+        exp = "2123 Medurma              A9D7954-C (Miya)X An Asla1 Cs Hi S'mr0          { 3 }  (G8E+1) [7C3A] BEF  -  - 823 12 ImDv G0 V           Xb:1823 Xb:1926 Xb:2223 Xb:2225 Xb:2322  "
 
         actual = DeltaStar.reduce(src)
         self.assertEqual(exp, actual)

Tests/testTradeCode.py

@@ -243,6 +243,21 @@ def testVerifyCompactDroyneCodeProcessing(self):
                 self.assertEqual(1, len(code.sophont_list), "Compacted Droyne code should result in sophont")
                 self.assertEqual(expected, str(code))
 
+    def testSharedHomeworld(self):
+        line = 'Hi Pz (S\'mrii)7 (Kiakh\'iee)3 '
+        code = TradeCodes(line)
+        result, msg = code.is_well_formed()
+        self.assertTrue(result, msg)
+
+        self.assertEqual(2, len(code.sophont_list), "Shared homeworld should result in two sophont")
+        self.assertEqual(2, len(code.homeworld_list), "Shared homeworld should result in two homeworld entries")
+
+        expected_line = '(Kiak)3 (SXmr)7 Hi Pz'
+        self.assertEqual(expected_line, str(code), "Unexpected string representation")
+
+        nu_code = TradeCodes(str(code))
+        result, msg = nu_code.is_well_formed()
+        self.assertTrue(result, msg)
 
 if __name__ == "__main__":
     # import sys;sys.argv = ['', 'Test.testName']