Mercurial Hosting > traffic-intelligence
diff python/ml.py @ 953:989917b1ed85
assign and learn work
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Tue, 25 Jul 2017 17:36:07 -0400 |
| parents | a9b2beef0db4 |
| children | ec1682ed999f |
line wrap: on
line diff
--- a/python/ml.py Mon Jul 24 21:22:18 2017 -0400 +++ b/python/ml.py Tue Jul 25 17:36:07 2017 -0400 @@ -138,7 +138,7 @@ self.prototypeId = prototypeId self.memberIndices = memberIndices -def assignToPrototypeClusters(instances, prototypeIndices, similarities, minSimilarity, similarityFunc = None, minClusterSize = None): +def assignToPrototypeClusters(instances, prototypeIndices, similarities, minSimilarity, similarityFunc = None, minClusterSize = 0): '''Assigns instances to prototypes if minClusterSize is not None, the clusters will be refined by removing iteratively the smallest clusters and reassigning all elements in the cluster until no cluster is smaller than minClusterSize''' @@ -166,8 +166,7 @@ prototypeIndices.remove(smallestClusterIndex) indices = [i for i in range(similarities.shape[0]) if labels[i] == smallestClusterIndex] return prototypeIndices, labels - -def prototypeCluster(instances, similarities, minSimilarity, similarityFunc = None, minClusterSize = 0, optimizeCentroid = True, randomInitialization = False, initialPrototypeIndices = None): +def prototypeCluster(instances, similarities, minSimilarity, similarityFunc = None, optimizeCentroid = True, randomInitialization = False, initialPrototypeIndices = None): '''Finds exemplar (prototype) instance that represent each cluster Returns the prototype indices (in the instances list)