From 73ea0717e408e874a8c8b817db852f234f838e8c Mon Sep 17 00:00:00 2001 From: MarekToma Date: Wed, 21 Feb 2024 12:01:31 +0100 Subject: [PATCH 1/3] Spring2024 first project --- notebooks/cranfield.ipynb | 12 ++++++------ pv211_utils/cranfield/leaderboard.py | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/notebooks/cranfield.ipynb b/notebooks/cranfield.ipynb index 99ba299..c5fdd69 100644 --- a/notebooks/cranfield.ipynb +++ b/notebooks/cranfield.ipynb @@ -43,7 +43,7 @@ "outputs": [], "source": [ "%%capture\n", - "! pip install git+https://github.com/MIR-MU/pv211-utils.git@spring2023" + "! pip install git+https://github.com/MIR-MU/pv211-utils.git@spring2024" ] }, { @@ -303,9 +303,9 @@ "outputs": [], "source": [ "from pv211_utils.systems import BoWSystem\n", - "from pv211_utils.preprocessing import SimpleDocPreprocessing\n", + "from pv211_utils.preprocessing import NoneDocPreprocessing\n", "\n", - "preprocessing = SimpleDocPreprocessing()\n", + "preprocessing = NoneDocPreprocessing()\n", "system = BoWSystem(documents, preprocessing)" ] }, @@ -350,7 +350,7 @@ "provenance": [] }, "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -364,11 +364,11 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.13" + "version": "3.10.12" }, "vscode": { "interpreter": { - "hash": "4525bb9afa5b11e91ff8883ff1427ebcb57df9afe31e89541862e2caa0e84c72" + "hash": "916dbcbb3f70747c44a77c7bcd40155683ae19c65e1c03b4aa3499c5328201f1" } } }, diff --git a/pv211_utils/cranfield/leaderboard.py b/pv211_utils/cranfield/leaderboard.py index 1d2b297..8def025 100644 --- a/pv211_utils/cranfield/leaderboard.py +++ b/pv211_utils/cranfield/leaderboard.py @@ -7,21 +7,21 @@ class CranfieldLeaderboard(GoogleSpreadsheetLeaderboardBase): def get_competition_start(self) -> datetime.date: - return datetime.date(2023, 2, 13) + return datetime.date(2024, 2, 19) def get_competition_end(self) -> datetime.date: - return datetime.date(2023, 3, 13) + return datetime.date(2024, 3, 19) def _get_key_path(self) -> str: key_path = pkg_resources.resource_filename('pv211_utils', 'data/pv211-leaderboard-b8e892e3e8bb.json') return key_path def _get_spreadsheet_key(self) -> str: - spreadsheet_key = '1kDRTDUCPTOi0crgIO_WqctuvCazTmZ4V_EoVSvb6VQI' + spreadsheet_key = '1K_GnmMTjeacPaUmvjO79abrlqOV8JqvnoxoQICulpAw' return spreadsheet_key def get_public_url(self) -> Optional[str]: return ( 'https://docs.google.com/spreadsheets/d/e/' - '2PACX-1vSXuOTclZfHWYxh2rf7hfMeLvcCuE5UsJu7BzteyunhPw3z4YNZjCovjmMB6SnDdgjGyenOgdochaEq/pubhtml' + '2PACX-1vQga_qzgcLp_IcrOt5xZBq4Pq7jjTwmV6JLMRPwkLwG3K3dm2FrcZT-1GhGItFkNyAxwDaOzzFLOIdu/pubhtml' ) From cbb04bfa3b663a5653d39477317e8f15bf979722 Mon Sep 17 00:00:00 2001 From: MarekToma Date: Thu, 22 Feb 2024 08:51:13 +0100 Subject: [PATCH 2/3] second term project leaderboard update --- pv211_utils/arqmath/leaderboard.py | 10 +++++----- pv211_utils/beir/leaderboard.py | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pv211_utils/arqmath/leaderboard.py b/pv211_utils/arqmath/leaderboard.py index 38c0a7f..7cd047b 100644 --- a/pv211_utils/arqmath/leaderboard.py +++ b/pv211_utils/arqmath/leaderboard.py @@ -7,22 +7,22 @@ class ArqmathLeaderboard(GoogleSpreadsheetLeaderboardBase): def get_competition_start(self) -> datetime.date: - return datetime.date(2023, 3, 22) + return datetime.date(2024, 3, 27) def get_competition_end(self) -> datetime.date: - return datetime.date(2023, 5, 1) + return datetime.date(2024, 5, 7) def _get_key_path(self) -> str: key_path = pkg_resources.resource_filename('pv211_utils', 'data/pv211-leaderboard-b8e892e3e8bb.json') return key_path def _get_spreadsheet_key(self) -> str: - spreadsheet_key = '1zGUntkeUmE8oFKgM9WdFbN14IPdGJHDbKWXoiec_lmM' + spreadsheet_key = '1ohEA6tcmKKKng0Tx787p112fTWDNgF8O5JMvSF-v0ds' return spreadsheet_key def get_public_url(self) -> Optional[str]: return ( 'https://docs.google.com/spreadsheets/d/e/2PACX' - '-1vT9GibzjkZJxdFNdgr666TLDIHD46HfTYSEPeKUN-ErxRIN2HGjUtKyfvf6Xg3MZ6cW4p9qcSmR' - '-4Rk/pubhtml?gid=0&single=true' + '-1vQyaxVj3qnJgeSyOnAtUb7VcielyLnw9MZTNC9vTVZm22' + 'aH4TqV-aIx2TjDZ9fXSeKveUJA8cVB23XR/pubhtml' ) diff --git a/pv211_utils/beir/leaderboard.py b/pv211_utils/beir/leaderboard.py index 32a333b..1ccdd1c 100644 --- a/pv211_utils/beir/leaderboard.py +++ b/pv211_utils/beir/leaderboard.py @@ -7,21 +7,22 @@ class BeirLeaderboard(GoogleSpreadsheetLeaderboardBase): def get_competition_start(self) -> datetime.date: - return datetime.date(2023, 3, 22) + return datetime.date(2024, 3, 27) def get_competition_end(self) -> datetime.date: - return datetime.date(2023, 5, 1) + return datetime.date(2024, 5, 7) def _get_key_path(self) -> str: key_path = pkg_resources.resource_filename('pv211_utils', 'data/pv211-leaderboard-b8e892e3e8bb.json') return key_path def _get_spreadsheet_key(self) -> str: - spreadsheet_key = '1YC0A9-XCd7p18rE37RI8edTOGeSlsAtQWnaPiS8GPOw' + spreadsheet_key = '1z59ROLx-0AS-Wd6ppmOrXKmx7gZG2SM4KdFgfiwoFPI' return spreadsheet_key def get_public_url(self) -> Optional[str]: return ( - 'https://docs.google.com/spreadsheets/d/e/2PACX-1vSLYKoYcsTgyTp2T' - '-pNgW2heZrwvmBVKAgWAAG_vELv8kgnxHffnJ-IKt5huAacvO7r-zKWOgSiqWFU/pubhtml?gid=0&single=true' + 'https://docs.google.com/spreadsheets/d/e/2PACX' + '-1vRc5VbtwD2YUdfTlICSlYwcS8ZjNqkHVJrKgQ2pVBNmUi' + 'Li9lUkTrYde9Mu6fxJTa07LN4VZ2oTs5jZ/pubhtml' ) From e853c8bc40c70272844f4491ed3831c89a253d22 Mon Sep 17 00:00:00 2001 From: MarekToma Date: Thu, 22 Feb 2024 08:58:22 +0100 Subject: [PATCH 3/3] fixed type error --- pv211_utils/datasets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pv211_utils/datasets.py b/pv211_utils/datasets.py index 300ba06..614c9f3 100644 --- a/pv211_utils/datasets.py +++ b/pv211_utils/datasets.py @@ -201,7 +201,7 @@ def load_train_queries(self, query_class=ArqmathQueryBase) -> OrderedDict: OrderedDict Dictionary of test queries in (query_id: Query) form. """ - year1, year2 = {2020, 2021, 2022} - {self.year} + year1, year2 = list({2020, 2021, 2022} - {self.year}) return OrderedDict( self._get_split(year1, Split.train, query_class), @@ -217,7 +217,7 @@ def load_validation_queries(self, query_class=ArqmathQueryBase) -> OrderedDict: OrderedDict Dictionary of test queries in (query_id: Query) form. """ - year1, year2 = {2020, 2021, 2022} - {self.year} + year1, year2 = list({2020, 2021, 2022} - {self.year}) return OrderedDict( self._get_split(year1, Split.validation, query_class), @@ -243,7 +243,7 @@ def load_train_judgements(self) -> ArqmathJudgements: Set of (Query, Answer) pairs, where Anwser is judged as relevant to the Query. """ - year1, year2 = {2020, 2021, 2022} - {self.year} + year1, year2 = list({2020, 2021, 2022} - {self.year}) return {(q, a) for q, a in self._load_judgements(year1).union( self._load_judgements(year2)) @@ -258,7 +258,7 @@ def load_validation_judgements(self) -> ArqmathJudgements: Set of (Query, Answer) pairs, where Anwser is judged as relevant to the Query. """ - year1, year2 = {2020, 2021, 2022} - {self.year} + year1, year2 = list({2020, 2021, 2022} - {self.year}) return {(q, a) for q, a in self._load_judgements(year1).union( self._load_judgements(year2))