Mercurial > hg > octave-lyh
changeset 1650:23aa282707e8
[project @ 1995-12-20 06:53:12 by jwe]
| author | jwe |
|---|---|
| date | Wed, 20 Dec 1995 06:55:46 +0000 |
| parents | 643b55bb57dd |
| children | e846e361a265 |
| files | liboctave/Array-C.cc liboctave/CColVector.cc liboctave/CDiagMatrix.cc liboctave/CMatrix.cc liboctave/CMatrix.h liboctave/CRowVector.cc liboctave/CmplxDET.cc liboctave/CmplxDET.h liboctave/MArray-C.cc liboctave/Makefile.in liboctave/dColVector.cc liboctave/dDiagMatrix.cc liboctave/dMatrix.cc liboctave/dRowVector.cc liboctave/idx-vector.cc liboctave/mx-inlines.cc |
| diffstat | 16 files changed, 34 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array-C.cc +++ b/liboctave/Array-C.cc @@ -26,7 +26,7 @@ #include "Array.h" #include "Array.cc" -#include <Complex.h> +#include "oct-cmplx.h" template class ArrayRep<Complex>; template class Array<Complex>;
--- a/liboctave/CColVector.cc +++ b/liboctave/CColVector.cc @@ -31,12 +31,11 @@ #include <iostream.h> -#include <Complex.h> - #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/CDiagMatrix.cc +++ b/liboctave/CDiagMatrix.cc @@ -31,11 +31,10 @@ #include <iostream.h> -#include <Complex.h> - #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Complex Diagonal Matrix class
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -35,14 +35,13 @@ #include <sys/types.h> // XXX FIXME XXX -#include <Complex.h> - #include "CmplxDET.h" #include "CmplxSVD.h" #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/CMatrix.h +++ b/liboctave/CMatrix.h @@ -28,11 +28,10 @@ #pragma interface #endif -#include <Complex.h> - #include "MArray.h" #include "mx-defs.h" +#include "oct-cmplx.h" class ComplexMatrix : public MArray2<Complex> {
--- a/liboctave/CRowVector.cc +++ b/liboctave/CRowVector.cc @@ -31,12 +31,11 @@ #include <iostream.h> -#include <Complex.h> - #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/CmplxDET.cc +++ b/liboctave/CmplxDET.cc @@ -32,9 +32,8 @@ #include <cfloat> #include <cmath> -#include <Complex.h> - #include "CmplxDET.h" +#include "oct-cmplx.h" int ComplexDET::value_will_overflow (void) const
--- a/liboctave/CmplxDET.h +++ b/liboctave/CmplxDET.h @@ -30,7 +30,7 @@ class ostream; -#include <Complex.h> +#include "oct-cmplx.h" class ComplexDET {
--- a/liboctave/MArray-C.cc +++ b/liboctave/MArray-C.cc @@ -26,7 +26,7 @@ #include "MArray.h" #include "MArray.cc" -#include <Complex.h> +#include "oct-cmplx.h" template class MArray<Complex>; template class MArray2<Complex>;
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -31,7 +31,7 @@ LinConst.h LP.h LPsolve.h NLConst.h NLEqn.h NLFunc.h NLP.h \ NPSOL.h ODE.h ODEFunc.h Objective.h QLD.h QP.h QPSOL.h \ Quad.h Range.h base-min.h f77-uscore.h idx-vector.h \ - lo-error.h sun-utils.h \ + lo-error.h oct-cmplx.h sun-utils.h \ $(MATRIX_INC) TEMPLATE_SRC = Array.cc MArray.cc
--- a/liboctave/dColVector.cc +++ b/liboctave/dColVector.cc @@ -31,12 +31,11 @@ #include <iostream.h> -#include <Complex.h> - #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/dDiagMatrix.cc +++ b/liboctave/dDiagMatrix.cc @@ -31,11 +31,10 @@ #include <iostream.h> -#include <Complex.h> - #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Diagonal Matrix class.
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -37,14 +37,13 @@ #include <sys/types.h> // XXX FIXME XXX -#include <Complex.h> - #include "dbleDET.h" #include "dbleSVD.h" #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/dRowVector.cc +++ b/liboctave/dRowVector.cc @@ -31,12 +31,11 @@ #include <iostream.h> -#include <Complex.h> - #include "f77-uscore.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" +#include "oct-cmplx.h" // Fortran functions we call.
--- a/liboctave/idx-vector.cc +++ b/liboctave/idx-vector.cc @@ -89,7 +89,7 @@ colon_equiv = 0; colon = 0; - int len = v.length (); + len = v.length (); orig_nr = len; orig_nc = 1; @@ -302,10 +302,10 @@ assert (num_ones + num_zeros == len); int *new_data = new int [num_ones]; - int count = 0; + int k = 0; for (int i = 0; i < len; i++) if (data[i] == 0) - new_data[count++] = i; + new_data[k++] = i; delete [] data; len = num_ones; @@ -340,40 +340,40 @@ } static inline int -intcmp (int *i, int *j) +intcmp (int *ii, int *jj) { - return (*i - *j); + return (*ii - *jj); } static inline void -sort_data (int *d, int len) +sort_data (int *d, int l) { - qsort ((void *) d, len, sizeof (int), + qsort ((void *) d, l, sizeof (int), (int (*)(const void*, const void*)) intcmp); } static inline int -make_uniq (int *d, int len) +make_uniq (int *d, int l) { int k = 0; - for (int i = 1; i < len; i++) + for (int ii = 1; k < l; ii++) { - if (d[i] != d[k]) + if (d[ii] != d[k]) { k++; - d[k] = d[i]; + d[k] = d[ii]; } } return k+1; } static inline int * -copy_data (const int *d, int len) +copy_data (const int *d, int l) { - int *new_data = new int [len]; + int *new_data = new int [l]; - for (int i = 0; i < len; i++) - new_data[i] = d[i]; + for (int ii = 0; ii < l; ii++) + new_data[ii] = d[ii]; return new_data; } @@ -425,8 +425,8 @@ ostream& IDX_VEC_REP::print (ostream& os) const { - for (int i = 0; i < len; i++) - os << data[i] << "\n"; + for (int ii = 0; ii < len; ii++) + os << data[ii] << "\n"; return os; } @@ -452,8 +452,8 @@ { maybe_convert_one_zero_to_idx (z_len, prefer_zero_one); - int max_val = max (); - int min_val = min (); + max_val = max (); + min_val = min (); if (min_val < 0) {