Changeset 516e91c in tol

Timestamp:

Mar 9, 2009, 8:57:24 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7168a54

Parents:

2b448e9

Message:

New methods Pack and Drop

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

File:

• tol/btol/vmatrix_type/vmatgra.cpp (modified) (3 diffs)

tol/btol/vmatrix_type/vmatgra.cpp

@@ -202 +202 @@
   if(Arg(2)) { chop=Real(Arg(2)); }
   contens_=VMat(Arg(1)).NonNullCells(chop);
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BDat, BDatTemporary, BDatStoredCells);
+DefExtOpr(1, BDatStoredCells, "VStoredCells", 1, 1,
+  "VMatrix",
+  "(VMatrix V)",
+  I2("Returns the number of stored cells of a virtual matrix.",
+     "Devuelve el numero de celdas almacenadas de una matriz virtual."),
+    BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BDatStoredCells::CalcContens()
+//--------------------------------------------------------------------
+{
+  const double *x;
+  int nzmax;
+  VMat(Arg(1)).StoredData(x,nzmax);
+  contens_=nzmax;
 }
 
@@ -447 +465 @@
   assert(contens_.Check());
 }
+
+//--------------------------------------------------------------------
+DeclareContensClass(BVMat, BVMatTemporary, BVMatPack);
+DefExtOpr(1, BVMatPack, "Pack", 1, 1, 
+  "VMatrix",
+  "(VMatrix data)",
+  I2("Packs an sparse matrix to be stored in the minimum posible size."
+     "It has no effect over non sparse matrices.",
+     "Empaqueta una matriz sparse para que ocupe el mínimo espacio posible."
+     "No tiene ningún efecto sobre matrices no sparse."),
+BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BVMatPack::CalcContens()
+//--------------------------------------------------------------------
+{
+  contens_.Copy(VMat(Arg(1)));
+  contens_.Pack();
+  assert(contens_.Check());
+}
+
 
 //--------------------------------------------------------------------
@@ -1117 +1155 @@
 //--------------------------------------------------------------------
 {
-  BVMat::Drop(VMat(Arg(1)),Real(Arg(2)),contens_);
-  assert(contens_.Check());
-}
-
+  contens_.Copy(VMat(Arg(1)));
+  double drop = 0;
+  if(Arg(2)) { drop = Real(Arg(2)); }
+  contens_.Drop(drop);
+  assert(contens_.Check());
+}
 
 #define DecMonaryF00(FUN,ENGLISH,SPANISH)                                      \