comparison src/OPERATORS/op-dm-scm.cc @ 9931:fb6b6fcafa62

untabify files in src/OPERATORS directory
author John W. Eaton <jwe@octave.org>
date Mon, 07 Dec 2009 14:49:48 -0500
parents b4fdfee405b5
children fd0a3ac60b0e
comparison
equal deleted inserted replaced
9930:1ddc25c3623a 9931:fb6b6fcafa62
109 } 109 }
110 110
111 DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix) 111 DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix)
112 { 112 {
113 CAST_BINOP_ARGS (const octave_diag_matrix&, 113 CAST_BINOP_ARGS (const octave_diag_matrix&,
114 const octave_sparse_complex_matrix&); 114 const octave_sparse_complex_matrix&);
115 115
116 MatrixType typ = v2.matrix_type (); 116 MatrixType typ = v2.matrix_type ();
117 return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (), 117 return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (),
118 typ); 118 typ);
119 } 119 }
120 120
121 DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix) 121 DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix)
122 { 122 {
123 CAST_BINOP_ARGS (const octave_complex_diag_matrix&, 123 CAST_BINOP_ARGS (const octave_complex_diag_matrix&,
124 const octave_sparse_matrix&); 124 const octave_sparse_matrix&);
125 125
126 MatrixType typ = v2.matrix_type (); 126 MatrixType typ = v2.matrix_type ();
127 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (), 127 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (),
128 typ); 128 typ);
129 } 129 }
130 130
131 DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix) 131 DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
132 { 132 {
133 CAST_BINOP_ARGS (const octave_complex_diag_matrix&, 133 CAST_BINOP_ARGS (const octave_complex_diag_matrix&,
134 const octave_sparse_complex_matrix&); 134 const octave_sparse_complex_matrix&);
135 135
136 MatrixType typ = v2.matrix_type (); 136 MatrixType typ = v2.matrix_type ();
137 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_complex_matrix_value (), 137 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_complex_matrix_value (),
138 typ); 138 typ);
139 } 139 }
140 140
141 DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix) 141 DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix)
142 { 142 {
143 CAST_BINOP_ARGS (const octave_diag_matrix&, const octave_sparse_complex_matrix&); 143 CAST_BINOP_ARGS (const octave_diag_matrix&, const octave_sparse_complex_matrix&);
319 if (v2.rows() == 1 && v2.columns() == 1) 319 if (v2.rows() == 1 && v2.columns() == 1)
320 { 320 {
321 double d = v2.scalar_value (); 321 double d = v2.scalar_value ();
322 322
323 if (d == 0.0) 323 if (d == 0.0)
324 gripe_divide_by_zero (); 324 gripe_divide_by_zero ();
325 325
326 return octave_value (v1.sparse_complex_matrix_value () / d); 326 return octave_value (v1.sparse_complex_matrix_value () / d);
327 } 327 }
328 else 328 else
329 { 329 {
339 if (v2.rows() == 1 && v2.columns() == 1) 339 if (v2.rows() == 1 && v2.columns() == 1)
340 { 340 {
341 std::complex<double> d = v2.complex_value (); 341 std::complex<double> d = v2.complex_value ();
342 342
343 if (d == 0.0) 343 if (d == 0.0)
344 gripe_divide_by_zero (); 344 gripe_divide_by_zero ();
345 345
346 return octave_value (v1.sparse_matrix_value () / d); 346 return octave_value (v1.sparse_matrix_value () / d);
347 } 347 }
348 else 348 else
349 { 349 {
359 if (v2.rows() == 1 && v2.columns() == 1) 359 if (v2.rows() == 1 && v2.columns() == 1)
360 { 360 {
361 std::complex<double> d = v2.complex_value (); 361 std::complex<double> d = v2.complex_value ();
362 362
363 if (d == 0.0) 363 if (d == 0.0)
364 gripe_divide_by_zero (); 364 gripe_divide_by_zero ();
365 365
366 return octave_value (v1.sparse_complex_matrix_value () / d); 366 return octave_value (v1.sparse_complex_matrix_value () / d);
367 } 367 }
368 else 368 else
369 { 369 {
470 470
471 void 471 void
472 install_dm_scm_ops (void) 472 install_dm_scm_ops (void)
473 { 473 {
474 INSTALL_BINOP (op_mul, octave_diag_matrix, octave_sparse_complex_matrix, 474 INSTALL_BINOP (op_mul, octave_diag_matrix, octave_sparse_complex_matrix,
475 mul_dm_scm); 475 mul_dm_scm);
476 INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_matrix, 476 INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_matrix,
477 mul_cdm_sm); 477 mul_cdm_sm);
478 INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_complex_matrix, 478 INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_complex_matrix,
479 mul_cdm_scm); 479 mul_cdm_scm);
480 INSTALL_BINOP (op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix, ldiv_dm_scm); 480 INSTALL_BINOP (op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix, ldiv_dm_scm);
481 INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix, ldiv_cdm_sm); 481 INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix, ldiv_cdm_sm);
482 INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_complex_matrix, 482 INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_complex_matrix,
483 ldiv_cdm_scm); 483 ldiv_cdm_scm);
484 484
485 INSTALL_BINOP (op_add, octave_diag_matrix, octave_sparse_complex_matrix, add_dm_scm); 485 INSTALL_BINOP (op_add, octave_diag_matrix, octave_sparse_complex_matrix, add_dm_scm);
486 INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_matrix, add_cdm_sm); 486 INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_matrix, add_cdm_sm);
487 INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_complex_matrix, 487 INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_complex_matrix,
488 add_cdm_scm); 488 add_cdm_scm);
489 INSTALL_BINOP (op_sub, octave_diag_matrix, octave_sparse_complex_matrix, sub_dm_scm); 489 INSTALL_BINOP (op_sub, octave_diag_matrix, octave_sparse_complex_matrix, sub_dm_scm);
490 INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_matrix, sub_cdm_sm); 490 INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_matrix, sub_cdm_sm);
491 INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_complex_matrix, 491 INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_complex_matrix,
492 sub_cdm_scm); 492 sub_cdm_scm);
493 493
494 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_diag_matrix, 494 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_diag_matrix,
495 mul_scm_dm); 495 mul_scm_dm);
496 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_complex_diag_matrix, 496 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_complex_diag_matrix,
497 mul_sm_cdm); 497 mul_sm_cdm);
498 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_complex_diag_matrix, 498 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_complex_diag_matrix,
499 mul_scm_cdm); 499 mul_scm_cdm);
500 500
501 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_diag_matrix, div_scm_dm); 501 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_diag_matrix, div_scm_dm);
502 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_complex_diag_matrix, div_sm_cdm); 502 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_complex_diag_matrix, div_sm_cdm);
503 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_complex_diag_matrix, div_scm_cdm); 503 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_complex_diag_matrix, div_scm_cdm);
504 504