diff --git a/.vs/2023-homework04-Seeratul/FileContentIndex/b7d93d7f-b3fa-41c5-ac17-d54dbff95199.vsidx b/.vs/2023-homework04-Seeratul/FileContentIndex/b7d93d7f-b3fa-41c5-ac17-d54dbff95199.vsidx new file mode 100644 index 0000000..56df6c7 Binary files /dev/null and b/.vs/2023-homework04-Seeratul/FileContentIndex/b7d93d7f-b3fa-41c5-ac17-d54dbff95199.vsidx differ diff --git a/.vs/2023-homework04-Seeratul/FileContentIndex/c4227827-1576-4f72-b1f0-72a49a49b5ee.vsidx b/.vs/2023-homework04-Seeratul/FileContentIndex/c4227827-1576-4f72-b1f0-72a49a49b5ee.vsidx deleted file mode 100644 index 5456a2b..0000000 Binary files a/.vs/2023-homework04-Seeratul/FileContentIndex/c4227827-1576-4f72-b1f0-72a49a49b5ee.vsidx and /dev/null differ diff --git a/.vs/2023-homework04-Seeratul/v17/.wsuo b/.vs/2023-homework04-Seeratul/v17/.wsuo index fbf246e..b61cf5f 100644 Binary files a/.vs/2023-homework04-Seeratul/v17/.wsuo and b/.vs/2023-homework04-Seeratul/v17/.wsuo differ diff --git a/combination.py b/combination.py index 2a3eed4..760bf53 100644 --- a/combination.py +++ b/combination.py @@ -5,8 +5,8 @@ def combination(a1,a2,axis = 0): # delete the NotImplementedError when you write your function. try: - #a1 = np.squeeze(a1) - #a2 = np.squeeze(a2) + a1 = np.squeeze(a1) + a2 = np.squeeze(a2) return np.concatenate((a1,a2),axis) except: @@ -15,8 +15,8 @@ def combination(a1,a2,axis = 0): if __name__ == "__main__": - # use this for your own testing! - #a1 = np.ones((2,2)) - #a2 = np.ones((2,2)) - #print(combination(a1,a2)) + #use this for your own testing! + a1 = np.ones((2,2)) + a2 = np.array([[[[1, 2], [3, 4], [5, 6]]]]) + print(combination(a1,a2)) pass