Skip to content

Commit 8d2b7ee

Browse files
committed
fix merge
1 parent 2e51e5f commit 8d2b7ee

File tree

3 files changed

+85
-10
lines changed

3 files changed

+85
-10
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
button {
2+
background-color: skyblue;
3+
border-radius: 5px;
4+
padding: 10px;
5+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import React from "react";
2+
import { useState } from "react";
3+
import "./MatchingGame.css";
4+
import placeholderThumbnail from "../placeholderThumbnail.png";
5+
6+
export const MatchingGame = () => {
7+
const [score, setScore] = useState(0);
8+
9+
function processGroup1Click() {
10+
setScore(score + 10);
11+
}
12+
13+
function processGroup2Click() {
14+
setScore(score - 5);
15+
console.log(score);
16+
}
17+
18+
return (
19+
<>
20+
<br></br>
21+
<h1>Let's play a game!</h1>
22+
23+
<p>Score: {score}</p>
24+
25+
<img src={placeholderThumbnail} width={250} height={250} alt="game"></img>
26+
<br></br>
27+
<button onClick={processGroup1Click}>Group 1</button>
28+
29+
<button onClick={processGroup2Click}>Group 2</button>
30+
31+
<br></br>
32+
</>
33+
);
34+
};

website/src/assets/College/collegeLabContent.js

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React from "react";
33
import "../../main.css";
44
import EssayContainer from "../../components/posts/CollegeAdmissions/essay/EssayContainer";
55
import WomenEnrollmentContainer from "../../components/posts/CollegeAdmissions/enrollmentGraph/WomenEnrollmentContainer.js";
6+
import { MatchingGame } from "./MatchingGame.js";
67

78
export default [
89
{
@@ -15,19 +16,21 @@ export default [
1516
{
1617
body: (
1718
<p>
18-
In 2013, the CS department at the University of Texas at Austin implemented the GRADE (GRaduate ADmissions Evaluator)
19-
machine learning system into its Ph.D. admissions process.
19+
In 2013, the CS department at the University of Texas at Austin
20+
implemented the GRADE (GRaduate ADmissions Evaluator) machine
21+
learning system into its Ph.D. admissions process.
2022
</p>
2123
),
2224
},
2325
{
2426
body: (
2527
<p>
26-
Made to reflect the admissions committee’s decisions prior to its implementation in 2013,
27-
issues arose of it{" "}
28+
Made to reflect the admissions committee’s decisions prior to its
29+
implementation in 2013, issues arose of it{" "}
2830
<mark className="underline">
29-
compounding the initial biases that the admissions committee held,
30-
which disadvantaged applicants from underrepresented groups.
31+
compounding the initial biases that the admissions committee
32+
held, which disadvantaged applicants from underrepresented
33+
groups.
3134
</mark>{" "}
3235
The department ultimately abandoned GRADE in 2020.
3336
</p>
@@ -37,16 +40,17 @@ export default [
3740
body: (
3841
<p>
3942
<mark className="bold">
40-
In this case study, we will analyze why and how ML models such as GRADE that screen various applications
41-
can undervalue the achievements of underrepresented groups.
43+
In this case study, we will analyze why and how ML models such
44+
as GRADE that screen various applications can undervalue the
45+
achievements of underrepresented groups.
4246
</mark>
4347
</p>
4448
),
4549
},
4650
],
4751
},
4852
},
49-
53+
5054
{
5155
post: {
5256
profilePic: teachLogo,
@@ -167,7 +171,39 @@ export default [
167171
],
168172
},
169173
},
170-
174+
{
175+
post: {
176+
profilePic: teachLogo,
177+
profilePicName: "Profile Picture - Thinking Like an ML Model",
178+
header: "Thinking Like an ML Model",
179+
headerLink: true,
180+
linkTo: "facebook",
181+
subheader:
182+
"Why did the model take factors unrelated to competence into account?",
183+
bodyText: [
184+
{
185+
body: (
186+
<p className="bold">
187+
The computer isn't really looking for gender. So why does it learn
188+
to take that into account without being told to do so?
189+
<br></br>
190+
<br></br>
191+
Here's an interactive example that emulates how machine learning
192+
models "learn".
193+
<br></br>
194+
<br></br>
195+
Grouping exercise!
196+
<br></br>
197+
Explain why you make mistakes.
198+
<br></br>
199+
Explain how that's similar to how ML models make mistakes.
200+
<MatchingGame />
201+
</p>
202+
),
203+
},
204+
],
205+
},
206+
},
171207
{
172208
post: {
173209
profilePic: teachLogo,

0 commit comments

Comments
 (0)