From df2c7057a641c1fb4bcf929934e7e24bc8ba71f5 Mon Sep 17 00:00:00 2001 From: s2356546 Date: Thu, 29 Sep 2022 16:04:20 +0200 Subject: [PATCH 1/7] Assignment 1 --- assignment_1.py | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/assignment_1.py b/assignment_1.py index ad78373..aa5089e 100644 --- a/assignment_1.py +++ b/assignment_1.py @@ -6,21 +6,7 @@ """ def lower_case(string): - """ - Argument: - string -- text you want to turn into lower case - - Returns: - lower_string -- lower case version of string - - """ - - ### your code starts here - - ### your code ends here - - return lower_string - + return string.str.lower() """ Do the same thing again with upper_case, but change the order so everyone @@ -28,17 +14,4 @@ def lower_case(string): """ def upper_case(string): - """ - Argument: - string -- text you want to turn into upper case - - Returns: - upper_string -- upper case version of string - - """ - - ### your code starts here - - ### your code ends here - - return upper_string + return string.str.upper() From c34d77d0af4ca85ef55e300f1734e7c18e749c8c Mon Sep 17 00:00:00 2001 From: s2356546 Date: Thu, 29 Sep 2022 16:06:25 +0200 Subject: [PATCH 2/7] Assignment 1 --- assignment_1.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assignment_1.py b/assignment_1.py index aa5089e..a19b601 100644 --- a/assignment_1.py +++ b/assignment_1.py @@ -6,12 +6,11 @@ """ def lower_case(string): - return string.str.lower() - + return string.lower() """ Do the same thing again with upper_case, but change the order so everyone experiences at least 1 merge conflict. """ def upper_case(string): - return string.str.upper() + return string.upper() From 376df53d6d1b01e80d62716df978a734bc661231 Mon Sep 17 00:00:00 2001 From: s2356546 Date: Thu, 29 Sep 2022 16:18:52 +0200 Subject: [PATCH 3/7] Assignment 1 --- assignment_2c | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 assignment_2c diff --git a/assignment_2c b/assignment_2c new file mode 100644 index 0000000..726ad5d --- /dev/null +++ b/assignment_2c @@ -0,0 +1,2 @@ +Function function_2c() takes 4 parameters as inputs and returns a dictionary with multiplication, division, addition and substraction. +The 2 and 3 parameter need to be multiplied and divided. The first and forth need to be addded and substracted. \ No newline at end of file From 43fd80631febd96cde50c42b4bc33762416c6528 Mon Sep 17 00:00:00 2001 From: s2356546 Date: Thu, 29 Sep 2022 16:19:47 +0200 Subject: [PATCH 4/7] Assignment 1 --- .idea/.gitignore | 8 ++++++++ .idea/SeminarsSept.iml | 12 ++++++++++++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 44 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/SeminarsSept.iml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/SeminarsSept.iml b/.idea/SeminarsSept.iml new file mode 100644 index 0000000..8a05c6e --- /dev/null +++ b/.idea/SeminarsSept.iml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..1e62cf2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8630d874f373219d925afe3d93c96a6a96fa4395 Mon Sep 17 00:00:00 2001 From: JT <68739686+abrap@users.noreply.github.com> Date: Thu, 29 Sep 2022 16:31:39 +0200 Subject: [PATCH 5/7] a --- Assi_2b | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Assi_2b diff --git a/Assi_2b b/Assi_2b new file mode 100644 index 0000000..63c95fb --- /dev/null +++ b/Assi_2b @@ -0,0 +1,4 @@ +define a function named function_2b, in which it take the two input strings and transfer the 1st string into +Lower case and the second one into Upper case +Then combine the lower and upper into one +Then put them into a dictionary From 48c631a6f00d76906e793ce552d2103c2669ad5b Mon Sep 17 00:00:00 2001 From: LincDe <905401325@qq.con> Date: Thu, 29 Sep 2022 16:41:55 +0200 Subject: [PATCH 6/7] assignment_2a.py --- assignment_2a.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assignment_2a.py b/assignment_2a.py index 1b8fc0e..6e947be 100644 --- a/assignment_2a.py +++ b/assignment_2a.py @@ -9,10 +9,11 @@ Run the script to see if you succeeded! PS: Multiple combinations are possible, just give a correct one. """ +input_2b=[-50, 10, 100, 1000] +input_2c=['seminars', 'Borrel'] +var_1 = function_2c(input_2c)['add'] -var_1 = function_2c(...) - -var_2 = function_2b(...) +var_2 = function_2b(input_2b)["C"] if var_1 == 950: print("Good job!") From e35fe2bc667f36c31872e3400a960f4b8fc5b753 Mon Sep 17 00:00:00 2001 From: LincDe <905401325@qq.con> Date: Thu, 29 Sep 2022 16:44:47 +0200 Subject: [PATCH 7/7] assignment_2a.py --- assignment_2a.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/assignment_2a.py b/assignment_2a.py index 6e947be..4277fe1 100644 --- a/assignment_2a.py +++ b/assignment_2a.py @@ -9,11 +9,10 @@ Run the script to see if you succeeded! PS: Multiple combinations are possible, just give a correct one. """ -input_2b=[-50, 10, 100, 1000] -input_2c=['seminars', 'Borrel'] -var_1 = function_2c(input_2c)['add'] -var_2 = function_2b(input_2b)["C"] +var_1 = function_2c(-50, 10, 100, 1000)['add'] + +var_2 = function_2b('seminars', 'Borrel')["C"] if var_1 == 950: print("Good job!")