added parameter for cf engine

Author: domkowald

src/engine/CFResourceRecommenderEngine.java

@@ -31,7 +31,7 @@ License, or (at your option) any later version.
 import common.Features;
 import common.Similarity;
 
-public class CFResourceRecommenderEngine implements EngineInterface {
+public class CFResourceRecommenderEngine implements ResourceEngineInterface {
 
 	private BookmarkReader reader = null;
 	private BM25Calculator calculator = null;
@@ -55,10 +55,13 @@ public void loadFile(String filename) throws Exception {
 		resetStructure(reader, calculator);
 	}
 
-	public synchronized 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, Boolean filterOwnEntities) {
 		if (count == null || count.doubleValue() < 1) {
 			count = 10;
 		}
+		if (filterOwnEntities == null) {
+			filterOwnEntities = true;
+		}
 		Map<String, Double> resourceMap = new LinkedHashMap<>();
 		if (this.reader == null || this.calculator == null) {
 			return resourceMap;
@@ -68,7 +71,7 @@ public synchronized Map<String, Double> getEntitiesWithLikelihood(String user, S
 			userID = this.reader.getUsers().indexOf(user);
 		}
 
-		Map<Integer, Double> resourceIDs = this.calculator.getRankedResourcesList(userID, true, false, false);
+		Map<Integer, Double> resourceIDs = this.calculator.getRankedResourcesList(userID, true, false, false, filterOwnEntities.booleanValue());
 		for (Map.Entry<Integer, Double> tEntry : resourceIDs.entrySet()) {
 			if (resourceMap.size() < count) {
 				resourceMap.put(this.reader.getResources().get(tEntry.getKey()), tEntry.getValue());

src/engine/EngineUtils.java

@@ -65,8 +65,7 @@ public static Map<String, Double> calcTopResources(BookmarkReader reader) {
 			countSum += reader.getResourceCounts().get(i);
 		}
 
-		Map<Integer, Integer> sortedCountMap = new TreeMap<Integer, Integer>(
-				new IntMapComparator(countMap));
+		Map<Integer, Integer> sortedCountMap = new TreeMap<Integer, Integer>(new IntMapComparator(countMap));
 		sortedCountMap.putAll(countMap);
 
 		for (Map.Entry<Integer, Integer> entry : sortedCountMap.entrySet()) {

src/processing/BM25Calculator.java

@@ -99,7 +99,7 @@ public BM25Calculator(BookmarkReader reader, int trainSize, boolean predictTags,
 		}
 	}
 
-	public Map<Integer, Double> getRankedResourcesList(int userID, boolean sorting, boolean allResources, boolean bll) {
+	public Map<Integer, Double> getRankedResourcesList(int userID, boolean sorting, boolean allResources, boolean bll, boolean filterOwnEntities) {
 		List<Integer> userResources = null;
 		Map<Integer, Double> userBllResources = null;
 		if (this.resBased) {
@@ -127,7 +127,7 @@ public Map<Integer, Double> getRankedResourcesList(int userID, boolean sorting,
 				if (bm25 != 0.0) {
 					List<Integer> resources = Bookmark.getResourcesFromUser(this.trainList, neighbor.getKey());				
 					for (Integer resID : resources) {
-						if (!userResources.contains(resID)) {
+						if (!filterOwnEntities || !userResources.contains(resID)) {
 							double bllVal = (bll ? userBllResources.get(resID) : 1.0);
 							Double val = rankedResources.get(resID);
 							double entryVal = bllVal * bm25;
@@ -284,7 +284,7 @@ private static List<Map<Integer, Double>> startBM25CreationForResourcesPredictio
 		List<Map<Integer, Double>> results = new ArrayList<Map<Integer, Double>>();
 		for (Integer userID : reader.getUniqueUserListFromTestSet(trainSize)) {
 			Map<Integer, Double> map = null;
-			map = calculator.getRankedResourcesList(userID, true, allResources, bll); // TODO
+			map = calculator.getRankedResourcesList(userID, true, allResources, bll, true); // TODO
 			results.add(map);
 		}
 

src/test/Pipeline.java

@@ -44,6 +44,7 @@ License, or (at your option) any later version.
 import engine.CFResourceRecommenderEngine;
 import engine.EngineInterface;
 import engine.LanguageModelEngine;
+import engine.ResourceEngineInterface;
 import engine.TagRecommenderEngine;
 import engine.ThreeLayersEngine;
 import file.BookmarkReader;
@@ -167,15 +168,17 @@ public static void main(String[] args) {
 		}
 		System.out.println("TagRec with Topics: " + tagrecEngine.getEntitiesWithLikelihood("41", "545", Arrays.asList("ontology", "conference", "tutorial", "web2.0", "rss", "tools"), 10));
 		System.out.println("TagRec without Topics: " + tagrecEngine.getEntitiesWithLikelihood("41", "545", null, 10));
-		EngineInterface resrecEngine = new CFResourceRecommenderEngine();
+		ResourceEngineInterface resrecEngine = new CFResourceRecommenderEngine();
 		try {
-			resrecEngine.loadFile("hugo2");
+			resrecEngine.loadFile(path);
 		} catch (Exception e2) {
 			e2.printStackTrace();
 		}
-		System.out.println("CF: " + resrecEngine.getEntitiesWithLikelihood("0", null, null, 10));
+		System.out.println("CF Filter: " + resrecEngine.getEntitiesWithLikelihood("0", null, null, 20, true));
+		System.out.println("CF -Filter: " + resrecEngine.getEntitiesWithLikelihood("0", null, null, 20, false));
 		*/
 
+		
 		// Commandline Arguments
 		if (args.length < 3) {
 			System.out.println("Too few arguments!");