Mercurial > hg > octave-lyh
comparison liboctave/Array.cc @ 4796:962457f25a6d
[project @ 2004-02-23 15:35:00 by jwe]
author | jwe |
---|---|
date | Mon, 23 Feb 2004 15:35:00 +0000 |
parents | fc316bde0053 |
children | d3bd9c04147f |
comparison
equal
deleted
inserted
replaced
4795:0bae5ef79e66 | 4796:962457f25a6d |
---|---|
889 | 889 |
890 rep = new typename Array<T>::ArrayRep (len); | 890 rep = new typename Array<T>::ArrayRep (len); |
891 | 891 |
892 dim_vector dv_old = dimensions; | 892 dim_vector dv_old = dimensions; |
893 | 893 |
894 if (n > dv_old.length ()) | 894 int dv_old_orig_len = dv_old.length (); |
895 | |
896 if (n > dv_old_orig_len) | |
895 { | 897 { |
896 dv_old.resize (n); | 898 dv_old.resize (n); |
897 | 899 |
898 for (int i = dv_old.length (); i < n; i++) | 900 for (int i = dv_old_orig_len; i < n; i++) |
899 dv_old.elem (i) = 1; | 901 dv_old.elem (i) = 1; |
900 } | 902 } |
901 | 903 |
902 dimensions = dv; | 904 dimensions = dv; |
903 | 905 |
2965 } | 2967 } |
2966 else | 2968 else |
2967 final_lhs_dims = new_dims; | 2969 final_lhs_dims = new_dims; |
2968 | 2970 |
2969 lhs.resize_and_fill (new_dims, rfv); | 2971 lhs.resize_and_fill (new_dims, rfv); |
2972 | |
2970 lhs_dims = lhs.dims (); | 2973 lhs_dims = lhs.dims (); |
2974 | |
2971 lhs_dims_len = lhs_dims.length (); | 2975 lhs_dims_len = lhs_dims.length (); |
2972 | 2976 |
2973 frozen_len = freeze (idx, lhs_dims, true); | 2977 frozen_len = freeze (idx, lhs_dims, true); |
2974 | 2978 |
2975 if (rhs_is_scalar) | 2979 if (rhs_is_scalar) |