diff --git a/diagrams/join.graffle b/diagrams/join.graffle index fc54f2a..1928c1e 100644 Binary files a/diagrams/join.graffle and b/diagrams/join.graffle differ diff --git a/diagrams/join/following.png b/diagrams/join/following.png index 51c3011..5f1d479 100644 Binary files a/diagrams/join/following.png and b/diagrams/join/following.png differ diff --git a/diagrams/join/gte.png b/diagrams/join/gte.png index 0a65350..c27bd50 100644 Binary files a/diagrams/join/gte.png and b/diagrams/join/gte.png differ diff --git a/diagrams/join/inner-both.png b/diagrams/join/inner-both.png index e2093f5..e39063d 100644 Binary files a/diagrams/join/inner-both.png and b/diagrams/join/inner-both.png differ diff --git a/diagrams/join/inner.png b/diagrams/join/inner.png index b82196a..97c30eb 100644 Binary files a/diagrams/join/inner.png and b/diagrams/join/inner.png differ diff --git a/diagrams/join/lt.png b/diagrams/join/lt.png index 6887776..965c8f8 100644 Binary files a/diagrams/join/lt.png and b/diagrams/join/lt.png differ diff --git a/diagrams/join/outer.png b/diagrams/join/outer.png index e6fc6c6..95db2b6 100644 Binary files a/diagrams/join/outer.png and b/diagrams/join/outer.png differ diff --git a/diagrams/join/setup.png b/diagrams/join/setup.png index 8e9b9f1..0033216 100644 Binary files a/diagrams/join/setup.png and b/diagrams/join/setup.png differ diff --git a/diagrams/join/setup2.png b/diagrams/join/setup2.png index 001a787..b621f8a 100644 Binary files a/diagrams/join/setup2.png and b/diagrams/join/setup2.png differ diff --git a/oreilly-colours.R b/oreilly-colours.R new file mode 100644 index 0000000..07798cd --- /dev/null +++ b/oreilly-colours.R @@ -0,0 +1,38 @@ +library(farver) +library(dplyr, warn.conflicts = FALSE) + +oreilly <- tribble( + ~ name, ~r, ~g, ~b, + "blue", 0, 113, 188, + "orange", 247, 147, 30, + "red", 193, 39, 45, + "green", 0, 146, 68, + "yellow", 255, 222, 0, + "purple", 153, 0, 204 +) +oreilly$col <- encode_colour(oreilly[c("r", "g", "b")]) + +tint <- function(col, tint) { + n <- length(tint) + col_Lab <- decode_colour(col, to = "Lab") + white_Lab <- decode_colour(white, to = "Lab") + + encode_colour( + col_Lab[rep(1,n), ] * tint + white_Lab[rep(1,n), ] * (1 - tint), + from = "Lab" + ) +} + + +tints <- seq(0.1, 1, length.out = 10) + +oreilly |> + group_by(name) |> + summarise( + tint = paste0("t", tints * 100), + colour = tint(col, tints), + .groups = "drop" + ) |> + tidyr::pivot_wider(names_from = tint, values_from = colour) + +scales::show_col(tint(oreilly$col[5], tints))