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
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
diff --git a/assignment_1.py b/assignment_1.py
index ad78373..a19b601 100644
--- a/assignment_1.py
+++ b/assignment_1.py
@@ -6,39 +6,11 @@
"""
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.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):
- """
- 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.upper()
diff --git a/assignment_2a.py b/assignment_2a.py
index 1b8fc0e..4277fe1 100644
--- a/assignment_2a.py
+++ b/assignment_2a.py
@@ -10,9 +10,9 @@
just give a correct one.
"""
-var_1 = function_2c(...)
+var_1 = function_2c(-50, 10, 100, 1000)['add']
-var_2 = function_2b(...)
+var_2 = function_2b('seminars', 'Borrel')["C"]
if var_1 == 950:
print("Good job!")
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