Mercurial > octave-nkf

comparison src/OPERATORS/op-sbm-bm.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 824c60c8f7b9
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
47 DEFBINOP_FN (el_and, sparse_bool_matrix, bool_matrix, mx_el_and) 47 DEFBINOP_FN (el_and, sparse_bool_matrix, bool_matrix, mx_el_and)
48 DEFBINOP_FN (el_or, sparse_bool_matrix, bool_matrix, mx_el_or) 48 DEFBINOP_FN (el_or, sparse_bool_matrix, bool_matrix, mx_el_or)
49 49
50 DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix) 50 DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix)
51 { 51 {
52 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); 52 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&);
53 53
54 SparseBoolMatrix tmp (v2.bool_matrix_value ()); 54 SparseBoolMatrix tmp (v2.bool_matrix_value ());
55 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); 55 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx));
56 } 56 }
57 57
58 DEFCATOP (sbm_m, sparse_bool_matrix, matrix) 58 DEFCATOP (sbm_m, sparse_bool_matrix, matrix)
59 { 59 {
60 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_matrix&); 60 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_matrix&);
61 61
62 SparseMatrix tmp (v2.matrix_value ()); 62 SparseMatrix tmp (v2.matrix_value ());
63 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); 63 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
64 } 64 }
65 65
66 DEFCATOP (sm_bm, sparse_matrix, bool_matrix) 66 DEFCATOP (sm_bm, sparse_matrix, bool_matrix)
67 { 67 {
68 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool_matrix&); 68 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool_matrix&);
69 69
70 SparseMatrix tmp (v2.matrix_value ()); 70 SparseMatrix tmp (v2.matrix_value ());
71 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); 71 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
72 } 72 }
73 73
74 DEFASSIGNOP (assign, sparse_bool_matrix, bool_matrix) 74 DEFASSIGNOP (assign, sparse_bool_matrix, bool_matrix)
83 install_sbm_bm_ops (void) 83 install_sbm_bm_ops (void)
84 { 84 {
85 INSTALL_BINOP (op_eq, octave_sparse_bool_matrix, octave_bool_matrix, eq); 85 INSTALL_BINOP (op_eq, octave_sparse_bool_matrix, octave_bool_matrix, eq);
86 INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, octave_bool_matrix, ne); 86 INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, octave_bool_matrix, ne);
87 87
88 INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, octave_bool_matrix, 88 INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, octave_bool_matrix,
89 el_and); 89 el_and);
90 INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, octave_bool_matrix, 90 INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, octave_bool_matrix,
91 el_or); 91 el_or);
92 92
93 INSTALL_CATOP (octave_sparse_bool_matrix, octave_bool_matrix, sbm_bm); 93 INSTALL_CATOP (octave_sparse_bool_matrix, octave_bool_matrix, sbm_bm);
94 INSTALL_CATOP (octave_sparse_matrix, octave_bool_matrix, sm_bm); 94 INSTALL_CATOP (octave_sparse_matrix, octave_bool_matrix, sm_bm);
95 INSTALL_CATOP (octave_sparse_bool_matrix, octave_matrix, sbm_m); 95 INSTALL_CATOP (octave_sparse_bool_matrix, octave_matrix, sbm_m);
96 96
97 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, 97 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix,
98 octave_bool_matrix, assign); 98 octave_bool_matrix, assign);
99 } 99 }