From 6c0c82a8b59aff2e74a73b9655da34aa0f222546 Mon Sep 17 00:00:00 2001 From: April Wright Date: Mon, 3 Jun 2019 15:19:34 -0500 Subject: [PATCH 1/5] add keypoints to 05 --- _episodes/05-merging-data.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_episodes/05-merging-data.md b/_episodes/05-merging-data.md index 141ce4198..9640a69ea 100644 --- a/_episodes/05-merging-data.md +++ b/_episodes/05-merging-data.md @@ -11,7 +11,10 @@ objectives: - "Employ `to_csv` to export a DataFrame in CSV format." - "Join DataFrames using common fields (join keys)." keypoints: - - "FIXME" + - "`Merge` and `concat` can be used to recombine subsets from a DataFrame, or even data from different files." + - "DataFrames can be combined using join keys with the `join` function." + - "Joining two DataFrames can be done in multiple ways (left, right, and inner) according to what data must be in the final DataFrame." + - "`to_csv` can be used to write out DataFrames in CSV format." --- In many "real world" situations, the data that we want to use come in multiple From fe879d3af8e01a16ee20bfcb1c20bb459485db2e Mon Sep 17 00:00:00 2001 From: April Wright Date: Fri, 7 Jun 2019 08:36:49 -0500 Subject: [PATCH 2/5] Update _episodes/05-merging-data.md --- _episodes/05-merging-data.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/05-merging-data.md b/_episodes/05-merging-data.md index 9640a69ea..46feb94ac 100644 --- a/_episodes/05-merging-data.md +++ b/_episodes/05-merging-data.md @@ -11,7 +11,7 @@ objectives: - "Employ `to_csv` to export a DataFrame in CSV format." - "Join DataFrames using common fields (join keys)." keypoints: - - "`Merge` and `concat` can be used to recombine subsets from a DataFrame, or even data from different files." + - "Pandas' `merge` and `concat` can be used to (re)-combine subsets from a DataFrame, or even data from different files." - "DataFrames can be combined using join keys with the `join` function." - "Joining two DataFrames can be done in multiple ways (left, right, and inner) according to what data must be in the final DataFrame." - "`to_csv` can be used to write out DataFrames in CSV format." From 755951fe24694c5ff44c5197c024ff4c820522fb Mon Sep 17 00:00:00 2001 From: April Wright Date: Fri, 7 Jun 2019 09:06:43 -0500 Subject: [PATCH 3/5] Update _episodes/05-merging-data.md --- _episodes/05-merging-data.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/05-merging-data.md b/_episodes/05-merging-data.md index 46feb94ac..93e0a2697 100644 --- a/_episodes/05-merging-data.md +++ b/_episodes/05-merging-data.md @@ -11,7 +11,7 @@ objectives: - "Employ `to_csv` to export a DataFrame in CSV format." - "Join DataFrames using common fields (join keys)." keypoints: - - "Pandas' `merge` and `concat` can be used to (re)-combine subsets from a DataFrame, or even data from different files." + - "Pandas' `merge` and `concat` can be used to combine subsets of a DataFrame, or even data from different files." - "DataFrames can be combined using join keys with the `join` function." - "Joining two DataFrames can be done in multiple ways (left, right, and inner) according to what data must be in the final DataFrame." - "`to_csv` can be used to write out DataFrames in CSV format." From 88f0c70b363df2a6d7e49b52338055ac7974d927 Mon Sep 17 00:00:00 2001 From: April Wright Date: Fri, 7 Jun 2019 09:49:50 -0500 Subject: [PATCH 4/5] Update _episodes/05-merging-data.md --- _episodes/05-merging-data.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/05-merging-data.md b/_episodes/05-merging-data.md index 93e0a2697..a7ca3211e 100644 --- a/_episodes/05-merging-data.md +++ b/_episodes/05-merging-data.md @@ -13,7 +13,7 @@ objectives: keypoints: - "Pandas' `merge` and `concat` can be used to combine subsets of a DataFrame, or even data from different files." - "DataFrames can be combined using join keys with the `join` function." - - "Joining two DataFrames can be done in multiple ways (left, right, and inner) according to what data must be in the final DataFrame." + - "Joining two DataFrames can be done in multiple ways (left, right, and inner) depending on what data must be in the final DataFrame." - "`to_csv` can be used to write out DataFrames in CSV format." --- From 27714d3e36d0daaa74d8a7494e7e8323922f47cc Mon Sep 17 00:00:00 2001 From: April Wright Date: Fri, 7 Jun 2019 10:51:45 -0500 Subject: [PATCH 5/5] Update _episodes/05-merging-data.md --- _episodes/05-merging-data.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/05-merging-data.md b/_episodes/05-merging-data.md index a7ca3211e..3ca9632d5 100644 --- a/_episodes/05-merging-data.md +++ b/_episodes/05-merging-data.md @@ -12,7 +12,7 @@ objectives: - "Join DataFrames using common fields (join keys)." keypoints: - "Pandas' `merge` and `concat` can be used to combine subsets of a DataFrame, or even data from different files." - - "DataFrames can be combined using join keys with the `join` function." + - "`join` function combines DataFrames based on index or column." - "Joining two DataFrames can be done in multiple ways (left, right, and inner) depending on what data must be in the final DataFrame." - "`to_csv` can be used to write out DataFrames in CSV format." ---