From 65d6e47513272c3e1bd41c16d2f4196b508647ba Mon Sep 17 00:00:00 2001
From: drevicko <drevicko@users.noreply.github.com>
Date: Mon, 29 May 2017 12:13:21 +0100
Subject: [PATCH] Implements Fernando's suggestion in #31

I've added a neutral point definition (in the converters senpy file) as used in pull request #29
---
 senpy/plugins/conversion/centroids.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/senpy/plugins/conversion/centroids.py b/senpy/plugins/conversion/centroids.py
index 1b59a7d..e3c1bd8 100644
--- a/senpy/plugins/conversion/centroids.py
+++ b/senpy/plugins/conversion/centroids.py
@@ -49,18 +49,15 @@ class CentroidConversion(EmotionConversionPlugin):
 
     def _backwards_conversion(self, original):
         """Find the closest category"""
-        dimensions = list(self.centroids.values())[0]
+        dimensions = set(k.keys() for i in centroids.values())
+        neutralPoint = self.get("origin", None)
+        neutralPoint = {k:neutralPoint[k] if k in neturalPoint else 0}
+        
+        def distance(centroid):
+            return sum((centroid.get(k, neutralPoint[k]) - original.get(k, neutralPoint[k]))**2 for k in dimensions)
 
-        def distance(e1, e2):
-            return sum((e1[k] - e2.get(k, 0)**2) for k in dimensions)
-
-        emotion = ''
-        mindistance = 10000000000000000000000.0
-        for state in self.centroids:
-            d = distance(self.centroids[state], original)
-            if d < mindistance:
-                mindistance = d
-                emotion = state
+        emotion = min(centroids, key=lambda x: distance(centroids[x])
+                
         result = Emotion(onyx__hasEmotionCategory=emotion)
         return result