Changeset d11b5b0 in tol

Timestamp:

Mar 9, 2009, 8:56:48 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2b448e9

Parents:

8ac1037

Message:

New method Pack

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

File:

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

tol/btol/vmatrix_type/vmat.cpp

@@ -168 +168 @@
   force_natural_order(false);
 
+  //No growing allowed
+  common_->grow2 = 0;
+
 /* * /
 //MatLab lchol options
@@ -279 +282 @@
   return(result);
 }
+
+////////////////////////////////////////////////////////////////////////////////
+  void BVMat::Pack()
+//Importing method
+////////////////////////////////////////////////////////////////////////////////
+{
+  switch(code_) {
+  case(ESC_blasRdense  ) : 
+  {
+    break;
+  }
+  case(ESC_chlmRsparse ) : 
+  {
+    int nnz = NonNullCells(0);
+    if(s_.chlmRsparse_->nzmax > nnz)
+    {
+      cholmod_drop(0,s_.chlmRsparse_, common_);
+    }
+    cholmod_sort(s_.chlmRsparse_, common_);
+    break;
+  }
+  case(ESC_chlmRfactor ) : 
+  {
+    cholmod_pack_factor(s_.chlmRfactor_,common_);
+    break;
+  }
+  case(ESC_chlmRtriplet) : 
+  {
+    int nnz = NonNullCells(0);
+    if(s_.chlmRtriplet_->nzmax > nnz)
+    {
+      Drop(0);
+    }
+    break; 
+  }
+  default: 
+    Error(I2("FATAL ERROR in",
+             "ERROR FATAL en")+" BVMat::Pack(const BVMat& v)"); 
+    assert(1); }
+};
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1028 +1071 @@
   if(Rows()!=Columns()) { return(false); }
   BVMat t = this->T();
-  BVMat z = ((*this)-t).Drop(DEpsilon());
+  BVMat z = Drop(((*this)-t),DEpsilon());
   bool isSymm = z.NonNullCells()==0;
   return(isSymm);