From dcba9a22dc02404bdca5b103cf29656da6fc028f Mon Sep 17 00:00:00 2001 From: Xiangyu Xu Date: Mon, 2 Nov 2020 23:48:24 -0600 Subject: [PATCH] conflict cleanup --- Matrix_Inverse_Using_Numpy-Scipy.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Matrix_Inverse_Using_Numpy-Scipy.py b/Matrix_Inverse_Using_Numpy-Scipy.py index 60277d4..f4b4ec3 100644 --- a/Matrix_Inverse_Using_Numpy-Scipy.py +++ b/Matrix_Inverse_Using_Numpy-Scipy.py @@ -1,4 +1,3 @@ -<<<<<<< HEAD import numpy as np from numpy.linalg import inv @@ -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