midgard/tab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #56 from ZeusWPI/better-rounding

Browse source 
Improve rounding of debtchart
This commit is contained in:
redfast00 2019-06-19 15:54:59 +02:00 committed by GitHub
commit dba60e9a18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/concerns/statistics.rb
View file

@ -10,16 +10,32 @@ class Statistics < Rails::Application
end end
def shamehash def shamehash
# Make a hash of all users and their debt
# only include them if their percentage is big enough
debt_users = shameful_users.inject({}) do |h, u| debt_users = shameful_users.inject({}) do |h, u|
h.merge({u.name => - u.balance.to_f / total_debt * 100.0}) h.merge({u.name => - u.balance.to_f / total_debt * 100.0})
end end
.select { |key, value| value > 2 } .select { |user, debtpct| debtpct > 2 }
.transform_values! { |value| value.floor }
total_displayed_debt_pct = debt_users.values.inject(0) {|a,b| a+b} # Sum of percentages that will be displayed
total_displayed_debt_pct = debt_users.values.reduce(0) {|a,b| a+b}
debt_users["Other users"] = 100 - total_displayed_debt_pct debt_users["Other users"] = 100 - total_displayed_debt_pct
debt_users
rounded_debts = debt_users.transform_values { |debtpct| debtpct.floor }
rounded_deficit = 100 - rounded_debts.values.reduce(0) {|a,b| a+b}
# Sort decending by amount after fraction of debt percentage
# then award users percentage points based on their ranking
debt_users.sort_by { |k, v| -(v - v.floor) }
.first(rounded_deficit)
.each do |k|
rounded_debts[k[0]] += 1
end
if rounded_debts["Other users"] == 0
rounded_debts.delete("Other users")
end
return rounded_debts
end end
def by_issuer def by_issuer