git push origin masterMerge branch 'deniederhut-master'

PUBLICITY.md

@@ -0,0 +1,55 @@
+# Facetweet announcement
+
+Learn how to analyze your datasets in R! [insert link here](https://youtu.be/dQw4w9WgXcQ)
+
+# Information for calendar
+
+The workshop duration is 3hrs per class.
+
+# Descriptions for website
+
+## Header
+
+**title** : R for Data Science
+
+**description** : The R for Data Science workshop series is a four part course, designed to take novices in the R language for statistical computing and produce programmers who are competent in finding, displaying, analyzing, and publishing data in R.
+
+## Part 1
+
+**subtitle** : Basics of R
+
+**description** : Students will understand the motivation behind object orientation, and how that relates to computation. Students will be able to perform basic functions in R necessary to use the software on their computers and conduct basic arithmetic. Students will understand data types and data structures, and why and how they are different from each other.
+
+**knowledge requirements** : [Programming Fun!damentals](https://github.com/dlab-berkeley/programming-fundamentals), or equivalent prior knowledge
+
+**tech requirements** : Laptop required; please install R version 3.2 or greater in advance (University laptops will need to have R installed by an administrator); the RStudio IDE is recommended but not required
+
+## Part 2
+
+**subtitle** : Clean and tidy data
+
+**description** : Students will be introduced to DRY principles and best practices for sanitizing and tidying data. Students will learn what missingness is, and how best to accommodate missing data in their research designs. Students will be able to read in files from disk or a database, clean the data found within them, select specific data from them, and merge them with other datasets. 
+
+**knowledge requirements** : R-for-Data-Science Part 1 or equivalent prior knowledge
+
+**tech requirements** :  Laptop required; please install R version 3.2 or greater in advance (University laptops will need to have R installed by an administrator); the RStudio IDE is recommended but not required
+
+## Part 3
+
+**subtitle** : Analyzing data
+
+**description** : Students will be introduced to the principles behind the grammar of graphics and the general linear model. Students will understand the implementation of plotting in R. Students will be able to explore, summarize, and analyze data using R's implementation of exploratory and inferential data analysis.
+
+**knowledge requirements** : R-for-Data-Science Part 2 or equivalent prior knowledge
+
+**tech requirements** : Laptop required; please install R version 3.2 or greater in advance (University laptops will need to have R installed by an administrator); the RStudio IDE is recommended but not required
+
+## Part 4
+
+**subtitle** : Functions and packages
+
+**description** : Students will be introduced to the principles behind functional programming. Students will learn how to write and import functions, add looped and vectorized computation to their functions, and control the flow of data through a function. Students will understand the basics of name spaces, and how that relates to assigning values within functions. Students will see how to successfully package a function for CRAN.
+
+**knowledge requirements** : R-for-Data-Science Part 2 or equivalent prior knowledge
+
+**tech requirements** : Laptop required; please install R version 3.2 or greater in advance (University laptops will need to have R installed by an administrator); the RStudio IDE is recommended but not required

README.md

@@ -19,7 +19,7 @@ The instructor of this workshop series will lead you through the activities for
 
 ## If you are a D-Lab instructor
 
-You'll see accumulated teaching notes and examples for each day's topics in the instructor folder. For your convenience, these are available as .Rmd, commented .R files, PDF documents, and HTML slides.
+You'll see accumulated teaching notes and examples for each day's topics in the instructor folder. For your convenience, these are available as .Rmd, commented .R files, PDF documents, and HTML slides. The meta-document for this workshop series, which explains the logic behind the structure and topics, can be viewed [at the D-Lab guides repository](https://github.com/dlab-berkeley/guides/blob/master/r.pdf)
 
 For information on contributing to this repository, see `CONTRIBUTING.md`
 
@@ -61,17 +61,17 @@ This workshop series covers:
 
 This workshop uses the following packages:
 
-1. Amelia
-2. devtools
-3. dplyr
-4. foreign
-5. ggplot2
-6. parallelMap
-7. RCurl
-8. reshape2
-9. roxygen2
-10. stringr
-11. XML
+* Amelia
+* devtools
+* dplyr
+* foreign
+* ggplot2
+* parallelMap
+* RCurl
+* roxygen2
+* stringr
+* tidyr
+* XML
 
 ---
 _D-Lab == Data Intensive Social Science, For All!_

data/dirty.csv

@@ -1,6 +1,6 @@
 Timestamp,How tall are you?,What department are you in?,Are you currently enrolled?,What is your birth order?
 7/25/2015 10:08:41,very,Geology  ,Yes,1
 7/25/2015 10:10:56,70,999,Yes,1
-7/25/2015 10:11:20,5’9,  geology,999,2
+7/25/2015 10:11:20,5'9,  geology,999,2
 7/25/2015 10:11:25,2.1,goelogy,No,"9,000"
-7/25/2015 10:11:29,156,anthro,999,2
+7/25/2015 10:11:29,156,anthro,999,2