From 9f9618014a04eaf012f5db3d58081d4e1b878ed4 Mon Sep 17 00:00:00 2001
From: nholzbach <81358704+nholzbach@users.noreply.github.com>
Date: Thu, 21 Oct 2021 15:57:23 +0200
Subject: [PATCH 01/14] Add files via upload
---
assignment_1.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/assignment_1.py b/assignment_1.py
index 166ef54..50c4d44 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -14,10 +14,7 @@ def lower_case(string):
lower_string -- lower case version of string
"""
-
- ### your code starts here
-
- ### your code ends here
+ string.lower()
return lower_string
From 3ac26883ad17d4e74c9a8e1751acf277a052d4df Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 15:57:47 +0200
Subject: [PATCH 02/14] Add files via upload
---
assignment_1.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/assignment_1.py b/assignment_1.py
index 50c4d44..965fedf 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -14,7 +14,11 @@ def lower_case(string):
lower_string -- lower case version of string
"""
- string.lower()
+
+ ### your code starts here
+ lower_string = string.lower()
+
+ ### your code ends here
return lower_string
From a8610777b87fe2ba19ef0dbe21a3de16f9fe4fe5 Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:07:27 +0200
Subject: [PATCH 03/14] Update assignment_1.py
---
assignment_1.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/assignment_1.py b/assignment_1.py
index 965fedf..9d56a8c 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -17,6 +17,8 @@ def lower_case(string):
### your code starts here
lower_string = string.lower()
+
+ print("hello")
### your code ends here
From 044e19cbd4fd4979f0a1f7efa1d81d11f7c7f3e2 Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:13:14 +0200
Subject: [PATCH 04/14] Update assignment_1.py
---
assignment_1.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/assignment_1.py b/assignment_1.py
index 9d56a8c..965fedf 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -17,8 +17,6 @@ def lower_case(string):
### your code starts here
lower_string = string.lower()
-
- print("hello")
### your code ends here
From 9c52a95bd70dc4a29bc0ff23c6df977afca07aa2 Mon Sep 17 00:00:00 2001
From: nholzbach <81358704+nholzbach@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:13:35 +0200
Subject: [PATCH 05/14] Update assignment_1.py
---
assignment_1.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/assignment_1.py b/assignment_1.py
index 166ef54..9246e92 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -16,7 +16,15 @@ def lower_case(string):
"""
### your code starts here
+ lower_string = string.lower()
+<<<<<<< HEAD
+ lower_string.lower()
+
+=======
+ print("hello")
+
+>>>>>>> a8610777b87fe2ba19ef0dbe21a3de16f9fe4fe5
### your code ends here
return lower_string
From d6f60f365fb9255d7f8d6636ea417a74a7844d47 Mon Sep 17 00:00:00 2001
From: nholzbach <81358704+nholzbach@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:15:45 +0200
Subject: [PATCH 06/14] Update assignment_2b.py
---
assignment_2b.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assignment_2b.py b/assignment_2b.py
index 1aef416..25861b3 100644
--- a/assignment_2b.py
+++ b/assignment_2b.py
@@ -5,7 +5,7 @@
No cheating! Don't show or tell hem the code directly
"""
def function_2b(string_1, string_2):
-
+ ''' the function results in the first string in lower case, the second strong in upper case and then both of them combined. '''
lower = string_1.lower()
upper = string_2.upper()
combined = string_1 + string_2
From 6908257c7c36f4780cb7f1be1a0975c5ee5cf6ec Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:22:00 +0200
Subject: [PATCH 07/14] help
---
.DS_Store | Bin 0 -> 6148 bytes
__pycache__/assignment_2b.cpython-39.pyc | Bin 0 -> 630 bytes
__pycache__/assignment_2c.cpython-39.pyc | Bin 0 -> 681 bytes
assignment_2a.py | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 .DS_Store
create mode 100644 __pycache__/assignment_2b.cpython-39.pyc
create mode 100644 __pycache__/assignment_2c.cpython-39.pyc
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a292f56e49e07b1b584c4550f1aadb55b0d12f63
GIT binary patch
literal 6148
zcmeHKJ8r`;3?&;60kUMws4L_KLXe&y2XONPG8k}yqC+=NIaiL>$IoK8-JB(O1gIxb
zd=m5q(-aZieP6aBYY|z(4drgb)NJ2;Vs9ByARK3$
tC`N@F;svGyp96)eJF6lnm7ddrvrnx0Kf)e
zH_W}402T`XYvK@y2uy*H-`E;s5miV-iS5P5@bSE9fX`9svu}$QSXE)X*cCa0yJ!Lx{
zgW|5_mC{o23J4)45qnz3nu+JfGhaSioSr6(9x%y`mytn8w46Hm%azF`FBSb6BF5usd!@gOmT^2r6-ipf*6D
za-pF$_GWAf%FmO9fxJM1uD8$O!sr(sTwz)m{sISdSUpSxsVwHc+$H(I&OxTM2}#dM
z-AghZyJPokA9VbV(|6Lbjz4AlunW3L7fSwZvX8omSPT}kNzbo(e%Kg5Ax{95*1T1^~usgHEBpZ=g#kr~0N~7#UsdE3F*%J!?dXru|v@R{xtw=Ba-Hl5x
zmH*JJ(Hk8-fp
literal 0
HcmV?d00001
diff --git a/__pycache__/assignment_2c.cpython-39.pyc b/__pycache__/assignment_2c.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1521b2ede3b18ef2987d8cf7023de8039c464747
GIT binary patch
literal 681
zcmY*X!H&}~5Vg~^$!4{P!%B+;hv9@Gp;p=hCxljFB{=m`Aw({f8@r9QiCt`GL#pJ)
zXY3E~OS$qF2qeZ~3(HtD_KfGvjAzWw&Ju$3On+u+K*)EmJS4P{D`fi^1t%Hdlm}l)
zM)_n#((v#z`DmmQz<}$#u7q;TNv&Y34Y)#pmDRo!u&q@-+Bc%q%^W`I+Q6O}r-Xq<
zmL(MIR)EvV=zAVZUKwR
znSw@}n=vRzH&2!t@X&&Oc>`wZ0n6PEO*~XdNR;vpkD^s4)l;cx(CR7?0pt{n8hh%F#@IUdv#IGyO>r%X-s9FC5!`W}w
CkiyCU
literal 0
HcmV?d00001
diff --git a/assignment_2a.py b/assignment_2a.py
index 529aceb..1b0d5d5 100644
--- a/assignment_2a.py
+++ b/assignment_2a.py
@@ -9,7 +9,7 @@
just give a correct one.
"""
-var_1 = function_2b(...)
+var_1 = function_2b(5)
var_2 = function_2c(...)
From e807d958324da4cacc33e2499b93506a30fb308f Mon Sep 17 00:00:00 2001
From: nholzbach <81358704+nholzbach@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:23:00 +0200
Subject: [PATCH 08/14] Add files via upload
From 9a538cd64d97f5e01894f24fa8cbdc4e8d4d7cbf Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:23:35 +0200
Subject: [PATCH 09/14] Delete __pycache__ directory
---
__pycache__/assignment_2b.cpython-39.pyc | Bin 630 -> 0 bytes
__pycache__/assignment_2c.cpython-39.pyc | Bin 681 -> 0 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 __pycache__/assignment_2b.cpython-39.pyc
delete mode 100644 __pycache__/assignment_2c.cpython-39.pyc
diff --git a/__pycache__/assignment_2b.cpython-39.pyc b/__pycache__/assignment_2b.cpython-39.pyc
deleted file mode 100644
index 81a7a84738c2c092a469902c46e7961ec3b5725b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 630
zcmY*Xy^ho{5Vo_)UI;pgj)r2WU?sE>S5P5@bSE9fX`9svu}$QSXE)X*cCa0yJ!Lx{
zgW|5_mC{o23J4)45qnz3nu+JfGhaSioSr6(9x%y`mytn8w46Hm%azF`FBSb6BF5usd!@gOmT^2r6-ipf*6D
za-pF$_GWAf%FmO9fxJM1uD8$O!sr(sTwz)m{sISdSUpSxsVwHc+$H(I&OxTM2}#dM
z-AghZyJPokA9VbV(|6Lbjz4AlunW3L7fSwZvX8omSPT}kNzbo(e%Kg5Ax{95*1T1^~usgHEBpZ=g#kr~0N~7#UsdE3F*%J!?dXru|v@R{xtw=Ba-Hl5x
zmH*JJ(Hk8-fp
diff --git a/__pycache__/assignment_2c.cpython-39.pyc b/__pycache__/assignment_2c.cpython-39.pyc
deleted file mode 100644
index 1521b2ede3b18ef2987d8cf7023de8039c464747..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 681
zcmY*X!H&}~5Vg~^$!4{P!%B+;hv9@Gp;p=hCxljFB{=m`Aw({f8@r9QiCt`GL#pJ)
zXY3E~OS$qF2qeZ~3(HtD_KfGvjAzWw&Ju$3On+u+K*)EmJS4P{D`fi^1t%Hdlm}l)
zM)_n#((v#z`DmmQz<}$#u7q;TNv&Y34Y)#pmDRo!u&q@-+Bc%q%^W`I+Q6O}r-Xq<
zmL(MIR)EvV=zAVZUKwR
znSw@}n=vRzH&2!t@X&&Oc>`wZ0n6PEO*~XdNR;vpkD^s4)l;cx(CR7?0pt{n8hh%F#@IUdv#IGyO>r%X-s9FC5!`W}w
CkiyCU
From c6852851c8ed31b7df9e58d3027e3c814e5db6f3 Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:23:43 +0200
Subject: [PATCH 10/14] Delete .DS_Store
---
.DS_Store | Bin 6148 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 .DS_Store
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index a292f56e49e07b1b584c4550f1aadb55b0d12f63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6148
zcmeHKJ8r`;3?&;60kUMws4L_KLXe&y2XONPG8k}yqC+=NIaiL>$IoK8-JB(O1gIxb
zd=m5q(-aZieP6aBYY|z(4drgb)NJ2;Vs9ByARK3$tC`N@F;svGyp96)eJF6lnm7ddrvrnx0Kf)e
zH_W}402T`XYvK@y2uy*H-`E;s5miV-i
Date: Thu, 21 Oct 2021 16:31:00 +0200
Subject: [PATCH 11/14] Update assignment_2c.py
---
assignment_2c.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assignment_2c.py b/assignment_2c.py
index 1ac1ced..047c565 100644
--- a/assignment_2c.py
+++ b/assignment_2c.py
@@ -5,7 +5,7 @@
No cheating! Don't show or tell hem the code directly
"""
def function_2c(w, x, y, z):
-
+ '''this function multiplies the 2nd and 3rd input, divides the 2nd and 3rd input, adds the 1st and 4th input, and subtracts the 4th from the 1st input '''
multiplication = x * y
division = x / y
addition = w + z
From ecd0fa61a6920ebd3e25cd3c4dfc7371ea21286f Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:32:36 +0200
Subject: [PATCH 12/14] Update assignment_2a.py
---
assignment_2a.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/assignment_2a.py b/assignment_2a.py
index 1b0d5d5..58aa3dd 100644
--- a/assignment_2a.py
+++ b/assignment_2a.py
@@ -8,10 +8,12 @@
Run the script to see if you succeeded! PS: Multiple combinations are possible,
just give a correct one.
"""
+help(function_2b)
+help(function_2c)
-var_1 = function_2b(5)
+var_1 = function_2c()
-var_2 = function_2c(...)
+var_2 = function_2b(Seminars, Borrel)
var_3 = str(function_2b(...)) + function_2c(...)
From 9c6e3861e7dbfbea02a0f71ad12a4423930ef22c Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Thu, 21 Oct 2021 16:43:46 +0200
Subject: [PATCH 13/14] Update assignment_2a.py
---
assignment_2a.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/assignment_2a.py b/assignment_2a.py
index 58aa3dd..c33869f 100644
--- a/assignment_2a.py
+++ b/assignment_2a.py
@@ -11,11 +11,11 @@
help(function_2b)
help(function_2c)
-var_1 = function_2c()
+var_1 = function_2c(1000, 5, -5, 50)['subtract']
-var_2 = function_2b(Seminars, Borrel)
+var_2 = function_2b('Seminars', 'Borrel')['C']
-var_3 = str(function_2b(...)) + function_2c(...)
+var_3 = str(function_2c(5, 10, 1000, 5)['multiply']) + function_2b('CLs', 'borrel')['L']
if var_1 == 950:
print("Good job!")
From 3d1339cef482849510f0159d08bae1ef3f5d66d0 Mon Sep 17 00:00:00 2001
From: LizaRoelofsen <60733836+LizaRoelofsen@users.noreply.github.com>
Date: Mon, 17 Jan 2022 17:38:28 +0100
Subject: [PATCH 14/14] ?
---
.DS_Store | Bin 0 -> 6148 bytes
__pycache__/assignment_2b.cpython-39.pyc | Bin 0 -> 752 bytes
__pycache__/assignment_2c.cpython-39.pyc | Bin 0 -> 830 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 .DS_Store
create mode 100644 __pycache__/assignment_2b.cpython-39.pyc
create mode 100644 __pycache__/assignment_2c.cpython-39.pyc
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..38734ca2de71d90578b12a191d5ff30a57f26d5c
GIT binary patch
literal 6148
zcmeHKJ8Hu~5S@u#2;8`IxmU;y7U7)02atb(6aoc8igc=cE+5TrJ{W}TCXgn)ftj~E
znx|!7q0xwlw%_Mhk+q04a6`FRn43K}pV>=h6bQ#VPI7>M$h&m2>c}_IdtuEgkdX>d0V;4;z`hR!Zden?K>u_g_y_=8
zBJGB?&l13531Cee1CfDgP=P_!95FQL$d|0EiDO{UMRWMjJXv!>Q9m8;FJ3NM0~x6R
z6__fpi0#_?{~P?t{68geM+KA!1r*gxx&q`b_#;GW1zQV
hY^)t`yeR65t?|4jj)6``-swR8445u7D)83|+yF)|6_)@2
literal 0
HcmV?d00001
diff --git a/__pycache__/assignment_2b.cpython-39.pyc b/__pycache__/assignment_2b.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4af13059f116152b6d0a86e3da746eb9e86d6d66
GIT binary patch
literal 752
zcmY*Xy^a$x5Vkj)Tv&7x9qmv-q*EfUph5`gPJ#km6P*xgR*pT%TDNNl+e=8a>39r^
zqom|@w&g7lLX0<;Q*Nvo+cV>D{wz*UGe-35>t|6WjQx(6V`{;B)5TLBAD>Oj_Z4E4}gHRxNU9C!lMQvoKpJQp)WB6oi2P@%%K?iGH
zmQaW<2*GBZf5hpYAKsmjQz&d5;KtasHp|W`t->)((J0s)15)7ZVLF0bJR;}?P*PGD
zSX+0~fr1X>?8<^HkWx3xXK-oF^8miEYlu}~%nqyjh@iAX8Olv2V|NZTphHT0LF`|U
zXxJ_L!FEZ*Z#nI~hBf>t+oes?^qN%h@4a2W=~EYz?dCzT;Lz7)@Sx3JubroSf{S&N
zjygzPlfvU!XZI*=tS>mbcc@pZI|qn`Q#%aIZ79Gl;-vy)r_0q&i=jZeBYSTVG44du|sQYp(8FE@l!fE{*r0x+}t|--$Jf{)o
bd8g$0
z2po93(8%VhvT!X`E#%5;GsXBAW?VAZ+;xb7lYi5pXks`A
zu>?#iqY`SRuf0JS()1pZ-N5aS$Zps~O}`m5Ll%6Ec5xG9Kf~=8n+tQ>
zuCgkuSQmmDAAX8uxKf^L212eYdxpu}2=;$9Wo!?9W~_(4uz3gdO{o@E)6DLToN}qv
zzE+3uL0}Z6@gb8n<7jE>r%Zi7#4uxW#BdcR9O^Mpua2Qx^GG)ACs
zWJr%YG#=Wa<_4=Zx`(~<;^)iBrQzC43bCb=^8>%kHe*PZxwIlz