From f96ae1d2d3c54bf680f63a2c693052ff009bbc00 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Mon, 14 Jun 2021 18:11:48 +0200
Subject: [PATCH] Make sure DistanceMatrix.delta_values does not use the wrong
 triangle ...

---
 delta/deltas.py     | 21 +++++++++++++++------
 test/deltas_test.py |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/delta/deltas.py b/delta/deltas.py
index 2c796b4..830e599 100644
--- a/delta/deltas.py
+++ b/delta/deltas.py
@@ -652,22 +652,31 @@ def save(self, filename):
         self.to_csv(filename)
         self.metadata.save(filename)
 
-    def _remove_duplicates(self):
+    def _remove_duplicates(self, transpose=False, check=True):
         """
         Returns a DistanceMatrix that has only the lower left triangle filled,
         ie contains only the unique meaningful values.
         """
-        return DistanceMatrix(self.where(np.tril(np.ones(self.shape, dtype=bool),
+        df = self.T if transpose else self
+        result = DistanceMatrix(df.where(np.tril(np.ones(self.shape, dtype=bool),
                                                  k=-1)),
                               copy_from=self)
+        if check and result.isna().sum().sum() > 0 and self.notna().sum().sum() > 0:
+            return self._remove_duplicates(transpose=not transpose, check=False)
+        return result
 
-    def delta_values(self):
+    def delta_values(self, transpose=False, check=True):
         r"""
         Converts the given n×n Delta matrix to a :math:`\binom{n}{2}` long
         series of distinct delta values – i.e. duplicates from the upper
         triangle and zeros from the diagonal are removed.
+
+        Args:
+            transpose: if True, transpose the dataframe first, i.e. use the upper right triangle
+            check: if True and if the result does not contain any non-null value, try the other
+                   option for transpose.
         """
-        return self._remove_duplicates().unstack().dropna()
+        return self._remove_duplicates(transpose, check).unstack().dropna()
 
     def delta_values_df(self):
         """
@@ -773,8 +782,8 @@ def simple_score(self):
         different than equal authors.
         """
         in_group_df, out_group_df = self.z_scores().partition()
-        in_group, out_group = (in_group_df.delta_values(),
-                               out_group_df.delta_values())
+        in_group, out_group = (in_group_df.delta_values(transpose=True, check=False),
+                               out_group_df.delta_values(transpose=True, check=False))
         score = out_group.mean() - in_group.mean()
         return score
 
diff --git a/test/deltas_test.py b/test/deltas_test.py
index 6923da6..f6dc86f 100644
--- a/test/deltas_test.py
+++ b/test/deltas_test.py
@@ -26,6 +26,10 @@ def test_distance(function, expected_distance, c1000):
     assert sample == approx(expected_distance, rel=1e-2)
 
 
+def test_simple_score(distances):
+    assert distances.simple_score() > 0
+
+
 def test_composite_metric(c1000):
     mcosine = d.MetricDeltaFunction('cosine', 'mcosine')
     assert mcosine.fix_symmetry == True, "fix_symmetry is False!?"