diff --git a/.classpath b/.classpath index 7d2f6e41e9b9eceb9d7e80386dbe5a718d6a42f5..320ae5b776242829cdb7fb91d8b5326b6db76d4f 100644 --- a/.classpath +++ b/.classpath @@ -1,20 +1,19 @@ - + - - - + + - - + + diff --git a/.gitignore b/.gitignore index e43b0f988953ae3a84b00331d0ccf5f7d51cb3cf..a44d20e9daec6abf52e1bc91a9a1c8b934bf4016 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +/target/ diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6e80039d3b822e65e46fbf18906ef652814e9505..4e4a3ada9aeac01e3bdc83230c968feb2575c8fd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/top/qianxinyao/Main/JobSetter.java b/src/top/qianxinyao/Main/JobSetter.java index 5a7bd1c717bbd5198bfce0fda693c984d887dd05..40ee790f24592d6df882d93bb03ba11f248da390 100755 --- a/src/top/qianxinyao/Main/JobSetter.java +++ b/src/top/qianxinyao/Main/JobSetter.java @@ -1,4 +1,4 @@ -package top.qianxinyao.Main; +package top.qianxinyao.main; import java.util.Date; import java.util.List; diff --git a/src/top/qianxinyao/Main/Main.java b/src/top/qianxinyao/Main/Main.java index 2d0cd696526cbc76120d283657e61fd30d7be34d..198b12e7ca200cfa525ce279082fb9528b8a4941 100755 --- a/src/top/qianxinyao/Main/Main.java +++ b/src/top/qianxinyao/Main/Main.java @@ -1,4 +1,7 @@ -package top.qianxinyao.Main; +package top.qianxinyao.main; +import java.util.ArrayList; +import java.util.List; + import org.apache.log4j.Logger; /** @@ -23,20 +26,20 @@ public class Main new TestDataRunner().runTestData(); -// //选择要在推荐系统中运行的推荐算法 -// boolean enableCF=false,enableCB=false,enableHR=true; -// -// List userList=new ArrayList(); -// userList.add(1l); -// userList.add(2l); -// userList.add(3l); -// -// -// -// //为指定用户执行一次推荐 -// new JobSetter(enableCF,enableCB,enableHR).executeInstantJobForCertainUsers(userList); -// //为活跃用户执行定时推荐 -//// new JobSetter(enableCF,enableCB,enableHR).executeQuartzJobForActiveUsers(); + //选择要在推荐系统中运行的推荐算法 + boolean enableCF=false,enableCB=false,enableHR=true; + + List userList=new ArrayList(); + userList.add(1l); + userList.add(2l); + userList.add(3l); + + + + //为指定用户执行一次推荐 + new JobSetter(enableCF,enableCB,enableHR).executeInstantJobForCertainUsers(userList); + //为活跃用户执行定时推荐 +// new JobSetter(enableCF,enableCB,enableHR).executeQuartzJobForActiveUsers(); } diff --git a/src/top/qianxinyao/Main/NewsScraper.java b/src/top/qianxinyao/Main/NewsScraper.java index 7493d01fef259a786fcc6f65c4f6f8ddaf81df55..365de45e4bde606c82982a0464f4bbd31b32917a 100755 --- a/src/top/qianxinyao/Main/NewsScraper.java +++ b/src/top/qianxinyao/Main/NewsScraper.java @@ -1,4 +1,4 @@ -package top.qianxinyao.Main; +package top.qianxinyao.main; import java.io.IOException; import java.net.SocketTimeoutException; diff --git a/src/top/qianxinyao/Main/TestDataRunner.java b/src/top/qianxinyao/Main/TestDataRunner.java index 244929cc530b18e4d78c601ebf57e86c3cbe6bc3..32a4c53e2997a9c21e7f71ffb4ef37ecb2b8a61b 100755 --- a/src/top/qianxinyao/Main/TestDataRunner.java +++ b/src/top/qianxinyao/Main/TestDataRunner.java @@ -1,4 +1,4 @@ -package top.qianxinyao.Main; +package top.qianxinyao.main; import java.util.ArrayList; import java.util.Date; diff --git a/target/classes/META-INF/maven/top.tomqian/recommender-system/pom.properties b/target/classes/META-INF/maven/top.tomqian/recommender-system/pom.properties index 41adcea89fd55b42d83aa1dec977dbc0a69543ce..7d1701f4ac74b2bbd6d88dba62c444c0675b786b 100644 --- a/target/classes/META-INF/maven/top.tomqian/recommender-system/pom.properties +++ b/target/classes/META-INF/maven/top.tomqian/recommender-system/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Wed Mar 21 17:07:36 CST 2018 +#Mon Apr 08 23:02:53 EDT 2019 version=0.0.1-SNAPSHOT groupId=top.tomqian -m2e.projectName=TomNewsRecommender -m2e.projectLocation=/Users/hanbo/Desktop/\u8FB9\u57CE/Github/modify_place/NewsRecommendSystem-master +m2e.projectName=recommender-system +m2e.projectLocation=/Users/qianxinyao/Desktop/biancheng/Github/NewsRecommendSystem artifactId=recommender-system diff --git a/target/classes/dbconfig.properties b/target/classes/dbconfig.properties deleted file mode 100755 index 33aa0f450282083a6f51bdc9652ee5ff67b262b6..0000000000000000000000000000000000000000 --- a/target/classes/dbconfig.properties +++ /dev/null @@ -1,3 +0,0 @@ -url = jdbc:mysql://121.42.36.199/tom_recommender?useUnicode=true&characterEncoding=utf8 -user = root -password = qxysay1+1=2 \ No newline at end of file diff --git a/target/classes/log4j.properties b/target/classes/log4j.properties deleted file mode 100755 index 534e8ed81e75b1015f00a411145a6d13be007981..0000000000000000000000000000000000000000 --- a/target/classes/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -####设置### -#log4j.rootLogger = D,E -# -#### 输出信息到控制台### -#log4j.appender.stdout = org.apache.log4j.ConsoleAppender -#log4j.appender.stdout.Target = logs/info.log -#log4j.appender.stdout.layout = org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n -# -####输出DEBUG级别日志到/res/logs ### -#log4j.appender.D = org.apache.log4j.DailyRollingFileAppender -#log4j.appender.D.File = logs/debug.log -#log4j.appender.D.Append = true -#log4j.appender.D.Threshold = DEBUG -#log4j.appender.D.layout = org.apache.log4j.PatternLayout -#log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n -# -####输出ERROR级别日志到/res/logs/error.log### -#log4j.appender.E = org.apache.log4j.DailyRollingFileAppender -#log4j.appender.E.File =logs/error.log -#log4j.appender.E.Append = true -#log4j.appender.E.Threshold = ERROR -#log4j.appender.E.layout = org.apache.log4j.PatternLayout -#log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n \ No newline at end of file diff --git a/target/classes/paraConfig.properties b/target/classes/paraConfig.properties deleted file mode 100755 index 1e775f711b7ed73e8df381da7f5fa922dee77da9..0000000000000000000000000000000000000000 --- a/target/classes/paraConfig.properties +++ /dev/null @@ -1,36 +0,0 @@ -#---Recommend System Parameter--- - -#Recommendation Executing Moment (Please refer to [Quartz's CronExpression]) -startAt=0 0 0 ? * * - - - - -#---Specific Algorithm Parameter--- - - -#-RecommendKit- -#Valid specific day the news published after which are still valuable -beforeDays=-30 -#Valid specific day after which those who has browsed news can be regarded "active" -activeDay=-30 - - -#-Collaborative Filtering Recommendation- -#Recommend Num from CF(Collaborative Filtering) -CFRecNum=5 -#Valid specific day after which users' browsing history would be calculated -CFValidDay=-30 - - -#-Content-Based Recommendation- -#Recommend Num from CB(Content-Based Recommend) -CBRecNum=5 -#Set a previous day after which the browsing history will be calculated with, namely, is still in time -previousDays=-30 -#TF-IDF's extracting numbers of keywords from every news -TFIDFKeywordsNum=10 - - -#-Hot Recommendation- - diff --git a/target/classes/top/qianxinyao/Main/JobSetter.class b/target/classes/top/qianxinyao/Main/JobSetter.class index 747df1cb090abe7d083aeaad365db8f25bbf1c88..d84a1f10025a16d0345ddba4c81d20a798709874 100644 Binary files a/target/classes/top/qianxinyao/Main/JobSetter.class and b/target/classes/top/qianxinyao/Main/JobSetter.class differ diff --git a/target/classes/top/qianxinyao/Main/Main.class b/target/classes/top/qianxinyao/Main/Main.class index d4a799b6dc710ad57a8014d0fb303841cd44376e..872bb337b75aa456130381bab4ce7f7782d841a3 100644 Binary files a/target/classes/top/qianxinyao/Main/Main.class and b/target/classes/top/qianxinyao/Main/Main.class differ diff --git a/target/classes/top/qianxinyao/Main/NewsScraper.class b/target/classes/top/qianxinyao/Main/NewsScraper.class index 19e126361ee8c1823b349266d50e48e5e3f39611..855c4188802f879715c20a7f6b27c7fc1336a6e6 100644 Binary files a/target/classes/top/qianxinyao/Main/NewsScraper.class and b/target/classes/top/qianxinyao/Main/NewsScraper.class differ diff --git a/target/classes/top/qianxinyao/Main/TestDataRunner.class b/target/classes/top/qianxinyao/Main/TestDataRunner.class index 636f202b55dfb8f8aa1ae4a796e144e037b2599b..3427c0c7318fe5b7525d68c463d8a468df36f5f5 100644 Binary files a/target/classes/top/qianxinyao/Main/TestDataRunner.class and b/target/classes/top/qianxinyao/Main/TestDataRunner.class differ diff --git a/target/classes/top/qianxinyao/algorithms/JsonKit$1.class b/target/classes/top/qianxinyao/algorithms/JsonKit$1.class index 0c72a2bb92a0ae27df638363002a1a9e99bd07b4..72c22e5fd1b15cd663c306620bace2ee4156842b 100644 Binary files a/target/classes/top/qianxinyao/algorithms/JsonKit$1.class and b/target/classes/top/qianxinyao/algorithms/JsonKit$1.class differ diff --git a/target/classes/top/qianxinyao/algorithms/JsonKit$2.class b/target/classes/top/qianxinyao/algorithms/JsonKit$2.class index 218bc3cbe852f2ce34173f17248f44279e6c8e23..54ae201a4162b85e22c319fce48ed67a1117b23e 100644 Binary files a/target/classes/top/qianxinyao/algorithms/JsonKit$2.class and b/target/classes/top/qianxinyao/algorithms/JsonKit$2.class differ diff --git a/target/classes/top/qianxinyao/algorithms/JsonKit$3.class b/target/classes/top/qianxinyao/algorithms/JsonKit$3.class index ad08cb1c036b421b62f8d46b74e35d067c6fdcf6..d3ac507f5b525f59347de0698b8cf679dca73e60 100644 Binary files a/target/classes/top/qianxinyao/algorithms/JsonKit$3.class and b/target/classes/top/qianxinyao/algorithms/JsonKit$3.class differ diff --git a/target/classes/top/qianxinyao/hotrecommend/HotRecommender.class b/target/classes/top/qianxinyao/hotrecommend/HotRecommender.class index d0296054518df36ab0379a0db326a07755c6e456..c4fc66e02c3586a3dbd839278e9835a88ac26ece 100644 Binary files a/target/classes/top/qianxinyao/hotrecommend/HotRecommender.class and b/target/classes/top/qianxinyao/hotrecommend/HotRecommender.class differ