Mercurial > hg > octave-nkf

comparison liboctave/array/CMatrix.cc @ 19535:fcd9e1198847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMatrix.cc: Use undeprecated Array constructor (bug #43646).
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Sat, 22 Nov 2014 00:06:51 +0100
parents 3746b92739f7
children 385499581a5e
comparison
equal deleted inserted replaced
19534:3a2a0b72b91b 19535:fcd9e1198847
1357 nsamples = nc; 1357 nsamples = nc;
1358 } 1358 }
1359 1359
1360 octave_idx_type nn = 4*npts+15; 1360 octave_idx_type nn = 4*npts+15;
1361 1361
1362 Array<Complex> wsave (nn, 1); 1362 Array<Complex> wsave (dim_vector (nn, 1));
1363 Complex *pwsave = wsave.fortran_vec (); 1363 Complex *pwsave = wsave.fortran_vec ();
1364 1364
1365 retval = *this; 1365 retval = *this;
1366 Complex *tmp_data = retval.fortran_vec (); 1366 Complex *tmp_data = retval.fortran_vec ();
1367 1367
1398 nsamples = nc; 1398 nsamples = nc;
1399 } 1399 }
1400 1400
1401 octave_idx_type nn = 4*npts+15; 1401 octave_idx_type nn = 4*npts+15;
1402 1402
1403 Array<Complex> wsave (nn, 1); 1403 Array<Complex> wsave (dim_vector (nn, 1));
1404 Complex *pwsave = wsave.fortran_vec (); 1404 Complex *pwsave = wsave.fortran_vec ();
1405 1405
1406 retval = *this; 1406 retval = *this;
1407 Complex *tmp_data = retval.fortran_vec (); 1407 Complex *tmp_data = retval.fortran_vec ();
1408 1408
1442 nsamples = nc; 1442 nsamples = nc;
1443 } 1443 }
1444 1444
1445 octave_idx_type nn = 4*npts+15; 1445 octave_idx_type nn = 4*npts+15;
1446 1446
1447 Array<Complex> wsave (nn, 1); 1447 Array<Complex> wsave (dim_vector (nn, 1));
1448 Complex *pwsave = wsave.fortran_vec (); 1448 Complex *pwsave = wsave.fortran_vec ();
1449 1449
1450 retval = *this; 1450 retval = *this;
1451 Complex *tmp_data = retval.fortran_vec (); 1451 Complex *tmp_data = retval.fortran_vec ();
1452 1452
1464 nn = 4*npts+15; 1464 nn = 4*npts+15;
1465 1465
1466 wsave.resize (dim_vector (nn, 1)); 1466 wsave.resize (dim_vector (nn, 1));
1467 pwsave = wsave.fortran_vec (); 1467 pwsave = wsave.fortran_vec ();
1468 1468
1469 Array<Complex> tmp (npts, 1); 1469 Array<Complex> tmp (dim_vector (npts, 1));
1470 Complex *prow = tmp.fortran_vec (); 1470 Complex *prow = tmp.fortran_vec ();
1471 1471
1472 F77_FUNC (zffti, ZFFTI) (npts, pwsave); 1472 F77_FUNC (zffti, ZFFTI) (npts, pwsave);
1473 1473
1474 for (octave_idx_type j = 0; j < nsamples; j++) 1474 for (octave_idx_type j = 0; j < nsamples; j++)
1508 nsamples = nc; 1508 nsamples = nc;
1509 } 1509 }
1510 1510
1511 octave_idx_type nn = 4*npts+15; 1511 octave_idx_type nn = 4*npts+15;
1512 1512
1513 Array<Complex> wsave (nn, 1); 1513 Array<Complex> wsave (dim_vector (nn, 1));
1514 Complex *pwsave = wsave.fortran_vec (); 1514 Complex *pwsave = wsave.fortran_vec ();
1515 1515
1516 retval = *this; 1516 retval = *this;
1517 Complex *tmp_data = retval.fortran_vec (); 1517 Complex *tmp_data = retval.fortran_vec ();
1518 1518
1533 nn = 4*npts+15; 1533 nn = 4*npts+15;
1534 1534
1535 wsave.resize (dim_vector (nn, 1)); 1535 wsave.resize (dim_vector (nn, 1));
1536 pwsave = wsave.fortran_vec (); 1536 pwsave = wsave.fortran_vec ();
1537 1537
1538 Array<Complex> tmp (npts, 1); 1538 Array<Complex> tmp (dim_vector (npts, 1));
1539 Complex *prow = tmp.fortran_vec (); 1539 Complex *prow = tmp.fortran_vec ();
1540 1540
1541 F77_FUNC (zffti, ZFFTI) (npts, pwsave); 1541 F77_FUNC (zffti, ZFFTI) (npts, pwsave);
1542 1542
1543 for (octave_idx_type j = 0; j < nsamples; j++) 1543 for (octave_idx_type j = 0; j < nsamples; j++)