francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refining CountriesMergerTest

Browse Source
This commit is contained in:
frankknoll
2023-03-31 12:40:05 +02:00
parent 0fa873e461
commit 85c5a0ee60
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CountriesMerger.py
View File

@@ -7,7 +7,7 @@ class CountriesMerger:
def mergeSrcIntoDst(src: pd.Series, dst: pd.Series): def mergeSrcIntoDst(src: pd.Series, dst: pd.Series):
def merge(series): def merge(series):
series = series.dropna() series = series.dropna()
return sorted(series[0].union(series[1:])) return sorted(set().union(*series))
return (pd return (pd
.merge(dst, src, how='left', left_index=True, right_index=True) .merge(dst, src, how='left', left_index=True, right_index=True)
.apply(merge, axis='columns')) .apply(merge, axis='columns'))

4
src/CountriesMergerTest.py
View File

@@ -8,8 +8,8 @@ class CountriesMergerTest(unittest.TestCase):
def test_mergeSrcIntoDst(self): def test_mergeSrcIntoDst(self):
# Given # Given
dstCountries = pd.Series({'NO72A': {'CountryA-1'}, 'EW096': {'CountryA-2'}}, name='dstCountries') dstCountries = pd.Series({'NO72A': ['CountryA-1'], 'EW096': ['CountryA-2']}, name='dstCountries')
srcCountries = pd.Series({'NO72A': 'CountryB-1', 'FS192': 'CountryB-2'}, name='srcCountries') srcCountries = pd.Series({'NO72A': ['CountryB-1'], 'FS192': ['CountryB-2']}, name='srcCountries')
# When # When
mergedCountries = CountriesMerger.mergeSrcIntoDst(src = srcCountries, dst = dstCountries) mergedCountries = CountriesMerger.mergeSrcIntoDst(src = srcCountries, dst = dstCountries)