octave-nkf: liboctave/fDiagMatrix.cc comparison

fix diag*diag multiplication

author	Jaroslav Hajek <highegg@gmail.com>
date	Tue, 06 Oct 2009 08:43:01 +0200
parents	a9b37bae1802
children	f80c566bc751

comparison

equal deleted inserted replaced

-:51c17bd18563
+:7c6d5d8c8d37
 octave_idx_type b_nr = b.rows ();
 octave_idx_type b_nc = b.cols ();
 if (a_nc != b_nr)
-{
+gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
-gripe_nonconformant ("operaotr *", a_nr, a_nc, b_nr, b_nc);
-return FloatDiagMatrix ();
-}
-if (a_nr == 0 || a_nc == 0 || b_nc == 0)
-return FloatDiagMatrix (a_nr, a_nc, 0.0);
 FloatDiagMatrix c (a_nr, b_nc);
-octave_idx_type len = a_nr < b_nc ? a_nr : b_nc;
+octave_idx_type len = c.length (), lenm = len < a_nc ? len : a_nc;
-for (octave_idx_type i = 0; i < len; i++)
+for (octave_idx_type i = 0; i < lenm; i++)
-{
+c.dgxelem (i) = a.dgelem (i) * b.dgelem (i);
-float a_element = a.elem (i, i);
+for (octave_idx_type i = lenm; i < len; i++)
-float b_element = b.elem (i, i);
+c.dgxelem (i) = 0.0f;
-c.elem (i, i) = a_element * b_element;
-}
 return c;
 }
 // other operations

Mercurial > octave-nkf