Skip to content

Commit 95fc270

Browse files
authored
Merge branch 'main' into 7-new-metric-request-award-numbers
2 parents 54073d6 + 8502b11 commit 95fc270

File tree

3 files changed

+47
-4
lines changed

3 files changed

+47
-4
lines changed

AUTHORS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ Ivan Cao-Berg (icaoberg) - Pittsburgh Supercomputing Center
44
## Undergraduate Students
55
Eduardo J. Figueroa (EduardoJFigueroa) - University of Puerto Rico
66

7-
# SAMS Data Science Group
7+
## CS Scholars Data Science Group
8+
Joshua Franco (francojoshua) - Western High School
9+
Nicolas Watkins (nicolasw-cmu) - Edmond Santa Fe Highschool
10+
Carmen Ung (cmucung) - Rosemead High School
11+
Marcuslyne Sieh (marcuslynes) - The Metropolitan Regional Career and Technical Center
12+
Manav Mahida (ManavMahida) - North Penn High School
13+
Temidayo Ogundare (Togundar) - Science Park High School
14+
Neptune Barton (jellyfishking-github)- Eldorado High School
15+
16+
17+
## SAMS Data Science Group
818
Tiffany Wang (Tffny3) - Cupertino High School
919
Eileen Lin (eileen-png) - Eleanor Roosevelt High School, eSTEM Academy
1020
Louis Lin (Bobvius) - Jack Britt High

braininventory/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .get import *
1+
from .get import *

braininventory/get.py

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ def __get_contributor(df):
5454
def __get_affilation(df):
5555
return df["affiliation"].value_counts().to_dict()
5656

57-
5857
def __get_awards(df):
5958
return df["award_number"].unique()
6059

61-
6260
def __get_award_number(df):
6361
return df["award_number"].value_counts().to_dict()
6462

@@ -90,6 +88,41 @@ def __get_technique(df):
9088
def __get_locations(df):
9189
return df["locations"].value_counts().to_dict()
9290

91+
def __get_contributors(df):
92+
"""
93+
This returns an array of contributor names from the contributorname column.
94+
"""
95+
return df["contributorname"].unique()
96+
97+
98+
def __get_project_names(df):
99+
'''
100+
Gets the unique list of project names.
101+
102+
Input: dataframe
103+
Output: list
104+
'''
105+
return df['project'].unique()
106+
107+
def __get_list_of_projects(df):
108+
'''
109+
Get the list of names for unique projects
110+
111+
Input parameter: dataframe
112+
Output: list of projects
113+
'''
114+
115+
return df['project'].unique().to_dict()
116+
117+
def __get_number_of_projects(df):
118+
'''
119+
Get the number of unique projects
120+
121+
Input parameter: dataframe
122+
Output: number of projects
123+
'''
124+
125+
return len(df['project'].unique())
93126

94127
def report():
95128
# Get today's date

0 commit comments

Comments
 (0)