annotate src/function.h @ 235:568aff85dfa9

Correct function constructor
author Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
date Mon, 23 Jun 2014 16:34:16 +0200
parents 94895618701f
children 418a5119047b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
1 /*
151
5fe2a157f4eb Update GPL to v3
gedeone-octave <marcovass89@hotmail.it>
parents: 80
diff changeset
2 Copyright (C) 2013 Marco Vassallo <gedeone-octave@users.sourceforge.net>
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
3
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify it under
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
5 the terms of the GNU General Public License as published by the Free Software
151
5fe2a157f4eb Update GPL to v3
gedeone-octave <marcovass89@hotmail.it>
parents: 80
diff changeset
6 Foundation; either version 3 of the License, or (at your option) any later
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
7 version.
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
8
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
9 This program is distributed in the hope that it will be useful, but WITHOUT
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
12 details.
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
13
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
14 You should have received a copy of the GNU General Public License along with
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
15 this program; if not, see <http://www.gnu.org/licenses/>.
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
16 */
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
17
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
18 #ifndef _FUNCTION_OCTAVE_
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
19 #define _FUNCTION_OCTAVE_
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
20
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
21 #include <memory>
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
22 #include <vector>
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
23 #include <dolfin.h>
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
24 #include <octave/oct.h>
234
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
25 #include <octave/parse.h>
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
26
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
27 class function : public octave_base_value
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
28 {
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
29
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
30 public:
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
31
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
32 function ()
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
33 : octave_base_value (), fun () {}
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
34
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
35 function (std::string & _str,
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
36 boost::shared_ptr <const dolfin::Function> _fun)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
37 : octave_base_value (), str(_str), fun (_fun) {}
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
38
234
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
39 function (function const& _func)
235
568aff85dfa9 Correct function constructor
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 234
diff changeset
40 : octave_base_value (), str (_func.get_str ()), fun (_func.get_pfun ()) {}
234
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
41
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
42 void
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
43 print (std::ostream& os,
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
44 bool pr_as_read_syntax = false) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
45 { os << "Function " << str << ": " << fun->str (true) << std::endl; }
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
46
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
47 ~function(void) {}
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
48
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
49 bool
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
50 is_defined (void) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
51 { return true; }
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
52
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
53 const dolfin::Function &
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
54 get_fun (void) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
55 { return (*fun); }
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
56
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
57 const boost::shared_ptr <const dolfin::Function> &
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
58 get_pfun (void) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
59 { return fun; }
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
60
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
61 void
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
62 set_fun (dolfin::Function & _fun)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
63 {
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
64 dolfin::Function * p = new dolfin::Function (_fun);
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
65 fun = boost::shared_ptr<const dolfin::Function> (p);
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
66 }
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
67
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
68 const std::string &
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
69 get_str (void) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
70 { return str; }
61
93e538063278 Add a string field to the class function
gedeone-octave <marco.vassallo@outlook.com>
parents: 46
diff changeset
71
234
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
72 octave_value
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
73 subsref (const std::string& type,
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
74 const std::list<octave_value_list>& idx)
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
75 {
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
76 octave_value retval;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
77
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
78 switch (type[0])
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
79 {
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
80 case '(':
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
81 {
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
82 std::list<octave_value_list> args;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
83 args.push_back (octave_value (new function (*this)));
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
84 args.push_back (idx.front ());
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
85 retval = feval ("feval", args);
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
86 }
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
87 break;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
88
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
89 case '{':
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
90 case '.':
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
91 {
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
92 std::string nm = type_name ();
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
93 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
94 }
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
95 break;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
96
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
97 default:
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
98 panic_impossible ();
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
99 }
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
100
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
101 return retval;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
102 }
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
103
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
104 octave_value_list
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
105 subsref (const std::string& type,
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
106 const std::list<octave_value_list>& idx,
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
107 int)
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
108 {
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
109 octave_value_list retval;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
110 retval = subsref (type, idx);
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
111 return retval;
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
112 }
94895618701f Add function evaluation with coordinates inside brackets
Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
parents: 173
diff changeset
113
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
114 private:
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
115
61
93e538063278 Add a string field to the class function
gedeone-octave <marco.vassallo@outlook.com>
parents: 46
diff changeset
116 std::string str;
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
117 boost::shared_ptr <const dolfin::Function> fun;
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
118
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
119 DECLARE_OCTAVE_ALLOCATOR;
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
120 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
121
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
122 };
80
16ccfaf1476a The function DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA
gedeone-octave <marcovass89@hotmail.it>
parents: 61
diff changeset
123 static bool function_type_loaded = false;
16ccfaf1476a The function DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA
gedeone-octave <marcovass89@hotmail.it>
parents: 61
diff changeset
124
16ccfaf1476a The function DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA
gedeone-octave <marcovass89@hotmail.it>
parents: 61
diff changeset
125 DEFINE_OCTAVE_ALLOCATOR (function);
16ccfaf1476a The function DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA
gedeone-octave <marcovass89@hotmail.it>
parents: 61
diff changeset
126 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (function, "function", "function");
46
a64e195d0611 Wrapper class for dolfin::Function
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
127 #endif