Changeset b77a57a in tol

Timestamp:

Jan 27, 2009, 10:24:25 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

c2dbd4c

Parents:

ee5da7f

Message:

New method SubDiag

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

Location:

tol/btol/vmatrix_type

Files:

• tol_bvmat.h (modified) (2 diffs)
• vmat_convert.cpp (modified) (2 diffs)
• vmatgra.cpp (modified) (2 diffs)

tol/btol/vmatrix_type/tol_bvmat.h

@@ -454 +454 @@
   int SubCols (const BArray<int>& rows, BVMat& aux) const;
   int SubBand (int from, int until, BVMat& aux) const;
+  int SubDiag(int numDiag, BVMat& aux) const;
+
   BVMat  Sub     (int i, int j, int r, int c  ) const;
   BVMat  SubCells(const BArray<int>& rows, const BArray<int>& cols) const;
@@ -459 +461 @@
   BVMat  SubCols (const BArray<int>& cols ) const;
   BVMat  SubBand (int from, int until) const;
+  BVMat  SubDiag (int numDiag) const;
   
   static void cRs_ensure_packed(cholmod_sparse_struct* sp);

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -1234 +1234 @@
     break;
   default:
-    err_cannot_apply("SubBand",I2("(Not implemenmted)",
+    err_cannot_apply("SubBand",I2("(Not implemented)",
                    "(Metodo no implementado)"),*this);
     return(-2); }
@@ -1251 +1251 @@
 };
 
+
+////////////////////////////////////////////////////////////////////////////////
+  int BVMat::SubDiag(int numDiag, BVMat& aux) const
+//Matrix algebra operator
+//Extracts cell (i,j) matching i-j=numDiag
+////////////////////////////////////////////////////////////////////////////////
+{
+  int fail = 0;
+  int rows = Rows();
+  int cols = Columns();
+  int dMin = -rows+1;
+  int dMax =  cols-1;
+  bool outOfRange = (numDiag<dMin)||(numDiag>dMax);
+  if(!outOfRange)
+  {
+    BVMat band;
+    fail = SubBand(numDiag, numDiag, band);
+    if(!fail)
+    {
+      int i0 = (numDiag>=0)?0:-numDiag;
+      int j0 = (numDiag<=0)?0:+numDiag;
+      int len = Minimum(rows-i0,cols-j0);
+      assert(len>0);
+      int k;
+      aux.BlasRDense(1,len);
+      double* x = (double*)(aux.s_.blasRdense_->x);
+      for(k=0; k<len; k++)
+      {
+        x[k] = band.GetCell(k+numDiag,k);
+      }
+    }
+  }
+  else
+  {
+    err_cannot_apply("SubDiag",I2("(Diagonal number out of range)",
+                     "(Número de diagonal fuera de rango)")+
+                     "["+dMin+","+dMax+"]",*this);
+    fail = -3;
+  }
+  return(fail);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+  BVMat BVMat::SubDiag(int numDiag) const
+//Matrix algebra operator
+//Extracts cell (i,j) matching i-j=numDiag
+////////////////////////////////////////////////////////////////////////////////
+{
+  BVMat aux;
+  SubDiag(numDiag, aux);
+  return(aux);
+}

tol/btol/vmatrix_type/vmatgra.cpp

@@ -996 +996 @@
   I2("Extracts the selected consecutive diagonals. Main diagonal is "
      "referenced as 0, lower ones are negative numbers and upper ones "
-     "positive.",
+     "positive. Returned matrix has same dimensions than incoming one.",
      "Extrae las diagonales consecutivas seleccionadas. La diagonal "
      "principal se referencia como 0, las inferiores como números "
-     "negativos y las superiores como positivos."),
+     "negativos y las superiores como positivos. La matriz devuelta "
+     "tiene las mismas dimensiones que la entrante."),
     BOperClassify::MatrixAlgebra_);
 //--------------------------------------------------------------------
@@ -1013 +1014 @@
   assert(contens_.Check());
 }
+
+
+//--------------------------------------------------------------------
+DeclareContensClass(BVMat, BVMatTemporary, BVMatSubDiag);
+DefExtOpr(1, BVMatSubDiag, "SubDiag", 1, 1,
+  "VMatrix Real ",
+  "(VMatrix m [, Real diagNumber=0])",
+  I2("Extracts the selected diagonal as a row matrix. Main diagonal is "
+     "referenced as 0, lower ones are negative numbers and upper ones "
+     "positive.",
+     "Extrae la diagonales seleccionada como una matriz fila. La diagonal "
+     "principal se referencia como 0, las inferiores como números "
+     "negativos y las superiores como positivos."),
+    BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BVMatSubDiag::CalcContens()
+//--------------------------------------------------------------------
+{
+  BVMat& M = VMat(Arg(1));
+  int diagNum = 0;
+  if(Arg(2)) { diagNum = (int)Real(Arg(2)); }
+  M.SubDiag(diagNum,contens_);
+  assert(contens_.Check());
+}
+
 
 /*------------------------------------------------------------------------------