Mercurial > octave
comparison src/ov-str-mat.cc @ 5086:55f5b61d74b7
[project @ 2004-11-19 21:50:50 by jwe]
author | jwe |
---|---|
date | Fri, 19 Nov 2004 21:50:50 +0000 |
parents | 3dcc3824b732 |
children | f7e39f977fe8 |
comparison
equal
deleted
inserted
replaced
5085:6861a84b1d47 | 5086:55f5b61d74b7 |
---|---|
94 case 2: | 94 case 2: |
95 { | 95 { |
96 idx_vector i = idx (0).index_vector (); | 96 idx_vector i = idx (0).index_vector (); |
97 idx_vector j = idx (1).index_vector (); | 97 idx_vector j = idx (1).index_vector (); |
98 | 98 |
99 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)), | 99 if (! error_state) |
100 true); | 100 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)), |
101 true); | |
101 } | 102 } |
102 break; | 103 break; |
103 | 104 |
104 case 1: | 105 case 1: |
105 { | 106 { |
106 idx_vector i = idx (0).index_vector (); | 107 idx_vector i = idx (0).index_vector (); |
107 | 108 |
108 retval = octave_value (charNDArray (matrix.index (i, resize_ok)), | 109 if (! error_state) |
109 true); | 110 retval = octave_value (charNDArray (matrix.index (i, resize_ok)), |
111 true); | |
110 } | 112 } |
111 break; | 113 break; |
112 | 114 |
113 default: | 115 default: |
114 { | 116 { |
115 Array<idx_vector> idx_vec (len); | 117 Array<idx_vector> idx_vec (len); |
116 | 118 |
117 for (int i = 0; i < len; i++) | 119 for (int i = 0; i < len; i++) |
118 idx_vec(i) = idx(i).index_vector (); | 120 idx_vec(i) = idx(i).index_vector (); |
119 | 121 |
120 retval = octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), | 122 if (! error_state) |
121 true); | 123 retval = octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), |
124 true); | |
122 } | 125 } |
123 break; | 126 break; |
124 } | 127 } |
125 | 128 |
126 return retval; | 129 return retval; |