Mercurial > octave-nkf

comparison src/DLD-FUNCTIONS/kron.cc @ 11570:57632dea2446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt better backward compatibility for Array constructors
author John W. Eaton <jwe@octave.org>
date Wed, 19 Jan 2011 17:55:56 -0500
parents 01f703952eff
children 12df7854fa7c
comparison
equal deleted inserted replaced
11569:7e9a111cae20 11570:57632dea2446
56 assert (b.ndims () == 2); 56 assert (b.ndims () == 2);
57 57
58 octave_idx_type nra = a.rows (), nrb = b.rows (); 58 octave_idx_type nra = a.rows (), nrb = b.rows ();
59 octave_idx_type nca = a.cols (), ncb = b.cols (); 59 octave_idx_type nca = a.cols (), ncb = b.cols ();
60 60
61 MArray<T> c (nra*nrb, nca*ncb); 61 MArray<T> c (dim_vector (nra*nrb, nca*ncb));
62 T *cv = c.fortran_vec (); 62 T *cv = c.fortran_vec ();
63 63
64 for (octave_idx_type ja = 0; ja < nca; ja++) 64 for (octave_idx_type ja = 0; ja < nca; ja++)
65 for (octave_idx_type jb = 0; jb < ncb; jb++) 65 for (octave_idx_type jb = 0; jb < ncb; jb++)
66 for (octave_idx_type ia = 0; ia < nra; ia++) 66 for (octave_idx_type ia = 0; ia < nra; ia++)
80 assert (b.ndims () == 2); 80 assert (b.ndims () == 2);
81 81
82 octave_idx_type nra = a.rows (), nrb = b.rows (), dla = a.diag_length (); 82 octave_idx_type nra = a.rows (), nrb = b.rows (), dla = a.diag_length ();
83 octave_idx_type nca = a.cols (), ncb = b.cols (); 83 octave_idx_type nca = a.cols (), ncb = b.cols ();
84 84
85 MArray<T> c (nra*nrb, nca*ncb, T()); 85 MArray<T> c (dim_vector (nra*nrb, nca*ncb), T());
86 86
87 for (octave_idx_type ja = 0; ja < dla; ja++) 87 for (octave_idx_type ja = 0; ja < dla; ja++)
88 for (octave_idx_type jb = 0; jb < ncb; jb++) 88 for (octave_idx_type jb = 0; jb < ncb; jb++)
89 { 89 {
90 octave_quit (); 90 octave_quit ();