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

refactoring

Browse Source
This commit is contained in:
frankknoll
2023-02-12 20:54:17 +01:00
parent 29786cc04a
commit f12519d1b8
4 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/HowBadIsMyBatch.ipynb
View File

@@ -18,7 +18,10 @@
"from DateProvider import DateProvider\n",
"from InternationalVaersCovid19Provider import getInternationalVaersCovid19, get_international_VAERSVAX_VAERSSYMPTOMS_Covid19\n",
"from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile\n",
"from BatchCodeTablePersister import createAndSaveBatchCodeTables"
"from BatchCodeTablePersister import createAndSaveBatchCodeTables\n",
"from SymptomByBatchcodeTableFactory import SymptomByBatchcodeTableFactory\n",
"from HistogramFactoryAndPersister import createAndSaveGlobalHistograms, createAndSaveHistogramsForCountries\n",
"from HtmlUtils import getCountries"
]
},
{
@@ -104,8 +107,6 @@
"metadata": {},
"outputs": [],
"source": [
"from SymptomByBatchcodeTableFactory import SymptomByBatchcodeTableFactory\n",
"\n",
"symptomByBatchcodeTable = SymptomByBatchcodeTableFactory.createSymptomByBatchcodeTable(international_VAERSVAX_Covid19, international_VAERSSYMPTOMS)\n",
"symptomByBatchcodeTable"
]
@@ -113,76 +114,21 @@
{
"cell_type": "code",
"execution_count": null,
"id": "5997ee59",
"id": "23731536",
"metadata": {},
"outputs": [],
"source": [
"isGlobal = False"
"createAndSaveGlobalHistograms(symptomByBatchcodeTable)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "9268d60d",
"id": "f8e42955",
"metadata": {},
"outputs": [],
"source": [
"from SymptomHistogramByBatchcodeTableFactory import SymptomHistogramByBatchcodeTableFactory\n",
"\n",
"symptomHistogramByBatchcodeTable = SymptomHistogramByBatchcodeTableFactory.createGlobalSymptomHistogramByBatchcodeTable(symptomByBatchcodeTable) if isGlobal else SymptomHistogramByBatchcodeTableFactory.createSymptomHistogramByBatchcodeTable(symptomByBatchcodeTable)\n",
"symptomHistogramByBatchcodeTable"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5170efad",
"metadata": {},
"outputs": [],
"source": [
"from HistogramTable2DictTableConverter import HistogramTable2DictTableConverter\n",
"\n",
"dictByBatchcodeTable = HistogramTable2DictTableConverter.convertGlobalHistogramTable2DictTable(symptomHistogramByBatchcodeTable) if isGlobal else HistogramTable2DictTableConverter.convertHistogramTable2DictTable(symptomHistogramByBatchcodeTable)\n",
"dictByBatchcodeTable"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "a57e0fd5",
"metadata": {},
"outputs": [],
"source": [
"from HtmlUtils import getCountries\n",
"from MultiIndexValuesProvider import MultiIndexValuesProvider\n",
"from HistogramDescriptionPersister import HistogramDescriptionPersister\n",
"import shutil\n",
"\n",
"if isGlobal:\n",
" batchcodes = MultiIndexValuesProvider.getValues(dictByBatchcodeTable.index)\n",
" batchcodes = {batchcode for batchcode in batchcodes if batchcode != 'nan'}\n",
" directory = f'../docs/data/histograms/Global'\n",
" shutil.rmtree(directory, ignore_errors = True)\n",
" histogramDescriptionPersister = HistogramDescriptionPersister(directory)\n",
" histogramDescriptionPersister.saveHistogramDescriptionsForBatchcodes(\n",
" batchcodes,\n",
" dictByBatchcodeTable,\n",
" progress = lambda count, size, batchcode: print(f'{count}/{size}: {batchcode}'))\n",
"else:\n",
" countries = getCountries(international_VAERSVAX_Covid19)\n",
" for count, country in enumerate(countries, start = 1):\n",
" # FK-TODO: use https://github.com/tqdm/tqdm\n",
" print(f'saving histograms for country {count}/{len(countries)}: {country}')\n",
" dictByBatchcodeTable4Country = dictByBatchcodeTable[dictByBatchcodeTable['COUNTRY'] == country]\n",
" batchcodes = MultiIndexValuesProvider.getValues(dictByBatchcodeTable4Country.index)\n",
" batchcodes = {batchcode for batchcode in batchcodes if batchcode != 'nan'}\n",
" directory = f'../docs/data/histograms/{country}'\n",
" shutil.rmtree(directory, ignore_errors = True)\n",
" histogramDescriptionPersister = HistogramDescriptionPersister(directory)\n",
" histogramDescriptionPersister.saveHistogramDescriptionsForBatchcodes(\n",
" batchcodes,\n",
" dictByBatchcodeTable4Country,\n",
" progress = lambda count, size, batchcode: print(f'{count}/{size}: {batchcode}'))"
"createAndSaveHistogramsForCountries(symptomByBatchcodeTable, getCountries(international_VAERSVAX_Covid19))"
]
},
{