Merge branch 'master' of github.com:w3champions/mmr-service

Dockerfile.build

@@ -0,0 +1,10 @@
+FROM ubuntu:20.04
+
+WORKDIR /w3champions-mmr-service
+
+COPY . .
+
+RUN pip install pipenv
+RUN pipenv install
+
+CMD pipenv run python main.py

Pipfile

@@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+pytest = "*"
 
 [packages]
 glicko2 = "*"

azure-pipelines.yml

@@ -7,9 +7,9 @@ pool:
 steps:
 - script: |
     python3 -m pip install --upgrade pip setuptools wheel
-    python3 -m pip install pipenv pytest
-    python3 -m pipenv install --system
-    python3 -m pytest
+    python3 -m pip install pipenv
+    python3 -m pipenv install --dev
+    python3 -m pipenv run pytest
   displayName: 'Run fastapi tests'
 
 - task: PublishTestResults@2

common/constants.py

@@ -1,4 +1,7 @@
-# TODO: Not sure what this is, could use a more descriptive name.
+# Constant to go from Mu/Standard deviation representation of Logistic distr.
+# to Mu/Scale representation.
+# https://en.wikipedia.org/wiki/Logistic_distribution
 C_SD = 0.551328895
+
 # TODO: Should be hardcoded to the same value as in the python mmr service
 BETA = 215

main.py

@@ -1,13 +1,29 @@
+import numpy as np
 import uvicorn
 from fastapi import FastAPI
 
-from mmr.update_mmr import UpdateMmrRequestBody, update_after_game, UpdateMmrResponseBody
+from mmr.bayesian_rating_w3c import UpdateMmrRequestBody, update_after_game, UpdateMmrResponseBody
+from teambalance.balance import BalanceTeamResponseBody, BalanceTeamRequestBody, Balance
 
 app = FastAPI()
 
+balance = Balance()
 
 @app.post("/mmr/update")
 async def update_mmr(body: UpdateMmrRequestBody) -> UpdateMmrResponseBody:
+    for i, rd in enumerate(body.rds_list):
+        if rd < 80:
+            body.rds_list[i] *= 80/60.25
+
+    for i, rating in enumerate(body.ratings_list):
+        if rating < 0:
+            body.ratings_list[i] = 0
+
+    return update_after_game(body.ratings_list, body.rds_list, body.winning_team, body.number_of_teams)
+
+
+@app.post("/team/balance")
+async def update_mmr(body: BalanceTeamRequestBody) -> BalanceTeamResponseBody:
     for i, rd in enumerate(body.rds_list):
         if rd < 60.25:
             body.rds_list[i] = 60.25
@@ -16,7 +32,7 @@ async def update_mmr(body: UpdateMmrRequestBody) -> UpdateMmrResponseBody:
         if rating < 0:
             body.ratings_list[i] = 0
 
-    return update_after_game(body.ratings_list, body.rds_list, 1 if body.t1_won else 0)
+    return balance.find_best_game(np.array(body.ratings_list), np.array(body.rds_list), body.gamemode)
 
 
 if __name__ == "__main__":