Mercurial > hg > octave-lojdl
changeset 3588:48834d424048
[project @ 2000-02-08 08:50:03 by jwe]
author | jwe |
---|---|
date | Tue, 08 Feb 2000 08:50:05 +0000 |
parents | b11f9c33558f |
children | 4ade6278d401 |
files | liboctave/CColVector.cc liboctave/CColVector.h liboctave/CRowVector.cc liboctave/CRowVector.h liboctave/ChangeLog src/version.h |
diffstat | 6 files changed, 6 insertions(+), 353 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CColVector.cc +++ b/liboctave/CColVector.cc @@ -314,160 +314,6 @@ return retval; } -// column vector by column vector -> column vector operations - -ComplexColumnVector -operator + (const ComplexColumnVector& v, const ColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator +", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (add (v.data (), a.data (), len), len); -} - -ComplexColumnVector -operator - (const ComplexColumnVector& v, const ColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator -", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (subtract (v.data (), a.data (), len), len); -} - -ComplexColumnVector -operator + (const ColumnVector& v, const ComplexColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator +", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (add (v.data (), a.data (), len), len); -} - -ComplexColumnVector -operator - (const ColumnVector& v, const ComplexColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator -", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (subtract (v.data (), a.data (), len), len); -} - -ComplexColumnVector -product (const ComplexColumnVector& v, const ColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("product", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (multiply (v.data (), a.data (), len), len); -} - -ComplexColumnVector -quotient (const ComplexColumnVector& v, const ColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("quotient", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (divide (v.data (), a.data (), len), len); -} - -ComplexColumnVector -product (const ColumnVector& v, const ComplexColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("product", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (multiply (v.data (), a.data (), len), len); -} - -ComplexColumnVector -quotient (const ColumnVector& v, const ComplexColumnVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("quotient", len, a_len); - return ComplexColumnVector (); - } - - if (len == 0) - return ComplexColumnVector (0); - - return ComplexColumnVector (divide (v.data (), a.data (), len), len); -} - // matrix by column vector -> column vector operations ComplexColumnVector
--- a/liboctave/CColVector.h +++ b/liboctave/CColVector.h @@ -96,28 +96,6 @@ friend ComplexColumnVector operator * (const ComplexMatrix& a, const ComplexColumnVector& b); - // column vector by column vector -> column vector operations - - friend ComplexColumnVector operator + (const ComplexColumnVector& a, - const ColumnVector& b); - friend ComplexColumnVector operator - (const ComplexColumnVector& a, - const ColumnVector& b); - - friend ComplexColumnVector operator + (const ColumnVector& a, - const ComplexColumnVector& b); - friend ComplexColumnVector operator - (const ColumnVector& a, - const ComplexColumnVector& b); - - friend ComplexColumnVector product (const ComplexColumnVector& a, - const ColumnVector& b); - friend ComplexColumnVector quotient (const ComplexColumnVector& a, - const ColumnVector& b); - - friend ComplexColumnVector product (const ColumnVector& a, - const ComplexColumnVector& b); - friend ComplexColumnVector quotient (const ColumnVector& a, - const ComplexColumnVector& b); - // matrix by column vector -> column vector operations friend ComplexColumnVector operator * (const Matrix& a,
--- a/liboctave/CRowVector.cc +++ b/liboctave/CRowVector.cc @@ -319,160 +319,6 @@ return tmp * a; } -// row vector by row vector -> row vector operations - -ComplexRowVector -operator + (const ComplexRowVector& v, const RowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator +", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (add (v.data (), a.data (), len), len); -} - -ComplexRowVector -operator - (const ComplexRowVector& v, const RowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator -", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (subtract (v.data (), a.data (), len), len); -} - -ComplexRowVector -operator + (const RowVector& v, const ComplexRowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator +", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (add (v.data (), a.data (), len), len); -} - -ComplexRowVector -operator - (const RowVector& v, const ComplexRowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("operator -", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (subtract (v.data (), a.data (), len), len); -} - -ComplexRowVector -product (const ComplexRowVector& v, const RowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("product", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (multiply (v.data (), a.data (), len), len); -} - -ComplexRowVector -quotient (const ComplexRowVector& v, const RowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("quotient", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (divide (v.data (), a.data (), len), len); -} - -ComplexRowVector -product (const RowVector& v, const ComplexRowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("product", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (multiply (v.data (), a.data (), len), len); -} - -ComplexRowVector -quotient (const RowVector& v, const ComplexRowVector& a) -{ - int len = v.length (); - - int a_len = a.length (); - - if (len != a_len) - { - gripe_nonconformant ("quotient", len, a_len); - return ComplexRowVector (); - } - - if (len == 0) - return ComplexRowVector (0); - - return ComplexRowVector (divide (v.data (), a.data (), len), len); -} - // other operations ComplexRowVector
--- a/liboctave/CRowVector.h +++ b/liboctave/CRowVector.h @@ -94,28 +94,6 @@ friend ComplexRowVector operator * (const RowVector& a, const ComplexMatrix& b); - // row vector by row vector -> row vector operations - - friend ComplexRowVector operator + (const ComplexRowVector& a, - const RowVector& b); - friend ComplexRowVector operator - (const ComplexRowVector& a, - const RowVector& b); - - friend ComplexRowVector operator + (const RowVector& a, - const ComplexRowVector& b); - friend ComplexRowVector operator - (const RowVector& a, - const ComplexRowVector& b); - - friend ComplexRowVector product (const ComplexRowVector& a, - const RowVector& b); - friend ComplexRowVector quotient (const ComplexRowVector& a, - const RowVector& b); - - friend ComplexRowVector product (const RowVector& a, - const ComplexRowVector& b); - friend ComplexRowVector quotient (const RowVector& a, - const ComplexRowVector& b); - // other operations ComplexRowVector map (c_c_Mapper f) const;
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2000-02-08 John W. Eaton <jwe@bevo.che.wisc.edu> + + * CRowVector.cc, CRowVector.h, CColVector.cc, CColVector.h: + Delete declarations and definitions of mixed-type vector-vector ops. + 2000-02-07 John W. Eaton <jwe@bevo.che.wisc.edu> * CMatrix.h, CMatrix.cc: Add lssolve methods for real-valued RHS
--- a/src/version.h +++ b/src/version.h @@ -45,7 +45,7 @@ ***\n\ *** If you want a stable, well-tested version of Octave, you should be\n\ *** using one of the stable releases (when this development release\n\ -*** was made, the latest stable version was 2.0.15)." +*** was made, the latest stable version was 2.0.16)." #endif