Skip to content

conflict cleanup #2

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.

Sign up for GitHub

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

Open
bkbncn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

conflict cleanup #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions Matrix_Inverse_Using_Numpy-Scipy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
import numpy as np
from numpy.linalg import inv

Expand All @@ -10,16 +9,3 @@
ainv = ainv.round(3)

print(ainv)
=======
import numpy as np
from numpy.linalg import inv


a = np.array([[5., 3., 1.], [3., 9., 4.], [1., 3., 5.]])
print(a, '\n')

ainv = inv(a)
ainv = ainv.round(3)

print(ainv)
>>>>>>> 7b6dac91eaad3501f2ee5e18c151c6f6b5c913e6