team sorting

Author: Headary

.coverage

@@ -16,6 +16,7 @@ jobs:
         python-version: "3.12"
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pytest
+        python -m pip install -r requirements.txt
+        python -m pip install pytest
     - name: Test
       run: pytest

.github/workflows/pytest.yml

@@ -0,0 +1 @@
+requests

requirements.txt

@@ -8,7 +8,7 @@
 import json
 import glob
 
-from src.teams import getTeamPoints
+from src.teams import Team, getTeamCoefficientAverage, getTeamPoints
 
 from .lines import parseFile
 
@@ -42,7 +42,7 @@ def process():
         print("Missing JSON data file of teams, please run download first")
         sys.exit()
     with open(TEAM_JSON, 'r') as jsonFile:
-        teams = json.load(jsonFile)
+        teamsJsonData = json.load(jsonFile)
 
     # load in files
     if not os.path.exists(IN_DIR):
@@ -56,7 +56,7 @@ def process():
     print(inputFiles)
 
     if (len(inputFiles) == 0):
-        print("No input files found")
+        print("No input file found")
         sys.exit()
 
     teamTasks = {}
@@ -65,7 +65,20 @@ def process():
     print(teamTasks)
 
     teamPoints = getTeamPoints(teamTasks)
-    print(teamPoints)
+
+    teams = []
+    for teamId in teamPoints:
+        coeffAvg = getTeamCoefficientAverage(
+            teamsJsonData[str(teamId)]['members'])
+        teams.append(Team(
+            teamId,
+            teamPoints[teamId],
+            coeffAvg,
+            teamsJsonData[str(teamId)]['category']
+        ))
+
+    teams.sort()
+    print(teams)
 
 
 def main():

src/__init__.py

@@ -12,8 +12,102 @@ def __init__(self, points, teamId, task) -> None:
 
 class InvalidTaskException(Exception):
     def __init__(self, task, teamId) -> None:
-        super().__init__(
-            f"Invalid task {task} for team {teamId}")
+        super().__init__(f"Invalid task {task} for team {teamId}")
+
+
+class InvalidStudyYearException(Exception):
+    def __init__(self, studyYear) -> None:
+        super().__init__(f"Invalid study year {studyYear}")
+
+
+class Team:
+    def __init__(self, teamId, points, coefficientAverage, category) -> None:
+        self.teamId = teamId
+        self.pointsSum = points['sum']
+        self.pointsCounts = points['counts']
+        self.coefficientAverage = coefficientAverage
+        self.category = category
+
+    def __repr__(self) -> str:
+        return f"<{self.teamId}, {self.category}>"
+
+    def __eq__(self, obj):
+        return self.teamId == obj.teamId
+
+    def __lt__(self, obj):
+        if self.teamId == obj.teamId:
+            return False
+        # compare sum
+        if self.pointsSum > obj.pointsSum:
+            return True
+        if self.pointsSum < obj.pointsSum:
+            return False
+
+        # compare averages -> sum is same, so compare counts
+        if self.getTotalPointsCount() < obj.getTotalPointsCount():
+            return True
+        if self.getTotalPointsCount() > obj.getTotalPointsCount():
+            return False
+
+        # more 5 point submits
+        if self.getPointsCount(5) > obj.getPointsCount(5):
+            return True
+        if self.getPointsCount(5) < obj.getPointsCount(5):
+            return False
+
+        # more 3 point submits
+        if self.getPointsCount(3) > obj.getPointsCount(3):
+            return True
+        if self.getPointsCount(3) < obj.getPointsCount(3):
+            return False
+
+        # lower coefficient
+        if self.coefficientAverage < obj.coefficientAverage:
+            return True
+        if self.coefficientAverage > obj.coefficientAverage:
+            return False
+
+        # lower team id
+        if self.teamId < obj.teamId:
+            return True
+
+        return False
+
+    def getTotalPointsCount(self) -> int:
+        count = 0
+        for points in self.pointsCounts:
+            count += self.pointsCounts[points]
+        return count
+
+    def getPointsCount(self, point):
+        if point in self.pointsCounts:
+            return self.pointsCounts[point]
+        return 0
+
+
+def studyYearToCoefficient(studyYear: str):
+    match studyYear:
+        case 'H_1':
+            return 1
+        case 'H_2':
+            return 2
+        case 'H_3':
+            return 3
+        case 'H_4':
+            return 4
+        case 'U_ALL' | None:
+            raise InvalidStudyYearException(studyYear)
+        case _:
+            return 0
+
+
+def getTeamCoefficientAverage(members) -> float:
+    memberCount = 0
+    coeffSum = 0
+    for member in members:
+        memberCount += 1
+        coeffSum += studyYearToCoefficient(member['studyYear'])
+    return coeffSum/memberCount
 
 
 def appendTeamsData(teamId: int, task: str, points: int, teamTasks: dict) -> None:
@@ -55,8 +149,3 @@ def getTeamPoints(teamTasks: dict) -> dict:
             'counts': pointsCount
         }
     return teamPoints
-
-
-# def orderTeams(teamPoints: dict):
-#    teams = []
-#    for ()

src/teams.py

@@ -1,6 +1,7 @@
 import pytest
+import random
 
-from src.teams import DuplicatePointsEntryException, InvalidPointsException, InvalidTaskException, appendTeamsData, getTeamPoints
+from src.teams import DuplicatePointsEntryException, InvalidPointsException, InvalidTaskException, Team, appendTeamsData, getTeamPoints
 
 
 def test_simple():
@@ -107,3 +108,49 @@ def test_points_sum():
             }
         }
     }
+
+
+def get_test_teams():
+    return [
+        Team(8, {'sum': 15, 'counts': {5: 3}}, 4, 'A'),
+        Team(2, {'sum': 8, 'counts': {5: 1, 3: 1}}, 4, 'B'),
+        Team(1, {'sum': 8, 'counts': {5: 1, 2: 1, 1: 1}}, 4, 'A'),
+        Team(4, {'sum': 8, 'counts': {3: 2, 2: 1}}, 4, 'B'),
+        Team(3, {'sum': 4, 'counts': {3: 1, 1: 1}}, 4, 'A'),
+        Team(7, {'sum': 4, 'counts': {2: 2}}, 1, 'A'),
+        Team(5, {'sum': 4, 'counts': {2: 2}}, 4, 'B'),
+        Team(6, {'sum': 4, 'counts': {2: 2}}, 4, 'A')
+    ]
+
+
+def test_team_compare_gt():
+    teams = get_test_teams()
+    for i in range(0, 7):
+        assert not teams[i] < teams[i]
+        assert not teams[i] > teams[i]
+        for j in range(i+1, 7+1):
+            assert teams[i] < teams[j]
+            assert not (teams[i] > teams[j])
+
+
+def test_team_sort():
+    teams = [
+        Team(8, {'sum': 15, 'counts': {5: 3}}, 4, 'A'),
+        Team(2, {'sum': 8, 'counts': {5: 1, 3: 1}}, 4, 'B'),
+        Team(1, {'sum': 8, 'counts': {5: 1, 2: 1, 1: 1}}, 4, 'A'),
+        Team(4, {'sum': 8, 'counts': {3: 2, 2: 1}}, 4, 'B'),
+        Team(3, {'sum': 4, 'counts': {3: 1, 1: 1}}, 4, 'A'),
+        Team(7, {'sum': 4, 'counts': {2: 2}}, 1, 'A'),
+        Team(5, {'sum': 4, 'counts': {2: 2}}, 4, 'B'),
+        Team(6, {'sum': 4, 'counts': {2: 2}}, 4, 'A')
+    ]
+    sorted(teams, key=lambda team: team.teamId)
+    print(teams)
+    assert teams[0].teamId == 8
+    assert teams[1].teamId == 2
+    assert teams[2].teamId == 1
+    assert teams[3].teamId == 4
+    assert teams[4].teamId == 3
+    assert teams[5].teamId == 7
+    assert teams[6].teamId == 5
+    assert teams[7].teamId == 6