Mercurial > forge

comparison main/fixed/src/Array-f.cc @ 9481:d84d2fea3c90 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-enable compilation of fixed package
author jordigh
date Wed, 22 Feb 2012 22:07:33 +0000
parents 8dcc0930589a
children
comparison
equal deleted inserted replaced
9480:954f2f00d782 9481:d84d2fea3c90
27 #include "int/fixed.h" 27 #include "int/fixed.h"
28 #include "fixedComplex.h" 28 #include "fixedComplex.h"
29 //#include "fixedMatrix.h" 29 //#include "fixedMatrix.h"
30 //#include "fixedCMatrix.h" 30 //#include "fixedCMatrix.h"
31 31
32 inline FixedPoint
33 xmin (const FixedPoint& x, const FixedPoint& y)
34 {
35 return x <= y ? x : y;
36 }
37
38 inline FixedPoint
39 xmax (const FixedPoint& x, const FixedPoint& y)
40 {
41 return x >= y ? x : y;
42 }
43
44 inline FixedPointComplex
45 xmin (const FixedPointComplex& x, const FixedPointComplex& y)
46 {
47 return x <= y ? x : y;
48 }
49
50 inline FixedPointComplex
51 xmax (const FixedPointComplex& x, const FixedPointComplex& y)
52 {
53 return x >= y ? x : y;
54 }
55
32 #include <octave/Array.h> 56 #include <octave/Array.h>
33 #include <octave/Array.cc> 57 #include <octave/Array.cc>
34 #include <octave/MArray.h> 58 #include <octave/MArray.h>
35 #include <octave/MArray.cc> 59 #include <octave/MArray.cc>
36 60
48 { 72 {
49 return ((abs (a) > abs (b)) || ((abs (a) == abs (b)) && 73 return ((abs (a) > abs (b)) || ((abs (a) == abs (b)) &&
50 (arg (a) > arg (b)))); 74 (arg (a) > arg (b))));
51 } 75 }
52 76
53 INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API); 77 INSTANTIATE_ARRAY (FixedPoint, );
54 template class MArray<FixedPoint>; 78 template class MArray<FixedPoint>;
55 INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API); 79 INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )
80
81 INSTANTIATE_ARRAY (FixedPointComplex, );
56 template class MArray<FixedPointComplex>; 82 template class MArray<FixedPointComplex>;
57
58 INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )
59 INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, ) 83 INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, )
60
61 #include <octave/Array2.h>
62 #include <octave/MArray2.h>
63 #include <octave/MArray2.cc>
64
65 template class Array2<FixedPoint>;
66 template class MArray2<FixedPoint>;
67 template class Array2<FixedPointComplex>;
68 template class MArray2<FixedPointComplex>;
69
70 INSTANTIATE_MARRAY2_FRIENDS (FixedPoint, OCTAVE_FIXED_API)
71 INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex, OCTAVE_FIXED_API)
72
73 #include <octave/ArrayN.h>
74 #include <octave/ArrayN.cc>
75 #include <octave/MArrayN.h>
76 #include <octave/MArrayN.cc>
77
78 template class ArrayN<FixedPoint>;
79 template class MArrayN<FixedPoint>;
80 template class ArrayN<FixedPointComplex>;
81 template class MArrayN<FixedPointComplex>;
82
83 INSTANTIATE_MARRAYN_FRIENDS (FixedPoint, )
84 INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex, )
85 84
86 /* 85 /*
87 ;;; Local Variables: *** 86 ;;; Local Variables: ***
88 ;;; mode: C++ *** 87 ;;; mode: C++ ***
89 ;;; End: *** 88 ;;; End: ***