1.1 --- a/tests/qualifiers.py Sun Dec 03 22:45:22 2017 +0100
1.2 +++ b/tests/qualifiers.py Sun Dec 03 22:56:53 2017 +0100
1.3 @@ -26,21 +26,24 @@
1.4 print x
1.5 print
1.6
1.7 +def select(dt, qualifiers):
1.8 + sel = make_selectors(qualifiers)
1.9 + show(sel)
1.10 + l = get_datetime_structure(dt)
1.11 + show(l)
1.12 + csel = combine_datetime_with_selectors(dt, sel)
1.13 + show(csel)
1.14 +
1.15 + s = get_selector(dt, sel)
1.16 + csel = get_selectors_from_selector(s)
1.17 + show(csel)
1.18 + return s
1.19 +
1.20 qualifiers = [
1.21 ("YEARLY", {"interval" : 1})
1.22 ]
1.23 -
1.24 -sel = make_selectors(qualifiers)
1.25 -show(sel)
1.26 dt = (1997, 11, 2)
1.27 -l = get_datetime_structure(dt)
1.28 -show(l)
1.29 -csel = combine_datetime_with_selectors(dt, sel)
1.30 -show(csel)
1.31 -
1.32 -s = get_selector(dt, sel)
1.33 -csel = get_selectors_from_selector(s)
1.34 -show(csel)
1.35 +s = select(dt, qualifiers)
1.36
1.37 l = s.materialise(dt, (2003, 12, 24))
1.38 print len(l) == 7, 7, len(l)
1.39 @@ -55,18 +58,8 @@
1.40 ("BYHOUR", {"values" : [8, 9]}),
1.41 ("BYMINUTE", {"values" : [30]})
1.42 ]
1.43 -
1.44 -sel = make_selectors(qualifiers)
1.45 -show(sel)
1.46 dt = (1997, 1, 5, 8, 30, 0)
1.47 -l = get_datetime_structure(dt)
1.48 -show(l)
1.49 -csel = combine_datetime_with_selectors(dt, sel)
1.50 -show(csel)
1.51 -
1.52 -s = get_selector(dt, sel)
1.53 -csel = get_selectors_from_selector(s)
1.54 -show(csel)
1.55 +s = select(dt, qualifiers)
1.56
1.57 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.58 print len(l) == 34, 34, len(l)
1.59 @@ -78,18 +71,8 @@
1.60 ("DAILY", {"interval" : 1}),
1.61 ("COUNT", {"values" : [10]})
1.62 ]
1.63 -
1.64 -sel = make_selectors(qualifiers)
1.65 -show(sel)
1.66 dt = (1997, 9, 2, 9, 0, 0)
1.67 -l = get_datetime_structure(dt)
1.68 -show(l)
1.69 -csel = combine_datetime_with_selectors(dt, sel)
1.70 -show(csel)
1.71 -
1.72 -s = get_selector(dt, sel)
1.73 -csel = get_selectors_from_selector(s)
1.74 -show(csel)
1.75 +s = select(dt, qualifiers)
1.76
1.77 l = s.materialise(dt, (1997, 12, 24))
1.78 print len(l) == 10, 10, len(l)
1.79 @@ -100,18 +83,8 @@
1.80 qualifiers = [
1.81 ("DAILY", {"interval" : 1})
1.82 ]
1.83 -
1.84 -sel = make_selectors(qualifiers)
1.85 -show(sel)
1.86 dt = (1997, 9, 2, 9, 0, 0)
1.87 -l = get_datetime_structure(dt)
1.88 -show(l)
1.89 -csel = combine_datetime_with_selectors(dt, sel)
1.90 -show(csel)
1.91 -
1.92 -s = get_selector(dt, sel)
1.93 -csel = get_selectors_from_selector(s)
1.94 -show(csel)
1.95 +s = select(dt, qualifiers)
1.96
1.97 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.98 print len(l) == 113, 113, len(l)
1.99 @@ -122,18 +95,8 @@
1.100 qualifiers = [
1.101 ("DAILY", {"interval" : 2})
1.102 ]
1.103 -
1.104 -sel = make_selectors(qualifiers)
1.105 -show(sel)
1.106 dt = (1997, 9, 2, 9, 0, 0)
1.107 -l = get_datetime_structure(dt)
1.108 -show(l)
1.109 -csel = combine_datetime_with_selectors(dt, sel)
1.110 -show(csel)
1.111 -
1.112 -s = get_selector(dt, sel)
1.113 -csel = get_selectors_from_selector(s)
1.114 -show(csel)
1.115 +s = select(dt, qualifiers)
1.116
1.117 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.118 print len(l) == 57, 57, len(l)
1.119 @@ -144,18 +107,8 @@
1.120 qualifiers = [
1.121 ("WEEKLY", {"interval" : 1})
1.122 ]
1.123 -
1.124 -sel = make_selectors(qualifiers)
1.125 -show(sel)
1.126 dt = (1997, 9, 2, 9, 0, 0)
1.127 -l = get_datetime_structure(dt)
1.128 -show(l)
1.129 -csel = combine_datetime_with_selectors(dt, sel)
1.130 -show(csel)
1.131 -
1.132 -s = get_selector(dt, sel)
1.133 -csel = get_selectors_from_selector(s)
1.134 -show(csel)
1.135 +s = select(dt, qualifiers)
1.136
1.137 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.138 print len(l) == 17, 17, len(l)
1.139 @@ -167,18 +120,8 @@
1.140 ("DAILY", {"interval" : 10}),
1.141 ("COUNT", {"values" : [5]})
1.142 ]
1.143 -
1.144 -sel = make_selectors(qualifiers)
1.145 -show(sel)
1.146 dt = (1997, 9, 2, 9, 0, 0)
1.147 -l = get_datetime_structure(dt)
1.148 -show(l)
1.149 -csel = combine_datetime_with_selectors(dt, sel)
1.150 -show(csel)
1.151 -
1.152 -s = get_selector(dt, sel)
1.153 -csel = get_selectors_from_selector(s)
1.154 -show(csel)
1.155 +s = select(dt, qualifiers)
1.156
1.157 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.158 print len(l) == 5, 5, len(l)
1.159 @@ -191,18 +134,8 @@
1.160 ("BYMONTH", {"values" : [1]}),
1.161 ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None), (6, None), (7, None)]})
1.162 ]
1.163 -
1.164 -sel = make_selectors(qualifiers)
1.165 -show(sel)
1.166 dt = (1998, 1, 1, 9, 0, 0)
1.167 -l = get_datetime_structure(dt)
1.168 -show(l)
1.169 -csel = combine_datetime_with_selectors(dt, sel)
1.170 -show(csel)
1.171 -
1.172 -s = get_selector(dt, sel)
1.173 -csel = get_selectors_from_selector(s)
1.174 -show(csel)
1.175 +s = select(dt, qualifiers)
1.176
1.177 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.178 print len(l) == 93, 93, len(l)
1.179 @@ -214,18 +147,8 @@
1.180 ("DAILY", {"interval" : 1}),
1.181 ("BYMONTH", {"values" : [1]})
1.182 ]
1.183 -
1.184 -sel = make_selectors(qualifiers)
1.185 -show(sel)
1.186 dt = (1998, 1, 1, 9, 0, 0)
1.187 -l = get_datetime_structure(dt)
1.188 -show(l)
1.189 -csel = combine_datetime_with_selectors(dt, sel)
1.190 -show(csel)
1.191 -
1.192 -s = get_selector(dt, sel)
1.193 -csel = get_selectors_from_selector(s)
1.194 -show(csel)
1.195 +s = select(dt, qualifiers)
1.196
1.197 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.198 print len(l) == 93, 93, len(l)
1.199 @@ -237,18 +160,8 @@
1.200 ("WEEKLY", {"interval" : 1}),
1.201 ("COUNT", {"values" : [10]})
1.202 ]
1.203 -
1.204 -sel = make_selectors(qualifiers)
1.205 -show(sel)
1.206 dt = (1997, 9, 2, 9, 0, 0)
1.207 -l = get_datetime_structure(dt)
1.208 -show(l)
1.209 -csel = combine_datetime_with_selectors(dt, sel)
1.210 -show(csel)
1.211 -
1.212 -s = get_selector(dt, sel)
1.213 -csel = get_selectors_from_selector(s)
1.214 -show(csel)
1.215 +s = select(dt, qualifiers)
1.216
1.217 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.218 print len(l) == 10, 10, len(l)
1.219 @@ -259,18 +172,8 @@
1.220 qualifiers = [
1.221 ("WEEKLY", {"interval" : 1})
1.222 ]
1.223 -
1.224 -sel = make_selectors(qualifiers)
1.225 -show(sel)
1.226 dt = (1997, 9, 2, 9, 0, 0)
1.227 -l = get_datetime_structure(dt)
1.228 -show(l)
1.229 -csel = combine_datetime_with_selectors(dt, sel)
1.230 -show(csel)
1.231 -
1.232 -s = get_selector(dt, sel)
1.233 -csel = get_selectors_from_selector(s)
1.234 -show(csel)
1.235 +s = select(dt, qualifiers)
1.236
1.237 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.238 print len(l) == 17, 17, len(l)
1.239 @@ -281,18 +184,8 @@
1.240 qualifiers = [
1.241 ("WEEKLY", {"interval" : 1})
1.242 ]
1.243 -
1.244 -sel = make_selectors(qualifiers)
1.245 -show(sel)
1.246 dt = (1997, 9, 2)
1.247 -l = get_datetime_structure(dt)
1.248 -show(l)
1.249 -csel = combine_datetime_with_selectors(dt, sel)
1.250 -show(csel)
1.251 -
1.252 -s = get_selector(dt, sel)
1.253 -csel = get_selectors_from_selector(s)
1.254 -show(csel)
1.255 +s = select(dt, qualifiers)
1.256
1.257 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.258 print len(l) == 17, 17, len(l)
1.259 @@ -303,18 +196,8 @@
1.260 qualifiers = [
1.261 ("WEEKLY", {"interval" : 2})
1.262 ]
1.263 -
1.264 -sel = make_selectors(qualifiers)
1.265 -show(sel)
1.266 dt = (1997, 9, 2, 9, 0, 0)
1.267 -l = get_datetime_structure(dt)
1.268 -show(l)
1.269 -csel = combine_datetime_with_selectors(dt, sel)
1.270 -show(csel)
1.271 -
1.272 -s = get_selector(dt, sel)
1.273 -csel = get_selectors_from_selector(s)
1.274 -show(csel)
1.275 +s = select(dt, qualifiers)
1.276
1.277 l = s.materialise(dt, (1998, 2, 20, 0, 0, 0))
1.278 print len(l) == 13, 13, len(l)
1.279 @@ -326,18 +209,8 @@
1.280 ("WEEKLY", {"interval" : 1}),
1.281 ("BYDAY", {"values" : [(2, None), (4, None)]})
1.282 ]
1.283 -
1.284 -sel = make_selectors(qualifiers)
1.285 -show(sel)
1.286 dt = (1997, 9, 2, 9, 0, 0)
1.287 -l = get_datetime_structure(dt)
1.288 -show(l)
1.289 -csel = combine_datetime_with_selectors(dt, sel)
1.290 -show(csel)
1.291 -
1.292 -s = get_selector(dt, sel)
1.293 -csel = get_selectors_from_selector(s)
1.294 -show(csel)
1.295 +s = select(dt, qualifiers)
1.296
1.297 l = s.materialise(dt, (1997, 10, 7, 9, 0, 0))
1.298 print len(l) == 10, 10, len(l)
1.299 @@ -350,18 +223,8 @@
1.300 ("BYDAY", {"values" : [(2, None), (4, None)]}),
1.301 ("COUNT", {"values" : [10]})
1.302 ]
1.303 -
1.304 -sel = make_selectors(qualifiers)
1.305 -show(sel)
1.306 dt = (1997, 9, 2, 9, 0, 0)
1.307 -l = get_datetime_structure(dt)
1.308 -show(l)
1.309 -csel = combine_datetime_with_selectors(dt, sel)
1.310 -show(csel)
1.311 -
1.312 -s = get_selector(dt, sel)
1.313 -csel = get_selectors_from_selector(s)
1.314 -show(csel)
1.315 +s = select(dt, qualifiers)
1.316
1.317 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.318 print len(l) == 10, 10, len(l)
1.319 @@ -373,18 +236,8 @@
1.320 ("WEEKLY", {"interval" : 2}),
1.321 ("BYDAY", {"values" : [(1, None), (3, None), (5, None)]})
1.322 ]
1.323 -
1.324 -sel = make_selectors(qualifiers)
1.325 -show(sel)
1.326 dt = (1997, 9, 1, 9, 0, 0)
1.327 -l = get_datetime_structure(dt)
1.328 -show(l)
1.329 -csel = combine_datetime_with_selectors(dt, sel)
1.330 -show(csel)
1.331 -
1.332 -s = get_selector(dt, sel)
1.333 -csel = get_selectors_from_selector(s)
1.334 -show(csel)
1.335 +s = select(dt, qualifiers)
1.336
1.337 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.338 print len(l) == 25, 25, len(l)
1.339 @@ -397,18 +250,8 @@
1.340 ("BYDAY", {"values" : [(2, None), (4, None)]}),
1.341 ("COUNT", {"values" : [8]})
1.342 ]
1.343 -
1.344 -sel = make_selectors(qualifiers)
1.345 -show(sel)
1.346 dt = (1997, 9, 2, 9, 0, 0)
1.347 -l = get_datetime_structure(dt)
1.348 -show(l)
1.349 -csel = combine_datetime_with_selectors(dt, sel)
1.350 -show(csel)
1.351 -
1.352 -s = get_selector(dt, sel)
1.353 -csel = get_selectors_from_selector(s)
1.354 -show(csel)
1.355 +s = select(dt, qualifiers)
1.356
1.357 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.358 print len(l) == 8, 8, len(l)
1.359 @@ -421,18 +264,8 @@
1.360 ("BYDAY", {"values" : [(5, 1)]}),
1.361 ("COUNT", {"values" : [10]})
1.362 ]
1.363 -
1.364 -sel = make_selectors(qualifiers)
1.365 -show(sel)
1.366 dt = (1997, 9, 5, 9, 0, 0)
1.367 -l = get_datetime_structure(dt)
1.368 -show(l)
1.369 -csel = combine_datetime_with_selectors(dt, sel)
1.370 -show(csel)
1.371 -
1.372 -s = get_selector(dt, sel)
1.373 -csel = get_selectors_from_selector(s)
1.374 -show(csel)
1.375 +s = select(dt, qualifiers)
1.376
1.377 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.378 print len(l) == 10, 10, len(l)
1.379 @@ -444,18 +277,8 @@
1.380 ("MONTHLY", {"interval" : 1}),
1.381 ("BYDAY", {"values" : [(5, 1)]})
1.382 ]
1.383 -
1.384 -sel = make_selectors(qualifiers)
1.385 -show(sel)
1.386 dt = (1997, 9, 5, 9, 0, 0)
1.387 -l = get_datetime_structure(dt)
1.388 -show(l)
1.389 -csel = combine_datetime_with_selectors(dt, sel)
1.390 -show(csel)
1.391 -
1.392 -s = get_selector(dt, sel)
1.393 -csel = get_selectors_from_selector(s)
1.394 -show(csel)
1.395 +s = select(dt, qualifiers)
1.396
1.397 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.398 print len(l) == 4, 4, len(l)
1.399 @@ -468,18 +291,8 @@
1.400 ("BYDAY", {"values" : [(7, 1), (7, -1)]}),
1.401 ("COUNT", {"values" : [10]})
1.402 ]
1.403 -
1.404 -sel = make_selectors(qualifiers)
1.405 -show(sel)
1.406 dt = (1997, 9, 7, 9, 0, 0)
1.407 -l = get_datetime_structure(dt)
1.408 -show(l)
1.409 -csel = combine_datetime_with_selectors(dt, sel)
1.410 -show(csel)
1.411 -
1.412 -s = get_selector(dt, sel)
1.413 -csel = get_selectors_from_selector(s)
1.414 -show(csel)
1.415 +s = select(dt, qualifiers)
1.416
1.417 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.418 print len(l) == 10, 10, len(l)
1.419 @@ -492,18 +305,8 @@
1.420 ("BYDAY", {"values" : [(1, -2)]}),
1.421 ("COUNT", {"values" : [6]})
1.422 ]
1.423 -
1.424 -sel = make_selectors(qualifiers)
1.425 -show(sel)
1.426 dt = (1997, 9, 22, 9, 0, 0)
1.427 -l = get_datetime_structure(dt)
1.428 -show(l)
1.429 -csel = combine_datetime_with_selectors(dt, sel)
1.430 -show(csel)
1.431 -
1.432 -s = get_selector(dt, sel)
1.433 -csel = get_selectors_from_selector(s)
1.434 -show(csel)
1.435 +s = select(dt, qualifiers)
1.436
1.437 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.438 print len(l) == 6, 6, len(l)
1.439 @@ -516,18 +319,8 @@
1.440 ("BYMONTHDAY", {"values" : [-3]}),
1.441 ("COUNT", {"values" : [6]})
1.442 ]
1.443 -
1.444 -sel = make_selectors(qualifiers)
1.445 -show(sel)
1.446 dt = (1997, 9, 28, 9, 0, 0)
1.447 -l = get_datetime_structure(dt)
1.448 -show(l)
1.449 -csel = combine_datetime_with_selectors(dt, sel)
1.450 -show(csel)
1.451 -
1.452 -s = get_selector(dt, sel)
1.453 -csel = get_selectors_from_selector(s)
1.454 -show(csel)
1.455 +s = select(dt, qualifiers)
1.456
1.457 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.458 print len(l) == 6, 6, len(l)
1.459 @@ -540,18 +333,8 @@
1.460 ("BYMONTHDAY", {"values" : [15, 2]}), # test ordering
1.461 ("COUNT", {"values" : [10]})
1.462 ]
1.463 -
1.464 -sel = make_selectors(qualifiers)
1.465 -show(sel)
1.466 dt = (1997, 9, 2, 9, 0, 0)
1.467 -l = get_datetime_structure(dt)
1.468 -show(l)
1.469 -csel = combine_datetime_with_selectors(dt, sel)
1.470 -show(csel)
1.471 -
1.472 -s = get_selector(dt, sel)
1.473 -csel = get_selectors_from_selector(s)
1.474 -show(csel)
1.475 +s = select(dt, qualifiers)
1.476
1.477 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.478 print len(l) == 10, 10, len(l)
1.479 @@ -564,18 +347,8 @@
1.480 ("BYMONTHDAY", {"values" : [1, -1]}),
1.481 ("COUNT", {"values" : [10]})
1.482 ]
1.483 -
1.484 -sel = make_selectors(qualifiers)
1.485 -show(sel)
1.486 dt = (1997, 9, 30, 9, 0, 0)
1.487 -l = get_datetime_structure(dt)
1.488 -show(l)
1.489 -csel = combine_datetime_with_selectors(dt, sel)
1.490 -show(csel)
1.491 -
1.492 -s = get_selector(dt, sel)
1.493 -csel = get_selectors_from_selector(s)
1.494 -show(csel)
1.495 +s = select(dt, qualifiers)
1.496
1.497 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.498 print len(l) == 10, 10, len(l)
1.499 @@ -588,18 +361,8 @@
1.500 ("BYMONTHDAY", {"values" : [10, 11, 12, 13, 14, 15]}),
1.501 ("COUNT", {"values" : [10]})
1.502 ]
1.503 -
1.504 -sel = make_selectors(qualifiers)
1.505 -show(sel)
1.506 dt = (1997, 9, 10, 9, 0, 0)
1.507 -l = get_datetime_structure(dt)
1.508 -show(l)
1.509 -csel = combine_datetime_with_selectors(dt, sel)
1.510 -show(csel)
1.511 -
1.512 -s = get_selector(dt, sel)
1.513 -csel = get_selectors_from_selector(s)
1.514 -show(csel)
1.515 +s = select(dt, qualifiers)
1.516
1.517 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.518 print len(l) == 10, 10, len(l)
1.519 @@ -611,18 +374,8 @@
1.520 ("MONTHLY", {"interval" : 2}),
1.521 ("BYDAY", {"values" : [(2, None)]})
1.522 ]
1.523 -
1.524 -sel = make_selectors(qualifiers)
1.525 -show(sel)
1.526 dt = (1997, 9, 2, 9, 0, 0)
1.527 -l = get_datetime_structure(dt)
1.528 -show(l)
1.529 -csel = combine_datetime_with_selectors(dt, sel)
1.530 -show(csel)
1.531 -
1.532 -s = get_selector(dt, sel)
1.533 -csel = get_selectors_from_selector(s)
1.534 -show(csel)
1.535 +s = select(dt, qualifiers)
1.536
1.537 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.538 print len(l) == 18, 18, len(l)
1.539 @@ -635,18 +388,8 @@
1.540 ("BYMONTH", {"values" : [6, 7]}),
1.541 ("COUNT", {"values" : [10]})
1.542 ]
1.543 -
1.544 -sel = make_selectors(qualifiers)
1.545 -show(sel)
1.546 dt = (1997, 6, 10, 9, 0, 0)
1.547 -l = get_datetime_structure(dt)
1.548 -show(l)
1.549 -csel = combine_datetime_with_selectors(dt, sel)
1.550 -show(csel)
1.551 -
1.552 -s = get_selector(dt, sel)
1.553 -csel = get_selectors_from_selector(s)
1.554 -show(csel)
1.555 +s = select(dt, qualifiers)
1.556
1.557 l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
1.558 print len(l) == 10, 10, len(l)
1.559 @@ -659,18 +402,8 @@
1.560 ("BYMONTH", {"values" : [1, 2, 3]}),
1.561 ("COUNT", {"values" : [10]})
1.562 ]
1.563 -
1.564 -sel = make_selectors(qualifiers)
1.565 -show(sel)
1.566 dt = (1997, 3, 10, 9, 0, 0)
1.567 -l = get_datetime_structure(dt)
1.568 -show(l)
1.569 -csel = combine_datetime_with_selectors(dt, sel)
1.570 -show(csel)
1.571 -
1.572 -s = get_selector(dt, sel)
1.573 -csel = get_selectors_from_selector(s)
1.574 -show(csel)
1.575 +s = select(dt, qualifiers)
1.576
1.577 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.578 print len(l) == 10, 10, len(l)
1.579 @@ -683,18 +416,8 @@
1.580 ("BYYEARDAY", {"values" : [1, 100, 200]}),
1.581 ("COUNT", {"values" : [10]})
1.582 ]
1.583 -
1.584 -sel = make_selectors(qualifiers)
1.585 -show(sel)
1.586 dt = (1997, 1, 1, 9, 0, 0)
1.587 -l = get_datetime_structure(dt)
1.588 -show(l)
1.589 -csel = combine_datetime_with_selectors(dt, sel)
1.590 -show(csel)
1.591 -
1.592 -s = get_selector(dt, sel)
1.593 -csel = get_selectors_from_selector(s)
1.594 -show(csel)
1.595 +s = select(dt, qualifiers)
1.596
1.597 l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.598 print len(l) == 10, 10, len(l)
1.599 @@ -706,18 +429,8 @@
1.600 ("YEARLY", {"interval" : 1}),
1.601 ("BYDAY", {"values" : [(1, 20)]})
1.602 ]
1.603 -
1.604 -sel = make_selectors(qualifiers)
1.605 -show(sel)
1.606 dt = (1997, 5, 19, 9, 0, 0)
1.607 -l = get_datetime_structure(dt)
1.608 -show(l)
1.609 -csel = combine_datetime_with_selectors(dt, sel)
1.610 -show(csel)
1.611 -
1.612 -s = get_selector(dt, sel)
1.613 -csel = get_selectors_from_selector(s)
1.614 -show(csel)
1.615 +s = select(dt, qualifiers)
1.616
1.617 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.618 print len(l) == 3, 3, len(l)
1.619 @@ -731,18 +444,8 @@
1.620 ("BYWEEKNO", {"values" : [20]}),
1.621 ("BYDAY", {"values" : [(1, None)]})
1.622 ]
1.623 -
1.624 -sel = make_selectors(qualifiers)
1.625 -show(sel)
1.626 dt = (1997, 5, 12, 9, 0, 0)
1.627 -l = get_datetime_structure(dt)
1.628 -show(l)
1.629 -csel = combine_datetime_with_selectors(dt, sel)
1.630 -show(csel)
1.631 -
1.632 -s = get_selector(dt, sel)
1.633 -csel = get_selectors_from_selector(s)
1.634 -show(csel)
1.635 +s = select(dt, qualifiers)
1.636
1.637 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.638 print len(l) == 3, 3, len(l)
1.639 @@ -756,18 +459,8 @@
1.640 ("BYMONTH", {"values" : [3]}),
1.641 ("BYDAY", {"values" : [(4, None)]})
1.642 ]
1.643 -
1.644 -sel = make_selectors(qualifiers)
1.645 -show(sel)
1.646 dt = (1997, 3, 13, 9, 0, 0)
1.647 -l = get_datetime_structure(dt)
1.648 -show(l)
1.649 -csel = combine_datetime_with_selectors(dt, sel)
1.650 -show(csel)
1.651 -
1.652 -s = get_selector(dt, sel)
1.653 -csel = get_selectors_from_selector(s)
1.654 -show(csel)
1.655 +s = select(dt, qualifiers)
1.656
1.657 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.658 print len(l) == 11, 11, len(l)
1.659 @@ -780,18 +473,8 @@
1.660 ("BYMONTH", {"values" : [6, 7, 8]}),
1.661 ("BYDAY", {"values" : [(4, None)]})
1.662 ]
1.663 -
1.664 -sel = make_selectors(qualifiers)
1.665 -show(sel)
1.666 dt = (1997, 6, 5, 9, 0, 0)
1.667 -l = get_datetime_structure(dt)
1.668 -show(l)
1.669 -csel = combine_datetime_with_selectors(dt, sel)
1.670 -show(csel)
1.671 -
1.672 -s = get_selector(dt, sel)
1.673 -csel = get_selectors_from_selector(s)
1.674 -show(csel)
1.675 +s = select(dt, qualifiers)
1.676
1.677 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.678 print len(l) == 39, 39, len(l)
1.679 @@ -804,18 +487,8 @@
1.680 ("BYMONTHDAY", {"values" : [13]}),
1.681 ("BYDAY", {"values" : [(5, None)]})
1.682 ]
1.683 -
1.684 -sel = make_selectors(qualifiers)
1.685 -show(sel)
1.686 dt = (1997, 9, 2, 9, 0, 0)
1.687 -l = get_datetime_structure(dt)
1.688 -show(l)
1.689 -csel = combine_datetime_with_selectors(dt, sel)
1.690 -show(csel)
1.691 -
1.692 -s = get_selector(dt, sel)
1.693 -csel = get_selectors_from_selector(s)
1.694 -show(csel)
1.695 +s = select(dt, qualifiers)
1.696
1.697 l = s.materialise(dt, (2000, 12, 24, 0, 0, 0))
1.698 print len(l) == 6, 6, len(l)
1.699 @@ -828,18 +501,8 @@
1.700 ("BYMONTHDAY", {"values" : [7, 8, 9, 10, 11, 12, 13]}),
1.701 ("BYDAY", {"values" : [(6, None)]})
1.702 ]
1.703 -
1.704 -sel = make_selectors(qualifiers)
1.705 -show(sel)
1.706 dt = (1997, 9, 13, 9, 0, 0)
1.707 -l = get_datetime_structure(dt)
1.708 -show(l)
1.709 -csel = combine_datetime_with_selectors(dt, sel)
1.710 -show(csel)
1.711 -
1.712 -s = get_selector(dt, sel)
1.713 -csel = get_selectors_from_selector(s)
1.714 -show(csel)
1.715 +s = select(dt, qualifiers)
1.716
1.717 l = s.materialise(dt, (1998, 6, 30, 0, 0, 0))
1.718 print len(l) == 10, 10, len(l)
1.719 @@ -853,18 +516,8 @@
1.720 ("BYMONTHDAY", {"values" : [2, 3, 4, 5, 6, 7, 8]}),
1.721 ("BYDAY", {"values" : [(2, None)]})
1.722 ]
1.723 -
1.724 -sel = make_selectors(qualifiers)
1.725 -show(sel)
1.726 dt = (1996, 11, 5, 9, 0, 0)
1.727 -l = get_datetime_structure(dt)
1.728 -show(l)
1.729 -csel = combine_datetime_with_selectors(dt, sel)
1.730 -show(csel)
1.731 -
1.732 -s = get_selector(dt, sel)
1.733 -csel = get_selectors_from_selector(s)
1.734 -show(csel)
1.735 +s = select(dt, qualifiers)
1.736
1.737 l = s.materialise(dt, (2004, 12, 24, 0, 0, 0))
1.738 print len(l) == 3, 3, len(l)
1.739 @@ -878,18 +531,8 @@
1.740 ("BYSETPOS", {"values" : [3]}),
1.741 ("COUNT", {"values" : [3]})
1.742 ]
1.743 -
1.744 -sel = make_selectors(qualifiers)
1.745 -show(sel)
1.746 dt = (1997, 9, 4, 9, 0, 0)
1.747 -l = get_datetime_structure(dt)
1.748 -show(l)
1.749 -csel = combine_datetime_with_selectors(dt, sel)
1.750 -show(csel)
1.751 -
1.752 -s = get_selector(dt, sel)
1.753 -csel = get_selectors_from_selector(s)
1.754 -show(csel)
1.755 +s = select(dt, qualifiers)
1.756
1.757 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.758 print len(l) == 3, 3, len(l)
1.759 @@ -904,18 +547,8 @@
1.760 ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None)]}),
1.761 ("BYSETPOS", {"values" : [-2]})
1.762 ]
1.763 -
1.764 -sel = make_selectors(qualifiers)
1.765 -show(sel)
1.766 dt = (1997, 9, 29, 9, 0, 0)
1.767 -l = get_datetime_structure(dt)
1.768 -show(l)
1.769 -csel = combine_datetime_with_selectors(dt, sel)
1.770 -show(csel)
1.771 -
1.772 -s = get_selector(dt, sel)
1.773 -csel = get_selectors_from_selector(s)
1.774 -show(csel)
1.775 +s = select(dt, qualifiers)
1.776
1.777 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.778 print len(l) == 7, 7, len(l)
1.779 @@ -924,18 +557,8 @@
1.780 print
1.781
1.782 qualifiers = get_qualifiers(["BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
1.783 -
1.784 -sel = make_selectors(qualifiers)
1.785 -show(sel)
1.786 dt = (2017, 6, 13)
1.787 -l = get_datetime_structure(dt)
1.788 -show(l)
1.789 -csel = combine_datetime_with_selectors(dt, sel)
1.790 -show(csel)
1.791 -
1.792 -s = get_selector(dt, sel)
1.793 -csel = get_selectors_from_selector(s)
1.794 -show(csel)
1.795 +s = select(dt, qualifiers)
1.796
1.797 l = s.materialise(dt, (2019, 1, 1))
1.798 print len(l) == 37, 37, len(l)
1.799 @@ -943,18 +566,8 @@
1.800 print l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1]
1.801
1.802 qualifiers = get_qualifiers(["FREQ=DAILY", "BYMONTH=1"])
1.803 -
1.804 -sel = make_selectors(qualifiers)
1.805 -show(sel)
1.806 dt = (2017, 6, 13)
1.807 -l = get_datetime_structure(dt)
1.808 -show(l)
1.809 -csel = combine_datetime_with_selectors(dt, sel)
1.810 -show(csel)
1.811 -
1.812 -s = get_selector(dt, sel)
1.813 -csel = get_selectors_from_selector(s)
1.814 -show(csel)
1.815 +s = select(dt, qualifiers)
1.816
1.817 l = s.materialise(dt, (2019, 1, 1))
1.818 print len(l) == 32, 32, len(l)
1.819 @@ -962,18 +575,8 @@
1.820 print l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1]
1.821
1.822 qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"])
1.823 -
1.824 -sel = make_selectors(qualifiers)
1.825 -show(sel)
1.826 dt = (2017, 10, 15)
1.827 -l = get_datetime_structure(dt)
1.828 -show(l)
1.829 -csel = combine_datetime_with_selectors(dt, sel)
1.830 -show(csel)
1.831 -
1.832 -s = get_selector(dt, sel)
1.833 -csel = get_selectors_from_selector(s)
1.834 -show(csel)
1.835 +s = select(dt, qualifiers)
1.836
1.837 l = s.materialise(dt, (2018, 1, 1))
1.838 print len(l) == 18, 18, len(l)