Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seminars: 11630604, 14121735, 14669862 #13

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/SeminarsSept.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Assi_2b
Original file line number Diff line number Diff line change
@@ -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
32 changes: 2 additions & 30 deletions assignment_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 2 additions & 2 deletions assignment_2a.py
Original file line number Diff line number Diff line change
Expand Up @@ -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!")
Expand Down
2 changes: 2 additions & 0 deletions assignment_2c
Original file line number Diff line number Diff line change
@@ -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.