Changeset 84e50984 in tol

Timestamp:

Feb 3, 2009, 9:16:58 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

44e5e09

Parents:

23b4ae2

Message:

New argument forceNaturalOrder in CholeskiFactor
CHOLMOD API for choleski solve treat P and Pt as products instaed of linear sistem solvers

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

File:

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

tol/btol/vmatrix_type/vmatgra.cpp

@@ -1715 +1715 @@
 //--------------------------------------------------------------------
 DeclareContensClass(BVMat, BVMatTemporary, BVMatCholeskiFactor);
-DefExtOpr(1, BVMatCholeskiFactor, "CholeskiFactor", 1, 2, "VMatrix Text",
-  "(VMatrix X [, Text S=\"X\"])",
+DefExtOpr(1, BVMatCholeskiFactor, "CholeskiFactor", 1, 3, "VMatrix Text Real",
+  "(VMatrix X [, Text S=\"X\", Real force_natural_order=false])",
   I2("Returns the Choleski decomposition of a symmetric positive definite "
      "virtual matrix S, that will be built as: \n"
@@ -1730 +1730 @@
      "In this case you only can handle with L and P using CholeskiSolve method.\n"
      "Otherwise no operation is performed and unknown virtual matrix is returned."
-     "NOTE: At current version P is allways the identity but next versions could be "
-     "able to handle with generic permutation mtrices.\n",
+     "If force_natural_order is true then P is the identity.\n",
      "Devuelve la descomposicion de Choleski de una matriz simetrica S definida "
      "positiva, la cual se construye de esta forma: \n"
@@ -1747 +1746 @@
      "En otro caso no se realiza ninguna operacion y se devuelve la matriz "
      "virtual desconocida.\n"
-     "NOTA: En la presente versión P es siempre la identidad pero en próximas "
-     "versiones será posible utilizar permutaciones genéricas.\n"),
+     "Si force_natural_order es falso entonces P es la identidad.\n"),
     BOperClassify::MatrixAlgebra_);
 //--------------------------------------------------------------------
@@ -1755 +1753 @@
 {
   BText S="X";
+  bool force = false;
   if(Arg(2)) { S=Text(Arg(2)); }
-  BVMat::CholeskiFactor(VMat(Arg(1)),contens_,S,true);
+  if(Arg(3)) { force=Real(Arg(3))!=0.0; }
+
+  BVMat::CholeskiFactor(VMat(Arg(1)),contens_,S,true,force);
   assert(contens_.Check());
 }
@@ -1770 +1771 @@
      "  sys=\"LLt\"    => F=    L*L'  *x = b\n"
      "  sys=\"PtL\"    => F= P'*L     *x = b\n"
-     "  sys=\"LtP\"    => F=     L'*P *x = b\n"
-     "  sys=\"Lt\"     => F=      L'  *x = b\n"
+     "  sys=\"LtP\"    => F=     *L'*P*x = b\n"
+     "  sys=\"Lt\"     => F=     *L'  *x = b\n"
      "  sys=\"L\"      => F=    L     *x = b\n"
      "  sys=\"Pt\"     => F= P'       *x = b\n"
-     "  sys=\"P\"      => F=        P *x = b\n"
+     "  sys=\"P\"      => F=         P*x = b\n"
      "At current version P is allways the identity but next versions could be "
      "able to handle with generic permutation mtrices.\n"
@@ -1790 +1791 @@
      "  sys=\"LLt\"    => F=    L*L'  *x = b\n"
      "  sys=\"PtL\"    => F= P'*L     *x = b\n"
-     "  sys=\"LtP\"    => F=     L'*P *x = b\n"
-     "  sys=\"Lt\"     => F=      L'  *x = b\n"
+     "  sys=\"LtP\"    => F=     *L'*P*x = b\n"
+     "  sys=\"Lt\"     => F=     *L'  *x = b\n"
      "  sys=\"L\"      => F=    L     *x = b\n"
      "  sys=\"Pt\"     => F= P'       *x = b\n"
-     "  sys=\"P\"      => F=        P *x = b\n"
+     "  sys=\"P\"      => F=         P*x = b\n"
      "La matriz L es triangular"
      "El factor puede ser una matriz Blas.R.Dense triangular inferior, en "