added link ellipsis, regenerating windows on modeling

vipra-cmd/src/main/java/de/vipra/cmd/file/FilebaseWindowIndex.java

@@ -156,7 +156,13 @@ public class FilebaseWindowIndex {
 		return window;
 	}
 
-	private void resizeWindows() {
+	public void clear() {
+		windowSizes.clear();
+		windowDates.clear();
+		windowMap.clear();
+	}
+
+	public void resizeWindows() {
 		final List<Date> dates = new ArrayList<>(windowMap.keySet());
 		Collections.sort(dates);
 		windowSizes = new ArrayList<>(windowMap.size());

vipra-cmd/src/main/java/de/vipra/cmd/lda/Analyzer.java

@@ -106,7 +106,13 @@ public class Analyzer {
 
 		BufferedReader in;
 
+		final FilebaseWordIndex wordIndex = new FilebaseWordIndex(modelDir);
+		final FilebaseIDDateIndex idDateIndex = new FilebaseIDDateIndex(modelDir);
+		final FilebaseWindowIndex windowIndex = new FilebaseWindowIndex(modelDir, modelConfig.getWindowResolution());
+
 		if (!reread) {
+			recalcWindows(idDateIndex, windowIndex);
+
 			final Process p = Runtime.getRuntime().exec(command, null);
 			if (!p.isAlive())
 				throw new AnalyzerException("dtm process is dead");
@@ -160,10 +166,6 @@ public class Analyzer {
 			p.waitFor();
 		}
 
-		final FilebaseWordIndex wordIndex = new FilebaseWordIndex(modelDir);
-		final FilebaseIDDateIndex idDateIndex = new FilebaseIDDateIndex(modelDir);
-		final FilebaseWindowIndex windowIndex = new FilebaseWindowIndex(modelDir, modelConfig.getWindowResolution());
-
 		final int topicCount = modelConfig.getkTopics();
 		assert topicCount > 0;
 
@@ -512,4 +514,11 @@ public class Analyzer {
 		return msg.length() - 1;
 	}
 
+	private void recalcWindows(final FilebaseIDDateIndex idDateIndex, final FilebaseWindowIndex windowIndex) throws IOException {
+		windowIndex.clear();
+		for (final FilebaseIDDateIndexEntry date : idDateIndex)
+			windowIndex.add(date.getDate());
+		windowIndex.sync();
+	}
+
 }

vipra-ui/app/html/directives/article-link.html

 <div class="link-wrapper">
-  <span class="menu-padding">
-    <a class="article-link" ui-sref="articles.show({id:article.id})" ng-attr-title="{{::article.title}}">
-      <span ng-bind="article.title"></span>
-      <ng-transclude/>
-    </a>
+  <span class="menu-padding ellipsis">
     <div class="pull-right article-dropdown">
       <i class="fa text-muted pointer" ng-class="{'fa-chevron-down':!excerptShown,'fa-chevron-up':excerptShown}" ng-click="toggleExcerpt()" ng-if="::showExcerpt" analytics-on analytics-event="Article excerpt" analytics-category="Article actions"></i>
       <span class="badge" ng-bind="::article.topicsCount" ng-attr-title="{{::article.topicsCount}} topic(s)" ng-if="::showBadge"></span>
     </div>
+    <a class="article-link" ui-sref="articles.show({id:article.id})" ng-attr-title="{{::article.title}}">
+      <span ng-bind="article.title"></span>
+      <ng-transclude/>
+    </a>
   </span>
   <article-menu class="menu-button" article="article" ng-if="::showMenu" />
   <div ng-bind="excerpt" ng-if="excerptShown" class="excerpt"></div>

vipra-ui/app/html/directives/topic-link.html

 <div class="link-wrapper">
-  <span class="menu-padding">
+  <span class="menu-padding ellipsis">
+    <span class="badge pull-right" ng-bind="::topic.articlesCount" ng-attr-title="{{::topic.articlesCount}} article(s)" ng-if="::showBadge"></span>
 	  <a class="topic-link" ui-sref="topics.show({id:topic.id})" ng-attr-title="{{::topic.name}}">
 	    <span ng-bind="topic.name"></span>
 	    <ng-transclude/>
 	  </a>
-	  <span class="badge pull-right" ng-bind="::topic.articlesCount" ng-attr-title="{{::topic.articlesCount}} article(s)" ng-if="::showBadge"></span>
 	</span>
   <topic-menu topic="topic" class="menu-button" ng-if="::showMenu" />
 </div>

vipra-ui/app/js/helpers.js

@@ -41,11 +41,6 @@
   Vipra.windowLabel = function(date, res) {
     date = moment(date);
     var parts = [];
-    if (res === 'QUARTER') {
-      parts.push('Q' + date.quarter());
-      parts.push(' ');
-      parts.push(date.year());
-    } else {
     switch (res) {
       case 'SECOND':
         parts.push(Vipra.zeroPad(date.second()));
@@ -69,7 +64,27 @@
       case 'YEAR':
         parts.push('-');
         parts.push(date.year());
-      }
+        break;
+      case 'WEEK':
+        parts.push('W' + date.week());
+        parts.push(' ');
+        parts.push(date.year());
+        break;
+      case 'SEMESTER':
+        parts.push('S' + date.month() < 6 ? 1 : 2);
+        parts.push(' ');
+        parts.push(date.year());
+        break;
+      case 'TRIMESTER':
+        var month = date.month();
+        parts.push('T' + month < 4 ? 1 : month < 8 ? 2 : 3);
+        parts.push(' ');
+        parts.push(date.year());
+        break;
+      case 'QUARTER':
+        parts.push('Q' + date.quarter());
+        parts.push(' ');
+        parts.push(date.year());
     }
     var rtrim = /^[\s\uFEFF\xA0:-]+|[\s\uFEFF\xA0:-]+$/g;
     return parts.reverse().join('').replace(rtrim, '');

vipra-util/src/main/java/de/vipra/util/CountMap.java

@@ -53,4 +53,8 @@ public class CountMap<T> {
 		return map.containsKey(key);
 	}
 
+	public void clear() {
+		map.clear();
+	}
+
 }

vipra-util/src/main/java/de/vipra/util/service/MongoService.java

@@ -3,6 +3,7 @@ package de.vipra.util.service;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -110,6 +111,20 @@ public class MongoService<Type extends Model<IdType>, IdType> {
 		return getMultiple(QueryBuilder.builder().fields(true, fields));
 	}
 
+	public Iterator<Type> getAllIterator(final QueryBuilder builder) {
+		final Query<Type> query = datastore.createQuery(clazz);
+
+		if (builder != null) {
+			builder.build(query);
+			if (builder.getFields() == null && !builder.isAllFields() && ignoredFieldsMultiQuery.length > 0) {
+				query.retrievedFields(false, ignoredFieldsMultiQuery);
+			}
+		} else if (ignoredFieldsMultiQuery.length > 0) {
+			query.retrievedFields(false, ignoredFieldsMultiQuery);
+		}
+		return query.iterator();
+	}
+
 	public Type createSingle(final Type t) throws DatabaseException {
 		if (t == null)
 			throw new DatabaseException(new NullPointerException("entity is null"));