Mercurial > octave-nkf

changeset 8453:9e1973f7709d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix missing widening ops for diag & perm matrices
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 09 Jan 2009 16:25:11 +0100
parents d6a349c7bd39
children aaf2b6d6813c
files src/ChangeLog src/OPERATORS/op-cdm-cdm.cc src/OPERATORS/op-dm-dm.cc src/OPERATORS/op-fcdm-fcdm.cc src/OPERATORS/op-fdm-fdm.cc src/OPERATORS/op-fpm-fpm.cc src/OPERATORS/op-pm-pm.cc
diffstat 7 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/ChangeLog	Fri Jan 09 16:25:11 2009 +0100
@@ -1,3 +1,12 @@
+2009-01-09  Jaroslav Hajek  <highegg@gmail.com>
+
+	* OPERATORS/op-cdm-cdm.cc: Install missing widening op.
+	* OPERATORS/op-dm-dm.cc: Dtto.
+	* OPERATORS/op-fcdm-fcdm.cc: Dtto.
+	* OPERATORS/op-fdm-fdm.cc: Dtto.
+	* OPERATORS/op-pm-pm.cc: Dtto.
+	* OPERATORS/op-fpm-fpm.cc: Dtto.
+
 2009-01-09  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-cell.cc (octave_cell::subsasgn): Put erased copy back after
--- a/src/OPERATORS/op-cdm-cdm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-cdm-cdm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -106,4 +106,5 @@
   INSTALL_CONVOP (octave_complex_diag_matrix, octave_float_complex_diag_matrix, 
                   complex_diag_matrix_to_float_complex_diag_matrix);
   INSTALL_ASSIGNCONV (octave_complex_diag_matrix, octave_complex_matrix, octave_complex_matrix);
+  INSTALL_WIDENOP (octave_complex_diag_matrix, octave_complex_matrix, complex_diag_matrix_to_complex_matrix);
 }
--- a/src/OPERATORS/op-dm-dm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-dm-dm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -99,4 +99,5 @@
   INSTALL_CONVOP (octave_diag_matrix, octave_matrix, diag_matrix_to_matrix);
   INSTALL_CONVOP (octave_diag_matrix, octave_float_diag_matrix, diag_matrix_to_float_diag_matrix);
   INSTALL_ASSIGNCONV (octave_diag_matrix, octave_matrix, octave_matrix);
+  INSTALL_WIDENOP (octave_diag_matrix, octave_matrix, diag_matrix_to_matrix);
 }
--- a/src/OPERATORS/op-fcdm-fcdm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-fcdm-fcdm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -102,8 +102,11 @@
   INSTALL_BINOP (op_div, octave_float_complex_diag_matrix, octave_float_complex_diag_matrix, div);
   INSTALL_BINOP (op_ldiv, octave_float_complex_diag_matrix, octave_float_complex_diag_matrix, ldiv);
 
-  INSTALL_CONVOP (octave_float_complex_diag_matrix, octave_complex_diag_matrix, float_complex_diag_matrix_to_complex_diag_matrix);
+  INSTALL_CONVOP (octave_float_complex_diag_matrix, octave_complex_diag_matrix, 
+                  float_complex_diag_matrix_to_complex_diag_matrix);
   INSTALL_CONVOP (octave_float_complex_diag_matrix, octave_float_complex_matrix, 
                   float_complex_diag_matrix_to_float_complex_matrix);
   INSTALL_ASSIGNCONV (octave_float_complex_diag_matrix, octave_float_complex_matrix, octave_float_complex_matrix);
+  INSTALL_WIDENOP (octave_float_complex_diag_matrix, octave_complex_diag_matrix, 
+                   float_complex_diag_matrix_to_complex_diag_matrix);
 }
--- a/src/OPERATORS/op-fdm-fdm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-fdm-fdm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -99,4 +99,5 @@
   INSTALL_CONVOP (octave_float_diag_matrix, octave_float_matrix, float_diag_matrix_to_float_matrix);
   INSTALL_CONVOP (octave_float_diag_matrix, octave_diag_matrix, float_diag_matrix_to_diag_matrix);
   INSTALL_ASSIGNCONV (octave_float_diag_matrix, octave_float_matrix, octave_float_matrix);
+  INSTALL_WIDENOP (octave_float_diag_matrix, octave_float_matrix, float_diag_matrix_to_float_matrix);
 }
--- a/src/OPERATORS/op-fpm-fpm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-fpm-fpm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -87,5 +87,6 @@
   INSTALL_CONVOP (octave_float_perm_matrix, octave_float_matrix, float_perm_matrix_to_float_matrix);
   INSTALL_CONVOP (octave_float_perm_matrix, octave_perm_matrix, float_perm_matrix_to_perm_matrix);
   INSTALL_ASSIGNCONV (octave_float_perm_matrix, octave_float_matrix, octave_float_matrix);
+  INSTALL_WIDENOP (octave_float_perm_matrix, octave_float_matrix, float_perm_matrix_to_float_matrix);
 }
 
--- a/src/OPERATORS/op-pm-pm.cc	Fri Jan 09 15:15:43 2009 +0100
+++ b/src/OPERATORS/op-pm-pm.cc	Fri Jan 09 16:25:11 2009 +0100
@@ -82,4 +82,5 @@
   INSTALL_CONVOP (octave_perm_matrix, octave_matrix, perm_matrix_to_matrix);
   INSTALL_CONVOP (octave_perm_matrix, octave_float_perm_matrix, perm_matrix_to_float_perm_matrix);
   INSTALL_ASSIGNCONV (octave_perm_matrix, octave_matrix, octave_matrix);
+  INSTALL_WIDENOP (octave_perm_matrix, octave_matrix, perm_matrix_to_matrix);
 }