From 76e0f6ac8059d3fca9b9aa2af3c0e9821c8fcaf2 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Wed, 23 Aug 2023 21:44:16 +0200 Subject: [PATCH] refactoring --- ...Distance2BarChartDescriptionColumnAdder.py | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/JensenShannonDistance2BarChartDescriptionColumnAdder.py b/src/JensenShannonDistance2BarChartDescriptionColumnAdder.py index 3ca42b17bd6..2df647c1cbe 100644 --- 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) + }