Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5976 b45a01b8-16f6-495d-af2f-9b41ad6348cc

Browse Source
This commit is contained in:
chrisparker126 2012-12-12 22:41:21 +00:00
parent 2d4c89aacf
commit eed8c28d7b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libretroshare/src/services/p3posted.cc
View File

@ -15,10 +15,10 @@
#define UPDATE_PHASE_COMMENT_COUNT 5 #define UPDATE_PHASE_COMMENT_COUNT 5
#define UPDATE_PHASE_COMPLETE 6 #define UPDATE_PHASE_COMPLETE 6
#define NUM_TOPICS_TO_GENERATE 7 #define NUM_TOPICS_TO_GENERATE 5
#define NUM_POSTS_TO_GENERATE 7 #define NUM_POSTS_TO_GENERATE 7
#define NUM_VOTES_TO_GENERATE 11 #define NUM_VOTES_TO_GENERATE 11
#define NUM_COMMENTS_TO_GENERATE 4 #define NUM_COMMENTS_TO_GENERATE 1
#define VOTE_UPDATE_PERIOD 5 // 20 seconds #define VOTE_UPDATE_PERIOD 5 // 20 seconds
@ -503,6 +503,7 @@ bool p3Posted::requestPostRankings(uint32_t &token, const RankType &rType, const
gp->rType = rType; gp->rType = rType;
gp->pubToken = token; gp->pubToken = token;
gp->rankingResult.rType = gp->rType; gp->rankingResult.rType = gp->rType;
gp->rankingResult.grpId = gp->grpId;
gp->grpId = gp->grpId; gp->grpId = gp->grpId;
mPendingPostRanks.push_back(gp); mPendingPostRanks.push_back(gp);
@ -528,7 +529,7 @@ bool p3Posted::getPostRanking(const uint32_t &token, RsPostedPostRanking &rankin
void p3Posted::processRankings() void p3Posted::processRankings()
{ {
// processPostRanks(); processPostRanks();
//processCommentRanks(); //processCommentRanks();
} }
@ -541,7 +542,7 @@ void p3Posted::processPostRanks()
std::vector<GxsPostedPostRanking*>::iterator vit = mPendingPostRanks.begin(); std::vector<GxsPostedPostRanking*>::iterator vit = mPendingPostRanks.begin();
// go through all pending posts // go through all pending posts
for(; vit !=mPendingPostRanks.begin(); ) for(; vit !=mPendingPostRanks.end(); )
{ {
GxsPostedPostRanking* gp = *vit; GxsPostedPostRanking* gp = *vit;
uint32_t token; uint32_t token;
@ -617,15 +618,15 @@ void p3Posted::discardCalc(const uint32_t &token)
bool PostedTopScoreComp(const PostedScore& i, const PostedScore& j) bool PostedTopScoreComp(const PostedScore& i, const PostedScore& j)
{ {
if((i.upVotes + (-i.downVotes)) == (j.upVotes + (-j.downVotes))){ // if((i.upVotes -i.downVotes) == (j.upVotes - j.downVotes)){
return i.date < j.date; // return i.date > j.date;
}else // }else
return (i.upVotes + (-i.downVotes)) < (j.upVotes + (-j.downVotes)); return (i.upVotes - i.downVotes) > (j.upVotes - j.downVotes);
} }
bool PostedNewScoreComp(const PostedScore& i, const PostedScore& j) bool PostedNewScoreComp(const PostedScore& i, const PostedScore& j)
{ {
return i.date < j.date; return i.date > j.date;
} }
bool PostedBestScoreComp(const PostedScore& i, const PostedScore& j) bool PostedBestScoreComp(const PostedScore& i, const PostedScore& j)
@ -679,7 +680,7 @@ bool p3Posted::completePostedPostCalc(GxsPostedPostRanking *gpp)
case NewRankType: case NewRankType:
calcPostedPostRank(msgMetaV, gpp->rankingResult.ranking, PostedNewScoreComp); calcPostedPostRank(msgMetaV, gpp->rankingResult.ranking, PostedNewScoreComp);
break; break;
case TopRankType: case BestRankType:
calcPostedPostRank(msgMetaV, gpp->rankingResult.ranking, PostedTopScoreComp); calcPostedPostRank(msgMetaV, gpp->rankingResult.ranking, PostedTopScoreComp);
break; break;
default: default:
@ -698,7 +699,7 @@ void p3Posted::calcPostedPostRank(const std::vector<RsMsgMetaData > msgMeta, Pos
std::vector<RsMsgMetaData>::const_iterator cit = msgMeta.begin(); std::vector<RsMsgMetaData>::const_iterator cit = msgMeta.begin();
std::vector<PostedScore> scores; std::vector<PostedScore> scores;
for(; cit != msgMeta.begin(); ) for(; cit != msgMeta.end(); cit++)
{ {
const RsMsgMetaData& m = *cit; const RsMsgMetaData& m = *cit;
uint32_t upVotes, downVotes, nComments; uint32_t upVotes, downVotes, nComments;
@ -708,10 +709,11 @@ void p3Posted::calcPostedPostRank(const std::vector<RsMsgMetaData > msgMeta, Pos
c.upVotes = upVotes; c.upVotes = upVotes;
c.downVotes = downVotes; c.downVotes = downVotes;
c.date = m.mPublishTs; c.date = m.mPublishTs;
c.msgId = m.mMsgId;
scores.push_back(c); scores.push_back(c);
} }
std::sort(scores.begin(), scores.end(), comp); std::sort(scores.begin(), scores.end(), PostedTopScoreComp);
std::vector<PostedScore>::iterator vit = scores.begin(); std::vector<PostedScore>::iterator vit = scores.begin();