From f3c97914c14d429abcae3b7949976ad82fe5b063 Mon Sep 17 00:00:00 2001 From: Simon Makumi Date: Thu, 25 Jul 2024 09:16:03 +0300 Subject: [PATCH 1/2] Updating the logo --- .../movie_recommendor-checkpoint.ipynb | 30 +++++++++---------- movie_recommendor.ipynb | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb b/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb index 7ba8fba..a6e70f5 100644 --- a/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb +++ b/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb @@ -5,7 +5,7 @@ "id": "9538a32c-c02a-4a83-8819-249bed447e92", "metadata": {}, "source": [ - "![logo.png](attachment:logo.png)" + "![attachment:logo.png](logo.png)" ] }, { @@ -144,7 +144,7 @@ }, { "cell_type": "code", - "execution_count": 48, + "execution_count": 1, "id": "7018cb24-f44b-4c38-ab33-d45adfde8093", "metadata": {}, "outputs": [], @@ -171,7 +171,7 @@ }, { "cell_type": "code", - "execution_count": 49, + "execution_count": 2, "id": "d587021f", "metadata": {}, "outputs": [], @@ -300,7 +300,7 @@ }, { "cell_type": "code", - "execution_count": 50, + "execution_count": 3, "id": "8e2b2e76", "metadata": {}, "outputs": [ @@ -602,7 +602,7 @@ }, { "cell_type": "code", - "execution_count": 51, + "execution_count": 4, "id": "9d454adf", "metadata": {}, "outputs": [ @@ -758,7 +758,7 @@ }, { "cell_type": "code", - "execution_count": 52, + "execution_count": 5, "id": "fa4b26e5", "metadata": {}, "outputs": [ @@ -873,7 +873,7 @@ }, { "cell_type": "code", - "execution_count": 53, + "execution_count": 6, "id": "8d0fb7f0", "metadata": {}, "outputs": [ @@ -905,7 +905,7 @@ }, { "cell_type": "code", - "execution_count": 54, + "execution_count": 7, "id": "b430f787", "metadata": {}, "outputs": [ @@ -938,7 +938,7 @@ }, { "cell_type": "code", - "execution_count": 55, + "execution_count": 8, "id": "bebeff6f", "metadata": {}, "outputs": [ @@ -967,7 +967,7 @@ }, { "cell_type": "code", - "execution_count": 56, + "execution_count": 9, "id": "8b2e0ae5", "metadata": {}, "outputs": [], @@ -1002,7 +1002,7 @@ }, { "cell_type": "code", - "execution_count": 57, + "execution_count": 10, "id": "95a81b7b", "metadata": {}, "outputs": [ @@ -1165,7 +1165,7 @@ "[100836 rows x 5 columns]" ] }, - "execution_count": 57, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -1184,7 +1184,7 @@ }, { "cell_type": "code", - "execution_count": 58, + "execution_count": 11, "id": "e9d0a39f", "metadata": {}, "outputs": [], @@ -1203,7 +1203,7 @@ }, { "cell_type": "code", - "execution_count": 59, + "execution_count": 12, "id": "c9948e24", "metadata": {}, "outputs": [ @@ -1302,7 +1302,7 @@ "12 4.5 1995 " ] }, - "execution_count": 59, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } diff --git a/movie_recommendor.ipynb b/movie_recommendor.ipynb index 7ba8fba..a6e70f5 100644 --- a/movie_recommendor.ipynb +++ b/movie_recommendor.ipynb @@ -5,7 +5,7 @@ "id": "9538a32c-c02a-4a83-8819-249bed447e92", "metadata": {}, "source": [ - "![logo.png](attachment:logo.png)" + "![attachment:logo.png](logo.png)" ] }, { @@ -144,7 +144,7 @@ }, { "cell_type": "code", - "execution_count": 48, + "execution_count": 1, "id": "7018cb24-f44b-4c38-ab33-d45adfde8093", "metadata": {}, "outputs": [], @@ -171,7 +171,7 @@ }, { "cell_type": "code", - "execution_count": 49, + "execution_count": 2, "id": "d587021f", "metadata": {}, "outputs": [], @@ -300,7 +300,7 @@ }, { "cell_type": "code", - "execution_count": 50, + "execution_count": 3, "id": "8e2b2e76", "metadata": {}, "outputs": [ @@ -602,7 +602,7 @@ }, { "cell_type": "code", - "execution_count": 51, + "execution_count": 4, "id": "9d454adf", "metadata": {}, "outputs": [ @@ -758,7 +758,7 @@ }, { "cell_type": "code", - "execution_count": 52, + "execution_count": 5, "id": "fa4b26e5", "metadata": {}, "outputs": [ @@ -873,7 +873,7 @@ }, { "cell_type": "code", - "execution_count": 53, + "execution_count": 6, "id": "8d0fb7f0", "metadata": {}, "outputs": [ @@ -905,7 +905,7 @@ }, { "cell_type": "code", - "execution_count": 54, + "execution_count": 7, "id": "b430f787", "metadata": {}, "outputs": [ @@ -938,7 +938,7 @@ }, { "cell_type": "code", - "execution_count": 55, + "execution_count": 8, "id": "bebeff6f", "metadata": {}, "outputs": [ @@ -967,7 +967,7 @@ }, { "cell_type": "code", - "execution_count": 56, + "execution_count": 9, "id": "8b2e0ae5", "metadata": {}, "outputs": [], @@ -1002,7 +1002,7 @@ }, { "cell_type": "code", - "execution_count": 57, + "execution_count": 10, "id": "95a81b7b", "metadata": {}, "outputs": [ @@ -1165,7 +1165,7 @@ "[100836 rows x 5 columns]" ] }, - "execution_count": 57, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -1184,7 +1184,7 @@ }, { "cell_type": "code", - "execution_count": 58, + "execution_count": 11, "id": "e9d0a39f", "metadata": {}, "outputs": [], @@ -1203,7 +1203,7 @@ }, { "cell_type": "code", - "execution_count": 59, + "execution_count": 12, "id": "c9948e24", "metadata": {}, "outputs": [ @@ -1302,7 +1302,7 @@ "12 4.5 1995 " ] }, - "execution_count": 59, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } From 636582da67803590a5a057fb7d568c3b797a17ab Mon Sep 17 00:00:00 2001 From: Simon Makumi Date: Thu, 25 Jul 2024 10:00:11 +0300 Subject: [PATCH 2/2] Solving merge conflict --- .../movie_recommendor-checkpoint.ipynb | 120 ------------------ movie_recommendor.ipynb | 120 ------------------ 2 files changed, 240 deletions(-) diff --git a/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb b/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb index f23d668..7419e97 100644 --- a/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb +++ b/.ipynb_checkpoints/movie_recommendor-checkpoint.ipynb @@ -944,102 +944,6 @@ }, { "cell_type": "markdown", -<<<<<<< HEAD - "id": "53af6b11", - "metadata": {}, - "source": [ - "### Check for Missing Values" - ] - }, - { - "cell_type": "code", - "execution_count": 6, - "id": "8d0fb7f0", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "movieId 0\n", - "title 0\n", - "genres 0\n", - "userId_x 21\n", - "rating 21\n", - "dtype: int64\n" - ] - } - ], - "source": [ - "# Check for missing values\n", - "print(data_explorer.merged_data.isnull().sum())" - ] - }, - { - "cell_type": "markdown", - "id": "aa6f7736", - "metadata": {}, - "source": [ - "This revealed some missing values in `userId_x`and `rating`. Since there were only 21 missing values in rating, we decided to drop rows with missing rating:" - ] - }, - { - "cell_type": "code", - "execution_count": 7, - "id": "b430f787", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "movieId 0\n", - "title 0\n", - "genres 0\n", - "userId_x 0\n", - "rating 0\n", - "dtype: int64\n" - ] - } - ], - "source": [ - "# Drop null values since they are just 21.\n", - "data_explorer.merged_data.dropna(subset=['rating'], inplace=True)\n", - "print(data_explorer.merged_data.isnull().sum())\n" - ] - }, - { - "cell_type": "markdown", - "id": "9615d18a", - "metadata": {}, - "source": [ - "### Remove Duplicate Rows" - ] - }, - { - "cell_type": "code", - "execution_count": 8, - "id": "bebeff6f", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "0\n" - ] - } - ], - "source": [ - "# Drop duplicates\n", - "data_explorer.merged_data.drop_duplicates(inplace=True)\n", - "print(data_explorer.merged_data.duplicated().sum())" - ] - }, - { - "cell_type": "markdown", -======= ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "94057848", "metadata": {}, "source": [ @@ -1049,11 +953,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 9, -======= "execution_count": 6, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "8b2e0ae5", "metadata": {}, "outputs": [], @@ -1082,11 +982,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 10, -======= "execution_count": 7, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "95a81b7b", "metadata": {}, "outputs": [ @@ -1250,11 +1146,7 @@ "[285783 rows x 5 columns]" ] }, -<<<<<<< HEAD - "execution_count": 10, -======= "execution_count": 7, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "metadata": {}, "output_type": "execute_result" } @@ -1275,11 +1167,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 11, -======= "execution_count": 8, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "e9d0a39f", "metadata": {}, "outputs": [], @@ -1299,11 +1187,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 12, -======= "execution_count": 9, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "c9948e24", "metadata": {}, "outputs": [ @@ -1402,11 +1286,7 @@ "4 4.0 1995 " ] }, -<<<<<<< HEAD - "execution_count": 12, -======= "execution_count": 9, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "metadata": {}, "output_type": "execute_result" } diff --git a/movie_recommendor.ipynb b/movie_recommendor.ipynb index f23d668..7419e97 100644 --- a/movie_recommendor.ipynb +++ b/movie_recommendor.ipynb @@ -944,102 +944,6 @@ }, { "cell_type": "markdown", -<<<<<<< HEAD - "id": "53af6b11", - "metadata": {}, - "source": [ - "### Check for Missing Values" - ] - }, - { - "cell_type": "code", - "execution_count": 6, - "id": "8d0fb7f0", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "movieId 0\n", - "title 0\n", - "genres 0\n", - "userId_x 21\n", - "rating 21\n", - "dtype: int64\n" - ] - } - ], - "source": [ - "# Check for missing values\n", - "print(data_explorer.merged_data.isnull().sum())" - ] - }, - { - "cell_type": "markdown", - "id": "aa6f7736", - "metadata": {}, - "source": [ - "This revealed some missing values in `userId_x`and `rating`. Since there were only 21 missing values in rating, we decided to drop rows with missing rating:" - ] - }, - { - "cell_type": "code", - "execution_count": 7, - "id": "b430f787", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "movieId 0\n", - "title 0\n", - "genres 0\n", - "userId_x 0\n", - "rating 0\n", - "dtype: int64\n" - ] - } - ], - "source": [ - "# Drop null values since they are just 21.\n", - "data_explorer.merged_data.dropna(subset=['rating'], inplace=True)\n", - "print(data_explorer.merged_data.isnull().sum())\n" - ] - }, - { - "cell_type": "markdown", - "id": "9615d18a", - "metadata": {}, - "source": [ - "### Remove Duplicate Rows" - ] - }, - { - "cell_type": "code", - "execution_count": 8, - "id": "bebeff6f", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "0\n" - ] - } - ], - "source": [ - "# Drop duplicates\n", - "data_explorer.merged_data.drop_duplicates(inplace=True)\n", - "print(data_explorer.merged_data.duplicated().sum())" - ] - }, - { - "cell_type": "markdown", -======= ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "94057848", "metadata": {}, "source": [ @@ -1049,11 +953,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 9, -======= "execution_count": 6, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "8b2e0ae5", "metadata": {}, "outputs": [], @@ -1082,11 +982,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 10, -======= "execution_count": 7, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "95a81b7b", "metadata": {}, "outputs": [ @@ -1250,11 +1146,7 @@ "[285783 rows x 5 columns]" ] }, -<<<<<<< HEAD - "execution_count": 10, -======= "execution_count": 7, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "metadata": {}, "output_type": "execute_result" } @@ -1275,11 +1167,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 11, -======= "execution_count": 8, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "e9d0a39f", "metadata": {}, "outputs": [], @@ -1299,11 +1187,7 @@ }, { "cell_type": "code", -<<<<<<< HEAD - "execution_count": 12, -======= "execution_count": 9, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "id": "c9948e24", "metadata": {}, "outputs": [ @@ -1402,11 +1286,7 @@ "4 4.0 1995 " ] }, -<<<<<<< HEAD - "execution_count": 12, -======= "execution_count": 9, ->>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193 "metadata": {}, "output_type": "execute_result" }