-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #89 from j3camero/Scarrab-decayrate-120
Decay rate 120
- Loading branch information
Showing
4 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
SELECT | ||
tt.lo_user_id AS lo_user_id, | ||
tt.hi_user_id AS hi_user_id, | ||
SUM(EXP(0.00000004456964896 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) AS discounted_diluted_seconds | ||
SUM(EXP(0.00000006685447343 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) AS discounted_diluted_seconds | ||
FROM time_together AS tt | ||
INNER JOIN users AS lo on lo.commissar_id = tt.lo_user_id | ||
INNER JOIN users AS hi ON hi.commissar_id = tt.hi_user_id | ||
WHERE lo.citizen IS TRUE AND hi.citizen IS TRUE | ||
AND tt.t > NOW() - INTERVAL 16 HOUR | ||
GROUP BY tt.lo_user_id, tt.hi_user_id | ||
ORDER BY SUM(EXP(0.00000004456964896 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) | ||
ORDER BY SUM(EXP(0.00000006685447343 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) | ||
; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
SELECT | ||
tt.lo_user_id AS lo_user_id, | ||
tt.hi_user_id AS hi_user_id, | ||
SUM(EXP(0.00000004456964896 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) AS discounted_diluted_seconds | ||
SUM(EXP(0.00000006685447343 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) AS discounted_diluted_seconds | ||
FROM time_together AS tt | ||
INNER JOIN users AS lo on lo.commissar_id = tt.lo_user_id | ||
INNER JOIN users AS hi ON hi.commissar_id = tt.hi_user_id | ||
WHERE lo.citizen IS TRUE AND hi.citizen IS TRUE | ||
GROUP BY tt.lo_user_id, tt.hi_user_id | ||
ORDER BY SUM(EXP(0.00000004456964896 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) | ||
ORDER BY SUM(EXP(0.00000006685447343 * TIMESTAMPDIFF(SECOND, NOW(), tt.t)) * tt.diluted_seconds) | ||
; |