diff python/utils.py @ 375:2ea8584aa80a

making indicator LCSS work
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 17 Jul 2013 01:29:25 -0400
parents a7af3519687e
children 2e6b8610bcaa
line wrap: on
line diff
--- a/python/utils.py	Wed Jul 17 00:50:44 2013 -0400
+++ b/python/utils.py	Wed Jul 17 01:29:25 2013 -0400
@@ -289,7 +289,7 @@
         '''get methods are to be shadowed in child classes '''
         return self._compute(l1, l2, computeSubSequence)
 
-    def computeAlignement(self):
+    def computeAlignment(self):
         from numpy import mean
         return mean([j-i for i,j in self.subSequenceIndices])
 
@@ -297,14 +297,14 @@
         ''' compute the normalized LCSS
         ie, the LCSS divided by the min or mean of the indicator lengths (using lengthFunc)
         lengthFunc = lambda x,y:float(x,y)/2'''
-        return float(self.compute(l1, l2))/self.lengthFunc(len(l1), len(l2))
+        return float(self._compute(l1, l2))/self.lengthFunc(len(l1), len(l2))
 
     def computeNormalized(self, l1, l2):
         return self._computeNormalized(l1, l2)
 
     def _computeDistance(self, l1, l2):
         ''' compute the LCSS distance'''
-        return 1-self.computeNormalized(l1, l2)
+        return 1-self._computeNormalized(l1, l2)
 
     def computeDistance(self, l1, l2):
         return self._computeDistance(l1, l2)