refactoring
This commit is contained in:
@@ -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)
|
||||||
Reference in New Issue
Block a user