regenerating global histograms

src/HistogramFactoryAndPersister.py

@@ -1,10 +1,14 @@
 from HistogramFactory import createGlobalHistograms, createHistograms
 from HistogramPersister import saveHistograms
+from MultiIndexExploder import MultiIndexExploder
+from HistogramDescriptionTableFactory import HistogramDescriptionTableFactory
 
 
 def createAndSaveGlobalHistograms(symptomByBatchcodeTable):
     dictByBatchcodeTable4Country = createGlobalHistograms(symptomByBatchcodeTable)
-    saveHistograms(dictByBatchcodeTable4Country, 'Global')
+    explodedTable = MultiIndexExploder.explodeMultiIndexOfTable(dictByBatchcodeTable4Country)
+    histogramDescriptionTable = HistogramDescriptionTableFactory.createHistogramDescriptionTable(explodedTable)
+    saveHistograms(histogramDescriptionTable, 'Global')
 
 
 def createAndSaveHistogramsForCountries(symptomByBatchcodeTable, countries):

src/HistogramPersister.py

@@ -1,13 +1,10 @@
-from MultiIndexValuesProvider import MultiIndexValuesProvider
-from HistogramDescriptionPersister import HistogramDescriptionPersister
 import shutil
+from IOUtils import IOUtils
 
-def saveHistograms(dictByBatchcodeTable4Country, country):
-    batchcodes = MultiIndexValuesProvider.getValues(dictByBatchcodeTable4Country.index)
-    batchcodes = {batchcode for batchcode in batchcodes if batchcode != 'nan'}
+def saveHistograms(histogramDescriptionTable, country):
     directory = f'../docs/data/histograms/{country}'
     shutil.rmtree(directory, ignore_errors = True)
-    HistogramDescriptionPersister(directory).saveHistogramDescriptionsForBatchcodes(
-        batchcodes,
-        dictByBatchcodeTable4Country,
-        progress = lambda count, size, batchcode: print(f'{count}/{size}: {batchcode}'))
+    for row in histogramDescriptionTable.itertuples():
+        batchcode = row.Index
+        histogramDescription = row.HISTOGRAM_DESCRIPTION
+        IOUtils.saveDictAsJson(histogramDescription, f'{directory}/{batchcode}.json')