# HG changeset patch # User jordigh # Date 1329948453 0 # Node ID d84d2fea3c90c60694d9dd5f6074db941d4c0161 # Parent 954f2f00d7829f0d180a598e2fd774cd19e44f8a Re-enable compilation of fixed package diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/doc/Makefile --- a/main/fixed/doc/Makefile Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/doc/Makefile Wed Feb 22 22:07:33 2012 +0000 @@ -5,7 +5,7 @@ MKDOC = ../../../admin/mkdoc MKTEXI = ../../../admin/mktexi MAKEINFO = makeinfo --no-split -TEXI2PDF = texi2ppf --clean +TEXI2PDF = texi2pdf --clean DVIPS = dvips LN_S = ln -s endif diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/Array-f.cc --- a/main/fixed/src/Array-f.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/Array-f.cc Wed Feb 22 22:07:33 2012 +0000 @@ -29,6 +29,30 @@ //#include "fixedMatrix.h" //#include "fixedCMatrix.h" +inline FixedPoint +xmin (const FixedPoint& x, const FixedPoint& y) +{ + return x <= y ? x : y; +} + +inline FixedPoint +xmax (const FixedPoint& x, const FixedPoint& y) +{ + return x >= y ? x : y; +} + +inline FixedPointComplex +xmin (const FixedPointComplex& x, const FixedPointComplex& y) +{ + return x <= y ? x : y; +} + +inline FixedPointComplex +xmax (const FixedPointComplex& x, const FixedPointComplex& y) +{ + return x >= y ? x : y; +} + #include #include #include @@ -50,38 +74,13 @@ (arg (a) > arg (b)))); } -INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API); +INSTANTIATE_ARRAY (FixedPoint, ); template class MArray; -INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API); -template class MArray; - INSTANTIATE_MARRAY_FRIENDS (FixedPoint, ) -INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, ) - -#include -#include -#include -template class Array2; -template class MArray2; -template class Array2; -template class MArray2; - -INSTANTIATE_MARRAY2_FRIENDS (FixedPoint, OCTAVE_FIXED_API) -INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex, OCTAVE_FIXED_API) - -#include -#include -#include -#include - -template class ArrayN; -template class MArrayN; -template class ArrayN; -template class MArrayN; - -INSTANTIATE_MARRAYN_FRIENDS (FixedPoint, ) -INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex, ) +INSTANTIATE_ARRAY (FixedPointComplex, ); +template class MArray; +INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, ) /* ;;; Local Variables: *** diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/Makefile --- a/main/fixed/src/Makefile Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/Makefile Wed Feb 22 22:07:33 2012 +0000 @@ -27,8 +27,8 @@ op-fcs-fs.cc op-fcs-fm.cc op-fcm-fs.cc op-fcm-fm.cc \ op-fcs-fcs.cc op-fcs-fcm.cc op-fcm-fcs.cc op-fcm-fcm.cc \ fixed-var.cc fixed.cc -FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES)) -FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES)) +FIXEDOBJECTS = int/fixed.o $(patsubst %.cc,%.o,$(FIXEDSOURCES)) +FIXEDDEPENDS = int/fixed.d $(patsubst %.cc,%.d,$(FIXEDSOURCES)) TARGETS = $(FIXEDTARGET) OBJECTS = $(FIXEDOBJECTS) @@ -73,45 +73,42 @@ endif $(FIXEDTARGET) : $(DEPENDS) $(FIXEDOBJECTS) - @echo "Linking $@"; \ + @echo "Linking $@"; $(MKOCTFILE) $(ADD_FLAGS) $(MOFLAGS) $(FIXEDOBJECTS) $(EXTRALIBS) -o $@ $(FIXEDVERTARGET) : - @echo "Creating $@"; $(RM) -f $@; \ + @echo "Creating $@"; $(RM) -f $@; echo "#define OCTAVEFIXEDVERSION \"$(OCTAVEFIXEDVERSION)\"" > $@ ifneq (,$(DEPENDS)) sinclude $(DEPENDS) endif -fixed-int.d : int/fixed.cc - @echo "Depending $<"; \ - $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M int/fixed.cc; \ - $(LN_S) $(patsubst %.cc,%.d,$<) $@ +int/fixed.d : int/fixed.cc + @echo "Depending $<"; + $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M int/fixed.cc; fixed-var.d : $(FIXEDVERTARGET) -fixed-int.o : int/fixed.cc fixed-int.d - @echo "Compiling $@ from $<"; \ - $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<; \ - $(RM) -f $@ ; \ - $(LN_S) $(patsubst %.cc,%.o,$<) $@ +int/fixed.o : int/fixed.cc int/fixed.d + @echo "Compiling $@ from $<" + $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c -o $@ $< %.d: %.cc - @echo "Depending $<"; \ + @echo "Depending $<" $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $< %.o:%.cc %.o:%.cc %.d - @echo "Compiling $@"; \ + @echo "Compiling $@" $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $< clean: - @echo "Cleaning..."; \ + @echo "Cleaning..." $(RM) -f $(DELETES) realclean: - @echo "Cleaning..."; \ + @echo "Cleaning..." $(RM) -f $(DELETES) Makeconf config.log config.status dist: diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixed.cc --- a/main/fixed/src/fixed.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixed.cc Wed Feb 22 22:07:33 2012 +0000 @@ -213,7 +213,7 @@ } else { if (args(0).is_complex_type()) { ComplexMatrix a = args(0).complex_matrix_value(); - MArray2 b(a.rows(),a.cols()); + MArray b(dim_vector (a.rows(),a.cols())); for (int j = 0; j < a.cols(); j++) for (int i = 0; i < a.rows(); i++) b(i,j) = (int)real(a(i,j)); @@ -225,7 +225,7 @@ retval = new octave_fixed_complex_matrix (fr, fi); } else { Matrix a = args(0).matrix_value(); - MArray2 b(a.rows(),a.cols()); + MArray b(dim_vector (a.rows(),a.cols())); for (int j = 0; j < a.cols(); j++) for (int i = 0; i < a.rows(); i++) b(i,j) = (int)a(i,j); @@ -237,7 +237,7 @@ if (args(0).is_complex_type() || args(1).is_complex_type() || ((nargin > 2) && args(2).is_complex_type())) { - MArray2 mir, mii, mdr, mdi; + MArray mir, mii, mdr, mdi; ComplexMatrix a, b; if (args(0).is_complex_type()) a = args(0).complex_matrix_value(); @@ -252,8 +252,8 @@ b = b + Complex(0.,1.)*b; } - mir.resize(a.rows(),a.cols()); - mii.resize(a.rows(),a.cols()); + mir.resize(dim_vector (a.rows(),a.cols())); + mii.resize(dim_vector (a.rows(),a.cols())); for (int j = 0; j < a.cols(); j++) for (int i = 0; i < a.rows(); i++) { mir(i,j) = (int) real(a(i,j)); @@ -266,8 +266,8 @@ } } - mdr.resize(b.rows(),b.cols()); - mdi.resize(b.rows(),b.cols()); + mdr.resize(dim_vector (b.rows(),b.cols())); + mdi.resize(dim_vector (b.rows(),b.cols())); for (int j = 0; j < b.cols(); j++) for (int i = 0; i < b.rows(); i++) { mdr(i,j) = (int) real(b(i,j)); @@ -281,12 +281,12 @@ } if ((mir.rows() == 1) && (mir.cols() == 1)) { - mir.resize(mdr.rows(),mdr.cols(),mir(0,0)); - mii.resize(mdr.rows(),mdr.cols(),mii(0,0)); + mir.resize(dim_vector (mdr.rows(),mdr.cols()), mir(0,0)); + mii.resize(dim_vector (mdr.rows(),mdr.cols()), mii(0,0)); } if ((mdr.rows() == 1) && (mdr.cols() == 1)) { - mdr.resize(mir.rows(),mir.cols(),mdr(0,0)); - mdi.resize(mir.rows(),mir.cols(),mdi(0,0)); + mdr.resize(dim_vector (mir.rows(),mir.cols()), mdr(0,0)); + mdi.resize(dim_vector (mir.rows(),mir.cols()), mdi(0,0)); } if ((mir.rows() != mdr.rows()) || (mir.cols() != mdr.cols())) { @@ -326,11 +326,11 @@ } } } else { - MArray2 mis, mds; + MArray mis, mds; Matrix a = args(0).matrix_value(); Matrix b = args(1).matrix_value(); - mis.resize(a.rows(),a.cols()); + mis.resize(dim_vector (a.rows(),a.cols())); for (int j = 0; j < a.cols(); j++) for (int i = 0; i < a.rows(); i++) { mis(i,j) = (int)a(i,j); @@ -339,7 +339,7 @@ return retval; } } - mds.resize(b.rows(),b.cols()); + mds.resize(dim_vector (b.rows(),b.cols())); for (int j=0; j < b.cols(); j++) for (int i=0; i < b.rows(); i++) { mds(i,j) = (int)b(i,j); @@ -350,9 +350,9 @@ } if ((mis.rows() == 1) && (mis.cols() == 1)) - mis.resize(mds.rows(),mds.cols(),mis(0,0)); + mis.resize(dim_vector (mds.rows(),mds.cols()),mis(0,0)); if ((mds.rows() == 1) && (mds.cols() == 1)) - mds.resize(mis.rows(),mis.cols(),mds(0,0)); + mds.resize(dim_vector (mis.rows(),mis.cols()),mds(0,0)); if ((mis.rows() != mds.rows()) || (mis.cols() != mds.cols())) { error("fixed: dimension mismatch in args"); @@ -414,8 +414,8 @@ if (args(0).type_id () == octave_fixed::static_type_id ()) { \ FixedPoint f = ((const octave_fixed&) args(0).get_rep()) \ .fixed_value (); \ - if ((REAL_CAN_RET_CMPLX_UPPER && (f.fixedpoint() > UPPER)) || \ - (REAL_CAN_RET_CMPLX_LOWER && (f.fixedpoint() < LOWER))) \ + if ((REAL_CAN_RET_CMPLX_UPPER && (f > UPPER)) || \ + (REAL_CAN_RET_CMPLX_LOWER && (f < LOWER))) \ retval = new octave_fixed_complex \ (FUNC (FixedPointComplex(f,FixedPoint(f.getintsize(), \ f.getdecsize())))); \ @@ -425,9 +425,9 @@ octave_fixed_matrix::static_type_id ()) { \ FixedMatrix f = ((const octave_fixed_matrix&) args(0).get_rep()) \ .fixed_matrix_value (); \ - if ((REAL_CAN_RET_CMPLX_UPPER && (f.row_max().max().fixedpoint() \ + if ((REAL_CAN_RET_CMPLX_UPPER && (f.row_max().max() \ > UPPER)) || \ - (REAL_CAN_RET_CMPLX_LOWER && (f.row_min().min().fixedpoint() \ + (REAL_CAN_RET_CMPLX_LOWER && (f.row_min().min() \ < LOWER))) { \ retval = new octave_fixed_complex_matrix \ (FUNC (FixedComplexMatrix(f))); \ @@ -955,9 +955,9 @@ int n = nc + k; FixedComplexMatrix r; if (same) - r.resize(n,n,FixedPointComplex(is,ds)); + r.resize(dim_vector (n,n), FixedPointComplex(is,ds)); else - r.resize(n,n); + r.resize(dim_vector (n,n)); for (int i = 0; i < nc; i++) r (i+roff, i+coff) = m (0, i); retval = new octave_fixed_complex_matrix (r); @@ -965,9 +965,9 @@ int n = nr + k; FixedComplexMatrix r; if (same) - r.resize(n,n,FixedPointComplex(is,ds)); + r.resize(dim_vector (n,n), FixedPointComplex(is,ds)); else - r.resize(n,n); + r.resize(dim_vector (n,n)); for (int i = 0; i < nr; i++) r (i+roff, i+coff) = m (i, 0); retval = new octave_fixed_complex_matrix (r); @@ -1024,7 +1024,7 @@ int n = nc + k; FixedMatrix r; if (same) - r.resize(n,n,FixedPoint(is,ds)); + r.resize(n,n, FixedPoint(is,ds)); else r.resize(n,n); for (int i = 0; i < nc; i++) diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCColVector.cc --- a/main/fixed/src/fixedCColVector.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCColVector.cc Wed Feb 22 22:07:33 2012 +0000 @@ -41,7 +41,8 @@ FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds) : MArray (is.length()) + const MArray &ds) + : MArray (dim_vector (is.length(), 1)) { if (length() != ds.length()) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -53,7 +54,8 @@ } FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds) : MArray (is.length()) + const ColumnVector &ds) + : MArray (dim_vector (is.length(), 1)) { if (length() != ds.length()) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -64,9 +66,9 @@ elem (i) = FixedPointComplex((unsigned int)is(i), (unsigned int)ds(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds) + : MArray (dim_vector (is.length(), 1)) { if (length() != ds.length()) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -77,25 +79,26 @@ elem (i) = FixedPointComplex(is(i), ds(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (unsigned int is, - unsigned int ds, const FixedComplexColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (unsigned int is, unsigned int ds, const FixedComplexColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (Complex is, - Complex ds, const FixedComplexColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (Complex is, Complex ds, const FixedComplexColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds, const FixedComplexColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const MArray &is, const MArray &ds, + const FixedComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -107,9 +110,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds, const FixedComplexColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ColumnVector &is, const ColumnVector &ds, + const FixedComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -121,10 +125,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds, - const FixedComplexColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds, + const FixedComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -135,25 +139,25 @@ elem (i) = FixedPointComplex(is(i), ds(i), a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (unsigned int is, - unsigned int ds, const FixedColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (unsigned int is, unsigned int ds, const FixedColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (Complex is, - Complex ds, const FixedColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (Complex is, Complex ds, const FixedColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, FixedPointComplex(a(i))); } -FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds, const FixedColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const MArray &is, const MArray &ds, const FixedColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -165,9 +169,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds, const FixedColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ColumnVector &is, const ColumnVector &ds, + const FixedColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -179,9 +184,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds, - const FixedColumnVector& a) : MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds, + const FixedColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -192,25 +198,25 @@ elem (i) = FixedPointComplex(is(i), ds(i), FixedPointComplex(a(i))); } -FixedComplexColumnVector::FixedComplexColumnVector (unsigned int is, - unsigned int ds, const ComplexColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (unsigned int is, unsigned int ds, const ComplexColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (Complex is, - Complex ds, const ComplexColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (Complex is, Complex ds, const ComplexColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds, const ComplexColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const MArray &is, const MArray &ds, const ComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -222,9 +228,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds, const ComplexColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ColumnVector &is, const ColumnVector &ds, + const ComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -236,9 +243,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds, - const ComplexColumnVector& a) : MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds, + const ComplexColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -249,25 +257,25 @@ elem (i) = FixedPointComplex(is(i), ds(i), a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (unsigned int is, - unsigned int ds, const ColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (unsigned int is, unsigned int ds, const ColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (Complex is, - Complex ds, const ColumnVector& a) : - MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (Complex is, Complex ds, const ColumnVector& a) + : MArray (dim_vector (a.length(), 1)) { for (int i = 0; i < length (); i++) elem (i) = FixedPointComplex(is, ds, a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds, const ColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const MArray &is, const MArray &ds, const ColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -279,9 +287,9 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds, const ColumnVector& a) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ColumnVector &is, const ColumnVector &ds, const ColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -293,9 +301,10 @@ a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds, - const ColumnVector& a) : MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds, + const ColumnVector& a) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length())) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -306,9 +315,10 @@ elem (i) = FixedPointComplex(is(i), ds(i), a(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (unsigned int is, - unsigned int ds, const ComplexColumnVector& a, - const ComplexColumnVector& b) : MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (unsigned int is, unsigned int ds, const ComplexColumnVector& a, + const ComplexColumnVector& b) + : MArray (dim_vector (a.length(), 1)) { if (length() != b.length()) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -319,9 +329,10 @@ elem (i) = FixedPointComplex(is, ds, a(i), b(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (Complex is, - Complex ds, const ComplexColumnVector& a, - const ComplexColumnVector& b) : MArray (a.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (Complex is, Complex ds, const ComplexColumnVector& a, + const ComplexColumnVector& b) + : MArray (dim_vector (a.length(), 1)) { if (length() != b.length()) { (*current_liboctave_error_handler) ("vector size mismatch"); @@ -332,9 +343,10 @@ elem (i) = FixedPointComplex(is, ds, a(i), b(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const MArray &is, - const MArray &ds, const ComplexColumnVector& a, - const ComplexColumnVector& b) : MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const MArray &is, const MArray &ds, + const ComplexColumnVector& a, const ComplexColumnVector& b) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length()) || (length() != b.length())) { @@ -347,9 +359,10 @@ a(i), b(i)); } -FixedComplexColumnVector::FixedComplexColumnVector (const ColumnVector &is, - const ColumnVector &ds, const ComplexColumnVector& a, - const ComplexColumnVector& b) : MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ColumnVector &is, const ColumnVector &ds, + const ComplexColumnVector& a, const ComplexColumnVector& b) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length()) || (length() != b.length())) { @@ -362,10 +375,10 @@ a(i), b(i)); } -FixedComplexColumnVector::FixedComplexColumnVector ( - const ComplexColumnVector &is, const ComplexColumnVector &ds, - const ComplexColumnVector& a, const ComplexColumnVector& b) : - MArray (is.length()) +FixedComplexColumnVector::FixedComplexColumnVector + (const ComplexColumnVector &is, const ComplexColumnVector &ds, + const ComplexColumnVector& a, const ComplexColumnVector& b) + : MArray (dim_vector (is.length(), 1)) { if ((length() != ds.length()) || (length() != a.length()) || (length() != b.length())) { @@ -472,7 +485,7 @@ FixedComplexColumnVector FixedComplexColumnVector::incdecsize () { - return chdecsize(1 + getdecsize()); + return chdecsize(Complex (1) + getdecsize()); } FixedComplexColumnVector @@ -491,7 +504,7 @@ FixedComplexColumnVector FixedComplexColumnVector::incintsize () { - return chintsize(1 + getintsize()); + return chintsize(Complex (1) + getintsize()); } // Fixed Point Complex Column Vector class. diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCColVector.h --- a/main/fixed/src/fixedCColVector.h Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCColVector.h Wed Feb 22 22:07:33 2012 +0000 @@ -53,10 +53,10 @@ FixedComplexColumnVector (void) : MArray () { } - explicit FixedComplexColumnVector (int n) : MArray (n) { } + explicit FixedComplexColumnVector (int n) : MArray (dim_vector (n, 1)) { } FixedComplexColumnVector (int n, FixedPointComplex val) : - MArray (n, val) { } + MArray (dim_vector (n, 1), val) { } FixedComplexColumnVector (const MArray &is, const MArray &ds); @@ -244,9 +244,11 @@ friend std::ostream& operator << (std::ostream& os, const FixedComplexColumnVector& a); friend std::istream& operator >> (std::istream& is, FixedComplexColumnVector& a); -private: - - FixedComplexColumnVector (FixedPointComplex *d, int l) : MArray (d, l) { } + void resize (octave_idx_type n, + const FixedPointComplex& rfv = Array::resize_fill_value ()) + { + Array::resize (dim_vector (n, 1), rfv); + } }; diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCMatrix.cc --- a/main/fixed/src/fixedCMatrix.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCMatrix.cc Wed Feb 22 22:07:33 2012 +0000 @@ -46,9 +46,9 @@ // Fixed Point Complex Matrix class. -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds) - : MArray2 (is.rows(), is.cols()) +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds) + : MArray (dim_vector (is.rows(), is.cols())) { if ((rows() != ds.rows()) || (cols() != ds.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -62,7 +62,7 @@ } FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds) - : MArray2 (is.rows(), is.cols()) + : MArray (dim_vector (is.rows(), is.cols())) { if ((rows() != ds.rows()) || (cols() != ds.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -77,7 +77,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds) - : MArray2 (is.rows(), is.cols()) + : MArray (dim_vector (is.rows(), is.cols())) { if ((rows() != ds.rows()) || (cols() != ds.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -91,7 +91,7 @@ FixedComplexMatrix::FixedComplexMatrix (unsigned int is, unsigned int ds, const FixedComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) @@ -100,16 +100,16 @@ FixedComplexMatrix::FixedComplexMatrix (Complex is, Complex ds, const FixedComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) elem (i, j) = FixedPointComplex(is, ds, a.elem (i, j)); } -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds, const FixedComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds, const FixedComplexMatrix& a) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -125,7 +125,7 @@ FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds, const FixedComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -141,7 +141,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds, const FixedComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -156,7 +156,7 @@ FixedComplexMatrix::FixedComplexMatrix (unsigned int is, unsigned int ds, const FixedMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) @@ -165,16 +165,16 @@ FixedComplexMatrix::FixedComplexMatrix (Complex is, Complex ds, const FixedMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) elem (i, j) = FixedPointComplex(is, ds, FixedPointComplex(a.elem (i, j))); } -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds, const FixedMatrix& a) - : MArray2 (a.rows(), a.cols()) +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds, const FixedMatrix& a) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -190,7 +190,7 @@ FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds, const FixedMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -206,7 +206,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds, const FixedMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -221,7 +221,7 @@ FixedComplexMatrix::FixedComplexMatrix (unsigned int is, unsigned int ds, const ComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) @@ -230,16 +230,16 @@ FixedComplexMatrix::FixedComplexMatrix (Complex is, Complex ds, const ComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) elem (i, j) = FixedPointComplex(is, ds, a.elem (i, j)); } -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds, const ComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds, const ComplexMatrix& a) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -255,7 +255,7 @@ FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds, const ComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -271,7 +271,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds, const ComplexMatrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -286,7 +286,7 @@ FixedComplexMatrix::FixedComplexMatrix (unsigned int is, unsigned int ds, const Matrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) @@ -295,16 +295,16 @@ FixedComplexMatrix::FixedComplexMatrix (Complex is, Complex ds, const Matrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { for (int j = 0; j < cols (); j++) for (int i = 0; i < rows (); i++) elem (i, j) = FixedPointComplex(is, ds, a.elem (i, j)); } -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds, const Matrix& a) - : MArray2 (a.rows(), a.cols()) +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds, const Matrix& a) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -320,7 +320,7 @@ FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds, const Matrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -336,7 +336,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds, const Matrix& a) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) || (cols() != ds.cols())) { @@ -352,7 +352,7 @@ FixedComplexMatrix::FixedComplexMatrix (unsigned int is, unsigned int ds, const ComplexMatrix& a, const ComplexMatrix& b) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != b.rows()) || (cols() != b.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -366,7 +366,7 @@ FixedComplexMatrix::FixedComplexMatrix (Complex is, Complex ds, const ComplexMatrix& a, const ComplexMatrix& b) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != b.rows()) || (cols() != b.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -378,10 +378,10 @@ elem (i, j) = FixedPointComplex(is, ds, a.elem (i, j), b.elem(i,j)); } -FixedComplexMatrix::FixedComplexMatrix (const MArray2 &is, - const MArray2 &ds, const ComplexMatrix& a, +FixedComplexMatrix::FixedComplexMatrix (const MArray &is, + const MArray &ds, const ComplexMatrix& a, const ComplexMatrix& b) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != b.rows()) || (cols() != b.cols()) || (rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) @@ -398,7 +398,7 @@ FixedComplexMatrix::FixedComplexMatrix (const Matrix &is, const Matrix &ds, const ComplexMatrix& a, const ComplexMatrix& b) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != b.rows()) || (cols() != b.cols()) || (rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) @@ -416,7 +416,7 @@ FixedComplexMatrix::FixedComplexMatrix (const ComplexMatrix &is, const ComplexMatrix &ds, const ComplexMatrix& a, const ComplexMatrix& b) - : MArray2 (a.rows(), a.cols()) + : MArray (dim_vector (a.rows(), a.cols())) { if ((rows() != b.rows()) || (cols() != b.cols()) || (rows() != is.rows()) || (cols() != is.cols()) || (rows() != ds.rows()) @@ -432,35 +432,35 @@ } FixedComplexMatrix::FixedComplexMatrix (const FixedComplexRowVector& rv) - : MArray2 (1, rv.length (), FixedPointComplex()) + : MArray (dim_vector (1, rv.length ()), FixedPointComplex()) { for (int i = 0; i < rv.length (); i++) elem (0, i) = rv.elem (i); } FixedComplexMatrix::FixedComplexMatrix (const FixedRowVector& rv) - : MArray2 (1, rv.length (), FixedPointComplex()) + : MArray (dim_vector (1, rv.length ()), FixedPointComplex()) { for (int i = 0; i < rv.length (); i++) elem (0, i) = FixedPointComplex(rv.elem (i)); } FixedComplexMatrix::FixedComplexMatrix (const FixedComplexColumnVector& cv) - : MArray2 (cv.length (), 1, FixedPointComplex()) + : MArray (dim_vector (cv.length (), 1), FixedPointComplex()) { for (int i = 0; i < cv.length (); i++) elem (i, 0) = cv.elem (i); } FixedComplexMatrix::FixedComplexMatrix (const FixedColumnVector& cv) - : MArray2 (cv.length (), 1, FixedPointComplex()) + : MArray (dim_vector (cv.length (), 1), FixedPointComplex()) { for (int i = 0; i < cv.length (); i++) elem (i, 0) = FixedPointComplex(cv.elem (i)); } FixedComplexMatrix::FixedComplexMatrix (const FixedMatrix& m) - : MArray2 (m.rows (), m.cols (), FixedPointComplex()) + : MArray (dim_vector (m.rows (), m.cols ()), FixedPointComplex()) { for (int j = 0; j < m.cols (); j++) for (int i = 0; i < m.rows (); i++) @@ -469,7 +469,7 @@ FixedComplexMatrix::FixedComplexMatrix (const FixedMatrix& a, const FixedMatrix& b) - : MArray2 (a.rows (), a.cols (), FixedPointComplex()) + : MArray (dim_vector (a.rows (), a.cols ()), FixedPointComplex()) { if ((rows() != b.rows()) || (cols() != b.cols())) { (*current_liboctave_error_handler) ("matrix size mismatch"); @@ -665,7 +665,7 @@ FixedComplexMatrix& FixedComplexMatrix::insert (const FixedComplexMatrix& a, int r, int c) { - Array2::insert (a, r, c); + Array::insert (a, r, c); return *this; } @@ -1008,7 +1008,7 @@ { int a_len = a.length (); - retval.resize (len, a_len); + retval.resize (dim_vector (len, a_len)); for (int i = 0; i < len; i++) for (int j = 0; j < a_len; j++) @@ -1041,43 +1041,43 @@ boolMatrix FixedComplexMatrix::all (int dim) const { - return do_mx_red_op (*this, dim, mx_inline_all); + return do_mx_red_op (*this, dim, mx_inline_all); } boolMatrix FixedComplexMatrix::any (int dim) const { - return do_mx_red_op (*this, dim, mx_inline_any); + return do_mx_red_op (*this, dim, mx_inline_any); } FixedComplexMatrix FixedComplexMatrix::cumprod (int dim) const { - return do_mx_cum_op (*this, dim, mx_inline_cumprod); + return do_mx_cum_op (*this, dim, mx_inline_cumprod); } FixedComplexMatrix FixedComplexMatrix::cumsum (int dim) const { - return do_mx_cum_op (*this, dim, mx_inline_cumsum); + return do_mx_cum_op (*this, dim, mx_inline_cumsum); } FixedComplexMatrix FixedComplexMatrix::prod (int dim) const { - return do_mx_red_op (*this, dim, mx_inline_prod); + return do_mx_red_op (*this, dim, mx_inline_prod); } FixedComplexMatrix FixedComplexMatrix::sum (int dim) const { - return do_mx_red_op (*this, dim, mx_inline_sum); + return do_mx_red_op (*this, dim, mx_inline_sum); } FixedComplexMatrix FixedComplexMatrix::sumsq (int dim) const { - return do_mx_red_op (*this, dim, mx_inline_sumsq); + return do_mx_red_op (*this, dim, mx_inline_sumsq); } FixedComplexMatrix @@ -1159,7 +1159,7 @@ if (nr > 0 && nc > 0) { result.resize (nr); - index.resize (nr); + index.resize (dim_vector (nr, 1)); for (int i = 0; i < nr; i++) { @@ -1206,7 +1206,7 @@ if (nr > 0 && nc > 0) { result.resize (nr); - index.resize (nr); + index.resize (dim_vector (nr, 1)); for (int i = 0; i < nr; i++) { @@ -1253,7 +1253,7 @@ if (nr > 0 && nc > 0) { result.resize (nc); - index.resize (nc); + index.resize (dim_vector (1, nc)); for (int j = 0; j < nc; j++) { @@ -1300,7 +1300,7 @@ if (nr > 0 && nc > 0) { result.resize (nc); - index.resize (nc); + index.resize (dim_vector (1, nc)); for (int j = 0; j < nc; j++) { @@ -1385,7 +1385,7 @@ if (a_nr == 1 && a_nc == 1) { - retval.resize(b_nr,b_nc); + retval.resize(dim_vector (b_nr,b_nc)); FixedPointComplex ad = a(0,0); for (int j = 0; j < b_nc; j++) for (int i = 0; i < b_nr; i++) @@ -1393,7 +1393,7 @@ } else if (b_nr == 1 && b_nc == 1) { - retval.resize(a_nr,a_nc); + retval.resize(dim_vector (a_nr,a_nc)); FixedPointComplex bd = b(0,0); for (int j = 0; j < a_nc; j++) for (int i = 0; i < a_nr; i++) @@ -1401,7 +1401,7 @@ } else if ((a_nr == b_nr) && (a_nc == b_nc)) { - retval.resize(a_nr,a_nc); + retval.resize(dim_vector (a_nr,a_nc)); for (int j = 0; j < a_nc; j++) for (int i = 0; i < a_nr; i++) retval(i,j) = pow(a(i,j), b(i,j)); @@ -1548,7 +1548,7 @@ FixedComplexMatrix result; if (length () > 0) { - result.resize (nc, nr); + result.resize (dim_vector (nc, nr)); for (int j = 0; j < nc; j++) for (int i = 0; i < nr; i++) result.elem (j, i) = conj (elem (i, j)); @@ -1612,7 +1612,7 @@ gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); else { - retval.resize (a_nr, b_nc, FixedPointComplex()); + retval.resize (dim_vector (a_nr, b_nc), FixedPointComplex()); if (a_nr != 0 && a_nc != 0 && b_nc != 0) { for (int j = 0; j < b_nr; j++) @@ -1773,14 +1773,14 @@ return result; } -MS_CMP_OPS(FixedComplexMatrix, real, FixedPointComplex, real) -MS_BOOL_OPS(FixedComplexMatrix, FixedPointComplex, FixedPointComplex()) +MS_CMP_OPS(FixedComplexMatrix, FixedPointComplex) +MS_BOOL_OPS(FixedComplexMatrix, FixedPointComplex) -SM_CMP_OPS(FixedPointComplex, real, FixedComplexMatrix, real) -SM_BOOL_OPS(FixedPointComplex, FixedComplexMatrix, FixedPointComplex()) +SM_CMP_OPS(FixedPointComplex, FixedComplexMatrix) +SM_BOOL_OPS(FixedPointComplex, FixedComplexMatrix) -MM_CMP_OPS(FixedComplexMatrix, real, FixedComplexMatrix, real) -MM_BOOL_OPS(FixedComplexMatrix, FixedComplexMatrix, FixedPointComplex()) +MM_CMP_OPS(FixedComplexMatrix, FixedComplexMatrix) +MM_BOOL_OPS(FixedComplexMatrix, FixedComplexMatrix) /* ;;; Local Variables: *** diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCMatrix.h --- a/main/fixed/src/fixedCMatrix.h Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCMatrix.h Wed Feb 22 22:07:33 2012 +0000 @@ -26,7 +26,7 @@ #if !defined (octave_FixedCMatrix_h) #define octave_FixedCMatrix_h 1 -#include +#include #include #include @@ -51,20 +51,21 @@ class OCTAVE_FIXED_API -FixedComplexMatrix : public MArray2 +FixedComplexMatrix : public MArray { public: - FixedComplexMatrix (void) : MArray2 () { } + FixedComplexMatrix (void) : MArray () { } - FixedComplexMatrix (const dim_vector& dv) : MArray2 (dv) { } + FixedComplexMatrix (const dim_vector& dv) : MArray (dv) { } - FixedComplexMatrix (int r, int c) : MArray2 (r, c) { } + FixedComplexMatrix (int r, int c) + : MArray (dim_vector (r, c)) { } - FixedComplexMatrix (int r, int c, const FixedPointComplex val) : - MArray2 (r, c, val) { } + FixedComplexMatrix (int r, int c, const FixedPointComplex val) + : MArray (dim_vector (r, c), val) { } - FixedComplexMatrix (const MArray2 &is, const MArray2 &ds); + FixedComplexMatrix (const MArray &is, const MArray &ds); FixedComplexMatrix (const Matrix &is, const Matrix &ds); @@ -75,7 +76,7 @@ FixedComplexMatrix (Complex is, Complex ds, const FixedComplexMatrix& a); - FixedComplexMatrix (const MArray2 &is, const MArray2 &ds, + FixedComplexMatrix (const MArray &is, const MArray &ds, const FixedComplexMatrix& a); FixedComplexMatrix (const Matrix &is, const Matrix &ds, @@ -88,7 +89,7 @@ FixedComplexMatrix (Complex is, Complex ds, const FixedMatrix& a); - FixedComplexMatrix (const MArray2 &is, const MArray2 &ds, + FixedComplexMatrix (const MArray &is, const MArray &ds, const FixedMatrix& a); FixedComplexMatrix (const Matrix &is, const Matrix &ds, @@ -102,7 +103,7 @@ FixedComplexMatrix (Complex is, Complex ds, const ComplexMatrix& a); - FixedComplexMatrix (const MArray2 &is, const MArray2 & ds, + FixedComplexMatrix (const MArray &is, const MArray & ds, const ComplexMatrix& a); FixedComplexMatrix (const Matrix &is, const Matrix & ds, @@ -115,7 +116,7 @@ FixedComplexMatrix (Complex is, Complex ds, const Matrix& a); - FixedComplexMatrix (const MArray2 &is, const MArray2 & ds, + FixedComplexMatrix (const MArray &is, const MArray & ds, const Matrix& a); FixedComplexMatrix (const Matrix &is, const Matrix & ds, const Matrix& a); @@ -129,7 +130,7 @@ FixedComplexMatrix (Complex is, Complex ds, const ComplexMatrix &a, const ComplexMatrix &b); - FixedComplexMatrix (const MArray2 &is, const MArray2 &ds, + FixedComplexMatrix (const MArray &is, const MArray &ds, const ComplexMatrix &a, const ComplexMatrix &b); FixedComplexMatrix (const Matrix &is, const Matrix &ds, @@ -143,10 +144,13 @@ FixedComplexMatrix (const FixedMatrix& a, const FixedMatrix& b); FixedComplexMatrix (const FixedComplexMatrix& a) : - MArray2 (a) { } + MArray (a) { } - FixedComplexMatrix (const MArray2& a) : - MArray2 (a) { } + FixedComplexMatrix (const MArray& a) : + MArray (a) { } + + FixedComplexMatrix (const Array& a) : + MArray (a) { } explicit FixedComplexMatrix (const FixedComplexRowVector& rv); @@ -174,7 +178,7 @@ FixedComplexMatrix& operator = (const FixedComplexMatrix& a) { - MArray2::operator = (a); + MArray::operator = (a); return *this; } @@ -208,7 +212,7 @@ FixedComplexMatrix stack (const FixedComplexColumnVector& a) const; FixedComplexMatrix hermitian (void) const; - FixedComplexMatrix transpose (void) const { return MArray2::transpose (); } + FixedComplexMatrix transpose (void) const { return MArray::transpose (); } // resize is the destructive equivalent for this one @@ -312,11 +316,6 @@ static FixedPointComplex resize_fill_value (void) { return FixedPointComplex(); } - -private: - - FixedComplexMatrix (FixedPointComplex *d, int r, int c) : - MArray2 (d, r, c) { } }; OCTAVE_FIXED_API FixedComplexMatrix operator * (const FixedComplexColumnVector& a, @@ -403,7 +402,7 @@ MM_CMP_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix, ) MM_BOOL_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix, ) -MARRAY_FORWARD_DEFS (MArray2, FixedComplexMatrix, FixedPointComplex) +MARRAY_FORWARD_DEFS (MArray, FixedComplexMatrix, FixedPointComplex) #endif diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCNDArray.cc --- a/main/fixed/src/fixedCNDArray.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCNDArray.cc Wed Feb 22 22:07:33 2012 +0000 @@ -45,9 +45,9 @@ // Fixed Point Complex Matrix class. -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds) - : MArrayN (is.dims()) +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds) + : MArray (is.dims()) { if (dims () != ds.dims ()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -60,7 +60,7 @@ FixedComplexNDArray::FixedComplexNDArray (const NDArray &is, const NDArray &ds) - : MArrayN (is.dims()) + : MArray (is.dims()) { if (dims () != ds.dims ()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -73,7 +73,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds) - : MArrayN (is.dims()) + : MArray (is.dims()) { if (dims () != ds.dims ()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -87,7 +87,7 @@ FixedComplexNDArray::FixedComplexNDArray (unsigned int is, unsigned int ds, const FixedComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); @@ -95,16 +95,16 @@ FixedComplexNDArray::FixedComplexNDArray (Complex is, Complex ds, const FixedComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); } -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds, +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds, const FixedComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -119,7 +119,7 @@ FixedComplexNDArray::FixedComplexNDArray (const NDArray &is, const NDArray &ds, const FixedComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -134,7 +134,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds, const FixedComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -148,7 +148,7 @@ FixedComplexNDArray::FixedComplexNDArray (unsigned int is, unsigned int ds, const FixedNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); @@ -156,16 +156,16 @@ FixedComplexNDArray::FixedComplexNDArray (Complex is, Complex ds, const FixedNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, FixedPointComplex(a.elem (i))); } -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds, +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds, const FixedNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -180,7 +180,7 @@ FixedComplexNDArray::FixedComplexNDArray (const NDArray &is, const NDArray &ds, const FixedNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -195,7 +195,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds, const FixedNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -209,7 +209,7 @@ FixedComplexNDArray::FixedComplexNDArray (unsigned int is, unsigned int ds, const ComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); @@ -217,16 +217,16 @@ FixedComplexNDArray::FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); } -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds, +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds, const ComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -241,7 +241,7 @@ FixedComplexNDArray::FixedComplexNDArray (const NDArray &is, const NDArray &ds, const ComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -256,7 +256,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds, const ComplexNDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -270,7 +270,7 @@ FixedComplexNDArray::FixedComplexNDArray (unsigned int is, unsigned int ds, const NDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); @@ -278,16 +278,16 @@ FixedComplexNDArray::FixedComplexNDArray (Complex is, Complex ds, const NDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(is, ds, a.elem (i)); } -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds, +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds, const NDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -302,7 +302,7 @@ FixedComplexNDArray::FixedComplexNDArray (const NDArray &is, const NDArray &ds, const NDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -317,7 +317,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds, const NDArray& a) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != is.dims()) || (dims() != ds.dims())) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -332,7 +332,7 @@ unsigned int ds, const ComplexNDArray& a, const ComplexNDArray& b) - : MArrayN (a.dims()) + : MArray (a.dims()) { if (dims() != b.dims()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -346,7 +346,7 @@ FixedComplexNDArray::FixedComplexNDArray (Complex is, Complex ds, const ComplexNDArray& a, const ComplexNDArray& b) - : MArrayN (a.dims()) + : MArray (a.dims()) { if (dims() != b.dims()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -357,11 +357,11 @@ elem (i) = FixedPointComplex(is, ds, a.elem (i), b.elem (i)); } -FixedComplexNDArray::FixedComplexNDArray (const MArrayN &is, - const MArrayN &ds, +FixedComplexNDArray::FixedComplexNDArray (const MArray &is, + const MArray &ds, const ComplexNDArray& a, const ComplexNDArray& b) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != b.dims()) || (dims() != is.dims()) || (dims() != ds.dims())) { @@ -377,7 +377,7 @@ const NDArray &ds, const ComplexNDArray& a, const ComplexNDArray& b) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != b.dims()) || (dims() != is.dims()) || (dims() != ds.dims())) { @@ -394,7 +394,7 @@ FixedComplexNDArray::FixedComplexNDArray (const ComplexNDArray &is, const ComplexNDArray &ds, const ComplexNDArray& a, const ComplexNDArray& b) - : MArrayN (a.dims()) + : MArray (a.dims()) { if ((dims() != b.dims()) || (dims() != is.dims()) || (dims() != ds.dims())) { @@ -407,7 +407,7 @@ } FixedComplexNDArray::FixedComplexNDArray (const FixedNDArray& m) - : MArrayN (m.dims (), FixedPointComplex()) + : MArray (m.dims (), FixedPointComplex()) { for (int i = 0; i < nelem (); i++) elem (i) = FixedPointComplex(m.elem (i)); @@ -415,7 +415,7 @@ FixedComplexNDArray::FixedComplexNDArray (const FixedNDArray& a, const FixedNDArray& b) - : MArrayN (a.dims (), FixedPointComplex()) + : MArray (a.dims (), FixedPointComplex()) { if (dims() != b.dims()) { (*current_liboctave_error_handler) ("NDArray size mismatch"); @@ -576,43 +576,43 @@ boolNDArray FixedComplexNDArray::all (octave_idx_type dim) const { - return do_mx_red_op (*this, dim, mx_inline_all); + return do_mx_red_op (*this, dim, mx_inline_all); } boolNDArray FixedComplexNDArray::any (octave_idx_type dim) const { - return do_mx_red_op (*this, dim, mx_inline_any); + return do_mx_red_op (*this, dim, mx_inline_any); } FixedComplexNDArray FixedComplexNDArray::cumprod (octave_idx_type dim) const { - return do_mx_cum_op (*this, dim, mx_inline_cumprod); + return do_mx_cum_op (*this, dim, mx_inline_cumprod); } FixedComplexNDArray FixedComplexNDArray::cumsum (octave_idx_type dim) const { - return do_mx_cum_op (*this, dim, mx_inline_cumsum); + return do_mx_cum_op (*this, dim, mx_inline_cumsum); } FixedComplexNDArray FixedComplexNDArray::prod (octave_idx_type dim) const { - return do_mx_red_op (*this, dim, mx_inline_prod); + return do_mx_red_op (*this, dim, mx_inline_prod); } FixedComplexNDArray FixedComplexNDArray::sum (octave_idx_type dim) const { - return do_mx_red_op (*this, dim, mx_inline_sum); + return do_mx_red_op (*this, dim, mx_inline_sum); } FixedComplexNDArray FixedComplexNDArray::sumsq (octave_idx_type dim) const { - return do_mx_red_op (*this, dim, mx_inline_sumsq); + return do_mx_red_op (*this, dim, mx_inline_sumsq); } FixedNDArray @@ -708,23 +708,23 @@ FixedComplexNDArray elem_pow (const FixedComplexNDArray &a, const FixedPointComplex &b) { - return elem_pow (a, FixedComplexNDArray(dim_vector(1), b)); + return elem_pow (a, FixedComplexNDArray(dim_vector (1, 1), b)); } FixedComplexNDArray elem_pow (const FixedPointComplex &a, const FixedComplexNDArray &b) { - return elem_pow (FixedComplexNDArray(dim_vector(1), a), b); + return elem_pow (FixedComplexNDArray(dim_vector (1, 1), a), b); } FixedComplexNDArray FixedComplexNDArray::max (octave_idx_type dim) const { - ArrayN dummy_idx; + Array dummy_idx; return max (dummy_idx, dim); } FixedComplexNDArray -FixedComplexNDArray::max (ArrayN& idx_arg, octave_idx_type dim) const +FixedComplexNDArray::max (Array& idx_arg, octave_idx_type dim) const { dim_vector dv = dims (); dim_vector dr = dims (); @@ -786,12 +786,12 @@ FixedComplexNDArray FixedComplexNDArray::min (octave_idx_type dim) const { - ArrayN dummy_idx; + Array dummy_idx; return min (dummy_idx, dim); } FixedComplexNDArray -FixedComplexNDArray::min (ArrayN& idx_arg, octave_idx_type dim) const +FixedComplexNDArray::min (Array& idx_arg, octave_idx_type dim) const { dim_vector dv = dims (); dim_vector dr = dims (); @@ -860,13 +860,13 @@ switch (nd) { case 1: - retval = FixedComplexMatrix (Array2 - (*this, dimensions(0), 1)); + retval = FixedComplexMatrix (Array + (*this, dim_vector (dimensions(0), 1))); break; case 2: - retval = FixedComplexMatrix (Array2 - (*this, dimensions(0), dimensions(1))); + retval = FixedComplexMatrix (Array + (*this, dim_vector (dimensions(0), dimensions(1)))); break; default: @@ -1094,14 +1094,14 @@ return result; } -NDS_CMP_OPS(FixedComplexNDArray, real, FixedPointComplex, real) -NDS_BOOL_OPS(FixedComplexNDArray, FixedPointComplex, FixedPointComplex()) +NDS_CMP_OPS(FixedComplexNDArray, FixedPointComplex) +NDS_BOOL_OPS(FixedComplexNDArray, FixedPointComplex) -SND_CMP_OPS(FixedPointComplex, real, FixedComplexNDArray, real) -SND_BOOL_OPS(FixedPointComplex, FixedComplexNDArray, FixedPointComplex()) +SND_CMP_OPS(FixedPointComplex, FixedComplexNDArray) +SND_BOOL_OPS(FixedPointComplex, FixedComplexNDArray) -NDND_CMP_OPS(FixedComplexNDArray, real, FixedComplexNDArray, real) -NDND_BOOL_OPS(FixedComplexNDArray, FixedComplexNDArray, FixedPointComplex()) +NDND_CMP_OPS(FixedComplexNDArray, FixedComplexNDArray) +NDND_BOOL_OPS(FixedComplexNDArray, FixedComplexNDArray) /* ;;; Local Variables: *** diff -r 954f2f00d782 -r d84d2fea3c90 main/fixed/src/fixedCNDArray.h --- a/main/fixed/src/fixedCNDArray.h Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/fixedCNDArray.h Wed Feb 22 22:07:33 2012 +0000 @@ -26,7 +26,7 @@ #if !defined (octave_FixedCNDArray_h) #define octave_FixedCNDArray_h 1 -#include +#include #include #include @@ -45,19 +45,19 @@ #include "fixedNDArray.h" class -FixedComplexNDArray : public MArrayN +FixedComplexNDArray : public MArray { public: - FixedComplexNDArray (void) : MArrayN () { } + FixedComplexNDArray (void) : MArray () { } FixedComplexNDArray (const dim_vector& dv) - : MArrayN (dv) { } + : MArray (dv) { } FixedComplexNDArray (const dim_vector& dv, const FixedPointComplex val) : - MArrayN (dv, val) { } + MArray (dv, val) { } - FixedComplexNDArray (const MArrayN &is, const MArrayN