refactoring

This commit is contained in:
frankknoll
2023-02-16 15:52:34 +01:00
parent 03ba89bcd5
commit 54ddc3e47f

View File

@@ -1,14 +1,12 @@
from HistogramFactory import createGlobalHistograms, createHistograms from HistogramFactory import createHistograms
from HistogramPersister import saveHistograms from HistogramPersister import saveHistograms
from MultiIndexExploder import MultiIndexExploder from MultiIndexExploder import MultiIndexExploder
from HistogramDescriptionTableFactory import HistogramDescriptionTableFactory from HistogramDescriptionTableFactory import HistogramDescriptionTableFactory
def createAndSaveGlobalHistograms(symptomByBatchcodeTable): def createAndSaveGlobalHistograms(symptomByBatchcodeTable):
dictByBatchcodeTable4Country = createGlobalHistograms(symptomByBatchcodeTable) symptomByBatchcodeTable = symptomByBatchcodeTable.assign(COUNTRY = 'Global')
explodedTable = MultiIndexExploder.explodeMultiIndexOfTable(dictByBatchcodeTable4Country) createAndSaveHistogramsForCountries(symptomByBatchcodeTable)
histogramDescriptionTable = HistogramDescriptionTableFactory.createHistogramDescriptionTable(explodedTable)
saveHistograms(histogramDescriptionTable, 'Global')
def createAndSaveHistogramsForCountries(symptomByBatchcodeTable): def createAndSaveHistogramsForCountries(symptomByBatchcodeTable):
@@ -16,5 +14,5 @@ def createAndSaveHistogramsForCountries(symptomByBatchcodeTable):
explodedTable = MultiIndexExploder.explodeMultiIndexOfTable(dictByBatchcodeTable) explodedTable = MultiIndexExploder.explodeMultiIndexOfTable(dictByBatchcodeTable)
histogramDescriptionTable = HistogramDescriptionTableFactory.createHistogramDescriptionTable(explodedTable) histogramDescriptionTable = HistogramDescriptionTableFactory.createHistogramDescriptionTable(explodedTable)
for country, histogramDescriptionTableForCountry in histogramDescriptionTable.groupby('COUNTRY'): for country, histogramDescriptionTableForCountry in histogramDescriptionTable.groupby('COUNTRY'):
print(country) print(f'saving histograms for {country}')
saveHistograms(histogramDescriptionTableForCountry, country) saveHistograms(histogramDescriptionTableForCountry, country)