Skip to content

Commit

Permalink
Solving merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonMakumi
simonMakumi committed Jul 25, 2024
1 parent cf841e4 commit 636582d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 240 deletions.
120 changes: 0 additions & 120 deletions .ipynb_checkpoints/movie_recommendor-checkpoint.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -1049,11 +953,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 9,
=======
"execution_count": 6,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "8b2e0ae5",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -1082,11 +982,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 10,
=======
"execution_count": 7,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "95a81b7b",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1250,11 +1146,7 @@
"[285783 rows x 5 columns]"
]
},
<<<<<<< HEAD
"execution_count": 10,
=======
"execution_count": 7,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -1275,11 +1167,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 11,
=======
"execution_count": 8,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "e9d0a39f",
"metadata": {},
"outputs": [],
Expand All @@ -1299,11 +1187,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 12,
=======
"execution_count": 9,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "c9948e24",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1402,11 +1286,7 @@
"4 4.0 1995 "
]
},
<<<<<<< HEAD
"execution_count": 12,
=======
"execution_count": 9,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"metadata": {},
"output_type": "execute_result"
}
Expand Down
120 changes: 0 additions & 120 deletions movie_recommendor.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -1049,11 +953,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 9,
=======
"execution_count": 6,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "8b2e0ae5",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -1082,11 +982,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 10,
=======
"execution_count": 7,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "95a81b7b",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1250,11 +1146,7 @@
"[285783 rows x 5 columns]"
]
},
<<<<<<< HEAD
"execution_count": 10,
=======
"execution_count": 7,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -1275,11 +1167,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 11,
=======
"execution_count": 8,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "e9d0a39f",
"metadata": {},
"outputs": [],
Expand All @@ -1299,11 +1187,7 @@
},
{
"cell_type": "code",
<<<<<<< HEAD
"execution_count": 12,
=======
"execution_count": 9,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"id": "c9948e24",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1402,11 +1286,7 @@
"4 4.0 1995 "
]
},
<<<<<<< HEAD
"execution_count": 12,
=======
"execution_count": 9,
>>>>>>> 5336d4ee52d409e6144a6cf533437f7d87b44193
"metadata": {},
"output_type": "execute_result"
}
Expand Down

0 comments on commit 636582d

Please sign in to comment.