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 22:05:46 +02:00
parent f96ef3d91d
commit 0f05b5aed8
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/BarChartDescriptionTables.py
View File

@@ -6,10 +6,9 @@ class BarChartDescriptionTables:
@staticmethod @staticmethod
def filterValidJensenShannonDistances(barChartDescriptionTable): def filterValidJensenShannonDistances(barChartDescriptionTable):
return barChartDescriptionTable[barChartDescriptionTable.apply( return BarChartDescriptionTables._filter(
lambda barChartDescription: BarChartDescriptionTables._isValidJensenShannonDistance( barChartDescriptionTable,
barChartDescription['BAR_CHART_DESCRIPTION']), BarChartDescriptionTables._isValidJensenShannonDistance)
axis='columns')]
@staticmethod @staticmethod
def _isValidJensenShannonDistance(barChartDescription): def _isValidJensenShannonDistance(barChartDescription):
@@ -18,11 +17,10 @@ class BarChartDescriptionTables:
@staticmethod @staticmethod
def filterHasMinSizeOfGuessedHistogram(barChartDescriptionTable, minSizeOfGuessedHistogram): def filterHasMinSizeOfGuessedHistogram(barChartDescriptionTable, minSizeOfGuessedHistogram):
return barChartDescriptionTable[ return BarChartDescriptionTables._filter(
barChartDescriptionTable.apply( barChartDescriptionTable,
lambda barChartDescription: BarChartDescriptionTables._hasMinSizeOfGuessedHistogram( lambda barChartDescription:
barChartDescription['BAR_CHART_DESCRIPTION'], minSizeOfGuessedHistogram), BarChartDescriptionTables._hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram))
axis='columns')]
@staticmethod @staticmethod
def _hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram): def _hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram):
@@ -32,13 +30,19 @@ class BarChartDescriptionTables:
@staticmethod @staticmethod
def filterHasCountryWithGuessedGreaterThanKnown(barChartDescriptionTable): def filterHasCountryWithGuessedGreaterThanKnown(barChartDescriptionTable):
return barChartDescriptionTable[barChartDescriptionTable.apply( return BarChartDescriptionTables._filter(
lambda barChartDescription:BarChartDescriptionTables._hasCountryWithGuessedGreaterThanKnown( barChartDescriptionTable,
barChartDescription['BAR_CHART_DESCRIPTION']), BarChartDescriptionTables._hasCountryWithGuessedGreaterThanKnown)
axis='columns')]
@staticmethod @staticmethod
def _hasCountryWithGuessedGreaterThanKnown(barChartDescription): def _hasCountryWithGuessedGreaterThanKnown(barChartDescription):
guessedBarChart = barChartDescription['Adverse Reaction Reports guessed'] guessedBarChart = barChartDescription['Adverse Reaction Reports guessed']
knownBarChart = barChartDescription['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))
@staticmethod
def _filter(barChartDescriptionTable, predicate):
return barChartDescriptionTable[barChartDescriptionTable.apply(
lambda barChartDescription: predicate(
barChartDescription['BAR_CHART_DESCRIPTION']),
axis='columns')]