commit - 953b42e64c7ee58655e1e4c4d0f531fe18e31a0c
commit + bbe0f250d659032149282bcc6c9f3ae00f54cec7
blob - /dev/null
blob + 4edd9c0a1d8ddb1cca1b82e7df7ac37caa8b685b (mode 644)
--- /dev/null
+++ midior.iml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="scala" name="Scala">
+      <configuration>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="Maven: org.scala-lang:scala-compiler-bundle:2.9.0-1" />
+        <option name="fsc" value="true" />
+        <option name="vmOptions" value="" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="twimpact-trending" />
+    <orderEntry type="module" module-name="streamio" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.scribe:scribe:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-stream:2.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.9.0-1" level="project" />
+    <orderEntry type="library" name="Maven: org.clapper:grizzled-slf4j_2.9.0:0.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.2" level="project" />
+    <orderEntry type="module" module-name="utils" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
+    <orderEntry type="module" module-name="marge" />
+    <orderEntry type="library" name="Maven: se.scalablesolutions.akka:akka-actor:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers:3.3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+  </component>
+</module>
+
blob - a0f83708310b6b869eeec9f94f75930295c0d30f
blob + 0633fc1f48ccfa883718efa5927d1212481e0c9f
--- src/main/scala/twimpact/SimpleAnalyzer.scala
+++ src/main/scala/twimpact/SimpleAnalyzer.scala
@@ -29,7 +29,7 @@ class SimpleAnalyzer(trevor: Trevor, timescales: Seq[T
     trevor.createMultiScaleTrend[Long]("retweetTrend", "retweet", "exactexpdecay", capacity
         .getOrElse("trends", 5000), timescales, true)
   var userRetweetTrend: MultiScaleTrend[String] =
-    trevor.createMultiScaleTrend[String]("userRetweetTrend", "retweet", "exactexpdecay", capacity
+    trevor.createMultiScaleTrend[String]("userRetweetTrend", "user", "exactexpdecay", capacity
         .getOrElse("trends", 5000), timescales, true)
 
   var twimpacts = new TwimpactScore[String, Long, Double](userRetweetTrend.scoreTrend(0), 1000, retweetTrend