Mercurial > hg > octave-nkf
annotate liboctave/CColVector.cc @ 9550:3d6a9aea2aea
refactor binary & bool ops in liboctave
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 19 Aug 2009 22:55:15 +0200 |
| parents | dc07bc4157b8 |
| children | cbabf50315ca |
| rev | line source |
|---|---|
| 1993 | 1 // ColumnVector manipulations. |
| 458 | 2 /* |
| 3 | |
| 7017 | 4 Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, |
| 8920 | 5 2005, 2007, 2008 John W. Eaton |
| 458 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 458 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 458 | 22 |
| 23 */ | |
| 24 | |
| 25 #ifdef HAVE_CONFIG_H | |
| 1192 | 26 #include <config.h> |
| 458 | 27 #endif |
| 28 | |
| 3503 | 29 #include <iostream> |
| 458 | 30 |
| 4669 | 31 #include "Array-util.h" |
| 1847 | 32 #include "f77-fcn.h" |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
33 #include "functor.h" |
| 1368 | 34 #include "lo-error.h" |
| 458 | 35 #include "mx-base.h" |
| 36 #include "mx-inlines.cc" | |
| 1650 | 37 #include "oct-cmplx.h" |
| 458 | 38 |
| 39 // Fortran functions we call. | |
| 40 | |
| 41 extern "C" | |
| 42 { | |
| 4552 | 43 F77_RET_T |
| 44 F77_FUNC (zgemv, ZGEMV) (F77_CONST_CHAR_ARG_DECL, | |
| 5275 | 45 const octave_idx_type&, const octave_idx_type&, const Complex&, |
| 46 const Complex*, const octave_idx_type&, const Complex*, | |
| 47 const octave_idx_type&, const Complex&, Complex*, const octave_idx_type& | |
| 4552 | 48 F77_CHAR_ARG_LEN_DECL); |
| 458 | 49 } |
| 50 | |
| 1360 | 51 // Complex Column Vector class |
| 458 | 52 |
| 53 ComplexColumnVector::ComplexColumnVector (const ColumnVector& a) | |
| 1214 | 54 : MArray<Complex> (a.length ()) |
| 458 | 55 { |
| 5275 | 56 for (octave_idx_type i = 0; i < length (); i++) |
| 458 | 57 elem (i) = a.elem (i); |
| 58 } | |
| 59 | |
| 2386 | 60 bool |
| 458 | 61 ComplexColumnVector::operator == (const ComplexColumnVector& a) const |
| 62 { | |
| 5275 | 63 octave_idx_type len = length (); |
| 458 | 64 if (len != a.length ()) |
| 65 return 0; | |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8999
diff
changeset
|
66 return mx_inline_equal (len, data (), a.data ()); |
| 458 | 67 } |
| 68 | |
| 2386 | 69 bool |
| 458 | 70 ComplexColumnVector::operator != (const ComplexColumnVector& a) const |
| 71 { | |
| 72 return !(*this == a); | |
| 73 } | |
| 74 | |
| 75 // destructive insert/delete/reorder operations | |
| 76 | |
| 77 ComplexColumnVector& | |
| 5275 | 78 ComplexColumnVector::insert (const ColumnVector& a, octave_idx_type r) |
| 458 | 79 { |
| 5275 | 80 octave_idx_type a_len = a.length (); |
| 4316 | 81 |
| 1699 | 82 if (r < 0 || r + a_len > length ()) |
| 458 | 83 { |
| 84 (*current_liboctave_error_handler) ("range error for insert"); | |
| 85 return *this; | |
| 86 } | |
| 87 | |
| 4316 | 88 if (a_len > 0) |
| 89 { | |
| 90 make_unique (); | |
| 91 | |
| 5275 | 92 for (octave_idx_type i = 0; i < a_len; i++) |
| 4316 | 93 xelem (r+i) = a.elem (i); |
| 94 } | |
| 458 | 95 |
| 96 return *this; | |
| 97 } | |
| 98 | |
| 99 ComplexColumnVector& | |
| 5275 | 100 ComplexColumnVector::insert (const ComplexColumnVector& a, octave_idx_type r) |
| 458 | 101 { |
| 5275 | 102 octave_idx_type a_len = a.length (); |
| 4316 | 103 |
| 1699 | 104 if (r < 0 || r + a_len > length ()) |
| 458 | 105 { |
| 106 (*current_liboctave_error_handler) ("range error for insert"); | |
| 107 return *this; | |
| 108 } | |
| 109 | |
| 4316 | 110 if (a_len > 0) |
| 111 { | |
| 112 make_unique (); | |
| 113 | |
| 5275 | 114 for (octave_idx_type i = 0; i < a_len; i++) |
| 4316 | 115 xelem (r+i) = a.elem (i); |
| 116 } | |
| 458 | 117 |
| 118 return *this; | |
| 119 } | |
| 120 | |
| 121 ComplexColumnVector& | |
| 122 ComplexColumnVector::fill (double val) | |
| 123 { | |
| 5275 | 124 octave_idx_type len = length (); |
| 4316 | 125 |
| 458 | 126 if (len > 0) |
| 4316 | 127 { |
| 128 make_unique (); | |
| 129 | |
| 5275 | 130 for (octave_idx_type i = 0; i < len; i++) |
| 4316 | 131 xelem (i) = val; |
| 132 } | |
| 133 | |
| 458 | 134 return *this; |
| 135 } | |
| 136 | |
| 137 ComplexColumnVector& | |
| 138 ComplexColumnVector::fill (const Complex& val) | |
| 139 { | |
| 5275 | 140 octave_idx_type len = length (); |
| 4316 | 141 |
| 458 | 142 if (len > 0) |
| 4316 | 143 { |
| 144 make_unique (); | |
| 145 | |
| 5275 | 146 for (octave_idx_type i = 0; i < len; i++) |
| 4316 | 147 xelem (i) = val; |
| 148 } | |
| 149 | |
| 150 | |
| 458 | 151 return *this; |
| 152 } | |
| 153 | |
| 154 ComplexColumnVector& | |
| 5275 | 155 ComplexColumnVector::fill (double val, octave_idx_type r1, octave_idx_type r2) |
| 458 | 156 { |
| 5275 | 157 octave_idx_type len = length (); |
| 4316 | 158 |
| 458 | 159 if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) |
| 160 { | |
| 161 (*current_liboctave_error_handler) ("range error for fill"); | |
| 162 return *this; | |
| 163 } | |
| 164 | |
| 5275 | 165 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; } |
| 458 | 166 |
| 4316 | 167 if (r2 >= r1) |
| 168 { | |
| 169 make_unique (); | |
| 170 | |
| 5275 | 171 for (octave_idx_type i = r1; i <= r2; i++) |
| 4316 | 172 xelem (i) = val; |
| 173 } | |
| 458 | 174 |
| 175 return *this; | |
| 176 } | |
| 177 | |
| 178 ComplexColumnVector& | |
| 5275 | 179 ComplexColumnVector::fill (const Complex& val, octave_idx_type r1, octave_idx_type r2) |
| 458 | 180 { |
| 5275 | 181 octave_idx_type len = length (); |
| 4316 | 182 |
| 458 | 183 if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) |
| 184 { | |
| 185 (*current_liboctave_error_handler) ("range error for fill"); | |
| 186 return *this; | |
| 187 } | |
| 188 | |
| 5275 | 189 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; } |
| 458 | 190 |
| 4316 | 191 if (r2 >= r1) |
| 192 { | |
| 193 make_unique (); | |
| 194 | |
| 5275 | 195 for (octave_idx_type i = r1; i <= r2; i++) |
| 4316 | 196 xelem (i) = val; |
| 197 } | |
| 458 | 198 |
| 199 return *this; | |
| 200 } | |
| 201 | |
| 202 ComplexColumnVector | |
| 203 ComplexColumnVector::stack (const ColumnVector& a) const | |
| 204 { | |
| 5275 | 205 octave_idx_type len = length (); |
| 206 octave_idx_type nr_insert = len; | |
| 458 | 207 ComplexColumnVector retval (len + a.length ()); |
| 208 retval.insert (*this, 0); | |
| 209 retval.insert (a, nr_insert); | |
| 210 return retval; | |
| 211 } | |
| 212 | |
| 213 ComplexColumnVector | |
| 214 ComplexColumnVector::stack (const ComplexColumnVector& a) const | |
| 215 { | |
| 5275 | 216 octave_idx_type len = length (); |
| 217 octave_idx_type nr_insert = len; | |
| 458 | 218 ComplexColumnVector retval (len + a.length ()); |
| 219 retval.insert (*this, 0); | |
| 220 retval.insert (a, nr_insert); | |
| 221 return retval; | |
| 222 } | |
| 223 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
224 ComplexRowVector |
| 458 | 225 ComplexColumnVector::hermitian (void) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
226 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
227 return MArray<Complex>::hermitian (std::conj); |
| 458 | 228 } |
| 229 | |
| 230 ComplexRowVector | |
| 231 ComplexColumnVector::transpose (void) const | |
| 232 { | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
233 return MArray<Complex>::transpose (); |
| 458 | 234 } |
| 235 | |
| 236 ComplexColumnVector | |
| 237 conj (const ComplexColumnVector& a) | |
| 238 { | |
| 5275 | 239 octave_idx_type a_len = a.length (); |
| 458 | 240 ComplexColumnVector retval; |
| 241 if (a_len > 0) | |
| 3769 | 242 retval = ComplexColumnVector (mx_inline_conj_dup (a.data (), a_len), a_len); |
| 458 | 243 return retval; |
| 244 } | |
| 245 | |
| 246 // resize is the destructive equivalent for this one | |
| 247 | |
| 248 ComplexColumnVector | |
| 5275 | 249 ComplexColumnVector::extract (octave_idx_type r1, octave_idx_type r2) const |
| 458 | 250 { |
| 5275 | 251 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; } |
| 458 | 252 |
| 5275 | 253 octave_idx_type new_r = r2 - r1 + 1; |
| 458 | 254 |
| 255 ComplexColumnVector result (new_r); | |
| 256 | |
| 5275 | 257 for (octave_idx_type i = 0; i < new_r; i++) |
| 458 | 258 result.elem (i) = elem (r1+i); |
| 259 | |
| 260 return result; | |
| 261 } | |
| 262 | |
| 4316 | 263 ComplexColumnVector |
| 5275 | 264 ComplexColumnVector::extract_n (octave_idx_type r1, octave_idx_type n) const |
| 4316 | 265 { |
| 266 ComplexColumnVector result (n); | |
| 267 | |
| 5275 | 268 for (octave_idx_type i = 0; i < n; i++) |
| 4316 | 269 result.elem (i) = elem (r1+i); |
| 270 | |
| 271 return result; | |
| 272 } | |
| 273 | |
| 458 | 274 // column vector by column vector -> column vector operations |
| 275 | |
| 276 ComplexColumnVector& | |
| 277 ComplexColumnVector::operator += (const ColumnVector& a) | |
| 278 { | |
| 5275 | 279 octave_idx_type len = length (); |
| 2386 | 280 |
| 5275 | 281 octave_idx_type a_len = a.length (); |
| 2386 | 282 |
| 283 if (len != a_len) | |
| 458 | 284 { |
| 2386 | 285 gripe_nonconformant ("operator +=", len, a_len); |
| 458 | 286 return *this; |
| 287 } | |
| 288 | |
| 289 if (len == 0) | |
| 290 return *this; | |
| 291 | |
| 292 Complex *d = fortran_vec (); // Ensures only one reference to my privates! | |
| 293 | |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8999
diff
changeset
|
294 mx_inline_add2 (len, d, a.data ()); |
| 458 | 295 return *this; |
| 296 } | |
| 297 | |
| 298 ComplexColumnVector& | |
| 299 ComplexColumnVector::operator -= (const ColumnVector& a) | |
| 300 { | |
| 5275 | 301 octave_idx_type len = length (); |
| 2386 | 302 |
| 5275 | 303 octave_idx_type a_len = a.length (); |
| 2386 | 304 |
| 305 if (len != a_len) | |
| 458 | 306 { |
| 2386 | 307 gripe_nonconformant ("operator -=", len, a_len); |
| 458 | 308 return *this; |
| 309 } | |
| 310 | |
| 311 if (len == 0) | |
| 312 return *this; | |
| 313 | |
| 314 Complex *d = fortran_vec (); // Ensures only one reference to my privates! | |
| 315 | |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8999
diff
changeset
|
316 mx_inline_sub2 (len, d, a.data ()); |
| 458 | 317 return *this; |
| 318 } | |
| 319 | |
| 1205 | 320 // matrix by column vector -> column vector operations |
| 321 | |
| 322 ComplexColumnVector | |
| 323 operator * (const ComplexMatrix& m, const ColumnVector& a) | |
| 324 { | |
| 325 ComplexColumnVector tmp (a); | |
| 326 return m * tmp; | |
| 327 } | |
| 328 | |
| 329 ComplexColumnVector | |
| 330 operator * (const ComplexMatrix& m, const ComplexColumnVector& a) | |
| 331 { | |
| 1947 | 332 ComplexColumnVector retval; |
| 333 | |
| 5275 | 334 octave_idx_type nr = m.rows (); |
| 335 octave_idx_type nc = m.cols (); | |
| 1947 | 336 |
| 5275 | 337 octave_idx_type a_len = a.length (); |
| 2386 | 338 |
| 339 if (nc != a_len) | |
| 340 gripe_nonconformant ("operator *", nr, nc, a_len, 1); | |
| 1947 | 341 else |
| 458 | 342 { |
| 1947 | 343 if (nc == 0 || nr == 0) |
| 344 retval.resize (nr, 0.0); | |
| 345 else | |
| 346 { | |
| 5275 | 347 octave_idx_type ld = nr; |
| 1947 | 348 |
| 349 retval.resize (nr); | |
| 350 Complex *y = retval.fortran_vec (); | |
| 351 | |
| 4552 | 352 F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), |
| 353 nr, nc, 1.0, m.data (), ld, | |
| 354 a.data (), 1, 0.0, y, 1 | |
| 355 F77_CHAR_ARG_LEN (1))); | |
| 1947 | 356 } |
| 458 | 357 } |
| 358 | |
| 1947 | 359 return retval; |
| 458 | 360 } |
| 361 | |
| 1205 | 362 // matrix by column vector -> column vector operations |
| 363 | |
| 364 ComplexColumnVector | |
| 365 operator * (const Matrix& m, const ComplexColumnVector& a) | |
| 366 { | |
| 367 ComplexMatrix tmp (m); | |
| 368 return tmp * a; | |
| 369 } | |
| 370 | |
| 371 // diagonal matrix by column vector -> column vector operations | |
| 372 | |
| 373 ComplexColumnVector | |
| 374 operator * (const DiagMatrix& m, const ComplexColumnVector& a) | |
| 375 { | |
| 5275 | 376 octave_idx_type nr = m.rows (); |
| 377 octave_idx_type nc = m.cols (); | |
| 2386 | 378 |
| 5275 | 379 octave_idx_type a_len = a.length (); |
| 2386 | 380 |
| 1205 | 381 if (nc != a_len) |
| 382 { | |
| 2386 | 383 gripe_nonconformant ("operator *", nr, nc, a_len, 1); |
| 3585 | 384 return ComplexColumnVector (); |
| 1205 | 385 } |
| 386 | |
| 387 if (nc == 0 || nr == 0) | |
| 388 return ComplexColumnVector (0); | |
| 389 | |
| 390 ComplexColumnVector result (nr); | |
| 391 | |
| 5275 | 392 for (octave_idx_type i = 0; i < a_len; i++) |
| 1205 | 393 result.elem (i) = a.elem (i) * m.elem (i, i); |
| 394 | |
| 5275 | 395 for (octave_idx_type i = a_len; i < nr; i++) |
| 1205 | 396 result.elem (i) = 0.0; |
| 397 | |
| 398 return result; | |
| 399 } | |
| 400 | |
| 401 ComplexColumnVector | |
| 402 operator * (const ComplexDiagMatrix& m, const ColumnVector& a) | |
| 403 { | |
| 5275 | 404 octave_idx_type nr = m.rows (); |
| 405 octave_idx_type nc = m.cols (); | |
| 2386 | 406 |
| 5275 | 407 octave_idx_type a_len = a.length (); |
| 2386 | 408 |
| 1205 | 409 if (nc != a_len) |
| 410 { | |
| 2386 | 411 gripe_nonconformant ("operator *", nr, nc, a_len, 1); |
| 1205 | 412 return ComplexColumnVector (); |
| 413 } | |
| 414 | |
| 415 if (nc == 0 || nr == 0) | |
| 416 return ComplexColumnVector (0); | |
| 417 | |
| 418 ComplexColumnVector result (nr); | |
| 419 | |
| 5275 | 420 for (octave_idx_type i = 0; i < a_len; i++) |
| 1205 | 421 result.elem (i) = a.elem (i) * m.elem (i, i); |
| 422 | |
| 5275 | 423 for (octave_idx_type i = a_len; i < nr; i++) |
| 1205 | 424 result.elem (i) = 0.0; |
| 425 | |
| 426 return result; | |
| 427 } | |
| 428 | |
| 429 ComplexColumnVector | |
| 430 operator * (const ComplexDiagMatrix& m, const ComplexColumnVector& a) | |
| 431 { | |
| 5275 | 432 octave_idx_type nr = m.rows (); |
| 433 octave_idx_type nc = m.cols (); | |
| 2386 | 434 |
| 5275 | 435 octave_idx_type a_len = a.length (); |
| 2386 | 436 |
| 1205 | 437 if (nc != a_len) |
| 438 { | |
| 2386 | 439 gripe_nonconformant ("operator *", nr, nc, a_len, 1); |
| 1205 | 440 return ComplexColumnVector (); |
| 441 } | |
| 442 | |
| 443 if (nc == 0 || nr == 0) | |
| 444 return ComplexColumnVector (0); | |
| 445 | |
| 446 ComplexColumnVector result (nr); | |
| 447 | |
| 5275 | 448 for (octave_idx_type i = 0; i < a_len; i++) |
| 1205 | 449 result.elem (i) = a.elem (i) * m.elem (i, i); |
| 450 | |
| 5275 | 451 for (octave_idx_type i = a_len; i < nr; i++) |
| 1205 | 452 result.elem (i) = 0.0; |
| 453 | |
| 454 return result; | |
| 455 } | |
| 456 | |
| 458 | 457 // other operations |
| 458 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
459 ColumnVector |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
460 ComplexColumnVector::map (dmapper fcn) const |
| 458 | 461 { |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
462 return MArray<Complex>::map<double> (func_ptr (fcn)); |
| 458 | 463 } |
| 464 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
465 ComplexColumnVector |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
466 ComplexColumnVector::map (cmapper fcn) const |
| 458 | 467 { |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7482
diff
changeset
|
468 return MArray<Complex>::map<Complex> (func_ptr (fcn)); |
| 458 | 469 } |
| 470 | |
| 471 Complex | |
| 472 ComplexColumnVector::min (void) const | |
| 473 { | |
| 5275 | 474 octave_idx_type len = length (); |
| 458 | 475 if (len == 0) |
| 476 return 0.0; | |
| 477 | |
| 478 Complex res = elem (0); | |
| 5260 | 479 double absres = std::abs (res); |
| 458 | 480 |
| 5275 | 481 for (octave_idx_type i = 1; i < len; i++) |
| 5260 | 482 if (std::abs (elem (i)) < absres) |
| 458 | 483 { |
| 484 res = elem (i); | |
| 5260 | 485 absres = std::abs (res); |
| 458 | 486 } |
| 487 | |
| 488 return res; | |
| 489 } | |
| 490 | |
| 491 Complex | |
| 492 ComplexColumnVector::max (void) const | |
| 493 { | |
| 5275 | 494 octave_idx_type len = length (); |
| 458 | 495 if (len == 0) |
| 496 return 0.0; | |
| 497 | |
| 498 Complex res = elem (0); | |
| 5260 | 499 double absres = std::abs (res); |
| 458 | 500 |
| 5275 | 501 for (octave_idx_type i = 1; i < len; i++) |
| 5260 | 502 if (std::abs (elem (i)) > absres) |
| 458 | 503 { |
| 504 res = elem (i); | |
| 5260 | 505 absres = std::abs (res); |
| 458 | 506 } |
| 507 | |
| 508 return res; | |
| 509 } | |
| 510 | |
| 511 // i/o | |
| 512 | |
| 3504 | 513 std::ostream& |
| 514 operator << (std::ostream& os, const ComplexColumnVector& a) | |
| 458 | 515 { |
| 516 // int field_width = os.precision () + 7; | |
| 5275 | 517 for (octave_idx_type i = 0; i < a.length (); i++) |
| 458 | 518 os << /* setw (field_width) << */ a.elem (i) << "\n"; |
| 519 return os; | |
| 520 } | |
| 521 | |
| 3504 | 522 std::istream& |
| 523 operator >> (std::istream& is, ComplexColumnVector& a) | |
| 458 | 524 { |
| 5275 | 525 octave_idx_type len = a.length(); |
| 458 | 526 |
|
8999
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
527 if (len > 0) |
| 458 | 528 { |
| 529 double tmp; | |
| 5275 | 530 for (octave_idx_type i = 0; i < len; i++) |
| 458 | 531 { |
| 532 is >> tmp; | |
| 533 if (is) | |
| 534 a.elem (i) = tmp; | |
| 535 else | |
| 536 break; | |
| 537 } | |
| 538 } | |
| 532 | 539 return is; |
| 458 | 540 } |
| 541 | |
| 542 /* | |
| 543 ;;; Local Variables: *** | |
| 544 ;;; mode: C++ *** | |
| 545 ;;; End: *** | |
| 546 */ |