bugfix

Author: domkowald

src/engine/CFResourceRecommenderEngine.java

@@ -47,9 +47,7 @@ public void loadFile(String filename) throws Exception {
 
 		BookmarkReader reader = new BookmarkReader(0, false);
 		reader.readFile(filename);
-
 		Collections.sort(reader.getBookmarks());
-		//System.out.println("read in and sorted file");
 
 		BM25Calculator calculator = new BM25Calculator(reader, reader.getBookmarks().size(), false, true, false, 5, Similarity.COSINE, Features.ENTITIES);
 

src/engine/EngineUtils.java

@@ -30,6 +30,10 @@ License, or (at your option) any later version.
 
 public class EngineUtils {
 
+	public static void logRecommendationCall() {
+		
+	}
+	
 	public static Map<String, Double> calcTopTags(BookmarkReader reader) {
 		Map<String, Double> tagMap = new LinkedHashMap<>();
 		Map<Integer, Integer> countMap = new LinkedHashMap<Integer, Integer>();

src/engine/TagRecommenderEngine.java

@@ -59,7 +59,7 @@ public void loadFile(String filename) throws Exception {
 	}
 
 	@Override
-	public Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count) {
+	public synchronized Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count) {
 		if (topics != null && topics.size() > 0 && this.threelEngine != null) {
 			return this.threelEngine.getEntitiesWithLikelihood(user, resource, topics, count);
 		} else if (this.bllEngine != null) {

src/engine/ThreeLayersEngine.java

@@ -49,8 +49,7 @@ public void loadFile(String filename) throws Exception {
 		Collections.sort(reader.getBookmarks());
 		//System.out.println("read in and sorted file");
 
-		ThreeLayersCalculator calculator = new ThreeLayersCalculator(reader, reader
-				.getBookmarks().size(), 5, 5, true, true, false);
+		ThreeLayersCalculator calculator = new ThreeLayersCalculator(reader, reader.getBookmarks().size(), 5, 5, true, true, false);
 
 		resetStructure(reader, calculator);
 	}

src/file/PredictionFileReader.java

@@ -90,7 +90,7 @@ public boolean readFile(String filename, int k, BookmarkReader wikiReader, Integ
 					this.predictions.add(null);
 				}
 			}
-			if (k == 1) {
+			if (k == 20) {
 				System.out.println("Number of users to predict: " + this.predictions.size());
 			}
 			br.close();

src/processing/MetricsCalculator.java

@@ -70,14 +70,14 @@ public MetricsCalculator(PredictionFileReader reader, String outputFile, int k,
 		BufferedWriter bw = null;
 		boolean recommTags = (reader == null);
 		// TODO: Enable if you need data for statistical tests
-		/*if (k == 5 || k == 10) {
+		if (k == 20) {
 			try {
 				FileWriter writer = new FileWriter(new File(outputFile + "_" + k + ".txt"), true);
 				bw = new BufferedWriter(writer);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}*/
+		}
 
 		//double count = this.reader.getPredictionCount(); // only user where there are recommendations
 		double count = this.reader.getPredictionData().size();		 // all users
@@ -150,15 +150,15 @@ public MetricsCalculator(PredictionFileReader reader, String outputFile, int k,
 		this.nDCG = nDCG / count;
 
 		// TODO: enable in case statistics are needed
-		/*if (bw != null) {
+		if (bw != null) {
 			try {
 				//bw.write("\n");
 				bw.flush();
 				bw.close();
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}*/
+		}
 	}
 
 	public double getRecall() {

src/test/Pipeline.java

@@ -72,9 +72,9 @@ public class Pipeline {
 	// set for categorizer/describer split (true is describer, false is categorizer - null for nothing)
 	private final static Boolean DESCRIBER = null;
 	// placeholder for the topic posfix
-	private static String TOPIC_NAME = "lda_500";
+	private static String TOPIC_NAME = null;
 	// placeholder for the used dataset
-	private final static String DATASET = "lastfm";
+	private final static String DATASET = "del";
 
 	public static void main(String[] args) {
 		System.out.println("TagRecommender:\n" + "" +