Mercurial > forge
changeset 2394:1728eb2120ef octave-forge
First cut at reworking fixed toolbox for package manager. Probably non-working
line wrap: on
line diff
--- a/main/fixed/src/Array-f.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/Array-f.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <octave/config.h> #include "int/fixed.h" #include "fixedComplex.h" @@ -59,9 +55,6 @@ INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex) #include <octave/Array2.h> -#ifndef HAVE_ND_ARRAYS -#include <octave/Array2.cc> -#endif #include <octave/MArray2.h> #include <octave/MArray2.cc> @@ -70,24 +63,9 @@ template class Array2<FixedPointComplex>; template class MArray2<FixedPointComplex>; -#ifndef HAVE_ND_ARRAYS -template int assign (Array2<FixedPoint>&, const Array2<FixedPoint>&); -template int assign (Array2<FixedPointComplex>&, const Array2<FixedPoint>&); -template int assign (Array2<FixedPointComplex>&, - const Array2<FixedPointComplex>&); - -template int assign (Array2<FixedPoint>&, const Array2<FixedPoint>&, - const FixedPoint&); -template int assign (Array2<FixedPointComplex>&, const Array2<FixedPoint>&, - const FixedPointComplex&); -template int assign (Array2<FixedPointComplex>&, - const Array2<FixedPointComplex>&, const FixedPointComplex&); -#endif - INSTANTIATE_MARRAY2_FRIENDS (FixedPoint) INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex) -#ifdef HAVE_ND_ARRAYS #include <octave/ArrayN.h> #include <octave/ArrayN.cc> #include <octave/MArrayN.h> @@ -100,7 +78,6 @@ INSTANTIATE_MARRAYN_FRIENDS (FixedPoint) INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex) -#endif /* ;;; Local Variables: ***
--- a/main/fixed/src/Makeconf.add Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/Makeconf.add Tue Aug 22 20:15:42 2006 +0000 @@ -1,4 +1,1 @@ - -HAVE_RESIZE_AND_FILL = @HAVE_RESIZE_AND_FILL@ -MX_ND_RED_NUM = @MX_ND_RED_NUM@ OCTAVEFIXEDVERSION = @OCTAVEFIXEDVERSION@
--- a/main/fixed/src/Makefile Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/Makefile Tue Aug 22 20:15:42 2006 +0000 @@ -33,7 +33,6 @@ op-fs-fcs.cc op-fs-fcm.cc op-fm-fcs.cc op-fm-fcm.cc \ 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 \ - op-fil-fs.cc op-fil-fm.cc op-fil-fcs.cc op-fil-fcm.cc \ fixed-var.cc fixed.cc FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES)) FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES)) @@ -53,7 +52,6 @@ op-fs-fcs.cc op-fs-fcm.cc op-fm-fcs.cc op-fm-fcm.cc \ 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 \ - op-fil-fs.cc op-fil-fm.cc op-fil-fcs.cc op-fil-fcm.cc \ fixed-var.cc FIXEDLIBOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDLIBSOURCES)) FIXEDLIBDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDLIBSOURCES))
--- a/main/fixed/src/configure.add Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/configure.add Tue Aug 22 20:15:42 2006 +0000 @@ -1,72 +1,8 @@ if test -e main/fixed/NOINSTALL ; then - dnl Not installing, do nothing STATUS=noinstall - else - - dnl Test for resize_and_fill function - TRY_MKOCTFILE([resize and fill function],[ -#include <octave/Array.h> -int test(void) { Array<int> t; t.resize_and_fill(1, 0); return 0;} - ],[HAVE_RESIZE_AND_FILL="-DHAVE_RESIZE_AND_FILL"],) - AC_SUBST(HAVE_RESIZE_AND_FILL) - - dnl Check for the number of arguments to MX_ND_REDUCTION - dnl this changed between 2.1.57 and 2.158 - TRY_MKOCTFILE([for 6 argument MX_ND_REDUCTION],[ -#include <octave/oct.h> -#include <octave/ops.h> -#include <octave/mx-inlines.cc> -class testclass : public MArrayN<double> -{ - public: - testclass (void) : MArrayN<double> () { } - testclass (const Matrix& a) : MArrayN<double> (a) { } - testclass testfun (int dim) { - MX_ND_REDUCTION (acc += elem (iter_idx), - retval.elem(iter_idx) = acc, 0, - double acc = 0, testclass, double); - } - static void increment_index (Array<int>& ra_idx, - const dim_vector& dimensions, - int start_dimension = 0) { - ::increment_index (ra_idx, dimensions, start_dimension); - } -}; -int main(void) { - testclass a ( Matrix (1,1,1)); - testclass b = a.testfun(0); -} - ],[MX_ND_RED_NUM="-DMX_ND_RED_NUM=6"], - [TRY_MKOCTFILE([for 5 argument MX_ND_REDUCTION],[ -#include <octave/oct.h> -#include <octave/ops.h> -#include <octave/mx-inlines.cc> -class testclass : public MArrayN<double> -{ - public: - testclass (void) : MArrayN<double> () { } - testclass (const Matrix& a) : MArrayN<double> (a) { } - testclass testfun (int dim) { - MX_ND_REDUCTION (acc += elem (iter_idx), - retval.elem(iter_idx) = acc, 0, - double acc = 0, testclass); - } - static void increment_index (Array<int>& ra_idx, - const dim_vector& dimensions, - int start_dimension = 0) { - ::increment_index (ra_idx, dimensions, start_dimension); - } -}; -int main(void) { - testclass a ( Matrix (1,1,1)); - testclass b = a.testfun(0); -} - ],[MX_ND_RED_NUM="-DMX_ND_RED_NUM=5"],[MX_ND_RED_NUM="-DMX_ND_RED_NUM=3"])]) - AC_SUBST(MX_ND_RED_NUM) - dnl version of the fixed point code OCTAVEFIXEDVERSION="0.7.0" AC_SUBST(OCTAVEFIXEDVERSION)
--- a/main/fixed/src/configure.base Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/configure.base Tue Aug 22 20:15:42 2006 +0000 @@ -229,34 +229,6 @@ [int F77_FUNC (hello, HELLO) (const int &n);],, [MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"]) -dnl -dnl Check if octave still uses SLList.h -dnl -TRY_MKOCTFILE([for SLList.h],[#include <octave/SLList.h>], -[MKOCTFILE="$MKOCTFILE -DHAVE_SLLIST_H"],) - -dnl -dnl Check if octave has lo_ieee_nan_value -dnl -TRY_MKOCTFILE([for lo_ieee_nan_value], -[ #include <octave/lo-ieee.h> -int test(void) { lo_ieee_nan_value(); }],, -[MKOCTFILE="$MKOCTFILE -DUSE_OCTAVE_NAN"]) - -dnl -dnl Check if octave is needs octave_idx_type -dnl -TRY_MKOCTFILE([for octave_idx_type], -[#include <octave/oct-types.h> -octave_idx_type test(void) { octave_idx_type idx = 1; return idx; }],, -[MKOCTFILE="$MKOCTFILE -Doctave_idx_type=int"]) - -dnl -dnl Check if octave uses quit.h -dnl -TRY_MKOCTFILE([for quit.h],[#include <octave/quit.h>],, -[MKOCTFILE="$MKOCTFILE -DNEED_OCTAVE_QUIT"]) - dnl ********************************************************** dnl Evaluate an expression in octave @@ -326,94 +298,6 @@ ;; esac -dnl Things needed to link to X11 programs -dnl defines X_CFLAGS, X_LIBS -AC_SUBST(DEFHAVE_X) -AC_SUBST(X_LIBS) -AC_SUBST(X_CFLAGS) -AC_PATH_XTRA -if test "$no_x" = yes ; then - DEFHAVE_X= - XSTATUS="no (plot/g{input,text,zoom,rab} will not work)" -else - DEFHAVE_X="HAVE_X=1" - X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - XSTATUS="yes" -fi - -OCTAVE_CHECK_EXIST(autoload,[ - HAVE_AUTOLOAD="yes" - OCTLINK=.octlink - MKOCTLINK=$TOPDIR/admin/octlink.sh -],[ - HAVE_AUTOLOAD="no" - OCTLINK=.oct - MKOCTLINK=$LN_S -]) -AC_SUBST(HAVE_AUTOLOAD) -AC_SUBST(OCTLINK) -AC_SUBST(MKOCTLINK) - -OCTAVE_CHECK_EXIST(do_fortran_indexing, - [HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"],) -AC_SUBST(HAVE_DO_FORTRAN_INDEXING) - -OCTAVE_CHECK_EXIST(propagate_empty_matrices, - [PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"],) -AC_SUBST(HAVE_PROPAGATE_EMPTY_MATRICES) - -OCTAVE_CHECK_EXIST(ok_to_lose_imaginary_part, - [HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"],) -AC_SUBST(HAVE_OK_TO_LOSE_IMAGINARY_PART) - -dnl Test for N-dimensional Arrays -TRY_MKOCTFILE([for N-dim arrays], -[#include <octave/dim-vector.h>], -[HAVE_ND_ARRAYS="-DHAVE_ND_ARRAYS"],) -AC_SUBST(HAVE_ND_ARRAYS) - -OCTAVE_CHECK_EXIST(class,[TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"],) -AC_SUBST(TYPEID_HAS_CLASS) - -dnl Test for load/save functions in class -TRY_MKOCTFILE([for load/save functions in class], -[#include <octave/ov-scalar.h> -int main (void) { octave_scalar a; a.load_ascii(std::cin); }], -[CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],) -AC_SUBST(CLASS_HAS_LOAD_SAVE) - -TRY_MKOCTFILE([for Octave_map indexing], -[#include <octave/oct-map.h> -int main(void) { Octave_map a; a[["key"]]; }], -[HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],) -AC_SUBST(HAVE_OCTAVE_MAP_INDEX) - -TRY_MKOCTFILE([for old Octave concatenation], -[#include <octave/dNDArray.h> -int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=concat(a,a,idx); }], -[HAVE_OCTAVE_CONCAT="-DHAVE_OLD_OCTAVE_CONCAT"],) - -TRY_MKOCTFILE([for Octave concatenation], -[#include <octave/dNDArray.h> -int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=a.concat(a,idx); }], -[HAVE_OCTAVE_CONCAT="-DHAVE_OCTAVE_CONCAT"],) -AC_SUBST(HAVE_OCTAVE_CONCAT) - -TRY_MKOCTFILE([for swap_8_bytes], -[#include <sys/types.h> -#include <octave/config.h> -#include <octave/byte-swap.h> -int main(void) {long long a = 1; swap_8_bytes (&a,1);}],, -[HAVE_SWAP_BYTES="-DHAVE_SWAP_BYTES"]) -AC_SUBST(HAVE_SWAP_BYTES) - -TRY_MKOCTFILE([for op_uplus], -[#include <octave/config.h> -#include <octave/ov.h> -int main(void) {int i = octave_value::op_uplus;}], -[HAVE_OCTAVE_UPLUS="-DHAVE_OCTAVE_UPLUS"],) -AC_SUBST(HAVE_OCTAVE_UPLUS) - dnl Test for the makeinfo program AC_CHECK_PROG(MAKEINFO,makeinfo,makeinfo) if [ test -n "$MAKEINFO" ]; then
--- a/main/fixed/src/fixed-conv.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixed-conv.h Tue Aug 22 20:15:42 2006 +0000 @@ -47,7 +47,6 @@ } \ while (0) -#if HAVE_SWAP_BYTES #define LS_DO_READ(TYPE, swap, data, size, len, stream) \ do \ { \ @@ -64,24 +63,6 @@ } \ while (0) -#else -#define LS_DO_READ(TYPE, swap, data, size, len, stream) \ - do \ - { \ - if (len > 0) \ - { \ - TYPE *ptr = new TYPE [len]; \ - stream.read (X_CAST (char *, ptr), size * len); \ - if (swap) \ - swap_ ## size ## _bytes (ptr, len); \ - for (int i = 0; i < len; i++) \ - (data)[i] = ptr[i]; \ - delete [] ptr ; \ - } \ - } \ - while (0) -#endif - #define LS_DO_READ_1(data, len, stream) \ do \ { \
--- a/main/fixed/src/fixed-def.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixed-def.h Tue Aug 22 20:15:42 2006 +0000 @@ -61,17 +61,6 @@ return retval; \ } -#ifdef HAVE_OLD_OCTAVE_CONCAT -#define FIXED_DEFCATOP_FN(name, t1, t2, e1, e2, ret, f) \ - CATOPDECL (name, a1, a2) \ - { \ - CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ - return new octave_ ## ret (f (v1.e1 ## _value (), v2.e2 ## _value (), ra_idx)); \ - } - -#define FIXED_INSTALL_CATOP(t1, t2, f) INSTALL_CATOP(t1, t2, f) - -#elif defined (HAVE_OCTAVE_CONCAT) #define FIXED_DEFCATOP_FN(name, t1, t2, e1, e2, ret, f) \ CATOPDECL (name, a1, a2) \ { \ @@ -80,10 +69,6 @@ } #define FIXED_INSTALL_CATOP(t1, t2, f) INSTALL_CATOP(t1, t2, f) -#else -#define FIXED_DEFCATOP_FN(name, t1, t2, e1, e2, ret, f) -#define FIXED_INSTALL_CATOP(t1, t2, f) -#endif #endif /*
--- a/main/fixed/src/fixed-var.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixed-var.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (fixed_var_h) #define fixed_var_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #if !defined(fixed_var_cc) extern int &Vfixed_point_print_width; extern char &fixed_point_version;
--- a/main/fixed/src/fixed.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixed.cc Tue Aug 22 20:15:42 2006 +0000 @@ -55,11 +55,6 @@ extern void install_fcm_fcs_ops (void); extern void install_fcm_fcm_ops (void); -extern void install_fil_fs_ops (void); -extern void install_fil_fm_ops (void); -extern void install_fil_fcs_ops (void); -extern void install_fil_fcm_ops (void); - static bool fixed_type_loaded = false; void load_fixed_type (void) @@ -89,11 +84,6 @@ install_fcm_fcs_ops (); install_fcm_fcm_ops (); - install_fil_fs_ops (); - install_fil_fm_ops (); - install_fil_fcs_ops (); - install_fil_fcm_ops (); - fixed_type_loaded = true; // Lock constructor function in place, otherwise
--- a/main/fixed/src/fixed.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixed.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (fixed_h) #define fixed_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include "int/fixed.h" #include "fixedComplex.h" #include "fixedRowVector.h"
--- a/main/fixed/src/fixedCColVector.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCColVector.cc Tue Aug 22 20:15:42 2006 +0000 @@ -24,11 +24,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/fixedCColVector.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCColVector.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedCColumnVector_h) #define octave_FixedCColumnVector_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray.h> #include <octave/CColVector.h> #include <octave/dColVector.h>
--- a/main/fixed/src/fixedCMatrix.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCMatrix.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,11 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h> @@ -38,12 +33,7 @@ #include <octave/dMatrix.h> #include <octave/gripes.h> #include <octave/ops.h> - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif #include "fixedColVector.h" #include "fixedRowVector.h" @@ -646,40 +636,6 @@ return false; } -#ifdef HAVE_OLD_OCTAVE_CONCAT -FixedComplexMatrix concat (const FixedComplexMatrix& ra, - const FixedComplexMatrix& rb, - const Array<int>& ra_idx) -{ - FixedComplexMatrix retval (ra); - if (rb.numel() > 0) - retval.insert (rb, ra_idx(0), ra_idx(1)); - return retval; -} - -FixedComplexMatrix concat (const FixedComplexMatrix& ra, - const FixedMatrix& rb, - const Array<int>& ra_idx) -{ - FixedComplexMatrix retval (ra); - FixedComplexMatrix tmp (rb); - if (rb.numel() > 0) - retval.insert (tmp, ra_idx(0), ra_idx(1)); - return retval; -} - -FixedComplexMatrix concat (const FixedMatrix& ra, - const FixedComplexMatrix& rb, - const Array<int>& ra_idx) -{ - FixedComplexMatrix retval (ra); - if (rb.numel() > 0) - retval.insert (rb, ra_idx(0), ra_idx(1)); - return retval; -} -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedComplexMatrix FixedComplexMatrix::concat (const FixedComplexMatrix& rb, const Array<int>& ra_idx) @@ -697,7 +653,6 @@ insert (FixedComplexMatrix (rb), ra_idx(0), ra_idx(1)); return *this; } -#endif FixedComplexMatrix& FixedComplexMatrix::insert (const FixedComplexMatrix& a, int r, int c)
--- a/main/fixed/src/fixedCMatrix.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCMatrix.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedCMatrix_h) #define octave_FixedCMatrix_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray2.h> #include <octave/mx-defs.h> @@ -185,27 +181,11 @@ bool is_hermitian (void) const; bool is_symmetric (void) const; -#ifdef HAVE_OLD_OCTAVE_CONCAT - friend FixedComplexMatrix concat (const FixedComplexMatrix& ra, - const FixedComplexMatrix& rb, - const Array<int>& ra_idx); - - friend FixedComplexMatrix concat (const FixedComplexMatrix& ra, - const FixedMatrix& rb, - const Array<int>& ra_idx); - - friend FixedComplexMatrix concat (const FixedMatrix& ra, - const FixedComplexMatrix& rb, - const Array<int>& ra_idx); -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedComplexMatrix concat (const FixedComplexMatrix& rb, const Array<int>& ra_idx); FixedComplexMatrix concat (const FixedMatrix& rb, const Array<int>& ra_idx); -#endif // destructive insert/delete/reorder operations
--- a/main/fixed/src/fixedCNDArray.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCNDArray.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,12 +23,6 @@ */ -#ifdef HAVE_ND_ARRAYS - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -42,12 +36,7 @@ #include <octave/CNDArray.h> #include <octave/gripes.h> #include <octave/ops.h> - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif #include "fixedCMatrix.h" #include "fixedCNDArray.h" @@ -616,57 +605,24 @@ FixedComplexNDArray::prod (octave_idx_type dim) const { FixedPointComplex one(1, 0, 1, 0); -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc *= elem (iter_idx), retval.elem (iter_idx) = acc, - one, FixedPointComplex acc = one, - FixedComplexNDArray, FixedPointComplex); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc *= elem (iter_idx), retval.elem (iter_idx) = acc, - one, FixedPointComplex acc = one, - FixedComplexNDArray); -#else MX_ND_REDUCTION (retval(result_idx) *= elem (iter_idx), one, FixedComplexNDArray); -#endif - } FixedComplexNDArray FixedComplexNDArray::sum (octave_idx_type dim) const { FixedPointComplex zero; -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc += elem (iter_idx), retval.elem (iter_idx) = acc, - zero, FixedPointComplex acc = zero, - FixedComplexNDArray, FixedPointComplex); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc += elem (iter_idx), retval.elem (iter_idx) = acc, - zero, FixedPointComplex acc = zero, - FixedComplexNDArray); -#else MX_ND_REDUCTION (retval(result_idx) += elem (iter_idx), zero, FixedComplexNDArray); -#endif } FixedComplexNDArray FixedComplexNDArray::sumsq (octave_idx_type dim) const { FixedPointComplex zero; -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc += elem (iter_idx) * conj (elem (iter_idx)), - retval.elem (iter_idx) = acc, zero, - FixedPointComplex acc = zero, - FixedComplexNDArray, FixedPointComplex); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc += elem (iter_idx) * conj (elem (iter_idx)), - retval.elem (iter_idx) = acc, zero, - FixedPointComplex acc = zero, - FixedComplexNDArray); -#else MX_ND_REDUCTION (retval(result_idx) += elem (iter_idx) * conj (elem (iter_idx)), zero, FixedComplexNDArray); -#endif } FixedNDArray @@ -932,41 +888,6 @@ return retval; } -#ifdef HAVE_OCTAVE_CONCAT -FixedComplexNDArray -concat (const FixedComplexNDArray& ra, const FixedComplexNDArray& rb, - const Array<octave_idx_type>& ra_idx) -{ - FixedComplexNDArray retval (ra); - if (ra.numel () > 0) - retval.insert (rb, ra_idx); - return retval; -} - -FixedComplexNDArray -concat (const FixedComplexNDArray& ra, const FixedNDArray& rb, - const Array<octave_idx_type>& ra_idx) -{ - FixedComplexNDArray retval (ra); - if (ra.numel () > 0) { - FixedComplexNDArray tmp (rb); - retval.insert (tmp, ra_idx); - } - return retval; -} - -FixedComplexNDArray -concat (const FixedNDArray& ra, const FixedComplexNDArray& rb, - const Array<octave_idx_type>& ra_idx) -{ - FixedComplexNDArray retval (ra); - if (ra.numel () > 0) - retval.insert (rb, ra_idx); - return retval; -} -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedComplexNDArray FixedComplexNDArray ::concat (const FixedComplexNDArray& rb, const Array<octave_idx_type>& ra_idx) @@ -984,9 +905,7 @@ insert (FixedComplexNDArray (rb), ra_idx); return *this; } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) FixedComplexNDArray& FixedComplexNDArray::insert (const FixedComplexNDArray& a, const Array<octave_idx_type>& ra_idx) @@ -994,33 +913,22 @@ Array<FixedPointComplex>::insert (a, ra_idx); return *this; } -#endif void FixedComplexNDArray::increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, octave_idx_type start_dimension) { -#ifdef HAVE_OCTAVE_CONCAT ::increment_index (ra_idx, dimensions, start_dimension); -#else - error("fixed increment_index not implemented"); -#endif } octave_idx_type FixedComplexNDArray::compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions) { -#ifdef HAVE_OCTAVE_CONCAT return ::compute_index (ra_idx, dimensions); -#else - error("fixed compute_index not implemented"); - return 0; -#endif } - // This contains no information on the array structure !!! std::ostream& operator << (std::ostream& os, const FixedComplexNDArray& a) @@ -1205,8 +1113,6 @@ NDND_CMP_OPS(FixedComplexNDArray, real, FixedComplexNDArray, real) NDND_BOOL_OPS(FixedComplexNDArray, FixedComplexNDArray, FixedPointComplex()) -#endif // HAVE_ND_ARRAYS - /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/main/fixed/src/fixedCNDArray.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCNDArray.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedCNDArray_h) && defined (HAVE_ND_ARRAYS) #define octave_FixedCNDArray_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArrayN.h> #include <octave/dMatrix.h> @@ -182,32 +178,14 @@ boolNDArray all (octave_idx_type dim = -1) const; boolNDArray any (octave_idx_type dim = -1) const; -#ifdef HAVE_OLD_OCTAVE_CONCAT - friend FixedComplexNDArray concat (const FixedComplexNDArray& ra, - const FixedComplexNDArray& rb, - const Array<octave_idx_type>& ra_idx); - - friend FixedComplexNDArray concat (const FixedComplexNDArray& ra, - const FixedNDArray& rb, - const Array<octave_idx_type>& ra_idx); - - friend FixedComplexNDArray concat (const FixedNDArray& ra, - const FixedComplexNDArray& rb, - const Array<octave_idx_type>& ra_idx); -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedComplexNDArray concat (const FixedComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); FixedComplexNDArray concat (const FixedNDArray& rb, const Array<octave_idx_type>& ra_idx); -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) FixedComplexNDArray& insert (const FixedComplexNDArray& a, const Array<octave_idx_type>& ra_idx); -#endif FixedComplexNDArray cumprod (octave_idx_type dim = -1) const; FixedComplexNDArray cumsum (octave_idx_type dim = -1) const;
--- a/main/fixed/src/fixedCRowVector.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCRowVector.cc Tue Aug 22 20:15:42 2006 +0000 @@ -24,11 +24,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/fixedCRowVector.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedCRowVector.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedCRowVector_h) #define octave_FixedCRowVector_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray.h> #include <octave/CRowVector.h> #include <octave/dRowVector.h>
--- a/main/fixed/src/fixedColVector.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedColVector.cc Tue Aug 22 20:15:42 2006 +0000 @@ -24,11 +24,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/fixedColVector.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedColVector.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedColumnVector_h) #define octave_FixedColumnVector_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray.h> #include <octave/dColVector.h> #include <octave/mx-defs.h>
--- a/main/fixed/src/fixedComplex.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedComplex.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (__fixed_complex_h) #define __fixed_complex_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <complex> #include <octave/oct-cmplx.h> #include "int/fixed.h"
--- a/main/fixed/src/fixedMatrix.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedMatrix.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,11 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h> @@ -38,12 +33,7 @@ #include <octave/dMatrix.h> #include <octave/gripes.h> #include <octave/ops.h> - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif #include "fixedColVector.h" #include "fixedRowVector.h" @@ -400,18 +390,6 @@ return false; } -#ifdef HAVE_OLD_OCTAVE_CONCAT -FixedMatrix concat (const FixedMatrix& ra, const FixedMatrix& rb, - const Array<int>& ra_idx) -{ - FixedMatrix retval (ra); - if (rb.numel() > 0) - retval.insert (rb, ra_idx(0), ra_idx(1)); - return retval; -} -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedMatrix FixedMatrix::concat (const FixedMatrix& rb, const Array<int>& ra_idx) { @@ -428,7 +406,6 @@ retval.insert (rb, ra_idx(0), ra_idx(1)); return retval; } -#endif FixedMatrix& FixedMatrix::insert (const FixedMatrix& a, int r, int c)
--- a/main/fixed/src/fixedMatrix.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedMatrix.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedMatrix_h) #define octave_FixedMatrix_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray2.h> #include <octave/mx-defs.h> @@ -129,16 +125,9 @@ bool is_symmetric (void) const; -#ifdef HAVE_OLD_OCTAVE_CONCAT - friend FixedMatrix concat (const FixedMatrix& ra, const FixedMatrix& rb, - const Array<int>& ra_idx); -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedMatrix concat (const FixedMatrix& rb, const Array<int>& ra_idx); FixedComplexMatrix concat (const FixedComplexMatrix& rb, const Array<int>& ra_idx); -#endif // destructive insert/delete/reorder operations
--- a/main/fixed/src/fixedNDArray.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedNDArray.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,12 +23,6 @@ */ -#ifdef HAVE_ND_ARRAYS - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -41,12 +35,7 @@ #include <octave/CNDArray.h> #include <octave/gripes.h> #include <octave/ops.h> - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif #include "fixedMatrix.h" #include "fixedNDArray.h" @@ -399,49 +388,22 @@ FixedNDArray::prod (octave_idx_type dim) const { FixedPoint one(1,0,1,0); -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc *= elem (iter_idx), retval.elem (iter_idx) = acc, - one, FixedPoint acc = one, FixedNDArray, FixedPoint); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc *= elem (iter_idx), retval.elem (iter_idx) = acc, - one, FixedPoint acc = one, FixedNDArray); -#else MX_ND_REDUCTION (retval(result_idx) *= elem (iter_idx), one, FixedNDArray); -#endif - } FixedNDArray FixedNDArray::sum (octave_idx_type dim) const { FixedPoint zero; -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc += elem (iter_idx), retval.elem (iter_idx) = acc, - zero, FixedPoint acc = zero, FixedNDArray, FixedPoint); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc += elem (iter_idx), retval.elem (iter_idx) = acc, - zero, FixedPoint acc = zero, FixedNDArray); -#else MX_ND_REDUCTION (retval(result_idx) += elem (iter_idx), zero, FixedNDArray); -#endif } FixedNDArray FixedNDArray::sumsq (octave_idx_type dim) const { FixedPoint zero; -#if (MX_ND_RED_NUM == 6) - MX_ND_REDUCTION (acc += pow (elem (iter_idx), 2), - retval.elem (iter_idx) = acc, - zero, FixedPoint acc = zero, FixedNDArray, FixedPoint); -#elif (MX_ND_RED_NUM == 5) - MX_ND_REDUCTION (acc += pow (elem (iter_idx), 2), - retval.elem (iter_idx) = acc, - zero, FixedPoint acc = zero, FixedNDArray); -#else MX_ND_REDUCTION (retval(result_idx) += pow (elem (iter_idx), 2), zero, FixedNDArray); -#endif } FixedNDArray @@ -698,19 +660,6 @@ return retval; } -#ifdef HAVE_OLD_OCTAVE_CONCAT -FixedNDArray -concat (const FixedNDArray& ra, const FixedNDArray& rb, - const Array<octave_idx_type>& ra_idx) -{ - FixedNDArray retval (ra); - if (rb.numel () > 0) - retval.insert (rb, ra_idx); - return retval; -} -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedNDArray FixedNDArray::concat (const FixedNDArray& rb, const Array<octave_idx_type>& ra_idx) { @@ -728,39 +677,27 @@ retval.insert (rb, ra_idx); return retval; } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) FixedNDArray& FixedNDArray::insert (const FixedNDArray& a, const Array<octave_idx_type>& ra_idx) { Array<FixedPoint>::insert (a, ra_idx); return *this; } -#endif void FixedNDArray::increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, octave_idx_type start_dimension) { -#ifdef HAVE_OCTAVE_CONCAT ::increment_index (ra_idx, dimensions, start_dimension); -#else - error("fixed increment_index not implemented"); -#endif } octave_idx_type FixedNDArray::compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions) { -#ifdef HAVE_OCTAVE_CONCAT return ::compute_index (ra_idx, dimensions); -#else - error("fixed compute_index not implemented"); - return 0; -#endif } std::ostream& @@ -942,8 +879,6 @@ NDND_CMP_OPS(FixedNDArray, , FixedNDArray, ) NDND_BOOL_OPS(FixedNDArray, FixedNDArray, FixedPoint()) -#endif // HAVE_ND_ARRAYS - /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/main/fixed/src/fixedNDArray.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedNDArray.h Tue Aug 22 20:15:42 2006 +0000 @@ -23,13 +23,9 @@ */ -#if !defined (octave_FixedNDArray_h) && defined (HAVE_ND_ARRAYS) +#if !defined (octave_FixedNDArray_h) #define octave_FixedNDArray_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArrayN.h> #include <octave/dMatrix.h> #include <octave/dNDArray.h> @@ -123,20 +119,11 @@ boolNDArray all (octave_idx_type dim = -1) const; boolNDArray any (octave_idx_type dim = -1) const; -#ifdef HAVE_OLD_OCTAVE_CONCAT - friend FixedNDArray concat (const FixedNDArray& ra, const FixedNDArray& rb, - const Array<octave_idx_type>& ra_idx); -#endif - -#ifdef HAVE_OCTAVE_CONCAT FixedNDArray concat (const FixedNDArray& rb, const Array<octave_idx_type>& ra_idx); FixedComplexNDArray concat (const FixedComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); -#endif -#if defined (HAVE_OCTAVE_CONCAT) || (HAVE_OLD_OCTAVE_CONCAT) FixedNDArray& insert (const FixedNDArray& a, const Array<octave_idx_type>& ra_idx); -#endif FixedNDArray cumprod (octave_idx_type dim = -1) const; FixedNDArray cumsum (octave_idx_type dim = -1) const;
--- a/main/fixed/src/fixedRowVector.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedRowVector.cc Tue Aug 22 20:15:42 2006 +0000 @@ -24,11 +24,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/fixedRowVector.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/fixedRowVector.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_FixedRowVector_h) #define octave_FixedRowVector_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <octave/MArray.h> #include <octave/dRowVector.h> #include <octave/mx-defs.h>
--- a/main/fixed/src/op-fcm-fcm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcm-fcm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -45,9 +41,8 @@ FIXED_DEFUNOP_OP (not, fixed_complex_matrix, !) FIXED_DEFUNOP_OP (uminus, fixed_complex_matrix, -) -#ifdef HAVE_OCTAVE_UPLUS FIXED_DEFUNOP_OP (uplus, fixed_complex_matrix, /* no-op */) -#endif + DEFUNOP (transpose, fixed_complex_matrix) { CAST_UNOP_ARG (const octave_fixed_complex_matrix&); @@ -131,9 +126,7 @@ { INSTALL_UNOP (op_not, octave_fixed_complex_matrix, not); INSTALL_UNOP (op_uminus, octave_fixed_complex_matrix, uminus); -#ifdef HAVE_OCTAVE_UPLUS INSTALL_UNOP (op_uplus, octave_fixed_complex_matrix, uplus); -#endif INSTALL_UNOP (op_transpose, octave_fixed_complex_matrix, transpose); INSTALL_UNOP (op_hermitian, octave_fixed_complex_matrix, hermitian);
--- a/main/fixed/src/op-fcm-fcs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcm-fcs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fcm-fm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcm-fm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fcm-fs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcm-fs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fcs-fcm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcs-fcm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fcs-fcs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcs-fcs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -46,9 +42,7 @@ FIXED_DEFUNOP_OP (not, fixed_complex, !) FIXED_DEFUNOP_OP (uminus, fixed_complex, -) -#ifdef HAVE_OCTAVE_UPLUS FIXED_DEFUNOP_OP (uplus, fixed_complex, /* no-op */) -#endif FIXED_DEFUNOP_OP (transpose, fixed_complex, /* no-op */) DEFUNOP (hermitian, fixed_complex) { @@ -201,9 +195,7 @@ { INSTALL_UNOP (op_not, octave_fixed_complex, not); INSTALL_UNOP (op_uminus, octave_fixed_complex, uminus); -#ifdef HAVE_OCTAVE_UPLUS INSTALL_UNOP (op_uplus, octave_fixed_complex, uplus); -#endif INSTALL_UNOP (op_transpose, octave_fixed_complex, transpose); INSTALL_UNOP (op_hermitian, octave_fixed_complex, hermitian);
--- a/main/fixed/src/op-fcs-fm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcs-fm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fcs-fs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fcs-fs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fil-fcm.cc Tue Aug 22 19:30:27 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - -Copyright (C) 2003 Motorola Inc -Copyright (C) 2003 David Bateman - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -In addition to the terms of the GPL, you are permitted to link -this program with any Open Source program, as defined by the -Open Source Initiative (www.opensource.org) - -*/ - -#ifndef HAVE_OCTAVE_29 - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <iostream> - -#include <octave/config.h> - -#include <octave/error.h> -#include <octave/oct-obj.h> -#include <octave/oct-stream.h> -#include <octave/ops.h> -#include <octave/ov.h> -#include <octave/ov-file.h> -#include <octave/ov-typeinfo.h> - -#include "ov-fixed-cx-mat.h" - -// file by fixed complexmatrix ops. - -DEFBINOP (lshift, file, fixed_matrix) -{ - CAST_BINOP_ARGS (const octave_file&, const octave_fixed_complex_matrix&); - - octave_stream oct_stream = v1.stream_value (); - - if (oct_stream) - { - std::ostream *osp = oct_stream.output_stream (); - - if (osp) - { - std::ostream& os = *osp; - - v2.print_raw (os); - } - else - error ("invalid file specified for binary operator `<<'"); - } - - return octave_value (oct_stream, v1.stream_number ()); -} - -void -install_fil_fcm_ops (void) -{ - INSTALL_BINOP (op_lshift, octave_file, octave_fixed_complex_matrix, lshift); -} - -#else - -void -install_fil_fcm_ops (void) -{ -} - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/main/fixed/src/op-fil-fcs.cc Tue Aug 22 19:30:27 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - -Copyright (C) 2003 Motorola Inc -Copyright (C) 2003 David Bateman - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -In addition to the terms of the GPL, you are permitted to link -this program with any Open Source program, as defined by the -Open Source Initiative (www.opensource.org) - -*/ - -#ifndef HAVE_OCTAVE_29 - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <iostream> - -#include <octave/config.h> - -#include <octave/error.h> -#include <octave/oct-obj.h> -#include <octave/oct-stream.h> -#include <octave/ops.h> -#include <octave/ov.h> -#include <octave/ov-file.h> -#include <octave/ov-typeinfo.h> - -#include "ov-fixed-complex.h" - -// file by fixed complex ops. - -DEFBINOP (lshift, file, fixed) -{ - CAST_BINOP_ARGS (const octave_file&, const octave_fixed_complex&); - - octave_stream oct_stream = v1.stream_value (); - - if (oct_stream) - { - std::ostream *osp = oct_stream.output_stream (); - - if (osp) - { - std::ostream& os = *osp; - - v2.print_raw (os); - } - else - error ("invalid file specified for binary operator `<<'"); - } - - return octave_value (oct_stream, v1.stream_number ()); -} - -void -install_fil_fcs_ops (void) -{ - INSTALL_BINOP (op_lshift, octave_file, octave_fixed_complex, lshift); -} - -#else - -void -install_fil_fcs_ops (void) -{ -} - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/main/fixed/src/op-fil-fm.cc Tue Aug 22 19:30:27 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - -Copyright (C) 2003 Motorola Inc -Copyright (C) 2003 David Bateman - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -In addition to the terms of the GPL, you are permitted to link -this program with any Open Source program, as defined by the -Open Source Initiative (www.opensource.org) - -*/ - -#ifndef HAVE_OCTAVE_29 - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <iostream> - -#include <octave/config.h> - -#include <octave/error.h> -#include <octave/oct-obj.h> -#include <octave/oct-stream.h> -#include <octave/ops.h> -#include <octave/ov.h> -#include <octave/ov-file.h> -#include <octave/ov-typeinfo.h> - -#include "ov-fixed-mat.h" - -// file by fixed matrix ops. - -DEFBINOP (lshift, file, fixed_matrix) -{ - CAST_BINOP_ARGS (const octave_file&, const octave_fixed_matrix&); - - octave_stream oct_stream = v1.stream_value (); - - if (oct_stream) - { - std::ostream *osp = oct_stream.output_stream (); - - if (osp) - { - std::ostream& os = *osp; - - v2.print_raw (os); - } - else - error ("invalid file specified for binary operator `<<'"); - } - - return octave_value (oct_stream, v1.stream_number ()); -} - -void -install_fil_fm_ops (void) -{ - INSTALL_BINOP (op_lshift, octave_file, octave_fixed_matrix, lshift); -} - -#else - -void -install_fil_fm_ops (void) -{ -} - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/main/fixed/src/op-fil-fs.cc Tue Aug 22 19:30:27 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - -Copyright (C) 2003 Motorola Inc -Copyright (C) 2003 David Bateman - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -In addition to the terms of the GPL, you are permitted to link -this program with any Open Source program, as defined by the -Open Source Initiative (www.opensource.org) - -*/ - -#ifndef HAVE_OCTAVE_29 - -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <iostream> - -#include <octave/config.h> - -#include <octave/error.h> -#include <octave/oct-obj.h> -#include <octave/oct-stream.h> -#include <octave/ops.h> -#include <octave/ov.h> -#include <octave/ov-file.h> -#include <octave/ov-typeinfo.h> - -#include "ov-fixed.h" - -// file by fixed scalar ops. - -DEFBINOP (lshift, file, fixed) -{ - CAST_BINOP_ARGS (const octave_file&, const octave_fixed&); - - octave_stream oct_stream = v1.stream_value (); - - if (oct_stream) - { - std::ostream *osp = oct_stream.output_stream (); - - if (osp) - { - std::ostream& os = *osp; - - v2.print_raw (os); - } - else - error ("invalid file specified for binary operator `<<'"); - } - - return octave_value (oct_stream, v1.stream_number ()); -} - -void -install_fil_fs_ops (void) -{ - INSTALL_BINOP (op_lshift, octave_file, octave_fixed, lshift); -} - -#else - -void -install_fil_fs_ops (void) -{ -} - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/main/fixed/src/op-fm-fcm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fm-fcm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fm-fcs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fm-fcs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fm-fm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fm-fm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -46,9 +42,8 @@ FIXED_DEFUNOP_OP (not, fixed_matrix, !) FIXED_DEFUNOP_OP (uminus, fixed_matrix, -) -#ifdef HAVE_OCTAVE_UPLUS FIXED_DEFUNOP_OP (uplus, fixed_matrix, /* no-op */) -#endif + DEFUNOP (transpose, fixed_matrix) { CAST_UNOP_ARG (const octave_fixed_matrix&); @@ -124,9 +119,7 @@ { INSTALL_UNOP (op_not, octave_fixed_matrix, not); INSTALL_UNOP (op_uminus, octave_fixed_matrix, uminus); -#ifdef HAVE_OCTAVE_UPLUS INSTALL_UNOP (op_uplus, octave_fixed_matrix, uplus); -#endif INSTALL_UNOP (op_transpose, octave_fixed_matrix, transpose); INSTALL_UNOP (op_hermitian, octave_fixed_matrix, transpose);
--- a/main/fixed/src/op-fm-fs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fm-fs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fs-fcm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fs-fcm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fs-fcs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fs-fcs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fs-fm.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fs-fm.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h>
--- a/main/fixed/src/op-fs-fs.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/op-fs-fs.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -46,9 +42,7 @@ FIXED_DEFUNOP_OP (not, fixed, !) FIXED_DEFUNOP_OP (uminus, fixed, -) -#ifdef HAVE_OCTAVE_UPLUS FIXED_DEFUNOP_OP (uplus, fixed, /* no-op */) -#endif FIXED_DEFUNOP_OP (transpose, fixed, /* no-op */) FIXED_DEFUNOP_OP (hermitian, fixed, /* no-op */) @@ -147,9 +141,7 @@ { INSTALL_UNOP (op_not, octave_fixed, not); INSTALL_UNOP (op_uminus, octave_fixed, uminus); -#ifdef HAVE_OCTAVE_UPLUS INSTALL_UNOP (op_uplus, octave_fixed, uplus); -#endif INSTALL_UNOP (op_transpose, octave_fixed, transpose); INSTALL_UNOP (op_hermitian, octave_fixed, hermitian);
--- a/main/fixed/src/ov-base-fixed-mat.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-base-fixed-mat.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <config.h> #include <iostream> #include <octave/oct-obj.h> @@ -118,20 +114,7 @@ { bool retval = false; -#if defined(HAVE_PROPAGATE_EMPTY_MATRICES) - if (rows () == 0 || columns () == 0) - { - int flag = Vpropagate_empty_matrices; - - if (flag < 0) - warning ("empty matrix used in conditional expression"); - else if (flag == 0) - error ("empty matrix used in conditional expression"); - } - else -#else if (rows () > 0 && columns () > 0) -#endif { boolMatrix m = (matrix.all () . all ());
--- a/main/fixed/src/ov-base-fixed-mat.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-base-fixed-mat.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_base_fixed_mat_h) #define octave_base_fixed_mat_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -79,24 +75,9 @@ void assign (const octave_value_list& idx, const MT& rhs); -#ifdef HAVE_ND_ARRAYS dim_vector dims (void) const { return matrix.dims (); } -#else - int rows (void) const { return matrix.rows (); } - int columns (void) const { return matrix.columns (); } - int length (void) const - { - int r = rows (); - int c = columns (); - - return (r == 0 || c == 0) ? 0 : ((r > c) ? r : c); - } -#endif - -#ifdef HAVE_OCTAVE_CONCAT size_t byte_size (void) const { return matrix.byte_size (); } -#endif octave_value all (int dim = 0) const { return matrix.all (dim); } octave_value any (int dim = 0) const { return matrix.any (dim); }
--- a/main/fixed/src/ov-base-fixed.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-base-fixed.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <config.h> #include <iostream> #include <octave/oct-obj.h>
--- a/main/fixed/src/ov-base-fixed.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-base-fixed.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_base_fixed_h) #define octave_base_fixed_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -79,19 +75,9 @@ octave_value_list dotref (const octave_value_list& idx); -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) size_t byte_size (void) const { return sizeof (ST); } -#endif -#ifdef HAVE_ND_ARRAYS dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } -#else - int rows (void) const { return 1; } - - int columns (void) const { return 1; } - - int length (void) const { return 1; } -#endif bool is_constant (void) const { return true; }
--- a/main/fixed/src/ov-fixed-complex.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-complex.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -37,19 +33,9 @@ #include <octave/utils.h> #include <octave/unwind-prot.h> #include <octave/variables.h> - -#ifdef CLASS_HAS_LOAD_SAVE #include <octave/data-conv.h> #include <octave/byte-swap.h> #include <octave/ls-hdf5.h> -#endif - -#include <memory> -#ifndef OCTAVE_LOCAL_BUFFER -#define OCTAVE_LOCAL_BUFFER(T, buf, size) \ - std::auto_ptr<T> buf ## _auto_ptr (new T [size]); \ - T *buf = buf ## _auto_ptr.get () -#endif #include "fixed-def.h" #include "ov-base-fixed.h" @@ -63,14 +49,9 @@ DEFINE_OCTAVE_ALLOCATOR (octave_fixed_complex); -#ifdef TYPEID_HAS_CLASS DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_complex, "fixed complex", "FixedPoint"); -#else -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_complex, "fixed complex"); -#endif -#ifdef HAVE_ND_ARRAYS NDArray octave_fixed_complex::array_value (bool force_conversion) const { @@ -90,9 +71,7 @@ { return ComplexNDArray (dim_vector (1, 1), scalar.fixedpoint ()); } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value octave_fixed_complex::resize (const dim_vector& dv, bool) const { @@ -106,7 +85,6 @@ retval(0) = scalar; return new octave_fixed_complex_matrix (retval); } -#endif octave_value octave_fixed_complex::subsasgn (const std::string& type, @@ -291,7 +269,6 @@ unwind_protect::run (); } -#ifdef CLASS_HAS_LOAD_SAVE bool octave_fixed_complex::save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf) @@ -621,7 +598,6 @@ return true; } #endif -#endif /* ;;; Local Variables: ***
--- a/main/fixed/src/ov-fixed-complex.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-complex.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_fixed_complex_h) #define octave_fixed_complex_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -60,10 +56,6 @@ #include "fixedComplex.h" #include "ov-fixed.h" -#ifndef OV_REP_TYPE -#define OV_REP_TYPE octave_value -#endif - class Octave_map; class octave_value_list; @@ -134,11 +126,9 @@ FixedComplexMatrix fixed_complex_matrix_value (void) const { return FixedComplexMatrix(1,1,scalar); } -#ifdef HAVE_ND_ARRAYS NDArray array_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; -#endif double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } @@ -151,9 +141,7 @@ ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, ::fixedpoint(scalar)); } -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value resize (const dim_vector& dv, bool) const; -#endif void increment (void) { scalar += FixedPoint(1,0,1,0); } @@ -161,7 +149,6 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; -#ifdef CLASS_HAS_LOAD_SAVE bool save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf); @@ -177,7 +164,6 @@ bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug); #endif -#endif private:
--- a/main/fixed/src/ov-fixed-cx-mat.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-cx-mat.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <climits> #include <iostream> #include <iomanip> @@ -42,26 +38,11 @@ #include <octave/utils.h> #include <octave/unwind-prot.h> #include <octave/variables.h> - -#ifdef CLASS_HAS_LOAD_SAVE #include <octave/data-conv.h> #include <octave/byte-swap.h> #include <octave/ls-oct-ascii.h> #include <octave/ls-hdf5.h> -#endif - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif - -#include <memory> -#ifndef OCTAVE_LOCAL_BUFFER -#define OCTAVE_LOCAL_BUFFER(T, buf, size) \ - std::auto_ptr<T> buf ## _auto_ptr (new T [size]); \ - T *buf = buf ## _auto_ptr.get () -#endif #include "fixed-def.h" #include "ov-base-fixed-mat.h" @@ -82,16 +63,10 @@ DEFINE_OCTAVE_ALLOCATOR (octave_fixed_complex_matrix); -#ifdef TYPEID_HAS_CLASS DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_complex_matrix, "fixed complex matrix", "FixedPoint"); -#else -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_complex_matrix, - "fixed complex matrix"); -#endif -#ifdef HAVE_ND_ARRAYS NDArray octave_fixed_complex_matrix::array_value (bool force_conversion) const { @@ -127,9 +102,7 @@ return retval; } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value octave_fixed_complex_matrix::resize (const dim_vector& dv, bool) const { @@ -142,7 +115,6 @@ retval.resize (dv(0), dv(1)); return new octave_fixed_complex_matrix (retval); } -#endif FixedComplexMatrix octave_fixed_complex_matrix::do_index_intern (const octave_value_list& idx, @@ -456,7 +428,6 @@ unwind_protect::run (); } -#ifdef CLASS_HAS_LOAD_SAVE bool octave_fixed_complex_matrix::save_ascii (std::ostream& os, bool& infnan_warned, @@ -562,13 +533,6 @@ return true; } -#ifdef HAVE_SWAP_BYTES -static inline void swap_4_bytes (volatile void *ptr) -{ - swap_bytes <4> (ptr); -} -#endif - bool octave_fixed_complex_matrix::load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt) @@ -577,7 +541,7 @@ if (! is.read (X_CAST (char *, &mdims), 4)) return false; if (swap) - swap_4_bytes (X_CAST (char *, &mdims)); + swap_bytes <4> (X_CAST (char *, &mdims)); if (mdims != -2) return false; @@ -592,7 +556,7 @@ if (! is.read (X_CAST (char *, &di), 4)) return false; if (swap) - swap_4_bytes (X_CAST (char *, &di)); + swap_bytes <4> (X_CAST (char *, &di)); dv(i) = di; } @@ -987,7 +951,6 @@ return true; } #endif -#endif /* ;;; Local Variables: ***
--- a/main/fixed/src/ov-fixed-cx-mat.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-cx-mat.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_fixed_complex_matrix_h) #define octave_fixed_complex_matrix_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -48,10 +44,6 @@ #include "fixedCColVector.h" #include "fixedCMatrix.h" -#ifndef OV_REP_TYPE -#define OV_REP_TYPE octave_value -#endif - class Octave_map; class octave_value_list; @@ -127,21 +119,16 @@ ComplexMatrix complex_matrix_value (bool = false) const { return matrix.fixedpoint(); } -#ifdef HAVE_ND_ARRAYS NDArray array_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value resize (const dim_vector& dv, bool) const; -#endif void increment (void) { matrix += FixedPoint(1,0,1,0); } void decrement (void) { matrix -= FixedPoint(1,0,1,0); } -#ifdef CLASS_HAS_LOAD_SAVE bool save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf); @@ -157,7 +144,6 @@ bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug); #endif -#endif private: FixedComplexMatrix do_index_intern (const octave_value_list& idx,
--- a/main/fixed/src/ov-fixed-mat.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-mat.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <climits> #include <iostream> #include <iomanip> @@ -42,23 +38,9 @@ #include <octave/utils.h> #include <octave/unwind-prot.h> #include <octave/variables.h> -#ifdef CLASS_HAS_LOAD_SAVE #include <octave/ls-oct-ascii.h> #include <octave/byte-swap.h> -#endif - -#ifdef NEED_OCTAVE_QUIT -#define OCTAVE_QUIT do {} while (0) -#else #include <octave/quit.h> -#endif - -#include <memory> -#ifndef OCTAVE_LOCAL_BUFFER -#define OCTAVE_LOCAL_BUFFER(T, buf, size) \ - std::auto_ptr<T> buf ## _auto_ptr (new T [size]); \ - T *buf = buf ## _auto_ptr.get () -#endif #include "fixed-def.h" #include "ov-base-fixed-mat.h" @@ -77,14 +59,9 @@ DEFINE_OCTAVE_ALLOCATOR (octave_fixed_matrix); -#ifdef TYPEID_HAS_CLASS DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_matrix, "fixed matrix", "FixedPoint"); -#else -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fixed_matrix, "fixed matrix"); -#endif -#ifdef HAVE_ND_ARRAYS NDArray octave_fixed_matrix::array_value (bool) const { @@ -114,9 +91,7 @@ return retval; } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value octave_fixed_matrix::resize (const dim_vector& dv, bool) const { @@ -129,7 +104,6 @@ retval.resize (dv(0), dv(1)); return new octave_fixed_matrix (retval); } -#endif FixedMatrix octave_fixed_matrix::do_index_intern (const octave_value_list& idx, @@ -443,7 +417,6 @@ unwind_protect::run (); } -#ifdef CLASS_HAS_LOAD_SAVE bool octave_fixed_matrix::save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf) @@ -534,13 +507,6 @@ return true; } -#ifdef HAVE_SWAP_BYTES -static inline void swap_4_bytes (volatile void *ptr) -{ - swap_bytes <4> (ptr); -} -#endif - bool octave_fixed_matrix::load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt) @@ -549,7 +515,7 @@ if (! is.read (X_CAST (char *, &mdims), 4)) return false; if (swap) - swap_4_bytes (X_CAST (char *, &mdims)); + swap_bytes <4> (X_CAST (char *, &mdims)); if (mdims != -2) return false; @@ -564,7 +530,7 @@ if (! is.read (X_CAST (char *, &di), 4)) return false; if (swap) - swap_4_bytes (X_CAST (char *, &di)); + swap_bytes <4> (X_CAST (char *, &di)); dv(i) = di; } @@ -855,7 +821,6 @@ return true; } #endif -#endif /* ;;; Local Variables: ***
--- a/main/fixed/src/ov-fixed-mat.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed-mat.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_fixed_matrix_h) #define octave_fixed_matrix_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -55,10 +51,6 @@ #include "fixedMatrix.h" #include "fixedCMatrix.h" -#ifndef OV_REP_TYPE -#define OV_REP_TYPE octave_value -#endif - class Octave_map; class octave_value_list; @@ -126,15 +118,11 @@ ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (matrix_value()); } -#ifdef HAVE_ND_ARRAYS NDArray array_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value resize (const dim_vector& dv, bool) const; -#endif void increment (void) { matrix += FixedPoint(1,0,1,0); } @@ -142,7 +130,6 @@ octave_value convert_to_str (bool pad = false) const; -#ifdef CLASS_HAS_LOAD_SAVE bool save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf); @@ -158,7 +145,6 @@ bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug); #endif -#endif private: FixedMatrix do_index_intern (const octave_value_list& idx, int resize_ok);
--- a/main/fixed/src/ov-fixed.cc Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed.cc Tue Aug 22 20:15:42 2006 +0000 @@ -23,10 +23,6 @@ */ -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma implementation -#endif - #include <iostream> #include <octave/config.h> @@ -36,11 +32,8 @@ #include <octave/utils.h> #include <octave/unwind-prot.h> #include <octave/variables.h> - -#ifdef CLASS_HAS_LOAD_SAVE #include <octave/data-conv.h> #include <octave/byte-swap.h> -#endif #include "fixed-def.h" #include "ov-base-fixed.h" @@ -53,14 +46,9 @@ DEFINE_OCTAVE_ALLOCATOR(octave_fixed); -#ifdef TYPEID_HAS_CLASS DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_fixed, "fixed scalar", "FixedPoint"); -#else -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_fixed, "fixed scalar"); -#endif -#ifdef HAVE_ND_ARRAYS NDArray octave_fixed::array_value (bool) const { @@ -72,9 +60,7 @@ { return ComplexNDArray (dim_vector (1, 1), Complex (scalar.fixedpoint ())); } -#endif -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value octave_fixed::resize (const dim_vector& dv, bool) const { @@ -88,7 +74,6 @@ retval(0) = scalar; return new octave_fixed_matrix (retval); } -#endif octave_value octave_fixed::subsasgn (const std::string& type, @@ -248,7 +233,6 @@ unwind_protect::run (); } -#ifdef CLASS_HAS_LOAD_SAVE bool octave_fixed::save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf) @@ -475,7 +459,6 @@ return true; } #endif -#endif /* ;;; Local Variables: ***
--- a/main/fixed/src/ov-fixed.h Tue Aug 22 19:30:27 2006 +0000 +++ b/main/fixed/src/ov-fixed.h Tue Aug 22 20:15:42 2006 +0000 @@ -26,10 +26,6 @@ #if !defined (octave_fixed_h) #define octave_fixed_h 1 -#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION) -#pragma interface -#endif - #include <cstdlib> #include <iostream> @@ -56,10 +52,6 @@ #include "fixedComplex.h" #include "fixedCMatrix.h" -#ifndef OV_REP_TYPE -#define OV_REP_TYPE octave_value -#endif - class Octave_map; class octave_value_list; @@ -121,11 +113,9 @@ FixedComplexMatrix fixed_complex_matrix_value (void) const { return FixedComplexMatrix(1,1,scalar); } -#ifdef HAVE_ND_ARRAYS NDArray array_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; -#endif double scalar_value (bool = false) const { return ::fixedpoint(scalar); } double double_value (bool = false) const { return ::fixedpoint(scalar); } @@ -136,9 +126,7 @@ ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, Complex (::fixedpoint(scalar))); } -#if defined (HAVE_OCTAVE_CONCAT) || defined (HAVE_OLD_OCTAVE_CONCAT) octave_value resize (const dim_vector& dv, bool) const; -#endif octave_value convert_to_str (bool pad = false) const; @@ -148,7 +136,6 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; -#ifdef CLASS_HAS_LOAD_SAVE bool save_ascii (std::ostream& os, bool& infnan_warned, bool strip_nan_and_inf); @@ -164,7 +151,6 @@ bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug); #endif -#endif private: