From f96ef3d91d946cddbd49ec60737487f67301c6b8 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Sat, 26 Aug 2023 21:55:45 +0200
Subject: [PATCH] refactoring

---
 src/BarChartDescriptionTables.py | 21 ++++++++++++++-------
 src/help.txt                     |  2 --
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/BarChartDescriptionTables.py b/src/BarChartDescriptionTables.py
index 068b451c8f9..d96950ed11e 100644
--- a/src/BarChartDescriptionTables.py
+++ b/src/BarChartDescriptionTables.py
@@ -6,11 +6,14 @@ class BarChartDescriptionTables:
 
     @staticmethod
     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
     def _isValidJensenShannonDistance(barChartDescription):
-        jensenShannonDistance = barChartDescription['BAR_CHART_DESCRIPTION']['Jensen-Shannon distance']
+        jensenShannonDistance = barChartDescription['Jensen-Shannon distance']
         return not math.isnan(jensenShannonDistance)
 
     @staticmethod
@@ -18,20 +21,24 @@ class BarChartDescriptionTables:
         return barChartDescriptionTable[
             barChartDescriptionTable.apply(
                 lambda barChartDescription: BarChartDescriptionTables._hasMinSizeOfGuessedHistogram(
-                    barChartDescription, minSizeOfGuessedHistogram),
+                    barChartDescription['BAR_CHART_DESCRIPTION'], minSizeOfGuessedHistogram),
                 axis='columns')]
 
     @staticmethod
     def _hasMinSizeOfGuessedHistogram(barChartDescription, minSizeOfGuessedHistogram):
-        sizeOfGuessedHistogram = sum(barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports guessed'])
+        sizeOfGuessedHistogram = sum(
+            barChartDescription['Adverse Reaction Reports guessed'])
         return sizeOfGuessedHistogram >= minSizeOfGuessedHistogram
 
     @staticmethod
     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
     def _hasCountryWithGuessedGreaterThanKnown(barChartDescription):
-        guessedBarChart = barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports guessed']
-        knownBarChart = barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports known']
+        guessedBarChart = barChartDescription['Adverse Reaction Reports guessed']
+        knownBarChart = barChartDescription['Adverse Reaction Reports known']
         return np.any(np.asarray(guessedBarChart) > np.asarray(knownBarChart))
diff --git a/src/help.txt b/src/help.txt
index 3d525a6af63..d06173d2974 100644
--- a/src/help.txt
+++ b/src/help.txt
@@ -5,8 +5,6 @@ FK-FIXME:
 FK-TODO:
 - add google captcha to batchCodeTable.html
 - Symptomhistogramm
-- Filter für ein Barchart:
-  - im Barchart gibt es mindestens ein Country mit Guessed > Known
 
 anacron job:
 sudo cp src/intensivstationen_howbadismybatch.sh /etc/cron.daily/intensivstationen_howbadismybatch