From 3ce5c2115e96ce56384b107ac094e40b63e11d41 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:37:15 +0530 Subject: [PATCH 01/17] Submitted --- .idea/Assignments.iml | 2 +- .idea/misc.xml | 2 +- .idea/vcs.xml | 6 ++ .idea/workspace.xml | 145 ++++++++++-------------------------- Section_01/assignment_01.py | 4 +- Section_01/assignment_02.py | 2 + Section_01/assignment_03.py | 3 + Section_01/assignment_04.py | 3 +- 8 files changed, 55 insertions(+), 112 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/Assignments.iml b/.idea/Assignments.iml index 74d515a..1467ed4 100644 --- a/.idea/Assignments.iml +++ b/.idea/Assignments.iml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index aa8302e..a4652f3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 55afcd0..7f6289c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,12 @@ - + + + + + + + + - - - - + @@ -40,8 +51,8 @@ - - + + - + - + - + - + + + + + - - - - @@ -168,6 +179,7 @@ + @@ -181,85 +193,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Section_01/assignment_01.py b/Section_01/assignment_01.py index fa1f33a..9888798 100644 --- a/Section_01/assignment_01.py +++ b/Section_01/assignment_01.py @@ -5,8 +5,8 @@ How would you change the code to meet the requirement? """ - - +result=15%4 +print(result) diff --git a/Section_01/assignment_02.py b/Section_01/assignment_02.py index a5636d1..587ddb9 100644 --- a/Section_01/assignment_02.py +++ b/Section_01/assignment_02.py @@ -8,6 +8,8 @@ print("We have {2} small boxes, {2} large boxes, {2} medium boxes".format(10,12,12)) """ +sentence='We actually have {} small, {} large, and {} medium boxes.'.format(10,12,12) +print(sentence) diff --git a/Section_01/assignment_03.py b/Section_01/assignment_03.py index 5d312a7..3c73c8f 100644 --- a/Section_01/assignment_03.py +++ b/Section_01/assignment_03.py @@ -21,6 +21,9 @@ # Expected Result Printed: [[Cool]] # Your code below: +mid_of_chars=len(chars)//2 +result=chars[:mid_of_chars]+word+chars[mid_of_chars:] +print(result) diff --git a/Section_01/assignment_04.py b/Section_01/assignment_04.py index addb148..afcbaca 100644 --- a/Section_01/assignment_04.py +++ b/Section_01/assignment_04.py @@ -19,7 +19,8 @@ # Expected Result Printed: omputerTuck # Your code below: - +result=word1[1:]+word2[0]+word2[2:] +print(result) From 670c214768526baf5a41e8ddcd285c053326ca6c Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:40:52 +0530 Subject: [PATCH 02/17] Submitted --- .idea/workspace.xml | 29 ++++++++++++++++------------- Section_01/assignment_05.py | 4 +++- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7f6289c..2424c27 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,8 @@ + + @@ -51,8 +54,8 @@ - - + + - + - + - + - + + - diff --git a/Section_01/assignment_05.py b/Section_01/assignment_05.py index d672da4..8c5b487 100644 --- a/Section_01/assignment_05.py +++ b/Section_01/assignment_05.py @@ -23,7 +23,9 @@ # Your code below: - +mid_of_char=len(chars)//2 +result=chars[:mid_of_char]+word+chars[mid_of_char:] +print(result) From 7a2fcc6b73e04b06fd75326388d2b382def3525e Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:44:04 +0530 Subject: [PATCH 03/17] Update assignment_01.py --- Section_02/assignment_01.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Section_02/assignment_01.py b/Section_02/assignment_01.py index 742cfa9..9889208 100644 --- a/Section_02/assignment_01.py +++ b/Section_02/assignment_01.py @@ -6,8 +6,11 @@ """ - +my_list = [{'Tom': 20000, 'Bill': 12000}, ['car', 'laptop', 'TV']] # your code below: +bill_salary=my_list[0]['Bill'] + +print(f'The Salary that {list(my_list[0].keys())[1]} earns is $ {bill_salary}') From 7afbcb00bfc67a03bcd8828147e948cc8d44c4f9 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:44:08 +0530 Subject: [PATCH 04/17] Update workspace.xml --- .idea/workspace.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2424c27..8319bee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,10 +5,7 @@ - - - - + - - + + + - From 7ddff5a1676105578b4b4e2d9f1568cb2df779f2 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 21:47:30 +0530 Subject: [PATCH 05/17] Update workspace.xml --- .idea/workspace.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8319bee..23e5cef 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,9 +4,7 @@ - - - + - + + + @@ -51,7 +52,7 @@ - + - + + - diff --git a/Section_02/assignment_02.py b/Section_02/assignment_02.py index da7812a..264d7df 100644 --- a/Section_02/assignment_02.py +++ b/Section_02/assignment_02.py @@ -10,7 +10,8 @@ """ # your code below: - +info={'Tom':{'Salary':20000,'Age':22,'owns_items':['Jacket','Car','TV']},'Mike':{'Salary':24000,'Age':27,'owns_items': + ['Bike','Laptop','Boat']}} From 98b9fef7d1a355553233c4baf9dbc959ba66b4af Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:02:40 +0530 Subject: [PATCH 08/17] Submitted --- .idea/workspace.xml | 11 ++++++----- Section_02/assignment_03.py | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d6d9271..556a9b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,6 +7,7 @@ + - + - + + - diff --git a/Section_02/assignment_03.py b/Section_02/assignment_03.py index 5e91adb..d7d7b87 100644 --- a/Section_02/assignment_03.py +++ b/Section_02/assignment_03.py @@ -13,6 +13,10 @@ # your code below: +new_list=original_list[:3] +new_list.append(tuple(sorted(list(original_list[3])))) +print(new_list) + From 92b16dd8648351a18361e48737630ff5592d28d3 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:14:15 +0530 Subject: [PATCH 09/17] Submitted --- .idea/workspace.xml | 11 ++++++----- Section_02/assignment_04.py | 8 ++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 556a9b1..9984947 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,6 +8,7 @@ + - + - + + - diff --git a/Section_02/assignment_04.py b/Section_02/assignment_04.py index c3e2a50..e2d832e 100644 --- a/Section_02/assignment_04.py +++ b/Section_02/assignment_04.py @@ -9,8 +9,12 @@ # Your Code Below: - - +third_element=list(my_list[2]) +manipulation_1=third_element[0][3]='x' +third_element=tuple(third_element) +fourth_element=my_list[3]='television' +my_list.pop(2) +my_list.insert(2,third_element) From b81913046d15197204588412702e32e58975c7a1 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:16:31 +0530 Subject: [PATCH 10/17] Submitted --- .idea/workspace.xml | 28 ++++++++++++++-------------- Section_03/assignment_01.py | 8 ++++++-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9984947..bd600a5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -54,8 +54,8 @@ - - + + - + - + - + - + + - diff --git a/Section_03/assignment_01.py b/Section_03/assignment_01.py index 3688656..5d77acf 100644 --- a/Section_03/assignment_01.py +++ b/Section_03/assignment_01.py @@ -7,6 +7,10 @@ # your code below: +def merge_lists(lst1,lst2): + result= lst1+lst2 + return result + @@ -51,5 +55,5 @@ # def merge_lists(list_a, list_b): # return list_a + list_b # -# my_list = merge_lists([1,2,3],['a', 'b', 'c']) -# print(my_list) \ No newline at end of file +my_list = merge_lists([1,2,3],['a', 'b', 'c']) +print(my_list) \ No newline at end of file From 043edf263bdeff0c179a36d342d01b3ba2ab29dc Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:17:34 +0530 Subject: [PATCH 11/17] Update workspace.xml --- .idea/workspace.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bd600a5..bc5a57c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,6 +9,7 @@ + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index a4652f3..b749013 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bc5a57c..f5c6dec 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,11 +5,10 @@ + + - - - - + - + - + - + + - @@ -197,4 +196,15 @@ + + + \ No newline at end of file diff --git a/Section_03/assignment_02.py b/Section_03/assignment_02.py index 3e74ab6..2e84530 100644 --- a/Section_03/assignment_02.py +++ b/Section_03/assignment_02.py @@ -7,6 +7,8 @@ Make sure to test the function. """ # Your Code Below: +def separate(string): + return list(string) @@ -15,6 +17,10 @@ +print(separate('Aadit Jain')) +print(separate('My Lovely Sister - Rashi')) + + @@ -56,4 +62,4 @@ # def separate(str): # return list(str) # -# print(separate("hello there")) \ No newline at end of file +print(separate("hello there")) \ No newline at end of file diff --git a/Section_03/assignment_03.py b/Section_03/assignment_03.py index 0d9731f..72e8a2a 100644 --- a/Section_03/assignment_03.py +++ b/Section_03/assignment_03.py @@ -10,7 +10,8 @@ """ # Your Code Below: - +def multi_merge(lst,string): + pass From 99c09950322a7555d2f1f9f32659f6d7bc381828 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sat, 15 Jul 2023 19:59:14 +0530 Subject: [PATCH 13/17] Submitted --- .idea/workspace.xml | 31 +++++++++++++++---------------- Section_03/assignment_03.py | 9 ++++++--- Section_03/assignment_04.py | 6 ++++-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f5c6dec..3383d81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,10 +5,9 @@ - - - + + - + - + - + - + - + + + - - diff --git a/Section_03/assignment_03.py b/Section_03/assignment_03.py index 72e8a2a..774111c 100644 --- a/Section_03/assignment_03.py +++ b/Section_03/assignment_03.py @@ -11,8 +11,10 @@ """ # Your Code Below: def multi_merge(lst,string): - pass - + lst=list(map(str,lst)) + string_list=list(string) + lst+=string_list + return sorted(lst) @@ -21,6 +23,7 @@ def multi_merge(lst,string): +print(multi_merge(['Aadit','Jain','UP','37','U','P',6,3,1,0],'UP37U6310')) @@ -57,4 +60,4 @@ def multi_merge(lst,string): # def multi_merge(list_a, str): # return list_a + str.split() + list(str) # -# print(multi_merge([1,2,3,4], "Hello My name is imtiaz")) +print(multi_merge([1,2,3,4], "Hello My name is imtiaz")) diff --git a/Section_03/assignment_04.py b/Section_03/assignment_04.py index a33876f..72e1837 100644 --- a/Section_03/assignment_04.py +++ b/Section_03/assignment_04.py @@ -13,14 +13,16 @@ """ # Your code below: +def last_list(*args): + return args[-1] - - +print(last_list([1,2,3,4,5], ['a', 'b', 'c'], ['mike', 'john'])) +print(last_list(['Aadit','Jain','UP','37','U','P',6,3,1,0])) From 4b73ec2df82e7929c39f0ecbea31c12a39de695d Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Sat, 15 Jul 2023 20:02:24 +0530 Subject: [PATCH 14/17] Still to Complete --- .idea/workspace.xml | 17 ++++++++--------- Section_03/assignment_05.py | 4 ---- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3383d81..a6b85d1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,8 +6,7 @@ - - + - + - + - + + - diff --git a/Section_03/assignment_05.py b/Section_03/assignment_05.py index 425df0b..2cd9128 100644 --- a/Section_03/assignment_05.py +++ b/Section_03/assignment_05.py @@ -50,10 +50,6 @@ - - - - From 45ce80fd52f666f8bf6934954db8de724827ffc6 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:42:27 +0530 Subject: [PATCH 15/17] Commit --- .idea/workspace.xml | 61 ++++++++++++++++++++----------------- Section_03/assignment_05.py | 9 +++--- Section_04/assignment_01.py | 10 ++++++ Section_04/assignment_02.py | 10 ++++++ Section_04/assignment_03.py | 3 ++ Section_04/assignment_04.py | 11 +++++++ Section_04/assignment_05.py | 9 ++++++ 7 files changed, 81 insertions(+), 32 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a6b85d1..5b0bd26 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,6 +7,11 @@ + + + + + - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "git-widget-placeholder": "master", - "last_opened_file_path": "C:/Users/aadit/OneDrive/Documents/GitHub/PythonCourse" + +}]]> @@ -52,8 +57,8 @@ - - + + - + - + - + - + - - - - - + + + + + diff --git a/Section_03/assignment_05.py b/Section_03/assignment_05.py index 2cd9128..5fa4056 100644 --- a/Section_03/assignment_05.py +++ b/Section_03/assignment_05.py @@ -14,7 +14,8 @@ """ # Your Code Below: - +def key_list_items(**kwargs): + return kwargs['people'][-2] @@ -61,6 +62,6 @@ # keys = kwargs[key] # return keys[-2] # -# result = key_list_items("people", things=['book', 'tv', 'shoes'], people=['pete', 'mike', 'jan', 'tom'], -# ages=[20, 30, 40]) -# print(result) \ No newline at end of file +result = key_list_items("people", things=['book', 'tv', 'shoes'], people=['pete', 'mike', 'jan', 'tom'], + ages=[20, 30, 40]) +print(result) \ No newline at end of file diff --git a/Section_04/assignment_01.py b/Section_04/assignment_01.py index f3313a1..0e0163c 100644 --- a/Section_04/assignment_01.py +++ b/Section_04/assignment_01.py @@ -13,6 +13,16 @@ """ # Your Code Below: +def twelver(a,b): + if ( a==12 or b==12 ) or (a+b==12): + return True + return False + +print(twelver(3, 12)) + +print(twelver(4, 9)) + +print(twelver(9, 3)) diff --git a/Section_04/assignment_02.py b/Section_04/assignment_02.py index d0dc7b5..0fbf46e 100644 --- a/Section_04/assignment_02.py +++ b/Section_04/assignment_02.py @@ -18,6 +18,16 @@ """ # Your Code Below: +def pay_extra(working,hour): + if working==True and (hour>=20 or hour<=8): + return True + return False + +print(pay_extra(True, 11)) + +print(pay_extra(False, 5)) + +print(pay_extra(True, 6)) diff --git a/Section_04/assignment_03.py b/Section_04/assignment_03.py index 6d4d390..818de0a 100644 --- a/Section_04/assignment_03.py +++ b/Section_04/assignment_03.py @@ -12,6 +12,9 @@ """ # Your Code Below: +def sequence(*args): + pass +print(sequence([1, 1, 2, 3, 1])) diff --git a/Section_04/assignment_04.py b/Section_04/assignment_04.py index b5940c4..fcbd381 100644 --- a/Section_04/assignment_04.py +++ b/Section_04/assignment_04.py @@ -10,6 +10,17 @@ """ # Your Code Below: +def grow_string(string): + result_string='' + for i in range(len(string)): + result_string+=string[:i+1] + return result_string + +print(grow_string('Code')) + +print(grow_string('abc')) + +print(grow_string('ab')) diff --git a/Section_04/assignment_05.py b/Section_04/assignment_05.py index 3b61d70..a95ff8e 100644 --- a/Section_04/assignment_05.py +++ b/Section_04/assignment_05.py @@ -14,8 +14,17 @@ """ # Your Code Below: +def first3(lst): + first_four=lst[:4] + return 6 in first_four +print(first3([1, 2, 6, 3, 4])) + +print(first3([1, 2, 3, 4, 6])) + +print(first3([1, 2, 3, 4, 5])) + From b5af20a6d8c8251af79cbd4ce81d7761ef57d841 Mon Sep 17 00:00:00 2001 From: aaditjainofficial360 <105768739+aaditjainofficial360@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:01:11 +0530 Subject: [PATCH 16/17] Update workspace.xml --- .idea/workspace.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5b0bd26..3f510e2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,12 +6,6 @@ - - - - - -