Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 01:17:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed small bugs in average friend reputation display

Browse Source
This commit is contained in:
csoler 2015-10-13 21:54:52 -04:00
parent 410102a7fc
commit 441b164c73
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/services/p3gxsreputation.cc
View File

@ -776,10 +776,10 @@ bool p3GxsReputation::loadReputationSet(RsGxsReputationSetItem *item, const std:
// if dropping entries has changed the score -> must update. // if dropping entries has changed the score -> must update.
float old_reputation = reputation.mReputation ; //float old_reputation = reputation.mReputation ;
//mUpdatedReputations.insert(gxsId) ;
if(old_reputation != reputation.updateReputation(mAverageActiveFriends)) reputation.updateReputation(mAverageActiveFriends) ;
mUpdatedReputations.insert(gxsId) ;
mUpdated.insert(std::make_pair(reputation.mOwnOpinionTs, gxsId)); mUpdated.insert(std::make_pair(reputation.mOwnOpinionTs, gxsId));
return true; return true;
@ -888,13 +888,14 @@ int p3GxsReputation::sendReputationRequest(RsPeerId peerid)
return 1; return 1;
} }
float Reputation::updateReputation(uint32_t average_active_friends) void Reputation::updateReputation(uint32_t average_active_friends)
{ {
// the calculation of reputation makes the whole thing // the calculation of reputation makes the whole thing
int friend_total = 0; int friend_total = 0;
// accounts for all friends. Neutral opinions count for 1-1=0 // accounts for all friends. Neutral opinions count for 1-1=0
// because the average is performed over only accessible peers (not the total number) we need to shift to 1
for(std::map<RsPeerId,RsReputations::Opinion>::const_iterator it(mOpinions.begin());it!=mOpinions.end();++it) for(std::map<RsPeerId,RsReputations::Opinion>::const_iterator it(mOpinions.begin());it!=mOpinions.end();++it)
friend_total += it->second - 1; friend_total += it->second - 1;
@ -908,8 +909,6 @@ float Reputation::updateReputation(uint32_t average_active_friends)
mReputation = mFriendAverage ; mReputation = mFriendAverage ;
else else
mReputation = (float)mOwnOpinion ; mReputation = (float)mOwnOpinion ;
return float(mOwnOpinion) ;
} }
void p3GxsReputation::debug_print() void p3GxsReputation::debug_print()

2
libretroshare/src/services/p3gxsreputation.h
View File

@ -64,7 +64,7 @@ public:
Reputation(const RsGxsId& about) Reputation(const RsGxsId& about)
:mOwnOpinion(RsReputations::OPINION_NEUTRAL), mOwnOpinionTs(0), mReputation(RsReputations::OPINION_NEUTRAL) { } :mOwnOpinion(RsReputations::OPINION_NEUTRAL), mOwnOpinionTs(0), mReputation(RsReputations::OPINION_NEUTRAL) { }
float updateReputation(uint32_t average_active_friends); void updateReputation(uint32_t average_active_friends);
std::map<RsPeerId, RsReputations::Opinion> mOpinions; std::map<RsPeerId, RsReputations::Opinion> mOpinions;
int32_t mOwnOpinion; int32_t mOwnOpinion;

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -680,9 +680,9 @@ void IdDialog::insertIdDetails(uint32_t token)
RsReputations::ReputationInfo info ; RsReputations::ReputationInfo info ;
rsReputations->getReputationInfo(RsGxsId(data.mMeta.mGroupId),info) ; rsReputations->getReputationInfo(RsGxsId(data.mMeta.mGroupId),info) ;
ui->neighborNodesOpinion_TF->setText(QString::number(info.mOverallReputationScore-1.0f)); ui->neighborNodesOpinion_TF->setText(QString::number(info.mFriendAverage - 1.0f));
ui->overallOpinion_TF->setText(QString::number(info.mOverallReputationScore-1.0f) +" ("+ ui->overallOpinion_TF->setText(QString::number(info.mOverallReputationScore - 1.0f) +" ("+
((info.mAssessment == RsReputations::ASSESSMENT_OK)? tr("OK") : tr("Banned")) +")" ) ; ((info.mAssessment == RsReputations::ASSESSMENT_OK)? tr("OK") : tr("Banned")) +")" ) ;
switch(info.mOwnOpinion) switch(info.mOwnOpinion)