Mercurial > repos > public > sbplib

annotate +grid/evalOn.m @ 622:0813d700a816 feature/grids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove whitespace
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 20 Oct 2017 18:43:26 +0200
parents 0546de4b31a2
children 190941ec12d8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
276
30321dc180e1 Fixed documentation for Curvilinear and evalOn.
Jonatan Werpers <jonatan@werpers.com>
parents: 275
diff changeset
1 % Takes a function and evaluates it on a grid to return a grid function in the
157
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 % form of a (n*k)x1 vector, where n is the number of grid points and k is the
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 % number of components of the function.
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 % g -- Grid to evaluate on.
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5 % func -- Function to evaluate. May be a function handle or a constant. If
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 % it is a vector value it has to be provided as a column vector,
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 function gf = evalOn(g, func)
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8 if ~isa(func, 'function_handle')
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
9 % We should have a constant.
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 if size(func,2) ~= 1
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11 error('grid:evalOn:VectorValuedWrongDim', 'A vector valued function must be given as a column vector')
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 end
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14 gf = repmat(func,[g.N, 1]);
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15 return
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16 end
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
17 % func should now be a function_handle
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18
277
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
19 if g.D ~= nargin(func)
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
20 g.D
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
21 nargin(func)
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
22 error('grid:evalOn:WrongNumberOfInputs', 'The number of inputs of the function must match the dimension of the domain.')
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
23 end
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
24
4c3f55a628c8 Made evalOn give more error message.
Jonatan Werpers <jonatan@werpers.com>
parents: 276
diff changeset
25
607
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
26 % Get coordinates
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
27 x = g.points();
157
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
28
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
29 % Find the number of components
582
ce44af8d7dd1 Rename grid.EmptyGrid to grid.Empty
Jonatan Werpers <jonatan@werpers.com>
parents: 277
diff changeset
30 if size(x,1) ~= 0
ce44af8d7dd1 Rename grid.EmptyGrid to grid.Empty
Jonatan Werpers <jonatan@werpers.com>
parents: 277
diff changeset
31 x0 = x(1,:);
ce44af8d7dd1 Rename grid.EmptyGrid to grid.Empty
Jonatan Werpers <jonatan@werpers.com>
parents: 277
diff changeset
32 else
ce44af8d7dd1 Rename grid.EmptyGrid to grid.Empty
Jonatan Werpers <jonatan@werpers.com>
parents: 277
diff changeset
33 x0 = num2cell(ones(1,size(x,2)));
ce44af8d7dd1 Rename grid.EmptyGrid to grid.Empty
Jonatan Werpers <jonatan@werpers.com>
parents: 277
diff changeset
34 end
622
0813d700a816 Remove whitespace
Jonatan Werpers <jonatan@werpers.com>
parents: 607
diff changeset
35
607
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
36 dim = length(x0);
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
37 % Evaluate f0 = func(x0(1),x0(2),...,x0(dim));
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
38 if(dim == 1)
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
39 f0 = func(x0);
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
40 else
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
41 eval_str = 'f0 = func(x0(1)';
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
42 for i = 2:dim
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
43 eval_str = [eval_str, sprintf(',x0(%d)',i)];
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
44 end
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
45 eval_str = [eval_str, ');'];
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
46 eval(eval_str);
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
47 end
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
48
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
49 % k = number of components
157
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
50 k = length(f0);
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
51
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
52 if size(f0,2) ~= 1
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
53 error('grid:evalOn:VectorValuedWrongDim', 'A vector valued function must be given as a column vector')
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
54 end
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
55
607
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
56 % Evaluate gf = func(x(:,1),x(:,2),...,x(:,dim));
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
57 if(dim == 1)
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
58 gf = func(x);
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
59 else
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
60 eval_str = 'gf = func(x(:,1)';
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
61 for i = 2:dim
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
62 eval_str = [eval_str, sprintf(',x(:,%d)',i)];
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
63 end
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
64 eval_str = [eval_str, ');'];
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
65 eval(eval_str);
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
66 end
622
0813d700a816 Remove whitespace
Jonatan Werpers <jonatan@werpers.com>
parents: 607
diff changeset
67
607
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
68 % Reorganize gf
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
69 gf_temp = gf;
275
3ea2ae2a3d15 Improvments to eval on grids. Added function to extrac components of a vector gf.
Jonatan Werpers <jonatan@werpers.com>
parents: 274
diff changeset
70 gf = zeros(g.N*k, 1);
607
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
71 for i = 1:k
0546de4b31a2 Make grid.evalOn faster.
Martin Almquist <malmquist@stanford.edu>
parents: 603
diff changeset
72 gf(i:k:end) = gf_temp((i-1)*g.N + 1 : i*g.N);
171
0e56192f6459 Made evalOn a bit clearer.
Jonatan Werpers <jonatan@werpers.com>
parents: 157
diff changeset
73 end
157
ea8103ad2cc5 Added function eval on.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
74 end