fixed?

scientificprogrammingUOS · May 9, 2023 · eb8bb30 · eb8bb30
1 parent 2b35d84
commit eb8bb30
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.vs/2023-homework04-Seeratul/FileContentIndex/261bc8d1-585b-4127-8fdd-e71e9dca8693.vsidx b/.vs/2023-homework04-Seeratul/FileContentIndex/261bc8d1-585b-4127-8fdd-e71e9dca8693.vsidx
diff --git a/.vs/2023-homework04-Seeratul/FileContentIndex/4b863c64-7a5c-4ce8-9161-d1e183a29de9.vsidx b/.vs/2023-homework04-Seeratul/FileContentIndex/4b863c64-7a5c-4ce8-9161-d1e183a29de9.vsidx
diff --git a/.vs/2023-homework04-Seeratul/v17/.wsuo b/.vs/2023-homework04-Seeratul/v17/.wsuo
diff --git a/combination.py b/combination.py
@@ -5,9 +5,9 @@
 def combination(a1,a2,axis = 0):
     # delete the NotImplementedError when you write your function.
     try: 
-         a1 = np.squeeze(a1)
-         a2 = np.squeeze(a2)
-         return np.concatenate(a1,a2,axis)
+         #a1 = np.squeeze(a1)
+         #a2 = np.squeeze(a2)
+         return np.concatenate((a1,a2),axis)
 
     except:
         print ("The combination appears to be impossible!")
@@ -16,5 +16,7 @@ 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))
     pass