Changeset d8928a5 in tol

Timestamp:

Aug 26, 2009, 9:48:31 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

b4b5301

Parents:

824d400

Message:

New API for generic ApplyFun* functions
New API for convertIfNeeded* functions
New If function for IfVMat method

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

File:

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

tol/btol/vmatrix_type/tol_bvmat.h

@@ -298 +298 @@
   int MergeRows(int nrow, BSet& items);
 
-  BVMat ApplyFunRR (BFunRR f,  bool f00, const char* fName) const;
-  BVMat ApplyFunR2R(BFunR2R f, bool f00, const char* fName,
-                    const BVMat& B) const;
-  BVMat ApplyFunR2R(BFunR2R f, bool f00, const char* fName,
-                   double b) const;
-  static int ApplyFunRR (BFunRR f, bool f00, const char* fName,
-                         const BVMat& A,  BVMat& B);
-  static int ApplyFunR2R(BFunR2R f, bool f00, const char* fName,
-                         const BVMat& A, const BVMat& B, BVMat& C);
-  static int ApplyFunR2R(BFunR2R f, bool f00, const char* fName,
-                         const BVMat& A, double b, BVMat& C);
+  static int ApplyFunRR (BFunRR f, bool f00, const char* fName, const BVMat& A,  BVMat& B);
+  BVMat      ApplyFunRR (BFunRR f, bool f00, const char* fName) const;
+
+  static int ApplyFunR2R(BFunR2R f, bool f00, bool f0x, const char* fName, const BVMat& A, const BVMat& B, BVMat& C);
+  BVMat      ApplyFunR2R(BFunR2R f, bool f00, bool f0x, const char* fName,                 const BVMat& B) const;
+
+  static int ApplyFunR2r(BFunR2R f, bool f00, bool f0x, const char* fName, const BVMat& A, double b, BVMat& C);
+  BVMat      ApplyFunR2r(BFunR2R f, bool f00, bool f0x, const char* fName,                 double b) const;
+
   static void BinGroup(BBinFun f, BVMat** arr, int num, BVMat& C);
   static BDat& AutoConvert();
@@ -484 +482 @@
   static int cRs2bRd(BVMat& left, const BVMat& right);
   static int cRt2bRd(BVMat& left, const BVMat& right);
-  static int convertIfNeeded2cRs(const BVMat&  A,  const BVMat&  B, 
-                                       BVMat*& A_,       BVMat*& B_,
-                                 const char* fName, bool forze=false);
-  static int convertIfNeeded2bRd(const BVMat&  A,  const BVMat&  B, 
-                                       BVMat*& A_,       BVMat*& B_,
-                                 const char* fName, bool forze=false);
-  static int convertIfNeeded2bRd(const BVMat&  A,  BVMat*& A_, 
-                                 const char* fName);
   static int convertIfNeeded_cRt2cRs(const BVMat&  A,  const BVMat&  B, 
                                            BVMat*& A_,       BVMat*& B_,
-                                     const char* fName, bool forze=false);
+                                     const char* fName, bool forze);
+  static int convertIfNeeded_cRt2cRs(const BVMat&  A,  BVMat*& A_, 
+                                     const char* fName);
+  static int convertIfNeeded_all2cRs(const BVMat&  A,  const BVMat&  B, 
+                                           BVMat*& A_,       BVMat*& B_,
+                                     const char* fName, bool forze);
+  static int convertIfNeeded_all2cRs(const BVMat&  A,  BVMat*& A_, 
+                                     const char* fName);
+  static int convertIfNeeded_all2bRd(const BVMat&  A,  const BVMat&  B, 
+                                           BVMat*& A_,       BVMat*& B_,
+                                     const char* fName, bool forze);
+  static int convertIfNeeded_all2bRd(const BVMat&  A,  BVMat*& A_, 
+                                     const char* fName);
 /*------------------------------------------------------------------------------
   vmat_stats.cpp: Statistics methods
@@ -694 +696 @@
   static int Min(const BVMat& A, const BVMat& B, BVMat& C);
   static int Max(const BVMat& A, const BVMat& B, BVMat& C);
-  
+  static int If (const BVMat& A, const BVMat& B, const BVMat& C, BVMat& D);
 /*------------------------------------------------------------------------------
   vmat_chol.cpp: Choleski methods