Changeset 1f41e156 in tol

Timestamp:

Feb 1, 2013, 7:09:07 AM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

9f675bb

Parents:

af86d11e

Message:

fixes #1636, checkeo incorrecto de la compatibilidad entre las matrices T y B

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5544 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• bmath/blinalg/tol_blas.cpp (modified) (1 diff)
• btol/matrix_type/matgra.cpp (modified) (1 diff)

tol/bmath/blinalg/tol_blas.cpp

@@ -346 +346 @@
   int N   = B.Columns();
   if(N&&M&&(
-    (Side==CblasLeft  && TransA==CblasNoTrans && A.Columns()==M) ||
-    (Side==CblasRight && TransA==CblasNoTrans && A.Rows   ()==N) ||
-    (Side==CblasLeft  && TransA==CblasTrans   && A.Rows   ()==M) ||
-    (Side==CblasRight && TransA==CblasTrans   && A.Columns()==N) ))
+     //(Side==CblasLeft  && TransA==CblasNoTrans && A.Columns()==M) ||
+     (Side==CblasLeft  && TransA==CblasNoTrans && A.Rows()==M) ||
+     //(Side==CblasRight && TransA==CblasNoTrans && A.Rows   ()==N) ||
+     (Side==CblasRight && TransA==CblasNoTrans && A.Columns   ()==N) ||
+     //(Side==CblasLeft  && TransA==CblasTrans   && A.Rows   ()==M) ||
+     (Side==CblasLeft  && TransA==CblasTrans   && A.Columns   ()==M) ||
+     //(Side==CblasRight && TransA==CblasTrans   && A.Columns()==N) ))
+     (Side==CblasRight && TransA==CblasTrans   && A.Rows()==N) ))
   {
     return(dtrsm(Side,Uplo,TransA,Diag,alpha.Value(),

tol/btol/matrix_type/matgra.cpp

@@ -2142 +2142 @@
   BMatrix<BDat>& B = Mat(Arg(2));
   if(!T.Columns()||!T.Rows()||
-     !B.Columns()||!B.Rows()||
-      T.Columns()!= B.Rows())
+     !B.Columns()||!B.Rows()/*||
+      T.Columns()!= B.Rows()*/)
   { 
     Warning(I2("Cannot apply TrSolve to matrices ",