Mercurial > hg > octave-lyh
annotate liboctave/util/functor.h @ 17136:f72ffae1fcc3
delaunay.m: Fixed matlab compatibility and input check for single matrix (bug #39644)
* scripts/geometry/delaunay.m: check for equal size of X and Y, check for 2 column single matrix input, added 2 tests for these two changes
author | Andreas Weber <andreas.weber@hs-offenburg.de> |
---|---|
date | Thu, 01 Aug 2013 15:16:14 +0200 |
parents | 648dabbb4c6b |
children |
rev | line source |
---|---|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
1 /* |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
2 |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 2008-2012 John W. Eaton |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
4 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
5 This file is part of Octave. |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
6 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
7 Octave is free software; you can redistribute it and/or modify it |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
8 under the terms of the GNU General Public License as published by the |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
9 Free Software Foundation; either version 3 of the License, or (at your |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
10 option) any later version. |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
11 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but WITHOUT |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
15 for more details. |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
16 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
18 along with Octave; see the file COPYING. If not, see |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
19 <http://www.gnu.org/licenses/>. |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
20 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
21 */ |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
22 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
23 #if !defined (octave_functor_h) |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
24 #define octave_functor_h 1 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
25 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
26 template <typename RT, typename PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
27 class fcn_ptr |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
28 { |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
29 public: |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
30 typedef RT (*TYPE) (PT); |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
31 }; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
32 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
33 template <typename RT, typename PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
34 class functor |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
35 { |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
36 private: |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
37 typedef typename fcn_ptr<RT, PT>::TYPE fcn_ptr_type; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
38 fcn_ptr_type fptr; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
39 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
40 public: |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
41 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
42 functor (fcn_ptr_type p) : fptr (p) { } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
43 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
44 RT operator () (PT arg) { return fptr (arg); } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
45 }; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
46 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
47 template <typename CT, typename RT, typename PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
48 class functor_with_conversion |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
49 { |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
50 private: |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
51 typedef typename fcn_ptr<RT, PT>::TYPE fcn_ptr_type; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
52 fcn_ptr_type fptr; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
53 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
54 public: |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
55 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
56 functor_with_conversion (fcn_ptr_type p) : fptr (p) { } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
57 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
58 CT operator () (PT arg) { return CT (fptr (arg)); } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
59 }; |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
60 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
61 template <typename RT, typename PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
62 functor<RT, PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
63 func_ptr (RT (*f) (PT)) |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
64 { |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
65 return functor<RT, PT> (f); |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
66 } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
67 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
68 template <typename CT, typename RT, typename PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
69 functor_with_conversion<CT, RT, PT> |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
70 func_ptr_with_conversion (RT (*f) (PT)) |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
71 { |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
72 return functor_with_conversion<CT, RT, PT> (f); |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
73 } |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
74 |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
diff
changeset
|
75 #endif |