Mercurial > octave

changeset 20629:ab705b42cfd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix compilation error when building with --without-qrupdate * CmplxCHOL.cc (ComplexCHOL::update, ComplexCHOL::downdate, ComplexCHOL::insert_sym, ComplxCHOL::delete_sym, ComplexCHOL::shift_sym): Insert new required argument to init function. * dbleCHOL.cc (CHOL::update, CHOL::downdate, CHOL::insert_sym, CHOL::delete_sym, CHOL::shift_sym): Likewise. * fCmplxCHOL.cc (FloatComplexCHOL::update, FloatComplexCHOL::downdate, FloatComplexCHOL::insert_sym, FloatComplexCHOL::delete_sym, FloatComplexCHOL::shift_sym): Likewise. * floatCHOL.cc (FloatCHOL::update, FloatCHOL::downdate, FloatCHOL::insert_sym, FloatCHOL::delete_sym, FloatCHOL::shift_sym): Likewise.
author Mike Miller <mtmiller@octave.org>
date Wed, 14 Oct 2015 23:56:42 -0400
parents 48fedd8fbff7
children 00caf63edcdf
files liboctave/numeric/CmplxCHOL.cc liboctave/numeric/dbleCHOL.cc liboctave/numeric/fCmplxCHOL.cc liboctave/numeric/floatCHOL.cc
diffstat 4 files changed, 21 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/CmplxCHOL.cc	Wed Oct 14 23:16:19 2015 -0400
+++ b/liboctave/numeric/CmplxCHOL.cc	Wed Oct 14 23:56:42 2015 -0400
@@ -335,7 +335,7 @@
   if (u.numel () == n)
     {
       init (chol_mat.hermitian () * chol_mat
-            + ComplexMatrix (u) * ComplexMatrix (u).hermitian (), false);
+            + ComplexMatrix (u) * ComplexMatrix (u).hermitian (), true, false);
     }
   else
     (*current_liboctave_error_handler) ("cholupdate: dimension mismatch");
@@ -366,7 +366,7 @@
         {
           info = init (chol_mat.hermitian () * chol_mat
                        - ComplexMatrix (u) * ComplexMatrix (u).hermitian (),
-                       false);
+                       true, false);
           if (info) info = 1;
         }
     }
@@ -409,7 +409,7 @@
                 else
                   a1(k, l) = a(k < j ? k : k-1, l < j ? l : l-1);
               }
-          info = init (a1, false);
+          info = init (a1, true, false);
           if (info) info = 1;
         }
     }
@@ -431,7 +431,7 @@
       ComplexMatrix a = chol_mat.hermitian () * chol_mat;
       a.delete_elements (1, idx_vector (j));
       a.delete_elements (0, idx_vector (j));
-      init (a, false);
+      init (a, true, false);
     }
 }
 
@@ -460,7 +460,7 @@
           for (octave_idx_type k = j+1; k < i+1; k++) p(k) = k-1;
         }
 
-      init (a.index (idx_vector (p), idx_vector (p)), false);
+      init (a.index (idx_vector (p), idx_vector (p)), true, false);
     }
 }
 
--- a/liboctave/numeric/dbleCHOL.cc	Wed Oct 14 23:16:19 2015 -0400
+++ b/liboctave/numeric/dbleCHOL.cc	Wed Oct 14 23:56:42 2015 -0400
@@ -343,7 +343,7 @@
   if (u.numel () == n)
     {
       init (chol_mat.transpose () * chol_mat
-            + Matrix (u) * Matrix (u).transpose (), false);
+            + Matrix (u) * Matrix (u).transpose (), true, false);
     }
   else
     (*current_liboctave_error_handler) ("cholupdate: dimension mismatch");
@@ -373,7 +373,7 @@
       else
         {
           info = init (chol_mat.transpose () * chol_mat
-                       - Matrix (u) * Matrix (u).transpose (), false);
+                       - Matrix (u) * Matrix (u).transpose (), true, false);
           if (info) info = 1;
         }
     }
@@ -414,7 +414,7 @@
                 else
                   a1(k, l) = a(k < j ? k : k-1, l < j ? l : l-1);
               }
-          info = init (a1, false);
+          info = init (a1, true, false);
           if (info) info = 1;
         }
     }
@@ -436,7 +436,7 @@
       Matrix a = chol_mat.transpose () * chol_mat;
       a.delete_elements (1, idx_vector (j));
       a.delete_elements (0, idx_vector (j));
-      init (a, false);
+      init (a, true, false);
     }
 }
 
@@ -465,7 +465,7 @@
           for (octave_idx_type k = j+1; k < i+1; k++) p(k) = k-1;
         }
 
-      init (a.index (idx_vector (p), idx_vector (p)), false);
+      init (a.index (idx_vector (p), idx_vector (p)), true, false);
     }
 }
 
--- a/liboctave/numeric/fCmplxCHOL.cc	Wed Oct 14 23:16:19 2015 -0400
+++ b/liboctave/numeric/fCmplxCHOL.cc	Wed Oct 14 23:56:42 2015 -0400
@@ -337,7 +337,7 @@
     {
       init (chol_mat.hermitian () * chol_mat
             + FloatComplexMatrix (u) * FloatComplexMatrix (u).hermitian (),
-            false);
+            true, false);
     }
   else
     (*current_liboctave_error_handler) ("cholupdate: dimension mismatch");
@@ -369,7 +369,7 @@
           info = init (chol_mat.hermitian () * chol_mat
                        - FloatComplexMatrix (u)
                        * FloatComplexMatrix (u).hermitian (),
-                       false);
+                       true, false);
           if (info) info = 1;
         }
     }
@@ -413,7 +413,7 @@
                 else
                   a1(k, l) = a(k < j ? k : k-1, l < j ? l : l-1);
               }
-          info = init (a1, false);
+          info = init (a1, true, false);
           if (info) info = 1;
         }
     }
@@ -435,7 +435,7 @@
       FloatComplexMatrix a = chol_mat.hermitian () * chol_mat;
       a.delete_elements (1, idx_vector (j));
       a.delete_elements (0, idx_vector (j));
-      init (a, false);
+      init (a, true, false);
     }
 }
 
@@ -464,7 +464,7 @@
           for (octave_idx_type k = j+1; k < i+1; k++) p(k) = k-1;
         }
 
-      init (a.index (idx_vector (p), idx_vector (p)), false);
+      init (a.index (idx_vector (p), idx_vector (p)), true, false);
     }
 }
 
--- a/liboctave/numeric/floatCHOL.cc	Wed Oct 14 23:16:19 2015 -0400
+++ b/liboctave/numeric/floatCHOL.cc	Wed Oct 14 23:56:42 2015 -0400
@@ -343,7 +343,7 @@
   if (u.numel () == n)
     {
       init (chol_mat.transpose () * chol_mat
-            + FloatMatrix (u) * FloatMatrix (u).transpose (), false);
+            + FloatMatrix (u) * FloatMatrix (u).transpose (), true, false);
     }
   else
     (*current_liboctave_error_handler) ("cholupdate: dimension mismatch");
@@ -373,7 +373,8 @@
       else
         {
           info = init (chol_mat.transpose () * chol_mat
-                       - FloatMatrix (u) * FloatMatrix (u).transpose (), false);
+                       - FloatMatrix (u) * FloatMatrix (u).transpose (), true,
+                       false);
           if (info) info = 1;
         }
     }
@@ -414,7 +415,7 @@
                 else
                   a1(k, l) = a(k < j ? k : k-1, l < j ? l : l-1);
               }
-          info = init (a1, false);
+          info = init (a1, true, false);
           if (info) info = 1;
         }
     }
@@ -436,7 +437,7 @@
       FloatMatrix a = chol_mat.transpose () * chol_mat;
       a.delete_elements (1, idx_vector (j));
       a.delete_elements (0, idx_vector (j));
-      init (a, false);
+      init (a, true, false);
     }
 }
 
@@ -465,7 +466,7 @@
           for (octave_idx_type k = j+1; k < i+1; k++) p(k) = k-1;
         }
 
-      init (a.index (idx_vector (p), idx_vector (p)), false);
+      init (a.index (idx_vector (p), idx_vector (p)), true, false);
     }
 }