Mercurial > hg > nsaunier > traffic-intelligence

comparison python/ml.py @ 515:727e3c529519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed all draw functions to plot for consistency
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 06 Jun 2014 14:10:42 -0400
parents c81cbd6953fb
children 21bdeb29f855
comparison
equal deleted inserted replaced
514:1ba618fb0f70 515:727e3c529519
46 def average(c): 46 def average(c):
47 inst = self.instance.multiply(self.nInstances)+c.instance.multiply(instance.nInstances) 47 inst = self.instance.multiply(self.nInstances)+c.instance.multiply(instance.nInstances)
48 inst.multiply(1/(self.nInstances+instance.nInstances)) 48 inst.multiply(1/(self.nInstances+instance.nInstances))
49 return Centroid(inst, self.nInstances+instance.nInstances) 49 return Centroid(inst, self.nInstances+instance.nInstances)
50 50
51 def draw(self, options = ''): 51 def plot(self, options = ''):
52 from matplotlib.pylab import text 52 from matplotlib.pylab import text
53 self.instance.draw(options) 53 self.instance.plot(options)
54 text(self.instance.position.x+1, self.instance.position.y+1, str(self.nInstances)) 54 text(self.instance.position.x+1, self.instance.position.y+1, str(self.nInstances))
55 55
56 def kMedoids(similarityMatrix, initialCentroids = None, k = None): 56 def kMedoids(similarityMatrix, initialCentroids = None, k = None):
57 '''Algorithm that clusters any dataset based on a similarity matrix 57 '''Algorithm that clusters any dataset based on a similarity matrix
58 Either the initialCentroids or k are passed''' 58 Either the initialCentroids or k are passed'''