Skip to content

Commit

Permalink
updated to java 8
Browse files Browse the repository at this point in the history
  • Loading branch information
domkowald committed Dec 4, 2014
1 parent b756fcc commit 1c9aef5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
14 changes: 7 additions & 7 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="file/reporting/CfEvaluator.java|processing/CfCalculator.java|processing/CfTagCalculator.java|processing/LdaCalculator.java|file/filtering/ResourceFiltering.java|file/filtering/TagFiltering.java|processing/MahoutCalculator.java" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="lib/guava-14.0-rc1.jar"/>
<classpathentry kind="lib" path="lib/mallet-deps.jar"/>
<classpathentry kind="lib" path="lib/mallet.jar"/>
<classpathentry kind="lib" path="lib/javaml-0.1.5.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-14.0-rc1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mallet-deps.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mallet.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javaml-0.1.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
7 changes: 4 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
1 change: 1 addition & 0 deletions src/engine/CFResourceRecommenderEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public synchronized Map<String, Double> getEntitiesWithLikelihood(String user, S
}
Map<String, Double> resourceMap = new LinkedHashMap<>();
if (this.reader == null || this.calculator == null) {
System.out.println("No data has been loaded");
return resourceMap;
}
int userID = -1;
Expand Down
4 changes: 2 additions & 2 deletions src/engine/ResourceEngineInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ License, or (at your option) any later version.

public interface ResourceEngineInterface {

public void loadFile(String filename) throws Exception;
void loadFile(String filename) throws Exception;

public Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count, Boolean filterOwnEntities);
Map<String, Double> getEntitiesWithLikelihood(String user, String resource, List<String> topics, Integer count, Boolean filterOwnEntities);
}
3 changes: 1 addition & 2 deletions src/test/Pipeline.java
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ 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));
ResourceEngineInterface resrecEngine = new CFResourceRecommenderEngine();
final ResourceEngineInterface resrecEngine = new CFResourceRecommenderEngine();
try {
resrecEngine.loadFile(path);
} catch (Exception e2) {
Expand All @@ -178,7 +178,6 @@ public static void main(String[] args) {
System.out.println("CF -Filter: " + resrecEngine.getEntitiesWithLikelihood("0", null, null, 20, false));
*/


// Commandline Arguments
if (args.length < 3) {
System.out.println("Too few arguments!");
Expand Down
Binary file modified tagrec.jar
Binary file not shown.

0 comments on commit 1c9aef5

Please sign in to comment.