Skip to content

Update hw text to be more clear #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajlee21 merged 2 commits into from
Jul 28, 2020
Merged

Update hw text to be more clear #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b723f7
clarify py comments
ajlee21 Jul 26, 2020
6bc0155
fix typo
ajlee21 Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions class_materials/Intro2Pandas/2020/q2.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
" Returns\n",
" -------\n",
" popular_df: pandas.DataFrame\n",
" The dataframe containing the top 3 most popular effective drugs\n",
" The dataframe containing the top 3 most popular effective drugs.\n",
" This dataframe should be dimenion (3 x #).\n",
" \n",
" \"\"\"\n",
" # Processing code here\n",
Expand All @@ -112,7 +113,7 @@
"source": [
"def get_most_effective_drugs(nonzero_df):\n",
" \"\"\"\n",
" Get the top 2 most effective and commonly used drugs\n",
" Get the top 2 most effective among the 3 most commonly used drugs\n",
" \n",
" Input\n",
" -----\n",
Expand Down Expand Up @@ -212,7 +213,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.8"
"version": "3.6.8"
}
},
"nbformat": 4,
Expand Down
5 changes: 3 additions & 2 deletions class_materials/Intro2Pandas/2020/q2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def get_most_popular_drugs(nonzero_df):
Returns
-------
popular_df: pandas.DataFrame
The dataframe containing the top 3 most popular effective drugs
The dataframe containing the top 3 most popular effective drugs.
This dataframe should be dimenion (3 x #).

"""
# Processing code here
Expand All @@ -72,7 +73,7 @@ def get_most_popular_drugs(nonzero_df):

def get_most_effective_drugs(nonzero_df):
"""
Get the top 2 most effective and commonly used drugs
Get the top 2 most effective among the 3 most commonly used drugs

Input
-----
Expand Down
7 changes: 4 additions & 3 deletions class_materials/Intro2Pandas/2020/q2_answers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def filter_patients(df):
The dataframe after filtering

"""
nonzero_df = df[(df["Effect"] >= 0) & (df["Year"] > 2015)]
nonzero_df = df[(df["Effect"] > 0) & (df["Year"] > 2015)]
return nonzero_df


Expand All @@ -62,7 +62,8 @@ def get_most_popular_drugs(nonzero_df):
Returns
-------
popular_df: pandas.DataFrame
The dataframe containing the top 3 most popular effective drugs
The dataframe containing the top 3 most popular effective drugs.
This dataframe should be dimenion (3 x #).

"""
drug_counts = nonzero_df.groupby(["Drug"]).count()
Expand All @@ -72,7 +73,7 @@ def get_most_popular_drugs(nonzero_df):

def get_most_effective_drugs(nonzero_df):
"""
Get the top 2 most effective and commonly used drugs
Get the top 2 most effective among the 3 most commonly used drugs

Input
-----
Expand Down