From 2b702c4ee83586926aeefadf039529b678e204b6 Mon Sep 17 00:00:00 2001
From: Umit <60366307+umitozmen@users.noreply.github.com>
Date: Sun, 8 Nov 2020 21:04:27 +0000
Subject: [PATCH] Fixture UCL-RITS/rse-classwork-2020#92

---
 .vscode/settings.json                         |   3 ++
 .../test_times.cpython-38-pytest-6.1.2.pyc    | Bin 2256 -> 1266 bytes
 .../__pycache__/times.cpython-37.pyc          | Bin 0 -> 1332 bytes
 .../__pycache__/times.cpython-38.pyc          | Bin 1482 -> 1328 bytes
 week05-testing/fixture.yaml                   |  20 ++++++++
 week05-testing/test_times.py                  |  46 +++++++++---------
 week05-testing/times.py                       |  38 ++++++++-------
 7 files changed, 65 insertions(+), 42 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 week05-testing/__pycache__/times.cpython-37.pyc
 create mode 100644 week05-testing/fixture.yaml

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..44f9878
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "C:\\Users\\umitozm\\AppData\\Local\\Programs\\Python\\Python37-32\\python.exe"
+}
\ No newline at end of file
diff --git a/week05-testing/__pycache__/test_times.cpython-38-pytest-6.1.2.pyc b/week05-testing/__pycache__/test_times.cpython-38-pytest-6.1.2.pyc
index 0afc867fb93421cc84a24d71269143fa8405f29d..9a1f52ce52692e3afb6480fe66ddfc1841e2c8f3 100644
GIT binary patch
delta 464
zcmZ8bOG^VW7)<t=)~@y?QtP8ATH^z@4^Tu!JP3Lyh<MpcsV3BgZ7oSE)^q<r$w|CR
zJ?jtgydVgkyn6Ixwg`%W%w#5+%=eP|j1|uuCw}h@>kkNkckpj%O7E-9YlGsN3jqNH
z1~D%-;<y(lIx+gd8zUyM6ekEg1=#+GeyL$?@VxMpHFYRWn351?<+?Qiv8=(V<;`u^
z#oBGA?3UaOx3p0z7fSASWlP!2R%r~swB22KV$D@UL~lCuLQsOWQ1A5I2+FtP4bCYO
zg{75FuZp>+%qotvXkw<zSG_;!nL&d!X=w7xD<;@jbd!*8)~fLcSWXU&!*o(mF6vGH
znzrkHyVDg(xo*$Gygas#EHeri^3E<E<f7v*Oe+~WqimZt8$#t5mBkGO045-tSB#wy
zop=2}_-)QoQbU#cgt9|Z_$|tR22}=|QQ#T9Mk`?XNJrs6Wuw|rBid<Qk#0cupnAc_
P6(EoXNr)hFPzIUbraWcH

literal 2256
zcmZuyOHU(55bo}Icsw@d8M2!w35l{2BLT9#zyew#qE#+AASJ6!q7l;UKsR15<A=K2
z5Qr^B3%NzfAJ_vNazKir9QU`3a?2(B1#(ELdW^xawx_1L>YM87ny<>wMn?Rf=6;Lv
z9wC2|TOSwJ8*r%~L2$xpLPBcptYI-iNy82uiXN7@ja-;(c%j$Ghk0Y8i68ph;<hLp
zlbXdH?!qdEt6htGJYRFeqVQjioR+vRif4=$c=3cB({PlJ@X`qh$M`58gZntAPf0L-
z0a=jEz)F2xZ-_|7&6-H3c3O>gM~kSnFJuz8BlM-yx2-Qk(iZZZT~1cZmGXSKGGD3A
zRLW})%WLKG9pfV~26wS5U_KfOP+hBHfWVRt<aW*^mTVXTdn^G&=E2j)8L$xnlexD&
zv3ec!EqN^7$)misSj9(}^dX#yImqcwI*7buT!vD}0_HMvUERvuwO*YQ-?zn%7JSD7
z*wqKq2kww3aH)SlXwoHJddzxO*Xpu8*0Z~|`b*PO#%b5yrJSLCmz~+%($=YcM)q8_
z0e(l5Gb+CX%|)%rkUIm!HX^!+NDzS<AZ+do5GMvf0r87LfCdQ1=++tK?g06RK{7zT
zF<#IB>GIrbXPWdJ<Yw2YQ_x+V1BBOg&*(9I1>Cnu&+6Hn03ZF$b9%|v*8_UA`e3$w
zxELt^hrTkiK7(30P_uZi1ZvJ0s(}jp-pqRDUJjJBp=4>{y3CcEi)!j!6+LiL3j&59
zDyUUaEaGzcs1z$Dq&7RO1PYBSK|TxZZ?q4!P&$fbIv(xBNfJrXme?P$6loFM(RQbv
z=z3G7ZqfpTO7BJLMXQr=1C44)YdcP&W(<v$k5s%XFhW}T-0WI!HNTLuCDX}hw<Q~~
zjv(bEZpIosK~9$7fN~VYm^mtLnC1I0EL<;^vPBl+(apu`Igua0qn8^`*0!F(LDg2L
zQP-`b#+FoKekXxw2Q9fbUoBV5TL(hym6zu6$n|Dz%N!l6s}|aaY2GZwew-8`pu*IM
z;{$(f@;fP#5|JN)We3eyALKV)hTm^M(J%)&1Ae0h48^&2Z1<?9ecm&k<6aH<4@~d#
z|4+?MEnpS$-$%RQe?i-)j^Y1v@Vi}P<V(<Ur~xBk9u5$%3<7v8e>Mov08!*4ubJU&
ziH{CA>j5Hv&DlO*$2KpAW)}`F_zfFzHo(u!v0)F47@T7l3~F%k7{t{8!|s=#punO+
zH%#=Ye?@a3ed<b~I*B$MfGIVO@Cgt@+=UL3lNiI7xQoO&Bd1WjgJK%RyD09VxR2sJ
z6z_uwa-oyN68;e!;I7p20eWszu5y!Deg0*XTQVHW#E0-`I%c?1tM7|uRBysx3}&V<
z8^U~Ag3F^woaY&FX2Cv090cObH^liA6irU4h8O$m7$w@uNJPoEWQlx5z9!$n-zW?f
zYg2v<SUCeCuv0f{UMOE&S3;%!H*wMtrr)v>VPo9Re8gnl6g6nUeSvjQIAsVeQaK0r
zU?TOdTHX{jy&q-!EM$!djk_Slfvjt2_<<?S^=;;rq>kyT8!rm?kO2sAb=rvtJ<Nm0
zI!^6IEcem^OdOaYTGo$*X*7vNGb!CTf;o|S1K#6Ci+2+783mX^hIwRyOi>SN&){q1
QzqaR6M%aJM_APJXf9j(uRR910

diff --git a/week05-testing/__pycache__/times.cpython-37.pyc b/week05-testing/__pycache__/times.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7a0549aa323681c3c82f474ba60feadc1b823f54
GIT binary patch
literal 1332
zcmZuwO>Y}F5GA=ET5s(%ZH!t#i(n7cK|o|U0(x-`H)vfTht?Oj2|~zSte2Fu)k-Uq
zRO}esOKrf;p@*J(v2X2P+G|hw3psU$w&Nfz7aVeCIm0)PGvBVP#018l{I7Hx67ml!
zx5I<Y6PWrT2tfob2`8c@JmH^FPDLQXGs2mmd!!q^fiq<H4F#F|xQ77&3GOkFHXsc7
zm0VH_p|03#cB4_$YX5>+e-fxih6#2`f1?&GZF1>d5z9U&7gTt-3a?F8$r^c0&dE7F
zXF~uZg0sl@7QA-IDXjq(ScnZ!18A+?lTSJ?dYx&nBa+V3&CZXToxPK9ej3X}&O}lT
z69ZdQOl6|7*+?eiOedyF@(L{4s3JGzt0Ws5sglBIFlEZDD+c-Gm@W=fBA5?g>Zc$^
z#FG6dHNC(rsihZy8YD&Rg8WX`$n772`~UnMvOn0N59nE!@|Ko)H51z1*=0>6G9wW%
zUqUHlX)-Xg^^JxWU9X{{SsP{Z^gx;;DQ9Uh1MDxeQm49EcJNd5OZDI6?brF{;AbtB
z9xSGXsZOQ?rDZQKGp&y*HR<&?`Wpj?GTHd5XQVd8Y&1Y;y*_{SHr^@=ZGfoxHkOe_
z8bWsR&_#D-u5Xo94mWSZ=Jx12*03(HM)uJ6OAwB=F9xipHM8^*n7X2tU9ayLq5t!o
zKvD!xHN=a%p2DKz%w!ES2WknFYk?TmM<7;UUV|mwKp_n0K1cT^ewLLB`Mpw=;wz>y
zS()DO-vlnFZph<17I_3!<oM(dW{c^8RB1K5qg=HxdVG5()qDw}r7n;|1#poAcTQmq
zDTLX?cN}6i`aTFk@4*+rm(Y7`nW~S$mLusnFi(v19ZWq2F(NfP{>73Vvi}S?^=kk4
z2May2zXMuOht{*<gsQd;pz~lg1T4WRt6K)T&xWvzY-C##rgjh8@D9wjY&2w7l#;{t
zb8;9zhu(x5rMpmc-ZVP~QOue!o6jNN?h+4OnvZYRK3}e0N>xH-VsbomBtGUo9ELMa
z>pQK_y|Oyu{<s*8KX|`p70Yd5Wcq$AWJj-pAk;^a*nJwq7g0t(qYAsS%Ut&;>{y^2
h-`vsXe!h2ys}}bH(blvQi&Ac*i$-Q6FJ6v5{TCCfJc$4R

literal 0
HcmV?d00001

diff --git a/week05-testing/__pycache__/times.cpython-38.pyc b/week05-testing/__pycache__/times.cpython-38.pyc
index 70a599317bbbd8e6dc6ebbeed9da45fae2c50a60..48b8b132f9ba983b67b6dfebfb3f9919d71e34dc 100644
GIT binary patch
delta 396
zcmWlU&q~8U5XN^l*(6PyQfl-drR>2=P`rvDsMu2x5B@s@MMF1jL;r8~ps>M%eSwmj
zURu2LDEJmWLLb4WaIzos&2PWU%>0(W-Rhm^xdh*5xPBU0i)v%9i9bOE3`t0YEev7K
zAq2sMH76kza6<xTao+~ESS4qtxBZyMW5Fj~t`Jo+in)x&y_ol-l&cBvOfX56Ogd`#
z%A>A|B~Mg}Q6$yj&jI)VZhlVJ;N^exYs<v(X}wqpswfAQFOA)|5+)Yb1y=fu)*~6!
zq(vUDA82M|rUv8|GRrJ&Xlnq{*G!v5R|FIGPBUA9HnoN1Xh+)vD%&$((<RlmcDi&0
zKxY2T(G;(QtH9V8qv!=KDUUZ+G@at9K`Ae@W`1lQ<(F*xq*m<XqY*Hn0u@>V7v%tj
dI>-j*0hJV+gn|vp3f?KKk$<p#X1Eo{`v*=+R;2&{

delta 556
zcmY*VO=}cE5Ur~I*m2?xi%JAtbXIU-Fdh;F@v7p%LoR~|gR%_i(JYzWOnN$!Ll1jM
z{=jBWo>WB8o8WKo;!oHgBi0Oiv7z6qeoa@uS3ko)ThXh2KLlRCcfL&)Y8ef8#(Xkh
zu!IcE6(fwizzmHt`T{aCJrghsgDE88a{ndD<;Us0QR;H*VmF-?@wAT1+!Z!<hxt4%
z=BAT>J;fV{TdUXf9ivO}bs_kl`da%pMi^0m0maPvuNHQj)dOnpHY;FmA3Wn-zhLn2
zh8k*wM`qb5PhK6VI`-0wBW1@9&LIVdtjlw1v?DLP;;QGh@4ch+A%{%i2ks|gt=wr<
z7Hcuf&lsljBv|WC+THNp>P$XfY#$uYs#8}?jz1K(%&W;^QC5W=w4NdcKn{Te)D&Wf
z_AV>`h0rW0-d%`CT)c;dJUoZD<2DHMu#pbfC|j1$C_C`<8NK>~2q%N#N#H33dy`)#
z)U{vhysCJ@iC$&$&UJg6uk4T^>uo%)KFRw}Zn08dWdM|&M;<uZ5udqFJ7$Y*Ep6+r
R8-CZ_jxN;$MPWY({{iziZ_5Ax

diff --git a/week05-testing/fixture.yaml b/week05-testing/fixture.yaml
new file mode 100644
index 0000000..fec76af
--- /dev/null
+++ b/week05-testing/fixture.yaml
@@ -0,0 +1,20 @@
+- generic:
+    time_range_1: ["2010-01-12 10:00:00", "2010-01-12 12:00:00"]
+    time_range_2: ["2010-01-12 10:30:00", "2010-01-12 10:45:00", 2, 60]
+    expected: 
+        - ["2010-01-12 10:30:00","2010-01-12 10:37:00"]
+        - ["2010-01-12 10:38:00", "2010-01-12 10:45:00"]
+- no_overlap:
+    time_range_1: ["2010-01-12 10:00:00", "2010-01-12 11:00:00"]
+    time_range_2: ["2010-01-12 12:30:00", "2010-01-12 12:45:00", 2, 60]
+    expected: []
+- multiple_overlaps:
+    time_range_1: ["2010-01-12 10:00:00", "2010-01-12 13:00:00", 3, 900]
+    time_range_2: ["2010-01-12 10:40:00", "2010-01-12 11:20:00", 2, 120]
+    expected:
+        - ["2010-01-12 10:40:00","2010-01-12 10:50:00"]
+        - ["2010-01-12 11:05:00", "2010-01-12 11:20:00"]
+- touching:
+    time_range_1: ["2010-01-12 10:00:00", "2010-01-12 11:00:00"]
+    time_range_2: ["2010-01-12 11:00:00", "2010-01-12 12:45:00"]
+    expected: [] 
diff --git a/week05-testing/test_times.py b/week05-testing/test_times.py
index b39bc19..806967b 100644
--- a/week05-testing/test_times.py
+++ b/week05-testing/test_times.py
@@ -1,21 +1,27 @@
-from times import time_range ,compute_overlap_time, compute_overlap_helper
 import pytest
+import yaml
+from times import compute_overlap_time, time_range
 
-testdata = [[('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:38:00', '2010-01-12 12:20:00'),tuple()] #test_no_overlap_helper
-     ,(('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:30:00', '2010-01-12 10:35:00'),('2010-01-12 10:30:00', '2010-01-12 10:35:00')) #test_inside_edge_overlap_helper
-     ,(('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:30:00', '2010-01-12 10:37:00')) #test_same_overlap_helper
-     ,(('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:37:00', '2010-01-12 10:39:00'),tuple()) #test_outside_edge_overlap_helper
-     ,(('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:34:00', '2010-01-12 10:42:00'),('2010-01-12 10:34:00', '2010-01-12 10:37:00')) #test_partial_overlap_helper
-     ,(('2010-01-12 10:30:00', '2010-01-12 10:37:00'),('2010-01-12 10:32:00', '2010-01-12 10:36:30'),('2010-01-12 10:32:00', '2010-01-12 10:36:30'))#test_subset_overlap_helper
-]
-
-@pytest.mark.parametrize(
-    "time_range1,time_range2,expected",testdata
-)
+with open("fixture.yaml", 'r') as yamlfile:
+    fixture = yaml.safe_load(yamlfile)
+    print(fixture)
+    
+@pytest.mark.parametrize("test_name", fixture)
+# fixture is a list of dictionaries [{'generic':...}, {'no_overlap':...}, ...]
 
-def test_eval(time_range1,time_range2,expected):
-    assert compute_overlap_helper(time_range1,time_range2) == expected
+def test_time_range_overlap(test_name):
+    # test_name will be a dictionary, e.g. for the first case: {'generic': {'time_range_1':..., 'time_range2':..., 'expected':...}
+    properties = list(test_name.values())[0]
+    first_range = time_range(*properties['time_range_1'])
+    second_range = time_range(*properties['time_range_2'])
+    expected_overlap = [(start, stop) for start, stop in properties['expected']]
+    assert compute_overlap_time(first_range, second_range) == expected_overlap
 
+def test_negative_time_range():
+    with pytest.raises(ValueError) as e:
+        time_range("2010-01-12 10:00:00", "2010-01-12 09:30:00")
+        assert e.match('The end of the time range has to come strictly after its start.')
+"""        
 def test_given_input():
     
     large = time_range("2010-01-12 10:00:00", "2010-01-12 12:00:00")
@@ -24,16 +30,8 @@ def test_given_input():
     result = compute_overlap_time(large, short) 
     expected = [('2010-01-12 10:30:00', '2010-01-12 10:37:00'), ('2010-01-12 10:38:00', '2010-01-12 10:45:00')]
     assert result == expected
-"""
-def test_subset_overlap_helper():
-    assert(
-        compute_overlap_helper(
-            ('2010-01-12 10:30:00', '2010-01-12 10:37:00'),
-            ('2010-01-12 10:32:00', '2010-01-12 10:36:30')
-        )
-        == ('2010-01-12 10:32:00', '2010-01-12 10:36:30')
-    )
-"""
+
 def test_negative():
     with pytest.raises(ValueError):
         time_range("2010-01-12 12:00:00", "2010-01-12 10:00:00")
+"""
diff --git a/week05-testing/times.py b/week05-testing/times.py
index b721729..4feed7a 100644
--- a/week05-testing/times.py
+++ b/week05-testing/times.py
@@ -1,32 +1,34 @@
 import datetime
 
+
 def time_range(start_time, end_time, number_of_intervals=1, gap_between_intervals_s=0):
     start_time_s = datetime.datetime.strptime(start_time, "%Y-%m-%d %H:%M:%S")
     end_time_s = datetime.datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S")
-
-    if start_time_s > end_time_s: 
-        raise ValueError("Start time is later than end time")
-
+    if(start_time_s>=end_time_s):
+        raise ValueError('The end of the time range has to come strictly after its start.')
     d = (end_time_s - start_time_s).total_seconds() / number_of_intervals + gap_between_intervals_s * (1 / number_of_intervals - 1)
     sec_range = [(start_time_s + datetime.timedelta(seconds=i * d + i * gap_between_intervals_s),
                   start_time_s + datetime.timedelta(seconds=(i + 1) * d + i * gap_between_intervals_s))
                  for i in range(number_of_intervals)]
     return [(ta.strftime("%Y-%m-%d %H:%M:%S"), tb.strftime("%Y-%m-%d %H:%M:%S")) for ta, tb in sec_range]
 
-def compute_overlap_helper(tuple1, tuple2):
-    start1, end1 = tuple1
-    start2, end2 = tuple2
-    if(start1 >= end2 or start2 >= end1):
-        return tuple()
-    else:
-        low = max(start1, start2)
-        high = min(end1, end2)
-        return((low, high))
 
 def compute_overlap_time(range1, range2):
     overlap_time = []
-    for tuple1 in range1:
-        for tuple2 in range2:
-            if(overlap := compute_overlap_helper(tuple1, tuple2)):
-                overlap_time.append((overlap))
-    return(overlap_time)
\ No newline at end of file
+    for start1, end1 in range1:
+        for start2, end2 in range2:
+            # both ranges need to start before the other ends, otherwise there is no overlap!
+            if start1 <= end2 and start2 <= end1: 
+                low = max(start1, start2)
+                high = min(end1, end2)
+                if high == low:
+                    continue
+                overlap_time.append((low, high))
+    return overlap_time
+    
+"""
+    if __name__ == "__main__":
+    large = time_range("2010-01-12 10:00:00", "2010-01-12 12:00:00")
+    short = time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00", 2, 60)
+    print(compute_overlap_time(large, short))
+"""    
\ No newline at end of file