refactoring
This commit is contained in:
@@ -45,7 +45,10 @@
|
||||
" }\n",
|
||||
"\n",
|
||||
"def readVaersDescrs(dataDir, years):\n",
|
||||
" return [readVaersDescr(dataDir, year) for year in years]\n"
|
||||
" return [readVaersDescr(dataDir, year) for year in years]\n",
|
||||
"\n",
|
||||
"def readAllVaersDescrs(dataDir):\n",
|
||||
" return readVaersDescrs(dataDir, [\"2021\", \"2022\"])"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -65,7 +68,7 @@
|
||||
" validate = 'one_to_many')\n",
|
||||
"\n",
|
||||
"def createDataFrameFromDescrs(vaersDescrs):\n",
|
||||
" dataFrames = map(createDataFrameFromDescr, vaersDescrs)\n",
|
||||
" dataFrames = [createDataFrameFromDescr(vaersDescr) for vaersDescr in vaersDescrs]\n",
|
||||
" return pd.concat(dataFrames)\n"
|
||||
]
|
||||
},
|
||||
@@ -85,8 +88,11 @@
|
||||
"def createAndFilterDataFrameFromDescrs(vaersDescrs, manufacturer, dose):\n",
|
||||
" return filterDataFrame(createDataFrameFromDescrs(vaersDescrs), manufacturer = manufacturer, dose = dose)\n",
|
||||
"\n",
|
||||
"def filterDataFrameForSevereEffects(df, dose):\n",
|
||||
" return filterDataFrame(df, dose = dose)\n",
|
||||
"\n",
|
||||
"def createDataFrameSevereEffectsFromDescrs(vaersDescrs, dose):\n",
|
||||
" return filterDataFrame(createDataFrameFromDescrs(vaersDescrs), dose = dose)"
|
||||
" return filterDataFrameForSevereEffects(createDataFrameFromDescrs(vaersDescrs), dose = dose)"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -97,10 +103,10 @@
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n",
|
||||
" return createAndFilterDataFrameFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), manufacturer, dose)\n",
|
||||
" return createAndFilterDataFrameFromDescrs(readAllVaersDescrs(dataDir), manufacturer, dose)\n",
|
||||
"\n",
|
||||
"def createDataFrameSevereEffectsFromFiles(dataDir, dose):\n",
|
||||
" return createDataFrameSevereEffectsFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), dose)"
|
||||
" return createDataFrameSevereEffectsFromDescrs(readAllVaersDescrs(dataDir), dose)"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user