Mercurial > octave

annotate liboctave/array/Array-f.cc @ 21213:f7d1050b9b53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Clean up various usages of #ifdef. * randmtzig.c: Use #ifdef rather than just #if. * EditControl.h : Use '#if ! defined' rather than '#ifndef' in guard block to match Octave style. * dialog.cc, settings-dialog.cc: Add FIXME notes about questionable use of #if mechanism. * file-editor-tab.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-i.cc, Array-s.cc, MatrixType.h, quit.h, lo-sysdep.cc, lo-cutils.c, oct-alloc.h, oct-shlib.cc, sparse-sort.h: #define HAVE_XXX macros to 1, not just empty but defined. * octave-txt-lexer.h, octave-cmd.h, octave-preserve-stream-state.h, txt-eng.h, zfstream.h, oct-conf-features.h, oct-conf.h: Use octave_ namespace prefix on name of #define used to prevent multiple inclusion of headers. * parser.h, webinfo.h, ov-oncleanup.h, op-int.h, display-available.h, shared-fcns.h: Add #define guard to prevent multiple inclusion. * quadcc.cc: use all capitals for #define MIN_CQUAD_HEAPSIZE. * ov-intx.h: Add note that this file must not use guard #define. * eigs-base.h, randmtzig.h: Write '! defined' rather than '!defined'. * file-ops.cc, oct-sparse.h: Use parentheses around complex #if tests. * oct-syscalls.cc, oct-base64.cc, statdefs.h: Indent #ifdef blocks correctly. * oct-conf-post.in.h: Use "! defined". Define macros to 1, not just empty but defined.
author Rik <rik@octave.org>
date Sat, 06 Feb 2016 18:22:32 -0800
parents f7121e111991
children 40de9f8f23a6
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
21202
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents: 19697
diff changeset
25 # include <config.h>
7789
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
21213
f7d1050b9b53 maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents: 21202
diff changeset
35 #define INLINE_ASCENDING_SORT 1
f7d1050b9b53 maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents: 21202
diff changeset
36 #define INLINE_DESCENDING_SORT 1
8700
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
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
39 template <>
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
40 inline bool
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
41 sort_isnan<float> (float x)
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
42 {
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
43 return xisnan (x);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
44 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
45
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
46 static bool
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
47 nan_ascending_compare (float x, float y)
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
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 (y) ? ! xisnan (x) : x < y;
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
50 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
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_descending_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 (x) ? ! xisnan (y) : 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 Array<float>::compare_fcn_type
9920
56fbe170d354 fix issorted with NaNs in middle
Jaroslav Hajek <highegg@gmail.com>
parents: 9732
diff changeset
59 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
60 {
8725
d5af326a3ede [mq]: sort-traits
John W. Eaton <jwe@octave.org>
parents: 8721
diff changeset
61 Array<float>::compare_fcn_type result = 0;
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 if (allow_chk)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
64 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
65 octave_idx_type k = 0;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
66 for (; k < a.numel () && ! xisnan (a(k)); k++) ;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
67 if (k == a.numel ())
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 (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
70 result = octave_sort<float>::ascending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
71 else if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
72 result = octave_sort<float>::descending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
73 }
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
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
76 if (! result)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
77 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
78 if (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
79 result = nan_ascending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
80 else if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
81 result = nan_descending_compare;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
82 }
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 return result;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
85 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
86
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
87 // 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
88 // slow than this code.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
89 template <>
9941
1369f13ae6b2 several fixes by M. Goffioul
Jaroslav Hajek <highegg@gmail.com>
parents: 9922
diff changeset
90 OCTAVE_API
9922
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
91 sortmode
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
92 Array<float>::is_sorted (sortmode mode) const
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
93 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
94 octave_idx_type n = numel ();
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
95
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
96 const float *el = data ();
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
97
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
98 if (n <= 1)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
99 return mode ? mode : ASCENDING;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
100
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
101 if (! mode)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
102 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
103 // Auto-detect mode.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
104 if (el[n-1] < el[0] || xisnan (el[0]))
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
105 mode = DESCENDING;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
106 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
107 mode = ASCENDING;
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
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
110 if (mode == DESCENDING)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
111 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
112 octave_idx_type j = 0;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
113 float r;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
114 // Sort out NaNs.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
115 do
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
116 r = el[j++];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
117 while (xisnan (r) && j < n);
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
118
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
119 // 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
120 for (; j < n; j++)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
121 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
122 if (r >= el[j])
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
123 r = el[j];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
124 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
125 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
126 mode = UNSORTED;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
127 break;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
128 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
129 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
130
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 else if (mode == ASCENDING)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
133 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
134 // Sort out NaNs.
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
135 while (n > 0 && xisnan (el[n-1]))
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
136 n--;
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 if (n > 0)
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
139 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
140 // 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
141 float r = el[0];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
142 for (octave_idx_type j = 1; j < n; j++)
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 (r <= el[j])
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
145 r = el[j];
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
146 else
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
147 {
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
148 mode = UNSORTED;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
149 break;
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
150 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
151 }
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
152 }
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
3a8327d51ed4 optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents: 9920
diff changeset
155 return mode;
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
19395
fb09907f4e49 Remove single line makro INSTANTIATE_ARRAY_SORT.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 17769
diff changeset
158 template class OCTAVE_API octave_sort<float>;
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
159
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8710
diff changeset
160 INSTANTIATE_ARRAY (float, OCTAVE_API);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
161
17769
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
162 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
163 const Array<float>&);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
164
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
165 #include "DiagArray2.h"
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
166 #include "DiagArray2.cc"
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
167
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
diff changeset
168 template class OCTAVE_API DiagArray2<float>;