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-08-26 21:55:45 +02:00
parent cb00dcb8d6
commit f96ef3d91d
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/BarChartDescriptionTables.py
View File

@@ -6,11 +6,14 @@ class BarChartDescriptionTables:
@staticmethod @staticmethod
def filterValidJensenShannonDistances(barChartDescriptionTable): def filterValidJensenShannonDistances(barChartDescriptionTable):
return barChartDescriptionTable[barChartDescriptionTable.apply(BarChartDescriptionTables._isValidJensenShannonDistance, axis='columns')] return barChartDescriptionTable[barChartDescriptionTable.apply(
lambda barChartDescription: BarChartDescriptionTables._isValidJensenShannonDistance(
barChartDescription['BAR_CHART_DESCRIPTION']),
axis='columns')]
@staticmethod @staticmethod
def _isValidJensenShannonDistance(barChartDescription): def _isValidJensenShannonDistance(barChartDescription):
jensenShannonDistance = barChartDescription['BAR_CHART_DESCRIPTION']['Jensen-Shannon distance'] jensenShannonDistance = barChartDescription['Jensen-Shannon distance']
return not math.isnan(jensenShannonDistance) return not math.isnan(jensenShannonDistance)
@staticmethod @staticmethod
@@ -18,20 +21,24 @@ class BarChartDescriptionTables:
return barChartDescriptionTable[ return barChartDescriptionTable[
barChartDescriptionTable.apply( barChartDescriptionTable.apply(
lambda barChartDescription: BarChartDescriptionTables._hasMinSizeOfGuessedHistogram( lambda barChartDescription: BarChartDescriptionTables._hasMinSizeOfGuessedHistogram(
barChartDescription, minSizeOfGuessedHistogram), barChartDescription['BAR_CHART_DESCRIPTION'], minSizeOfGuessedHistogram),
axis='columns')] axis='columns')]
@staticmethod @staticmethod
def _hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram): def _hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram):
sizeOfGuessedHistogram = sum(barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports guessed']) sizeOfGuessedHistogram = sum(
barChartDescription['Adverse Reaction Reports guessed'])
return sizeOfGuessedHistogram >= minSizeOfGuessedHistogram return sizeOfGuessedHistogram >= minSizeOfGuessedHistogram
@staticmethod @staticmethod
def filterHasCountryWithGuessedGreaterThanKnown(barChartDescriptionTable): def filterHasCountryWithGuessedGreaterThanKnown(barChartDescriptionTable):
return barChartDescriptionTable[barChartDescriptionTable.apply(BarChartDescriptionTables._hasCountryWithGuessedGreaterThanKnown, axis='columns')] return barChartDescriptionTable[barChartDescriptionTable.apply(
lambda barChartDescription:BarChartDescriptionTables._hasCountryWithGuessedGreaterThanKnown(
barChartDescription['BAR_CHART_DESCRIPTION']),
axis='columns')]
@staticmethod @staticmethod
def _hasCountryWithGuessedGreaterThanKnown(barChartDescription): def _hasCountryWithGuessedGreaterThanKnown(barChartDescription):
guessedBarChart = barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports guessed'] guessedBarChart = barChartDescription['Adverse Reaction Reports guessed']
knownBarChart = barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports known'] knownBarChart = barChartDescription['Adverse Reaction Reports known']
return np.any(np.asarray(guessedBarChart) > np.asarray(knownBarChart)) return np.any(np.asarray(guessedBarChart) > np.asarray(knownBarChart))

2
src/help.txt
View File

@@ -5,8 +5,6 @@ FK-FIXME:
FK-TODO: FK-TODO:
- add google captcha to batchCodeTable.html - add google captcha to batchCodeTable.html
- Symptomhistogramm - Symptomhistogramm
- Filter für ein Barchart:
- im Barchart gibt es mindestens ein Country mit Guessed > Known
anacron job: anacron job:
sudo cp src/intensivstationen_howbadismybatch.sh /etc/cron.daily/intensivstationen_howbadismybatch sudo cp src/intensivstationen_howbadismybatch.sh /etc/cron.daily/intensivstationen_howbadismybatch