@@ -35,7 +35,6 @@ class Cluster: def create_clusters(contextables, clusters, tags): - print "Start creating new clusters" new_clusters = [] for cluster in clusters: for tag in tags: @@ -43,20 +42,23 @@ def create_clusters(contextables, clusters, tags): tag_cluster = CLUSTERS[frozenset([tag])] new_cluster = Cluster(cluster.tags.union(tag_cluster.tags)) new_cluster.populate(cluster.contextables.union(tag_cluster.contextables)) - new_clusters.append(new_cluster) + if new_cluster.contextables: + new_clusters.append(new_cluster) return list(sorted(new_clusters, key=lambda i: len(i))) def merge_clusters(contextables, number=5): - print "Merging" - tags = order_tags(contextables)[:160] + tags = order_tags(contextables)[:260] new_clusters = [] - print "First clusters" for tag in tags: cluster = Cluster(frozenset([tag])) cluster.populate(contextables) new_clusters.append(cluster) for i in range(number-1): - new_clusters = create_clusters(contextables, new_clusters, tags)[:160/(i+2)] + nclusters = create_clusters(contextables, new_clusters, tags)[:260/(i+2)] + if nclusters: + new_clusters = nclusters + else: + return new_clusters return new_clusters def order_clusters(clusters): clusters.py @@ -1,4 +1,4 @@ from analyser import dig_web from clusters import merge_clusters -mc = merge_clusters(dig_web(), 5) +mc = merge_clusters(dig_web(), 2) main.py @@ -5,7 +5,6 @@ url = 'http://search.twitter.com/search.json?q=%s' def query_twitter(term): s = urlopen(url % (term)).read() dic = eval(s.replace('null', 'None')) - #print dic return dic if __name__ == '__main__': twitter_api2.py ceb161336769e40c5e618c01b1f49d3342efddc7 fc6261f154cc804bb2228b9a2c3c22a2d2d67da9 Fabs fabriciosn@gmail.com http://github.com/Fabs/eventomeeter/commit/43c69a2de59f9a7bbef240fdb47add648b4b806e 43c69a2de59f9a7bbef240fdb47add648b4b806e 2008-11-09T06:23:37-08:00 2008-11-09T06:23:37-08:00 Merge branch 'master' of git@github.com:Fabs/eventomeeter Conflicts: flickr_api.py ccb92f2b6fc15147e69ad7629fc53acedd189808 Fabs fabriciosn@gmail.com