Changeset 7c166a2 in tol

Timestamp:

Feb 3, 2009, 9:10:07 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

8f6db64

Parents:

4c49c6a

Message:

New static method force_natural_order
New argument forceNaturalOrder in CholeskiFactor

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

File:

• tol/btol/vmatrix_type/tol_bvmat.h (modified) (3 diffs)

tol/btol/vmatrix_type/tol_bvmat.h

@@ -309 +309 @@
   static void BinGroup(BBinFun f, BVMat** arr, int num, BVMat& C);
 private:
+  static bool force_natural_order(bool force);
   static void restore_cholmod_common();
   double* bRd_checkCell(int i, int j, int& accessCode) const;
@@ -691 +692 @@
 public:
 //Linear systems of equations  
-  BVMat CholeskiFactor(ECholFacOri ori, bool checkSymmetric);
-  BVMat CholeskiFactor(const BText& ori, bool checkSymmetric);
+  BVMat CholeskiFactor(ECholFacOri ori, bool checkSymmetric,
+                            bool forceNaturalOrder);
+  BVMat CholeskiFactor(const BText& ori, bool checkSymmetric,
+                            bool forceNaturalOrder);
   BVMat CholeskiSolve(const BVMat& B, ECholSolSys sys)const;
   BVMat CholeskiSolve(const BVMat& B, const BText& sys)const;
@@ -698 +701 @@
 
   static int CholeskiFactor(const BVMat& X, BVMat& L, 
-                            ECholFacOri ori, bool checkSym);
+                            ECholFacOri ori, bool checkSym,
+                            bool forceNaturalOrder);
   static int CholeskiFactor(const BVMat& X, BVMat& L, 
-                            const BText& ori, bool checkSym);
+                            const BText& ori, bool checkSym,
+                            bool forceNaturalOrder);
   static int CholeskiSolve (const BVMat& L,const BVMat& B, 
                             BVMat& X, ECholSolSys sys);