diff --git a/01-intro-to-computing.Rmd b/01-intro-to-computing.Rmd
index 536cced..99cfee8 100644
--- a/01-intro-to-computing.Rmd
+++ b/01-intro-to-computing.Rmd
@@ -105,17 +105,6 @@ add(18, add(21, 65))
Remember that the Python language is supposed to help us understand what we are writing in code easily, lending to *readable* code. Therefore, it is sometimes useful to come up with operations that is easier to read. (Most functions in Python are stored in a collection of functions called **modules** that needs to be loaded. The `import` statement gives us permission to access the functions in the module "operator".)
-### Data types
-
-Here are some common data types we will be using in this course.
-
-| Data type name | **Data type shorthand** | **Examples** |
-|----------------|:-----------------------:|:-----------------------:|
-| Integer | int | 2, 4 |
-| Float | float | 3.5, -34.1009 |
-| String | str | "hello", "234-234-8594" |
-| Boolean | bool | True, False |
-
### Function machine schema
A nice way to summarize this first grammar structure is using the function machine schema, way back from algebra class:
@@ -128,6 +117,17 @@ Here are some aspects of this schema to pay attention to:
- A function can have different kinds of inputs and outputs - it doesn't need to be numbers. In the `len()` function, the input is a String, and the output is an Integer. We will see increasingly complex functions with all sorts of different inputs and outputs.
+### Data types
+
+Here are some common data types we will be using in this course.
+
+| Data type name | **Data type shorthand** | **Examples** |
+|----------------|:-----------------------:|:-----------------------:|
+| Integer | int | 2, 4 |
+| Float | float | 3.5, -34.1009 |
+| String | str | "hello", "234-234-8594" |
+| Boolean | bool | True, False |
+
## Grammar Structure 2: Storing data types in the Variable Environment
To build up a computer program, we need to store our returned data type from our expression somewhere for downstream use. We can assign a variable to it as follows:
@@ -175,7 +175,7 @@ Let's look at functions a little bit more formally: A function has a **function
>
> The output of functions is called the **returned value**.
-Often, we will use multiple functions in a nested way, and it is important to understand how the Python console understand the order of operation. We can also use paranthesis to change the order of operation. Think about what the Python is going to do step-by--step in the lines of code below:
+Often, we will use multiple functions in a nested way, and it is important to understand how the Python console understand the order of operation. We can also use parenthesis to change the order of operation. Think about what the Python is going to do step-by--step in the lines of code below:
```{python}
max(len("hello"), 4)
@@ -221,11 +221,11 @@ And there is an operational equivalent:
We will mostly look at functions with input arguments and return types in this course, but not all functions need to have input arguments and output return. Let's look at some examples of functions that don't always have an input or output:
-| Function call | What it takes in | What it does | Returns |
+| Function call | What it takes in | What it does | Returns |
|----------------|----------------|-------------------------|----------------|
-| [`pow(a, b)`](https://docs.python.org/3/library/functions.html#pow) | integer `a`, integer `b` | Raises `a` to the `b`th power. | Integer |
-| [`print(x)`](https://docs.python.org/3/library/functions.html#print) | any data type `x` | Prints out the value of `x` to the console. | None |
-| [`dir()`](https://docs.python.org/3/library/functions.html#dir) | Nothing | Gives a list of all the variables defined in the environment. | List |
+| [`pow(a, b)`](https://docs.python.org/3/library/functions.html#pow) | integer `a`, integer `b` | Raises `a` to the `b`th power. | Integer |
+| [`time.sleep(x)`](https://docs.python.org/3/library/time.html#time.sleep) | Integer `x` | Waits for `x` seconds. | None |
+| [`dir()`](https://docs.python.org/3/library/functions.html#dir) | Nothing | Gives a list of all the variables defined in the environment. | List |
## Tips on writing your first code
diff --git a/03-data-wrangling1.Rmd b/03-data-wrangling1.Rmd
index eeac127..53dea24 100644
--- a/03-data-wrangling1.Rmd
+++ b/03-data-wrangling1.Rmd
@@ -169,7 +169,7 @@ metadata.OncotreeLineage.value_counts().plot(kind = "bar")
plt.show()
```
-(The `plt.figure()` and `plt.show()` functions are used to render the plots on the website, but you don't need to use it for your exercises - yet. We will discuss this in more detail during our week of data visualization.)
+(The `plt.figure()` and `plt.show()` functions are used to render the plots on the website, but you don't need to use it for your exercises. We will discuss this in more detail during our week of data visualization.)
#### Chained function calls
diff --git a/slides/images/function_machine.png b/slides/images/function_machine.png
new file mode 100644
index 0000000..2bb7d9f
Binary files /dev/null and b/slides/images/function_machine.png differ
diff --git a/slides/lesson1_slides.html b/slides/lesson1_slides.html
index 31ee4e5..de68197 100644
--- a/slides/lesson1_slides.html
+++ b/slides/lesson1_slides.html
@@ -307,6 +307,7 @@
}
.reveal .slide:not(.center) {
height: 100%;
+ overflow-y: auto;
}
.reveal .slide.scrollable {
overflow-y: auto;
@@ -438,8 +439,8 @@
Goals of the course
-
-Culture of the course
+
+Culture of the course (1/3)
- Challenge: We are learning on the job, but you already have a full-time job
@@ -455,54 +456,53 @@ Culture of the course
- You should understand the gist of the material with class time, but mastery takes practice and practice.
-
+
+
+Culture of the course (2/3)
- Challenge: We sometimes struggle with our data science in isolation, unaware that someone two doors down from us has gone through the same struggle.
-
-- We learn and work better with our peers.
+- We learn and work better with our peers.
-- You might make a new friend, or two. đ
+- You might make a new friend, or two. đ
-
+
+
+Culture of the course (3/3)
-- Challenge: We all have various personal goals and applications
+- Challenge: We all have various personal goals and applications.
-
-- Curate content during open community sessions and office hours based on your inputs.
+- Curate content during open community sessions and office hours based on your inputs.
-