Mercurial > octave

annotate liboctave/array/Array-f.cc @ 21573:f3f8e1d3e399 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid mulitple definitions of static function-scope vars (bug #47372) Some systems (Windows, others?) may generate multiple definitions of function-scope static variables if those functions appear in header files. This can cause trouble in various ways. Attempt to avoid the problem by moving functions that contain file-scope varaibles from header files to source files, or by using class-scope static variables instead. Also attempt to avoid similar problems caused by implicit instantiations of templates that have functions with static variables. * Cell.h, Cell.cc (Cell::resize_fill_value): Move definition from header to source file. * oct-map.h, oct-map.cc (octave_fields::nil_rep): Likewise. * ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::dims): Likewise. * ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::dims): Likewise. * ov.h, ov.cc (octave_value::nil_rep): Likewise. * Array.h, Array.cc (Array<T>::nil_rep): Likewise. * DiagArray2.h, DiagArray2.cc (DiagArray2<T>::elem, DiagArray2<T>::checkelem): Likewise. * Sparse.h, Sparse.cc (Sparse<T>::nil_rep): Likewise. * dim-vector.h, dim-vector.cc (dim_vector::nil_rep): Likewise. * idx-vector.h, idx-vector.cc (idx_vector::nil_rep, idx_vector::err_rep): Likewise. * oct-inttypes.h, oct-inttypes.cc (octave_int_base<T>::convert_real): Likewise. * symtab.h, symtab.cc (octave_value symbol_table::dummy_octave_value, symbol_table::symbol_record symbol_table::dummy_symbol_record): New class-scope static variables. Use them to eliminate function-scope static variables. * ov-int8.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-uint8.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-scalar.cc, ov-flt-complex.cc, ov-complex.cc, ov-classdef.cc, ov-bool.cc, Array-jit.cc, Array-os.cc, Array-tc.cc, Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-voidp.cc: Prevent impliticit template instantiation. * Array-tc.cc: Also instantiate Array<cdef_object>.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Apr 2016 12:04:04 -0400
parents 4197fc428c7d
children ae4d7dfea337
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
1 /*
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19395
diff changeset
3 Copyright (C) 1994-2015 John W. Eaton
10521
4d1fc073fbb7 add some missing copyright stmts
Jaroslav Hajek <highegg@gmail.com>
parents: 10374
diff changeset
4 Copyright (C) 2009 VZLU Prague
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
5
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
6 This file is part of Octave.
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
7
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
11 option) any later version.
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
12
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
16 for more details.
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
17
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
21
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
22 */
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
23
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
25 #include <config.h>
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
26 #endif
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
27
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
28 // Instantiate Arrays of float values.
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
29
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
30 #include "lo-mappers.h"
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
31 #include "Array.h"
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
32 #include "Array.cc"
8377
25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents: 8290
diff changeset
33 #include "oct-locbuf.h"
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
34
8700
314be237cd5b sorting optimizations
Jaroslav Hajek <highegg@gmail.com>
parents: 8651
diff changeset
35 #define INLINE_ASCENDING_SORT
314be237cd5b sorting optimizations
Jaroslav Hajek <highegg@gmail.com>
parents: 8651
diff changeset
36 #define INLINE_DESCENDING_SORT
314be237cd5b sorting optimizations
Jaroslav Hajek <highegg@gmail.com>
parents: 8651
diff changeset
37 #include "oct-sort.cc"
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
38
21573
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
39 // Prevent implicit instantiations on some systems (Windows, others?)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
40 // that can lead to duplicate definitions of static data members.
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
41
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
42 extern template class OCTAVE_API Array<idx_vector>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
43 extern template class OCTAVE_API Array<octave_idx_type>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
44
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
45 template <>
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
46 inline bool
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
47 sort_isnan<float> (float x)
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
48 {
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
49 return xisnan (x);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
50 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
51
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
52 static bool
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
53 nan_ascending_compare (float x, float y)
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
54 {
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
55 return xisnan (y) ? ! xisnan (x) : x < y;
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
56 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
57
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
58 static bool
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
59 nan_descending_compare (float x, float y)
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
60 {
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
61 return xisnan (x) ? ! xisnan (y) : x > y;
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
62 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
63
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
64 Array<float>::compare_fcn_type
9920
56fbe170d354 fix issorted with NaNs in middle
Jaroslav Hajek <highegg@gmail.com>
parents: 9732
diff changeset
65 safe_comparator (sortmode mode, const Array<float>& a , bool allow_chk)
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
66 {
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
67 Array<float>::compare_fcn_type result = 0;
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
68
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
69 if (allow_chk)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
70 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
71 octave_idx_type k = 0;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
72 for (; k < a.numel () && ! xisnan (a(k)); k++) ;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
73 if (k == a.numel ())
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
74 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
75 if (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
76 result = octave_sort<float>::ascending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
77 else if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
78 result = octave_sort<float>::descending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
79 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
80 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
81
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
82 if (! result)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
83 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
84 if (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
85 result = nan_ascending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
86 else if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
87 result = nan_descending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
88 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
89
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
90 return result;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
91 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
92
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
93 // The default solution using NaN-safe comparator is OK, but almost twice as
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
94 // slow than this code.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
95 template <>
9941
1369f13ae6b2 several fixes by M. Goffioul
Jaroslav Hajek <highegg@gmail.com>
parents: 9922
diff changeset
96 OCTAVE_API
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
97 sortmode
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
98 Array<float>::is_sorted (sortmode mode) const
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
99 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
100 octave_idx_type n = numel ();
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
101
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
102 const float *el = data ();
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
103
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
104 if (n <= 1)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
105 return mode ? mode : ASCENDING;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
106
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
107 if (! mode)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
108 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
109 // Auto-detect mode.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
110 if (el[n-1] < el[0] || xisnan (el[0]))
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
111 mode = DESCENDING;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
112 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
113 mode = ASCENDING;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
114 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
115
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
116 if (mode == DESCENDING)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
117 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
118 octave_idx_type j = 0;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
119 float r;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
120 // Sort out NaNs.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
121 do
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
122 r = el[j++];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
123 while (xisnan (r) && j < n);
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
124
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
125 // Orient the test so that NaN will not pass through.
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
126 for (; j < n; j++)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
127 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
128 if (r >= el[j])
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
129 r = el[j];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
130 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
131 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
132 mode = UNSORTED;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
133 break;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
134 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
135 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
136
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
137 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
138 else if (mode == ASCENDING)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
139 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
140 // Sort out NaNs.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
141 while (n > 0 && xisnan (el[n-1]))
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
142 n--;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
143
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
144 if (n > 0)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
145 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
146 // Orient the test so that NaN will not pass through.
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
147 float r = el[0];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
148 for (octave_idx_type j = 1; j < n; j++)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
149 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
150 if (r <= el[j])
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
151 r = el[j];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
152 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
153 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
154 mode = UNSORTED;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
155 break;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
156 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
157 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
158 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
159 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
160
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
161 return mode;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
162 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
163
19395
fb09907f4e49 Remove single line makro INSTANTIATE_ARRAY_SORT.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 17769
diff changeset
164 template class OCTAVE_API octave_sort<float>;
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
165
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
166 INSTANTIATE_ARRAY (float, OCTAVE_API);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
167
17769
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
168 template OCTAVE_API std::ostream& operator << (std::ostream&,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
169 const Array<float>&);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
170
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
171 #include "DiagArray2.h"
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
172 #include "DiagArray2.cc"
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
173
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
174 template class OCTAVE_API DiagArray2<float>;