Fix stuff?

Author: Bottersnike

src/cogs/util/results.py

@@ -7,47 +7,48 @@ def f(v):
         perc = (v['borda'] / v['votes']) / (len(round['votes'][0]['vote']) - 1) * 100
         stdv = (sum((i - perc) ** 2 for i in v['raw_borda']) / len(v['raw_borda']))**0.5
         return (perc, -stdv)
+
     totals = {}
     for r in round['responses']:
         totals[r] = {'borda': 0, 'votes': 0, 'raw_borda': []}
-    
+
     vote_weights = {}
-    
+
     for vote in round['votes']:
         if vote['voter'] not in vote_weights:
             vote_weights[vote['voter']] = 1
         else:
             vote_weights[vote['voter']] += 1
     for i in vote_weights:
         vote_weights[i] = 1 / vote_weights[i]
-    
+
     for vote in round['votes']:
         c = len(vote['vote'])
         for n, v in enumerate(vote['vote']):
             bc = c - n - 1
             totals[v]['borda'] += bc * vote_weights[vote['voter']]
             totals[v]['votes'] += vote_weights[vote['voter']]
-            totals[v]['raw_borda'].append(bc / (c - 1) * 100)
-    
+            totals[v]['raw_borda'].append((bc * vote_weights[vote['voter']]) / (c - 1) * 100)
+
     totals = [{'name': i[0], **i[1]} for i in totals.items()]
-    
+
     totals.sort(key=f, reverse=True)
     for twower in alive:
         if twower not in round['responses']:
             round['responses'][twower] = '*DNP*'.encode('UTF-8')
             totals.append({'name': twower, 'borda': 0, 'votes': 1, 'raw_borda': [0]})
     return totals
-    
+
 def get_results(totals, elim, round):
     def f(v):
-        return (v['borda'] / v['votes']) / (len(round['votes'][0]['vote']) - 1) * 100
+        perc = (v['borda'] / v['votes']) / (len(round['votes'][0]['vote']) - 1) * 100
+        stdv = (sum((i - perc) ** 2 for i in v['raw_borda']) / len(v['raw_borda']))**0.5
+        return (perc, stdv)
+
     for n, v in list(enumerate(totals))[::-1]:
-        score = f(v)
+        score, stdev = f(v)
 
-        mean = sum(v['raw_borda']) / len(v['raw_borda'])
-        variance = sum((i - mean) ** 2 for i in v['raw_borda']) / len(v['raw_borda'])
-        stdev = variance ** 0.5
-    
+        # Formatting
         if str(n + 1)[-1] == '1':
             if n + 1 == 11:
                 symbol = SUPERSCRIPT[3]
@@ -65,16 +66,16 @@ def f(v):
                 symbol = SUPERSCRIPT[2]
         else:
             symbol = SUPERSCRIPT[3]
-            
+
         dead = n >= elim
-        
-        
+
+        # :blobeyes:
         msg = '\n{}\n{} **{}{} place**: *{}*\n**{}** ({}% σ={})'.format(
-            '=' * 50, 
-            ':skull_crossbones:' if (dead and n!=0) else ':white_check_mark:', 
-            n + 1, symbol, round['responses'][v['name']].decode('utf-8'), 
+            '=' * 50,
+            ':skull_crossbones:' if (dead and n!=0) else ':white_check_mark:',
+            n + 1, symbol, round['responses'][v['name']].decode('utf-8'),
             '{}',
-            builtins.round(score, 2), 
+            builtins.round(score, 2),
             builtins.round(stdev, 2)
             )
         yield (msg, dead, v['name'], n)

src/cogs/util/timed_funcs.py

@@ -5,11 +5,11 @@
 
 async def start_voting(bot, channel):
     sd = bot.server_data[channel.id]
-        
+
     if sd['voting']:
         await bot.send_message(channel, 'Voting is already active.')
         return
-    
+
     round = sd['seasons']['season-{}'.format(sd['season'])]['rounds']['round-{}'.format(sd['round'])]
     if len(round['responses']) < 2:
         await bot.send_message(channel, 'There aren\'t enough responses to start voting. You need at least 2.')
@@ -26,23 +26,23 @@ async def start_voting(bot, channel):
         round['restimer'] = datetime.datetime.utcnow()+sd['queuetimer']['results']
     bot.save_data()
     await bot.send_message(channel, 'Voting has been activated.')
-    
+
 async def do_results(bot, channel, guild, nums='', message=None):
     sd = bot.server_data[channel.id]
     round = sd['seasons']['season-{}'.format(sd['season'])]['rounds']['round-{}'.format(sd['round'])]
-        
+
     if not sd['voting']:
         await bot.send_message(channel, 'Voting hasn\'t even started yet...')
         if round['restimer'] != None:
             round['restimer'] = None
             bot.save_data()
         return
-    
+
     if 'season-{}'.format(sd['season']) not in sd['seasons']:
         sd['seasons']['season-{}'.format(sd['season'])] = {}
     if 'round-{}'.format(sd['round']) not in sd['seasons']['season-{}'.format(sd['season'])]['rounds']:
         sd['seasons']['season-{}'.format(sd['season'])]['rounds']['round-{}'.format(sd['round'])] = dict(templates.round())
-    
+
     voted_ons = set()
     for vote in round['votes']: voted_ons |= set(vote['vote'])
     if set(round['responses']) != voted_ons:
@@ -56,7 +56,7 @@ async def do_results(bot, channel, guild, nums='', message=None):
     totals = results.count_votes(round, round['alive'])
     msg = '**Results for round {}, season {}:**'.format(sd['round'], sd['season'])
     if message != None:
-        await message.delete()    
+        await message.delete()
     eliminated = []
     living = []
     elim = int(0.8 * len(totals))
@@ -79,25 +79,27 @@ async def do_results(bot, channel, guild, nums='', message=None):
     if votec != 1: votest += 's'
     voterst = '{} voter'.format(voterc)
     if voterc != 1: voterst += 's'
-    
+
     await asyncio.sleep(1)
     await bot.send_message(channel, '{} submitted {}.'.format(voterst, votest))
-    
+
     for msg, dead, uid, n in results.get_results(totals, elim, round):
         user = guild.get_member(uid)
         name = ''
         if user is not None:
             name = user.mention
         else:
             name = str(uid)
-        
+
         if dead:
             eliminated.append((name, user))
         else:
             living.append((name, user))
-        
+
         await asyncio.sleep(len(totals) - n / 2)
-        await bot.send_message(channel,msg.format(name)) 
+        await bot.send_message(channel, msg.format(name))
+
+    # Winner/looser stuff
     user = guild.get_member(totals[0]['name'])
     if user is not None:
         name = user.mention
@@ -106,13 +108,14 @@ async def do_results(bot, channel, guild, nums='', message=None):
     msg = '{}\nThe winner was {}! Well done!'.format('=' * 50, name)
     await bot.send_message(channel,msg)
     round['winner'] = user.id
-    
+
     if eliminated:
         await bot.send_message(channel,
             'Sadly though, we have to say goodbye to {}.'.format(', '.join([i[0] for i in eliminated])))
     else:
         await bot.send_message(channel, 'You all lived on. I would say well done, but The elimination threshold was probably at 0.')
     advance = False
+
     # Do all the round incrementing and stuff.
     if len(totals) - len(eliminated) <= 1:
         await bot.send_message(channel,'**This season has ended! The winner was {}!**'.format(name))
@@ -128,17 +131,17 @@ async def do_results(bot, channel, guild, nums='', message=None):
         if sd['canqueue'] and len(sd['queue']) > 0:
             if sd['queuetimer']['prompt'] != None:
                 sd['hosttimer'] = datetime.datetime.utcnow()+sd['queuetimer']['prompt']
-                
+
     if 'season-{}'.format(sd['season']) not in sd['seasons']:#new season
         sd['seasons']['season-{}'.format(sd['season'])] = {'rounds':{}}
         living = []
     if 'round-{}'.format(sd['round']) not in sd['seasons']['season-{}'.format(sd['season'])]['rounds']:#new round
         sd['seasons']['season-{}'.format(sd['season'])]['rounds']['round-{}'.format(sd['round'])] = dict(templates.round())
         sd['seasons']['season-{}'.format(sd['season'])]['rounds']['round-{}'.format(sd['round'])]['alive']=[t[1].id for t in living]
-        
+
     if advance:
         await twow_helper.next_host(bot, channel, sd)
-    
+
     sd['voting'] = False
-    
+
     bot.save_data()