diff --git a/lab3/assignment2.R b/lab3/assignment2.R index 8ee408dac5313709b86e5b42bb950330ea3b493f..8b12a3875f1efa7bead9c5ccce4f623f431af7d7 100644 --- a/lab3/assignment2.R +++ b/lab3/assignment2.R @@ -86,7 +86,7 @@ date_diff_ignoring_year <- function(date1, date2) { return(diff) } -difftime_ignoring_day <- function(time1, time2) { +time_diff_ignoring_day <- function(time1, time2) { # Get difference in hours diff <- abs(as.numeric(difftime(time1, time2, units = "hours"))) @@ -124,7 +124,7 @@ for (time in times) { time_kernels <- mapply(function(time_i) { - dist <- difftime_ignoring_day(time, time_i) + dist <- time_diff_ignoring_day(time, time_i) gaussian_kernel(dist, h_time) }, st_temp$time) diff --git a/lab3/figures/assignment2-added-kernels.eps b/lab3/figures/assignment2-added-kernels.eps index d8b1859d564b273d1af054785d6ba6edda34eae7..6594857f7131b9fcbc3f65d5cc6d37247454769e 100644 --- a/lab3/figures/assignment2-added-kernels.eps +++ b/lab3/figures/assignment2-added-kernels.eps @@ -144,28 +144,28 @@ bp 1 setlinejoin 10.00 setmiterlimit np -72.40 92.57 m -33.40 34.69 l -33.40 40.11 l -33.40 38.04 l -33.40 24.66 l -33.40 4.69 l -33.40 -14.00 l -33.40 -26.20 l -33.40 -33.22 l -33.40 -38.62 l -33.40 -43.08 l +72.40 88.94 m +33.40 32.38 l +33.40 42.14 l +33.40 40.56 l +33.40 26.52 l +33.40 4.22 l +33.40 -16.45 l +33.40 -30.76 l +33.40 -38.89 l +33.40 -39.43 l +33.40 -29.59 l o -72.40 92.57 2.70 c p1 -105.80 127.26 2.70 c p1 -139.20 167.37 2.70 c p1 -172.60 205.41 2.70 c p1 -206.00 230.07 2.70 c p1 +72.40 88.94 2.70 c p1 +105.80 121.32 2.70 c p1 +139.20 163.46 2.70 c p1 +172.60 204.02 2.70 c p1 +206.00 230.54 2.70 c p1 239.40 234.76 2.70 c p1 -272.80 220.76 2.70 c p1 -306.20 194.56 2.70 c p1 -339.60 161.34 2.70 c p1 -373.00 122.72 2.70 c p1 +272.80 218.31 2.70 c p1 +306.20 187.55 2.70 c p1 +339.60 148.66 2.70 c p1 +373.00 109.23 2.70 c p1 406.40 79.64 2.70 c p1 0.00 0.00 450.00 300.00 cl 0 0 0 srgb @@ -175,30 +175,30 @@ o 1 setlinejoin 10.00 setmiterlimit np -59.04 90.89 m -0 116.15 l +59.04 81.81 m +0 123.95 l o np -59.04 90.89 m +59.04 81.81 m -7.20 0 l o np -59.04 129.61 m +59.04 123.13 m -7.20 0 l o np -59.04 168.33 m +59.04 164.45 m -7.20 0 l o np -59.04 207.04 m +59.04 205.76 m -7.20 0 l o /Font1 findfont 12 s -41.76 90.89 (3.0) .5 90 t -41.76 129.61 (3.5) .5 90 t -41.76 168.33 (4.0) .5 90 t -41.76 207.04 (4.5) .5 90 t +41.76 81.81 (3.0) .5 90 t +41.76 123.13 (3.5) .5 90 t +41.76 164.45 (4.0) .5 90 t +41.76 205.76 (4.5) .5 90 t np 59.04 73.44 m 360.72 0 l @@ -285,19 +285,19 @@ o 1 setlinejoin 10.00 setmiterlimit np -59.04 90.89 m +59.04 81.81 m 360.72 0 l o np -59.04 129.61 m +59.04 123.13 m 360.72 0 l o np -59.04 168.33 m +59.04 164.45 m 360.72 0 l o np -59.04 207.04 m +59.04 205.76 m 360.72 0 l o np diff --git a/lab3/figures/assignment2-added-kernels.png b/lab3/figures/assignment2-added-kernels.png index 24f60e45e208c5e6a05a7c4b94d10c480a7e39a5..1a8249ca6fba38ecd2f2dc8b4dd1f4622e13bdb1 100644 Binary files a/lab3/figures/assignment2-added-kernels.png and b/lab3/figures/assignment2-added-kernels.png differ diff --git a/lab3/figures/assignment2-multiplied-kernels.eps b/lab3/figures/assignment2-multiplied-kernels.eps index 6d8f3de90a960111668686751e7e28075bdea663..511866df07a881f4b71b14613e42e217009d2b4e 100644 --- a/lab3/figures/assignment2-multiplied-kernels.eps +++ b/lab3/figures/assignment2-multiplied-kernels.eps @@ -144,29 +144,29 @@ bp 1 setlinejoin 10.00 setmiterlimit np -72.40 147.70 m -33.40 7.87 l -33.40 23.34 l -33.40 28.86 l -33.40 21.35 l -33.40 5.64 l -33.40 -9.97 l -33.40 -21.47 l -33.40 -30.61 l -33.40 -40.72 l -33.40 -52.35 l -o -72.40 147.70 2.70 c p1 -105.80 155.57 2.70 c p1 -139.20 178.91 2.70 c p1 -172.60 207.77 2.70 c p1 -206.00 229.12 2.70 c p1 +72.40 79.64 m +33.40 22.22 l +33.40 41.76 l +33.40 46.97 l +33.40 33.50 l +33.40 10.67 l +33.40 -11.56 l +33.40 -23.87 l +33.40 -29.50 l +33.40 -33.75 l +33.40 -34.99 l +o +72.40 79.64 2.70 c p1 +105.80 101.86 2.70 c p1 +139.20 143.62 2.70 c p1 +172.60 190.59 2.70 c p1 +206.00 224.09 2.70 c p1 239.40 234.76 2.70 c p1 -272.80 224.79 2.70 c p1 -306.20 203.32 2.70 c p1 -339.60 172.71 2.70 c p1 -373.00 131.99 2.70 c p1 -406.40 79.64 2.70 c p1 +272.80 223.20 2.70 c p1 +306.20 199.33 2.70 c p1 +339.60 169.83 2.70 c p1 +373.00 136.08 2.70 c p1 +406.40 101.09 2.70 c p1 0.00 0.00 450.00 300.00 cl 0 0 0 srgb 0.75 setlinewidth @@ -175,42 +175,30 @@ o 1 setlinejoin 10.00 setmiterlimit np -59.04 74.20 m -0 155.27 l -o -np -59.04 74.20 m --7.20 0 l -o -np -59.04 100.08 m --7.20 0 l -o -np -59.04 125.96 m --7.20 0 l +59.04 104.99 m +0 119.64 l o np -59.04 151.84 m +59.04 104.99 m -7.20 0 l o np -59.04 177.71 m +59.04 144.87 m -7.20 0 l o np -59.04 203.59 m +59.04 184.75 m -7.20 0 l o np -59.04 229.47 m +59.04 224.63 m -7.20 0 l o /Font1 findfont 12 s -41.76 74.20 (-2.6) .5 90 t -41.76 125.96 (-2.2) .5 90 t -41.76 177.71 (-1.8) .5 90 t -41.76 229.47 (-1.4) .5 90 t +41.76 104.99 (-2.0) .5 90 t +41.76 144.87 (-1.8) .5 90 t +41.76 184.75 (-1.6) .5 90 t +41.76 224.63 (-1.4) .5 90 t np 59.04 73.44 m 360.72 0 l @@ -296,31 +284,19 @@ o 1 setlinejoin 10.00 setmiterlimit np -59.04 74.20 m -360.72 0 l -o -np -59.04 100.08 m -360.72 0 l -o -np -59.04 125.96 m -360.72 0 l -o -np -59.04 151.84 m +59.04 104.99 m 360.72 0 l o np -59.04 177.71 m +59.04 144.87 m 360.72 0 l o np -59.04 203.59 m +59.04 184.75 m 360.72 0 l o np -59.04 229.47 m +59.04 224.63 m 360.72 0 l o np