Skip to content

Commit f7b8951

Browse files
domkowalddomkowald
committed
added full path option to engines
1 parent 8e83dcc commit f7b8951

17 files changed

+170
-114
lines changed

‎src/engine/BaseLevelLearningCollectiveEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class BaseLevelLearningCollectiveEngine implements EngineInterface {
1313
private BookmarkReader reader = null;
1414
private final Map<String, Double> collectiveTags = new LinkedHashMap<String, Double>();
1515

16-
public void loadFile(String filename) throws Exception {
17-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
16+
public void loadFile(String path, String filename) throws Exception {
17+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
1818
Map<Integer, Double> collectiveTags = BLLCalculator.getCollectiveArtifactMap(reader, reader.getBookmarks(), null, false, new ArrayList<Long>(), new ArrayList<Double>(), 0.5, true);
1919

2020
// map to strings

‎src/engine/BaseLevelLearningEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public BaseLevelLearningEngine() {
5353
reader = null;
5454
}
5555

56-
public void loadFile(String filename) throws Exception {
57-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
56+
public void loadFile(String path, String filename) throws Exception {
57+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
5858

5959
Map<String, Map<Integer, Double>> userMaps = new HashMap<>();
6060
Map<String, Map<Integer, Double>> userCounts = new HashMap<>();

‎src/engine/EngineInterface.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ License, or (at your option) any later version.
2525

2626
public interface EngineInterface {
2727

28-
public void loadFile(String filename) throws Exception;
28+
public void loadFile(String path, String filename) throws Exception;
2929

3030
public Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count, Boolean filterOwnEntities, Algorithm algorithm, EntityType type);
3131
}

‎src/engine/EngineUtils.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,28 @@ License, or (at your option) any later version.
3333
import common.IntMapComparator;
3434
import file.BookmarkReader;
3535
import file.BookmarkSplitter;
36+
import file.BookmarkWriter;
3637

3738
public class EngineUtils {
3839

39-
public static BookmarkReader getSortedBookmarkReader(String filename) {
40+
public static BookmarkReader getSortedBookmarkReader(String path, String filename) {
4041
BookmarkReader reader = new BookmarkReader(0, false);
41-
reader.readFile(filename);
42+
reader.readFile(path, filename);
4243
Collections.sort(reader.getBookmarks());
4344

4445
String sortedFile = filename + "_sorted";
45-
BookmarkSplitter.writeSample(reader, reader.getBookmarks(), sortedFile, null, true);
46+
BookmarkWriter.writeSample(reader, reader.getBookmarks(), path, sortedFile, null, true);
4647
reader = new BookmarkReader(0, false);
47-
reader.readFile(sortedFile);
48+
reader.readFile(path, sortedFile);
4849

4950
try {
50-
if (!new File("./data/csv/" + sortedFile + ".txt").delete()) {
51+
String deletePath = "";
52+
if (path == null) {
53+
deletePath = "./data/csv/" + sortedFile + ".txt";
54+
} else {
55+
deletePath = path + sortedFile;
56+
}
57+
if (!new File(deletePath).delete()) {
5158
System.out.println("Problem while deleting sorted temp-file");
5259
}
5360
} catch (Exception e) {

‎src/engine/EntityRecommenderEngine.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public class EntityRecommenderEngine implements EngineInterface {
1010
private EngineInterface resourceRecommender;
1111
private EngineInterface userRecommender;
1212

13-
public void loadFile(String filename) throws Exception {
13+
public void loadFile(String path, String filename) throws Exception {
1414
this.tagRecommender = new TagRecommenderEvalEngine();
15-
this.tagRecommender.loadFile(filename);
15+
this.tagRecommender.loadFile(path, filename);
1616
this.resourceRecommender = new ResourceRecommenderEngine();
17-
this.resourceRecommender.loadFile(filename);
17+
this.resourceRecommender.loadFile(path, filename);
1818
this.userRecommender = new UserRecommenderEngine();
19-
this.userRecommender.loadFile(filename);
19+
this.userRecommender.loadFile(path, filename);
2020
}
2121

2222
public Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count, Boolean filterOwnEntities, Algorithm algorithm, EntityType type) {

‎src/engine/LanguageModelEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public LanguageModelEngine() {
4545
reader = null;
4646
}
4747

48-
public void loadFile(String filename) throws Exception {
49-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
48+
public void loadFile(String path, String filename) throws Exception {
49+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
5050

5151
Map<String, Map<Integer, Double>> userMaps = new HashMap<>();
5252
Map<String, Map<Integer, Double>> resMaps = new HashMap<>();

‎src/engine/MostPopularCollectiveEngine.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
import java.util.LinkedHashMap;
55
import java.util.List;
66
import java.util.Map;
7+
78
import file.BookmarkReader;
89

910
public class MostPopularCollectiveEngine implements EngineInterface {
1011

1112
private BookmarkReader reader;
1213
private final Map<String, Double> collectiveTags = new LinkedHashMap<String, Double>();
1314

14-
public void loadFile(String filename) throws Exception {
15-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
15+
public void loadFile(String path, String filename) throws Exception {
16+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
1617
Map<Integer, Double> collectiveTags = EngineUtils.calcTopEntities(reader, EntityType.TAG);
1718

1819
// map to strings

‎src/engine/ResourceRecommenderEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public ResourceRecommenderEngine() {
4848
this.reader = new BookmarkReader(0, false);
4949
}
5050

51-
public void loadFile(String filename) throws Exception {
52-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
51+
public void loadFile(String path, String filename) throws Exception {
52+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
5353

5454
CFResourceCalculator calculator = new CFResourceCalculator(reader, reader.getBookmarks().size(), false, true, false, 5, Similarity.COSINE, Features.ENTITIES);
5555
CFResourceCalculator tagCalculator = new CFResourceCalculator(reader, reader.getBookmarks().size(), false, true, false, 5, Similarity.COSINE, Features.TAGS);

‎src/engine/TagRecommenderEvalEngine.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,23 @@ public TagRecommenderEvalEngine() {
4343
//this.threelEngine = null;
4444
//this.random = new Random();
4545
this.bw = null;
46-
47-
try {
48-
FileWriter writer = new FileWriter(new File("./data/tagrec_log.txt"), true);
49-
this.bw = new BufferedWriter(writer);
50-
} catch (Exception e) {
51-
e.printStackTrace();
52-
}
5346
}
5447

5548
@Override
56-
public void loadFile(String filename) throws Exception {
49+
public void loadFile(String path, String filename) throws Exception {
5750
//this.lmEngine = null;
5851
//this.bllEngine = null;
5952
//this.threelEngine = null;
6053

61-
BookmarkReader reader = new BookmarkReader(0, false);
62-
reader.readFile(filename);
54+
//BookmarkReader reader = new BookmarkReader(0, false);
55+
//reader.readFile(filename);
6356
//if (reader.getCategories().size() > 0) {
6457
// this.threelEngine = new ThreeLayersEngine();
6558
// this.threelEngine.loadFile(filename);
6659
//}
6760
//if (reader.hasTimestamp()) {
6861
this.bllEngine = new BaseLevelLearningEngine();
69-
this.bllEngine.loadFile(filename);
62+
this.bllEngine.loadFile(path, filename);
7063
//}
7164
//this.lmEngine = new LanguageModelEngine();
7265
//this.lmEngine.loadFile(filename);
@@ -82,6 +75,19 @@ public void loadFile(String filename) throws Exception {
8275
this.mpEngine = new MostPopularCollectiveEngine();
8376
this.mpEngine.loadFile(filename);
8477
*/
78+
79+
try {
80+
String logFile = "";
81+
if (path == null) {
82+
logFile = "./data/tagrec_log.txt";
83+
} else {
84+
logFile = path + "tagrec_log.txt";
85+
}
86+
FileWriter writer = new FileWriter(new File(logFile), true);
87+
this.bw = new BufferedWriter(writer);
88+
} catch (Exception e) {
89+
e.printStackTrace();
90+
}
8591
}
8692

8793
@Override

‎src/engine/ThreeLayersCollectiveEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public class ThreeLayersCollectiveEngine implements EngineInterface {
1515
private BookmarkReader reader = null;
1616
private ThreeLTCalculator calculator = null;
1717

18-
public void loadFile(String filename) throws Exception {
19-
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(filename);
18+
public void loadFile(String path, String filename) throws Exception {
19+
BookmarkReader reader = EngineUtils.getSortedBookmarkReader(path, filename);
2020
ThreeLTCalculator calculator = new ThreeLTCalculator(reader, reader.getBookmarks().size(), 5, 5, true, false, false, CalculationType.NONE);
2121

2222
resetStructures(reader, calculator);

0 commit comments

Comments
 (0)