Mercurial > hg > octave-nkf

comparison liboctave/lo-specfun.cc @ 11574:a83bad07f7e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt better backward compatibility for Array resize functions
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 00:12:05 -0500
parents fd0a3ac60b0e
children 12df7854fa7c
comparison
equal deleted inserted replaced
11573:6f8ffe2c6f76 11574:a83bad07f7e3
1047 octave_idx_type nr = x.rows (); 1047 octave_idx_type nr = x.rows ();
1048 octave_idx_type nc = x.cols (); 1048 octave_idx_type nc = x.cols ();
1049 1049
1050 ComplexMatrix retval (nr, nc); 1050 ComplexMatrix retval (nr, nc);
1051 1051
1052 ierr.resize (nr, nc); 1052 ierr.resize (dim_vector (nr, nc));
1053 1053
1054 for (octave_idx_type j = 0; j < nc; j++) 1054 for (octave_idx_type j = 0; j < nc; j++)
1055 for (octave_idx_type i = 0; i < nr; i++) 1055 for (octave_idx_type i = 0; i < nr; i++)
1056 retval(i,j) = f (x(i,j), alpha, (scaled ? 2 : 1), ierr(i,j)); 1056 retval(i,j) = f (x(i,j), alpha, (scaled ? 2 : 1), ierr(i,j));
1057 1057
1065 octave_idx_type nr = alpha.rows (); 1065 octave_idx_type nr = alpha.rows ();
1066 octave_idx_type nc = alpha.cols (); 1066 octave_idx_type nc = alpha.cols ();
1067 1067
1068 ComplexMatrix retval (nr, nc); 1068 ComplexMatrix retval (nr, nc);
1069 1069
1070 ierr.resize (nr, nc); 1070 ierr.resize (dim_vector (nr, nc));
1071 1071
1072 for (octave_idx_type j = 0; j < nc; j++) 1072 for (octave_idx_type j = 0; j < nc; j++)
1073 for (octave_idx_type i = 0; i < nr; i++) 1073 for (octave_idx_type i = 0; i < nr; i++)
1074 retval(i,j) = f (x, alpha(i,j), (scaled ? 2 : 1), ierr(i,j)); 1074 retval(i,j) = f (x, alpha(i,j), (scaled ? 2 : 1), ierr(i,j));
1075 1075
1093 octave_idx_type nr = x_nr; 1093 octave_idx_type nr = x_nr;
1094 octave_idx_type nc = x_nc; 1094 octave_idx_type nc = x_nc;
1095 1095
1096 retval.resize (nr, nc); 1096 retval.resize (nr, nc);
1097 1097
1098 ierr.resize (nr, nc); 1098 ierr.resize (dim_vector (nr, nc));
1099 1099
1100 for (octave_idx_type j = 0; j < nc; j++) 1100 for (octave_idx_type j = 0; j < nc; j++)
1101 for (octave_idx_type i = 0; i < nr; i++) 1101 for (octave_idx_type i = 0; i < nr; i++)
1102 retval(i,j) = f (x(i,j), alpha(i,j), (scaled ? 2 : 1), ierr(i,j)); 1102 retval(i,j) = f (x(i,j), alpha(i,j), (scaled ? 2 : 1), ierr(i,j));
1103 } 1103 }
1171 octave_idx_type nr = x.length (); 1171 octave_idx_type nr = x.length ();
1172 octave_idx_type nc = alpha.length (); 1172 octave_idx_type nc = alpha.length ();
1173 1173
1174 ComplexMatrix retval (nr, nc); 1174 ComplexMatrix retval (nr, nc);
1175 1175
1176 ierr.resize (nr, nc); 1176 ierr.resize (dim_vector (nr, nc));
1177 1177
1178 for (octave_idx_type j = 0; j < nc; j++) 1178 for (octave_idx_type j = 0; j < nc; j++)
1179 for (octave_idx_type i = 0; i < nr; i++) 1179 for (octave_idx_type i = 0; i < nr; i++)
1180 retval(i,j) = f (x(i), alpha(j), (scaled ? 2 : 1), ierr(i,j)); 1180 retval(i,j) = f (x(i), alpha(j), (scaled ? 2 : 1), ierr(i,j));
1181 1181
1644 octave_idx_type nr = x.rows (); 1644 octave_idx_type nr = x.rows ();
1645 octave_idx_type nc = x.cols (); 1645 octave_idx_type nc = x.cols ();
1646 1646
1647 FloatComplexMatrix retval (nr, nc); 1647 FloatComplexMatrix retval (nr, nc);
1648 1648
1649 ierr.resize (nr, nc); 1649 ierr.resize (dim_vector (nr, nc));
1650 1650
1651 for (octave_idx_type j = 0; j < nc; j++) 1651 for (octave_idx_type j = 0; j < nc; j++)
1652 for (octave_idx_type i = 0; i < nr; i++) 1652 for (octave_idx_type i = 0; i < nr; i++)
1653 retval(i,j) = f (x(i,j), alpha, (scaled ? 2 : 1), ierr(i,j)); 1653 retval(i,j) = f (x(i,j), alpha, (scaled ? 2 : 1), ierr(i,j));
1654 1654
1662 octave_idx_type nr = alpha.rows (); 1662 octave_idx_type nr = alpha.rows ();
1663 octave_idx_type nc = alpha.cols (); 1663 octave_idx_type nc = alpha.cols ();
1664 1664
1665 FloatComplexMatrix retval (nr, nc); 1665 FloatComplexMatrix retval (nr, nc);
1666 1666
1667 ierr.resize (nr, nc); 1667 ierr.resize (dim_vector (nr, nc));
1668 1668
1669 for (octave_idx_type j = 0; j < nc; j++) 1669 for (octave_idx_type j = 0; j < nc; j++)
1670 for (octave_idx_type i = 0; i < nr; i++) 1670 for (octave_idx_type i = 0; i < nr; i++)
1671 retval(i,j) = f (x, alpha(i,j), (scaled ? 2 : 1), ierr(i,j)); 1671 retval(i,j) = f (x, alpha(i,j), (scaled ? 2 : 1), ierr(i,j));
1672 1672
1690 octave_idx_type nr = x_nr; 1690 octave_idx_type nr = x_nr;
1691 octave_idx_type nc = x_nc; 1691 octave_idx_type nc = x_nc;
1692 1692
1693 retval.resize (nr, nc); 1693 retval.resize (nr, nc);
1694 1694
1695 ierr.resize (nr, nc); 1695 ierr.resize (dim_vector (nr, nc));
1696 1696
1697 for (octave_idx_type j = 0; j < nc; j++) 1697 for (octave_idx_type j = 0; j < nc; j++)
1698 for (octave_idx_type i = 0; i < nr; i++) 1698 for (octave_idx_type i = 0; i < nr; i++)
1699 retval(i,j) = f (x(i,j), alpha(i,j), (scaled ? 2 : 1), ierr(i,j)); 1699 retval(i,j) = f (x(i,j), alpha(i,j), (scaled ? 2 : 1), ierr(i,j));
1700 } 1700 }
1768 octave_idx_type nr = x.length (); 1768 octave_idx_type nr = x.length ();
1769 octave_idx_type nc = alpha.length (); 1769 octave_idx_type nc = alpha.length ();
1770 1770
1771 FloatComplexMatrix retval (nr, nc); 1771 FloatComplexMatrix retval (nr, nc);
1772 1772
1773 ierr.resize (nr, nc); 1773 ierr.resize (dim_vector (nr, nc));
1774 1774
1775 for (octave_idx_type j = 0; j < nc; j++) 1775 for (octave_idx_type j = 0; j < nc; j++)
1776 for (octave_idx_type i = 0; i < nr; i++) 1776 for (octave_idx_type i = 0; i < nr; i++)
1777 retval(i,j) = f (x(i), alpha(j), (scaled ? 2 : 1), ierr(i,j)); 1777 retval(i,j) = f (x(i), alpha(j), (scaled ? 2 : 1), ierr(i,j));
1778 1778
1941 octave_idx_type nr = z.rows (); 1941 octave_idx_type nr = z.rows ();
1942 octave_idx_type nc = z.cols (); 1942 octave_idx_type nc = z.cols ();
1943 1943
1944 ComplexMatrix retval (nr, nc); 1944 ComplexMatrix retval (nr, nc);
1945 1945
1946 ierr.resize (nr, nc); 1946 ierr.resize (dim_vector (nr, nc));
1947 1947
1948 for (octave_idx_type j = 0; j < nc; j++) 1948 for (octave_idx_type j = 0; j < nc; j++)
1949 for (octave_idx_type i = 0; i < nr; i++) 1949 for (octave_idx_type i = 0; i < nr; i++)
1950 retval(i,j) = airy (z(i,j), deriv, scaled, ierr(i,j)); 1950 retval(i,j) = airy (z(i,j), deriv, scaled, ierr(i,j));
1951 1951
1958 octave_idx_type nr = z.rows (); 1958 octave_idx_type nr = z.rows ();
1959 octave_idx_type nc = z.cols (); 1959 octave_idx_type nc = z.cols ();
1960 1960
1961 ComplexMatrix retval (nr, nc); 1961 ComplexMatrix retval (nr, nc);
1962 1962
1963 ierr.resize (nr, nc); 1963 ierr.resize (dim_vector (nr, nc));
1964 1964
1965 for (octave_idx_type j = 0; j < nc; j++) 1965 for (octave_idx_type j = 0; j < nc; j++)
1966 for (octave_idx_type i = 0; i < nr; i++) 1966 for (octave_idx_type i = 0; i < nr; i++)
1967 retval(i,j) = biry (z(i,j), deriv, scaled, ierr(i,j)); 1967 retval(i,j) = biry (z(i,j), deriv, scaled, ierr(i,j));
1968 1968
2071 octave_idx_type nr = z.rows (); 2071 octave_idx_type nr = z.rows ();
2072 octave_idx_type nc = z.cols (); 2072 octave_idx_type nc = z.cols ();
2073 2073
2074 FloatComplexMatrix retval (nr, nc); 2074 FloatComplexMatrix retval (nr, nc);
2075 2075
2076 ierr.resize (nr, nc); 2076 ierr.resize (dim_vector (nr, nc));
2077 2077
2078 for (octave_idx_type j = 0; j < nc; j++) 2078 for (octave_idx_type j = 0; j < nc; j++)
2079 for (octave_idx_type i = 0; i < nr; i++) 2079 for (octave_idx_type i = 0; i < nr; i++)
2080 retval(i,j) = airy (z(i,j), deriv, scaled, ierr(i,j)); 2080 retval(i,j) = airy (z(i,j), deriv, scaled, ierr(i,j));
2081 2081
2088 octave_idx_type nr = z.rows (); 2088 octave_idx_type nr = z.rows ();
2089 octave_idx_type nc = z.cols (); 2089 octave_idx_type nc = z.cols ();
2090 2090
2091 FloatComplexMatrix retval (nr, nc); 2091 FloatComplexMatrix retval (nr, nc);
2092 2092
2093 ierr.resize (nr, nc); 2093 ierr.resize (dim_vector (nr, nc));
2094 2094
2095 for (octave_idx_type j = 0; j < nc; j++) 2095 for (octave_idx_type j = 0; j < nc; j++)
2096 for (octave_idx_type i = 0; i < nr; i++) 2096 for (octave_idx_type i = 0; i < nr; i++)
2097 retval(i,j) = biry (z(i,j), deriv, scaled, ierr(i,j)); 2097 retval(i,j) = biry (z(i,j), deriv, scaled, ierr(i,j));
2098 2098