forked from theforage/forage-jpmc-swe-task-1
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmulti_commit.patch
286 lines (262 loc) · 9.88 KB
/
multi_commit.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
From 211a73a9f89b0a6aa1db3b9922d0816cdfe9b3fb Mon Sep 17 00:00:00 2001
From: junxng <dungthcsnt2014@gmail.com>
Date: Tue, 10 Sep 2024 14:39:58 +0700
Subject: [PATCH 1/4] Fix bug
---
0001-Apply-updates-to-meet-requirements.patch | 47 +++++++++++++++++++
client3.py | 2 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 0001-Apply-updates-to-meet-requirements.patch
diff --git a/0001-Apply-updates-to-meet-requirements.patch b/0001-Apply-updates-to-meet-requirements.patch
new file mode 100644
index 0000000..ba1d6ea
--- /dev/null
+++ b/0001-Apply-updates-to-meet-requirements.patch
@@ -0,0 +1,47 @@
+From f20d501f45b62e217801a8c087d8f2fdd73001dd Mon Sep 17 00:00:00 2001
+From: junxng <dungthcsnt2014@gmail.com>
+Date: Tue, 10 Sep 2024 14:36:23 +0700
+Subject: [PATCH] Apply updates to meet requirements
+
+---
+ client3.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/client3.py b/client3.py
+index 3fc09b7..38ce35a 100644
+--- a/client3.py
++++ b/client3.py
+@@ -35,14 +35,16 @@ def getDataPoint(quote):
+ stock = quote['stock']
+ bid_price = float(quote['top_bid']['price'])
+ ask_price = float(quote['top_ask']['price'])
+- price = bid_price
++ price = (bid_price + ask_price) / 2
+ return stock, bid_price, ask_price, price
+
+
+ def getRatio(price_a, price_b):
+ """ Get ratio of price_a and price_b """
+ """ ------------- Update this function ------------- """
+- return 1
++ if price_b = 0:
++ raise ZeroDivisionError
++ return price_a / price_b
+
+
+ # Main
+@@ -52,8 +54,10 @@ if __name__ == "__main__":
+ quotes = json.loads(urllib.request.urlopen(QUERY.format(random.random())).read())
+
+ """ ----------- Update to get the ratio --------------- """
++ prices = {}
+ for quote in quotes:
+ stock, bid_price, ask_price, price = getDataPoint(quote)
++ prices[stock] = price
+ print("Quoted %s at (bid:%s, ask:%s, price:%s)" % (stock, bid_price, ask_price, price))
+
+- print("Ratio %s" % getRatio(price, price))
++ print("Ratio %s" % getRatio(prices['ABC'], prices['DEF']))
+--
+2.45.2.windows.1
+
diff --git a/client3.py b/client3.py
index 38ce35a..4c2b515 100644
--- a/client3.py
+++ b/client3.py
@@ -42,7 +42,7 @@ def getDataPoint(quote):
def getRatio(price_a, price_b):
""" Get ratio of price_a and price_b """
""" ------------- Update this function ------------- """
- if price_b = 0:
+ if price_b == 0:
raise ZeroDivisionError
return price_a / price_b
--
2.45.2.windows.1
From c4d3328de9498768570d42a48736c215f048dce0 Mon Sep 17 00:00:00 2001
From: junxng <dungthcsnt2014@gmail.com>
Date: Tue, 10 Sep 2024 16:44:51 +0700
Subject: [PATCH 2/4] Apply changes to meet requirements
---
0001-Apply-updates-to-meet-requirements.patch | 47 ------------------
__pycache__/client3.cpython-312.pyc | Bin 0 -> 1707 bytes
client_test.py | 8 ++-
3 files changed, 6 insertions(+), 49 deletions(-)
delete mode 100644 0001-Apply-updates-to-meet-requirements.patch
create mode 100644 __pycache__/client3.cpython-312.pyc
diff --git a/0001-Apply-updates-to-meet-requirements.patch b/0001-Apply-updates-to-meet-requirements.patch
deleted file mode 100644
index ba1d6ea..0000000
--- a/0001-Apply-updates-to-meet-requirements.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f20d501f45b62e217801a8c087d8f2fdd73001dd Mon Sep 17 00:00:00 2001
-From: junxng <dungthcsnt2014@gmail.com>
-Date: Tue, 10 Sep 2024 14:36:23 +0700
-Subject: [PATCH] Apply updates to meet requirements
-
----
- client3.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/client3.py b/client3.py
-index 3fc09b7..38ce35a 100644
---- a/client3.py
-+++ b/client3.py
-@@ -35,14 +35,16 @@ def getDataPoint(quote):
- stock = quote['stock']
- bid_price = float(quote['top_bid']['price'])
- ask_price = float(quote['top_ask']['price'])
-- price = bid_price
-+ price = (bid_price + ask_price) / 2
- return stock, bid_price, ask_price, price
-
-
- def getRatio(price_a, price_b):
- """ Get ratio of price_a and price_b """
- """ ------------- Update this function ------------- """
-- return 1
-+ if price_b = 0:
-+ raise ZeroDivisionError
-+ return price_a / price_b
-
-
- # Main
-@@ -52,8 +54,10 @@ if __name__ == "__main__":
- quotes = json.loads(urllib.request.urlopen(QUERY.format(random.random())).read())
-
- """ ----------- Update to get the ratio --------------- """
-+ prices = {}
- for quote in quotes:
- stock, bid_price, ask_price, price = getDataPoint(quote)
-+ prices[stock] = price
- print("Quoted %s at (bid:%s, ask:%s, price:%s)" % (stock, bid_price, ask_price, price))
-
-- print("Ratio %s" % getRatio(price, price))
-+ print("Ratio %s" % getRatio(prices['ABC'], prices['DEF']))
---
-2.45.2.windows.1
-
diff --git a/__pycache__/client3.cpython-312.pyc b/__pycache__/client3.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..51972e40dd14d843b693c81cd7bb79de7fdbfe11
GIT binary patch
literal 1707
zcmah}O>7%Q6rQnn*LM8V*ol)San(&lXk7BwR)G*Dpfqt%4~>#S3t0uMjdzl+YkS?<
zO{*A3iYgAS;NXfwQXxdCI285LN=Q^3P=NynE^(}?W?G3N#GxnB1PLi8-mGm1Y9&UR
z_qXr8dGozD`;*__fM9+5*Dnjddl34KEA{2C2|G71LTgAv8crdl%CUlN-Jv)&hazZB
zMbv~3kRoX!P#1A)()n(L=vNLzJg^&xcnh-dRp%4v-5UrgUigZV`>WsfQsPXu@71ev
z^1!n;A|ww!YlXZx>3G(Dt7fX#QRm6d|Myjb9;72BM1oL#6sm86QzX(<&oL)}tyu{x
zElMkCB_Yy00!hJVzvd#%pJ2^R!azNw1!x0l1?v6OQ;){zqnCuLw+~`mB&7M<ARc&t
z^INss<fMO5gqSY`w2YT=bl($xfvH^QIm^lp_xGoagqk{MnAY&nz|cVdg(X6lU)QzK
z_gC~kp%;l-KX?#=x{(w1P6o&t@}N9)o1eLYt$+N$=HNEXX;)LTuQ>kWAw0*!nRn!!
zIUXtIypU7KV{XX{3&NWyD&=00r>UVWC5Wu1QnGc9$QeR3qRAK4)Dkge%a9jIhEUZ4
z4_Q+!HEZY@OJ<^J8Hw}EWf|G{ysj}ZOZ5b)>Z*DE2?s2SnYfTLR4Xbn@xqc}5z24N
zJP;7C`g_2)DpG(JnIaIGuib(1;kh#=q2`>brS;6*f<e_q(woet6TRjo(rZCv@6owL
zN+%iXcwcsz`4)*a0ToX33Tc36;wj$(vWgxHBNbn;c=*cHYV1*CxJcGdmRerCeyP;b
zUv3;&J^4Ia#ow~tR`MUZu9kd<S7Q}#V==ludsE!-_HGEhJCGM8_KrE1?N+`3g5652
zVf!&k7I(JSWt>NO%$orXaO4ijZxBlce04)M7GxWhxGJj|ttQXQw1#C+A=H@AFY2al
zWMY&WH0ofkT0~u#H@UYgQ~nQOZh+)8&rO>_Jp$Y0ueb__D^TpboPQKJxZyrn@rH_T
zm%Nb;Awu`rk@0w1)id#U&Nah3r^z{wtXgt6^lmsO^~eDKaL(ORt#Wu5M{{obB)Q9E
z&ao5Y%sCO8jJ7c$X&M<OQMi$jW`QM|O6l``l)$4fEhbfUCeECRot|ZQ%I=$8Epx}?
z88uDfaVF?6I!uHdi-h4g6Je+{ley|yT#&`c5;z8?B&}LZphVS}WY3(*BpV}>@*l1}
zffUe3)W->*I(v9C)|be>x{chfdn66-B1K-KJ>bC~ocRZkEhol!=Lo{ShsggBg|{T+
z=~)$liSAXrExB;tcC&~NY=w~EE95qvZNK`1SG(5n$K4;kw~ZRaaa_QaU`Mfet^I2I
z`s8O**QOpsj+G+EZV!Gva%be8|DN=t|2zK=`^v|s%aNG}k+Y@9*>dEaa&WdFJ$8>*
zf=vaf67JYWPLGBQv7e8Q-X-Ou6D40?Ay#~KUB4NwL^=zT#lb75m@oLv()ar2jIueW
zZiMFV`x09&9`>{Wc>;yxwV~^iHwQmIb^GPJU3W&y9b=`y*nRhjr(s^^mWYIQ8<4*N
DTiU8s
literal 0
HcmV?d00001
diff --git a/client_test.py b/client_test.py
index af2bf26..13e362f 100644
--- a/client_test.py
+++ b/client_test.py
@@ -8,6 +8,8 @@ class ClientTest(unittest.TestCase):
{'top_ask': {'price': 121.68, 'size': 4}, 'timestamp': '2019-02-11 22:06:30.572453', 'top_bid': {'price': 117.87, 'size': 81}, 'id': '0.109974697771', 'stock': 'DEF'}
]
""" ------------ Add the assertion below ------------ """
+ for quote in quotes:
+ self.assertEqual(getDataPoint(quote), (quote['stock'], quote['top_bid']['price'], quote['top_ask']['price'], (quote['top_bid']['price'] + quote['top_ask']['price']) / 2))
def test_getDataPoint_calculatePriceBidGreaterThanAsk(self):
quotes = [
@@ -15,10 +17,12 @@ class ClientTest(unittest.TestCase):
{'top_ask': {'price': 121.68, 'size': 4}, 'timestamp': '2019-02-11 22:06:30.572453', 'top_bid': {'price': 117.87, 'size': 81}, 'id': '0.109974697771', 'stock': 'DEF'}
]
""" ------------ Add the assertion below ------------ """
-
+ for quote in quotes:
+ self.assertEqual(getDataPoint(quote), (quote['stock'], quote['top_bid']['price'], quote['top_ask']['price'], (quote['top_bid']['price'] + quote['top_ask']['price']) / 2))
+
""" ------------ Add more unit tests ------------ """
-
+
if __name__ == '__main__':
--
2.45.2.windows.1
From 833840e941b81ba4960babf490efd7b3cb1633a8 Mon Sep 17 00:00:00 2001
From: junxng <dungthcsnt2014@gmail.com>
Date: Tue, 10 Sep 2024 17:04:03 +0700
Subject: [PATCH 3/4] Final answer
---
client3.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client3.py b/client3.py
index 4c2b515..bd1fe43 100644
--- a/client3.py
+++ b/client3.py
@@ -42,8 +42,8 @@ def getDataPoint(quote):
def getRatio(price_a, price_b):
""" Get ratio of price_a and price_b """
""" ------------- Update this function ------------- """
- if price_b == 0:
- raise ZeroDivisionError
+ if (price_b === 0):
+ return
return price_a / price_b
--
2.45.2.windows.1
From aad27aca80677b914fea9f011cf140eb982bc6da Mon Sep 17 00:00:00 2001
From: junxng <dungthcsnt2014@gmail.com>
Date: Tue, 10 Sep 2024 21:43:31 +0700
Subject: [PATCH 4/4] update
---
0001-Final-answer.patch | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 0001-Final-answer.patch
diff --git a/0001-Final-answer.patch b/0001-Final-answer.patch
new file mode 100644
index 0000000..27e2a45
--- /dev/null
+++ b/0001-Final-answer.patch
@@ -0,0 +1,27 @@
+From 833840e941b81ba4960babf490efd7b3cb1633a8 Mon Sep 17 00:00:00 2001
+From: junxng <dungthcsnt2014@gmail.com>
+Date: Tue, 10 Sep 2024 17:04:03 +0700
+Subject: [PATCH] Final answer
+
+---
+ client3.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/client3.py b/client3.py
+index 4c2b515..bd1fe43 100644
+--- a/client3.py
++++ b/client3.py
+@@ -42,8 +42,8 @@ def getDataPoint(quote):
+ def getRatio(price_a, price_b):
+ """ Get ratio of price_a and price_b """
+ """ ------------- Update this function ------------- """
+- if price_b == 0:
+- raise ZeroDivisionError
++ if (price_b === 0):
++ return
+ return price_a / price_b
+
+
+--
+2.45.2.windows.1
+
--
2.45.2.windows.1