refactoring

2023-08-23 21:44:16 +02:00
parent 3e1c59a697
commit 76e0f6ac80
1 changed files with 12 additions and 11 deletions
--- a/src/JensenShannonDistance2BarChartDescriptionColumnAdder.py
+++ b/src/JensenShannonDistance2BarChartDescriptionColumnAdder.py
@@ -5,15 +5,16 @@ class JensenShannonDistance2BarChartDescriptionColumnAdder:

    @staticmethod
    def addJensenShannonDistance2BarChartDescriptionColumn(barChartDescriptionTable):
-        barChartDescriptionTable['BAR_CHART_DESCRIPTION'] = (
-            barChartDescriptionTable.apply(
-                lambda barChartDescription:
-                    {
-                        **barChartDescription['BAR_CHART_DESCRIPTION'],
-                        'Jensen-Shannon distance': distance.jensenshannon(
-                            barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports guessed'],
-                            barChartDescription['BAR_CHART_DESCRIPTION']['Adverse Reaction Reports known'],
-                            base=2.0)
-                    },
-                axis='columns'))
+        barChartDescriptionTable['BAR_CHART_DESCRIPTION'] = barChartDescriptionTable['BAR_CHART_DESCRIPTION'].map(
+            JensenShannonDistance2BarChartDescriptionColumnAdder._addJensenShannonDistance2BarChartDescription)
        return barChartDescriptionTable
+
+    @staticmethod
+    def _addJensenShannonDistance2BarChartDescription(barChartDescription):
+        return {
+            **barChartDescription,
+            'Jensen-Shannon distance': distance.jensenshannon(
+                barChartDescription['Adverse Reaction Reports guessed'],
+                barChartDescription['Adverse Reaction Reports known'],
+                base=2.0)
+        }