From c8e2a4373a42ef5339db6e22183defc485a450cb Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmai.com>
Date: Sat, 27 Feb 2021 22:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Mij=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA=E4=BD=99=E5=AD=90=E5=BC=8F=E5=80=BC=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0MijMatrix=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/3dMath/v15/.suo             | Bin 38400 -> 36352 bytes
 .vs/3dMath/v15/Browse.VC.opendb | Bin 42 -> 0 bytes
 GMath.cpp                       |  54 +++++++++++++++++++++++---------
 GMath.h                         |   8 +++--
 main.cpp                        |  30 ++++++++++++------
 5 files changed, 66 insertions(+), 26 deletions(-)
 delete mode 100644 .vs/3dMath/v15/Browse.VC.opendb

diff --git a/.vs/3dMath/v15/.suo b/.vs/3dMath/v15/.suo
index 33c6da62476dc47920193ff22e7a226da209f482..769db18b03584406dbe477621e704b643a32db37 100644
GIT binary patch
delta 2888
zcmd@WZERCj^xoI+@?I^YjPbFpW3$5g=w3Tv3=zsYy0I@d*1`DLSQ(q+bIT~`1lb@a
z1Vp1f{_w|)3z`@cqqt|{4^38q7<G{;A(0qV^p_z9KT=~F6Y4pAEtU@n@XN%ToOka%
z=iGD8_kAO83nQb#i%P!0(!<V}1(&qHo=heQtAiH(jQ6^J=3Ea&LZRi?N88Rgq_26N
zx?gDG61O4GA_QblLW{Em;<^PJrz2tpf)QaJf&+mVX5yTmUei7o*Cb#X0$n%<=Nts0
z&Bl2y!fFH;f*HXIMTTN7lS(gj>EU!v316vg9JBpMuR@@+QhKI!fyQttDl}*&NL|78
znhD6|haur0KMj8vr^MS$F*%3H6cUpe`m8;fNO&@d%p?;sCe6y?Ba_gz>{gRR#66Ve
zbK*?q&qp9R=>cU1!#x;Wh^I0~iZTXUtNFXI$~ptut$qBu`mya8H)p(?3ROhBXm+Ph
zY6vN0F3m!yaVaF+=NUsPb0FcagR_DcB671xno$U8)^bFiBBBKlNlsy?<}9%1=+(TO
zpLo<0kT~&{WS@z6z7!WCqWC6c&&g;(K)a}5EzO2er1wLj;B$!;;F3}<bFbkzZ8EAE
zUceoPA-Vov6`XxTL1e|TI~dy4y1!*lAOKApbMq%OEPl<gDg08*DW*CEruw(&Im~Ha
z4kH~QNm*Pem-`L{!@KwOG{O%ZGht$bQQvpypc0*TPNcw7;bjzs_`J0evm(Znjg90#
z%N>wdRChn_ah{c!j8e+7B&l(y$fL_^&5vXuA>u+0c6-&htC@?G+j%!p=Ug;r>PkzN
zxhJE(b0Q_SlFb<Rr2+ww@@A1d;msl%Uct>~NEA+rchm`Z@L{7*DVMz!@J)v+8g%It
zS%Ig6!92<nDi-onO=CFH=jk38DAqgStD*(tH3A30@rjulPR5C9JQs~DsD)3BGDL34
zj!E&($)P3|oAlAn3cJf@egDmp&#ryZ9y&j+TWx@`u3YHoY`3p`?ZcJ>Cwx~g7uf@A
z?BANwgjw)==c=}%%g3jEFuo<{Pg8K2!y6q#byE6}PKBuXF9ybzpj$6ti~S4R#`oAx
zh(@FBmOX2qq71;|ux?o*bk{;`s~>!o+tuyM#<;34nc#5N=#5tBxd4f>VO|GA3f7#_
z3-R75DOFe0lt{EzbWe=(rLZborpEg09PD9*!udcc%{d(DXuWe%Lw&GROhr)3_6E%M
zLJXwES1Btg6pRG@cMa#M8V*&}GQ^hJVR>Ij)B5#TAGi0|&YXGmYS?}FtvAficTN|{
z3VYx-q(@D)gt#X}!B-<?dd}<AA>|k!U*h2CuOk(1)n5@4POT6$mkx|tz_+qj?Tx%+
zmZ+c8pjm{XdN(M79UTpO>vw`&VS`KcGAymP?>fLXWA1k#8)efT=0VuZcCgaax|=zf
z8)0XP<I1&U@&Izs84W{E$xZ}%cQTan6fYufjD9x2de|TgH_UWLP+ARZWMLLzgLuzV
zxOXA!!3uY>Zr0ECvVBNHE|_TW*{axBNnQR0lEtwjB^xXpE;P=ED~(q0)QRA4ItoXd
zR*bJ5)L||>t~D<97{0T^>rTM&*27?F9Z^l81Rt+;=>C^}!M2m-7j_hjm|CNbJp<3J
zYoaa=-?c6zKf#H0!(a;8_)Qe`<<Jg+8`SITdxhNT6!P>a#<dgI)&H=c-&h`9|649S
zA==1^Wm2(vIDMT(?c89z2T4AaZ~BqX{fGq7{~SJ1llZ0Ine-Etd4<%xO_RLzE{t^g
z!TN;6G3}^n3+S*+Bbc^W_LghCp*gLC#eff?qWm}et{U6Afam!t2g7Ck&24M8?cWe+
S>kn1+ZrkVUZhZ1onEwqn_jI2C

delta 2602
zcmeHIT})h65I*O!z%F|i7g+u(<)<ukk?pdVzk&hm!tz%sKZ*@Tn}EBtQrm`*Z3K}*
zO;ggkP0F1I`#=m5;)_05?wj#plf|TIO`u5=8>_~|#F(_zX!eB%xX#?Yw=4~5G`<<n
z=G!@E&YYP!b7tnwEedm=3)j8yMZlcR?2K6%V*+AZRaGR6!zbaao5PPd&x8`8$YQT_
zzBrlkEw59~3%wkof&{T7SKWRT#S?0lPE&MBJQ}3#xdfgA=hdV-!<)b*Negj#C;cxB
zJ2Pr=J0BtGVs^OesH`}GD<7g2(T4CN+7TUy1Bfm}H)4BX;DIdkaGU1)#>K}H`MwX(
zcW85=>%xXet{y^=ap0v+h@}?KX6g)Ln)JD-QybD;1l@=3MI#&MX^8krRr7G3fyhCm
z>-^`D79a}sbrI5HL<yo4;XybNWsCthO7iI<Rfrmdp_l0P&4C&&r}-6sy2@>g<F?_h
z=6^`MXEtoc8MZ;VTVD!Z!J@=$gMyj7Cr!HehDcZ16@$>u5sQ%u41DRiV0W05JjbtG
z_S`ZXFB%V<r_aVoYtk<5Rbkn)CQ=L&`AW<qa`2}+cJ!6|MLJE9BO3Ru{GQ=Cgbs$~
z!Zl5XBKAZkR)}^f_Nj^7P|+psg3YQvvynM*g?YM@l?lShi@2DDP46AC0%zvLtt+&E
z&5ApkVR{b3uo62Ua@pIphXIQIGYn9&7+S2F0c7A%)W$Wfq~sdYg4ZlN{UYVaL4+X=
zA!i@7b-bhqWvzU#cx`B*Hp(x4X9`@@#`Zm}>zR?uIBMfm&DawXtY`L%7G#tsGGm$R
z@rTF6eIjZBT+mxG*vjrem**gwb5Zk{a^1L(66!Q@KBP=_&2!ncCQ|;tkgyLi7d{yE
z2%~D^SE}gORJjvGtv7J-1_H-ZkzB4e!O}ob2{tToFgg7@ITep42xZ&Lub5%LU7l3q
zu7&S>J;{xdTWW;&+#R`e3(9oLi?btR=RAS&@f2o7M=Dki2^>~>3zg#Gm|&xD(I9Gt
zl0an^CBj)Y!p7J+=3<mwDKHS2g8Kn?J9Swqi!lVLo?xRagfww<vSWBU#NNi{5Mbl@
zV{9D{{`8xw62+bzsI=0<zN($>hS^{?GzHQygJ3vN2$7&fWsgfPC~DBc;a0E$q>~Hq
z!D!3ssfi?8GajDCM(RUU!|ds+V4j)-%R3j8)H9nL)afm5Q?}keDP;dl9&5uMc}T`_
z?uV<B7kDaUTq;rWFW=@RpCWTk6LLnPNa;bTaZ>SX1EQCklp_Tu4oUM(Ft>j&rB*uZ
zmTIBWT`t!jwqN;W;?dW$v7X}P)e|{0nboiq&Vdv4L-zAu)_uP;^V#Uj#o^n{+wC{>
zja>M%-uK$dL;J@CkE_4>@rQ6zL~?vYrYOf~te~%_u_B5vbAL}pijVmKn}r42;C<Zt
z1HUidAdO4oXK!eo+6iWE=X`?_`OwAlj=tXTZvXhH?)Fw+@A1Loy~m_8gCpHO-|{ss
zXSV%=LV>7L`kSQzq1>?CHOYrys%ss(nx`S!-7L3UhyH6`CDLN&u+ifEmo<~D)r_(!
srRoLJzi3$<b|n2*Q#qNsnN{I4Z~dRnd#5wJ+2@8xtsR<L26tuJUw*V+SO5S3

diff --git a/.vs/3dMath/v15/Browse.VC.opendb b/.vs/3dMath/v15/Browse.VC.opendb
deleted file mode 100644
index f2a154f09f01beee5553de0f55d9b6408f32ec6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42
tcmXS5NMxvFh-WZiU|{fJaAXKz2x0IClDZ7e452{L00uV(3!sc80|1Mx1^NI0

diff --git a/GMath.cpp b/GMath.cpp
index 8c3566e..50e40c4 100644
--- a/GMath.cpp
+++ b/GMath.cpp
@@ -1022,7 +1022,7 @@ int Nullity(const GMatrix & m)
 	return m.GetColNum() - rank;
 }
 
-GMatrix Mij(const GMatrix & m, int rom, int col)
+GMatrix MijMatrix(const GMatrix & m, int rom, int col)
 {
 	int i,j = 0;
 	int r = m.GetRowNum();
@@ -1055,16 +1055,17 @@ GMatrix Mij(const GMatrix & m, int rom, int col)
 	return ret;
 }
 
-GMatrix Cij(const GMatrix & m, int r, int c)
+float Mij(const GMatrix & m, int r, int c)
 {
-	GMatrix ret = Mij(m, r, c);
+	GMatrix M = MijMatrix(m, r, c);
+	return Det(M);
+}
+
+float Cij(const GMatrix & m, int r, int c)
+{
+	GMatrix M = MijMatrix(m, r, c);
 	int t = pow(-1, r + c);
-	if (t == -1) {
-		for (int i = 0; i < ret.GetColNum(); i++) {
-			ret[0][i] = -ret[0][i];//行列式运算的-号只能影响一行
-		}
-	}
-	return ret;
+	return t*Det(M);
 }
 
 float Det(const GMatrix & m)
@@ -1083,17 +1084,42 @@ float Det(const GMatrix & m)
 	}
 	else {
 		for (i = 0; i < c; i++) {
-			//GMatrix t = Mij(m, 0, i);
-			//ret += pow(-1, 0+ i) * m[0][i] * Det(t);
-			GMatrix t = Cij(m, 0, i);
-			//cout << t << endl;
-			ret += m[0][i] * Det(t);
+			GMatrix t = MijMatrix(m, 0, i);
+			ret += pow(-1, 0+ i) * m[0][i] * Det(t);
 		}
 	}
 
 	return ret;
 }
 
+GMatrix Inverse(const GMatrix & m)
+{
+	GMatrix ret(m);
+	ret.SetInverse();
+	return ret;
+}
+
+GMatrix Transpose(const GMatrix & m)
+{
+	GMatrix ret(m);
+	ret.SetTranspose();
+	return ret;
+}
+
+GMatrix Adjoint(const GMatrix & m)
+{
+	GMatrix tM = Transpose(m);
+	GMatrix ret(tM.r, tM.c);
+
+	int i, j = 0;
+	for (i = 0; i < tM.r; i++) {
+		for (j = 0; j < tM.c; j++) {
+			ret[i][j] = Cij(tM, i, j);
+		}
+	}
+	return ret;
+}
+
 GLine::GLine(const GPoint3 & _p, const GVector3 & _v)
 {
 	p = _p;
diff --git a/GMath.h b/GMath.h
index 0ba5737..ec8d62e 100644
--- a/GMath.h
+++ b/GMath.h
@@ -200,9 +200,13 @@ public:
 	friend int Rank(const GMatrix& m);//获取矩阵的秩
 	friend int Nullity(const GMatrix& m);//获取矩阵的零化度
 
-	friend GMatrix Mij(const GMatrix& m, int r, int c); //计算余子式矩阵
-	friend GMatrix Cij(const GMatrix& m, int r, int c); //计算代数余子式矩阵
+	friend GMatrix MijMatrix(const GMatrix& m, int r, int c); //计算余子式矩阵
+	friend float Mij(const GMatrix& m, int r, int c); //计算余子式
+	friend float Cij(const GMatrix& m, int r, int c); //计算代数余子式矩阵的行列式值
 	friend float Det(const GMatrix& m);
+	friend GMatrix Inverse(const GMatrix& m);
+	friend GMatrix Transpose(const GMatrix& m);
+	friend GMatrix Adjoint(const GMatrix& m);//求伴随矩阵
 
 private:
 	int r;
diff --git a/main.cpp b/main.cpp
index c5e531f..c638222 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,20 +2,30 @@
 
 int main() {
 
-	float m1[] = { 
-		2, 3, 8, 4,
-		6, 0, -3, 8,
-		-1, 3, 2, 9,
-		2,  0, 4, 10  
+	float a[] = { 
+		0, 0, 0, 2,
+		0, 0, 2, 1,
+		0, 2, 1, 2,
+		2, 1, 2, 3
 	};
+	GMatrix A(4, 4, a);
 
+	//cout << B*A << endl;
+	cout << Det(A) << endl;
 
-	GMatrix M1(4, 4, m1);
-	GMatrix M2(4, 4, m1);
+	/*float a[] = {
+		1,0,
+		1,4
+	};
+	GMatrix A(2, 2, a);
 
-	M1.SetInverse();
-	cout << M1 << endl;
+	float c[] = {
+		0,1,
+		1,0
+	};
+	GMatrix C(2, 2, c);
 
+	cout << A*A << endl;*/
 
- 	return 0;
+  	return 0;
 }
\ No newline at end of file