summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2010-04-18 13:49:15 +0200
committerSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2010-04-18 13:49:15 +0200
commit6dfddab739968ec4c32f9af7da19e89658338ef7 (patch)
treee3eec9347220f31d5638d3706e7a85cdca808679
parentf350c76ccba410d3f17efbc0bd5397a27adfea43 (diff)
Change print->log and split some long lines.
-rw-r--r--_zeitgeist/engine/main.py26
1 files changed, 19 insertions, 7 deletions
diff --git a/_zeitgeist/engine/main.py b/_zeitgeist/engine/main.py
index a792ecfa..7f57461c 100644
--- a/_zeitgeist/engine/main.py
+++ b/_zeitgeist/engine/main.py
@@ -342,7 +342,8 @@ class ZeitgeistEngine:
if len(events) == 0 or len(landmarks) == 0:
return []
if len(events) <= window_size:
- highest_count = self.__add_window(list(set([events])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(list(set([events])),
+ highest_count, assoc, landmarks, windows)
else:
events = events[min_index:max_index]
windows = []
@@ -350,19 +351,30 @@ class ZeitgeistEngine:
for i in xrange(len(events)):
if i < offset:
- highest_count = self.__add_window(list(set(events[0: i + offset + 1])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(
+ list(set(events[0: i + offset + 1])),
+ highest_count, assoc, landmarks, windows)
elif len(events) - offset - 1 < i:
- highest_count = self.__add_window(list(set(events[i-offset: len(events)])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(
+ list(set(events[i-offset: len(events)])),
+ highest_count, assoc, landmarks, windows)
else:
- highest_count = self.__add_window(list(set(events[i-offset: i+offset+1])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(
+ list(set(events[i-offset: i+offset+1])),
+ highest_count, assoc, landmarks, windows)
for i in xrange(offset):
- highest_count = self.__add_window(list(set(events[0: offset - i])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(
+ list(set(events[0: offset - i])), highest_count,
+ assoc, landmarks, windows)
for i in xrange(offset):
- highest_count = self.__add_window(list(set(events[len(events) - offset + i: len(events)])), highest_count, assoc, landmarks, windows)
+ highest_count = self.__add_window(
+ list(set(events[len(events) - offset + i: len(events)])),
+ highest_count, assoc, landmarks, windows)
- print "\n finished sliding windows in ", time.time()-t1, "\n"
+ log.debug("FindRelatedUris: Finished sliding windows in %fs." % \
+ (time.time()-t1))
if highest_count%2 == 0:
highest_count = highest_count/2
else: