summaryrefslogtreecommitdiffstats
path: root/scilab/modules/differential_equations
diff options
context:
space:
mode:
authorYuvraj Tomar <yuvrajtomar@gmail.com>2010-03-30 18:16:34 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-30 18:16:34 +0200
commitaeffe15517c26085f73580bded195fc01c0f6679 (patch)
tree13a8a2db9ad1d330fe7a29671659cef104340953 /scilab/modules/differential_equations
parent9af46627fddfbfa81a5fecf8170513a20d6051ef (diff)
downloadscilab-aeffe15517c26085f73580bded195fc01c0f6679.zip
scilab-aeffe15517c26085f73580bded195fc01c0f6679.tar.gz
* bug 4672 fixed - Internal function AddFunctionInTable renamed to
getFunctionByName to avoid confusions on the actual usage of this function. Thanks to Yuvraj Tomar.
Diffstat (limited to 'scilab/modules/differential_equations')
-rw-r--r--scilab/modules/differential_equations/src/c/colnewtable.c12
-rw-r--r--scilab/modules/differential_equations/src/c/dassltable.c10
-rw-r--r--scilab/modules/differential_equations/src/c/fevaltable.c4
-rw-r--r--scilab/modules/differential_equations/src/c/fydot2table.c4
-rw-r--r--scilab/modules/differential_equations/src/c/fydottable.c6
-rw-r--r--scilab/modules/differential_equations/src/c/impltable.c8
-rw-r--r--scilab/modules/differential_equations/src/c/int2dtable.c4
-rw-r--r--scilab/modules/differential_equations/src/c/int3dtable.c4
-rw-r--r--scilab/modules/differential_equations/src/c/intgtable.c4
9 files changed, 28 insertions, 28 deletions
diff --git a/scilab/modules/differential_equations/src/c/colnewtable.c b/scilab/modules/differential_equations/src/c/colnewtable.c
index ea27fd0..089bbf6 100644
--- a/scilab/modules/differential_equations/src/c/colnewtable.c
+++ b/scilab/modules/differential_equations/src/c/colnewtable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15/*********************************** 15/***********************************
16* Search Table for colnew 16* Search Table for colnew
@@ -94,7 +94,7 @@ void C2F(fcoldg)(int *i, double *z, double *dg)
94 94
95void C2F(setfcoldg)(char *name, int *rep) 95void C2F(setfcoldg)(char *name, int *rep)
96{ 96{
97 fcoldgfonc = (fcoldgf) AddFunctionInTable(name,rep,FTab_fcoldg); 97 fcoldgfonc = (fcoldgf) GetFunctionByName(name,rep,FTab_fcoldg);
98} 98}
99 99
100 100
@@ -113,7 +113,7 @@ void C2F(fcolg)(int *i, double *z, double *g)
113 113
114void C2F(setfcolg)(char *name, int *rep) 114void C2F(setfcolg)(char *name, int *rep)
115{ 115{
116 fcolgfonc = (fcolgf) AddFunctionInTable(name,rep,FTab_fcolg); 116 fcolgfonc = (fcolgf) GetFunctionByName(name,rep,FTab_fcolg);
117} 117}
118 118
119 119
@@ -133,7 +133,7 @@ void C2F(fcoldf)(double *x, double *z, double *df)
133 133
134void C2F(setfcoldf)(char *name, int *rep) 134void C2F(setfcoldf)(char *name, int *rep)
135{ 135{
136 fcoldffonc = (fcoldff) AddFunctionInTable(name,rep,FTab_fcoldf); 136 fcoldffonc = (fcoldff) GetFunctionByName(name,rep,FTab_fcoldf);
137} 137}
138 138
139 139
@@ -152,7 +152,7 @@ void C2F(fcolf)(double *x, double *z, double *df)
152 152
153void C2F(setfcolf)(char *name, int *rep) 153void C2F(setfcolf)(char *name, int *rep)
154{ 154{
155 fcolffonc = (fcolff) AddFunctionInTable(name,rep,FTab_fcolf); 155 fcolffonc = (fcolff) GetFunctionByName(name,rep,FTab_fcolf);
156} 156}
157 157
158/** the current function fixed by setfcolgu **/ 158/** the current function fixed by setfcolgu **/
@@ -170,5 +170,5 @@ void C2F(fcolgu)(double *x, double *z, double *dmval)
170 170
171void C2F(setfcolgu)(char *name, int *rep) 171void C2F(setfcolgu)(char *name, int *rep)
172{ 172{
173 fcolgufonc = (fcolguf) AddFunctionInTable(name,rep,FTab_fcolgu); 173 fcolgufonc = (fcolguf) GetFunctionByName(name,rep,FTab_fcolgu);
174} 174}
diff --git a/scilab/modules/differential_equations/src/c/dassltable.c b/scilab/modules/differential_equations/src/c/dassltable.c
index 8ed213e..bf30fc3 100644
--- a/scilab/modules/differential_equations/src/c/dassltable.c
+++ b/scilab/modules/differential_equations/src/c/dassltable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15/*********************************** 15/***********************************
16* Search Table for dassl 16* Search Table for dassl
@@ -102,7 +102,7 @@ void C2F(fresd)(double *t, double *y, double *ydot, double *res, int *ires, doub
102 102
103void C2F(setfresd)(char *name, int *rep) 103void C2F(setfresd)(char *name, int *rep)
104{ 104{
105 fresdfonc = (fresdf) AddFunctionInTable(name,rep,FTab_fresd); 105 fresdfonc = (fresdf) GetFunctionByName(name,rep,FTab_fresd);
106} 106}
107 107
108 108
@@ -121,7 +121,7 @@ void C2F(fjacd)(double *t, double *y, double *ydot, double *pd, double *cj, doub
121 121
122void C2F(setfjacd)(char *name, int *rep) 122void C2F(setfjacd)(char *name, int *rep)
123{ 123{
124 fjacdfonc = (fjacdf) AddFunctionInTable(name,rep,FTab_fjacd); 124 fjacdfonc = (fjacdf) GetFunctionByName(name,rep,FTab_fjacd);
125} 125}
126 126
127 127
@@ -141,7 +141,7 @@ void C2F(fsurfd)(int *neq, double *t, double *y, int *ng, double *gout, double *
141 141
142void C2F(setfsurfd)(char *name, int *rep) 142void C2F(setfsurfd)(char *name, int *rep)
143{ 143{
144 fsurfdfonc = (fsurfdf) AddFunctionInTable(name,rep,FTab_fsurfd); 144 fsurfdfonc = (fsurfdf) GetFunctionByName(name,rep,FTab_fsurfd);
145} 145}
146 146
147/*********************************** 147/***********************************
@@ -163,5 +163,5 @@ void C2F(fsurf)(int *ny, double *t, double *y, int *ng, double *gout)
163 163
164void C2F(setfsurf)(char *name, int *rep) 164void C2F(setfsurf)(char *name, int *rep)
165{ 165{
166 fsurffonc = (fsurff) AddFunctionInTable(name,rep,FTab_fsurf); 166 fsurffonc = (fsurff) GetFunctionByName(name,rep,FTab_fsurf);
167} 167}
diff --git a/scilab/modules/differential_equations/src/c/fevaltable.c b/scilab/modules/differential_equations/src/c/fevaltable.c
index 4a701ae..fc976e999 100644
--- a/scilab/modules/differential_equations/src/c/fevaltable.c
+++ b/scilab/modules/differential_equations/src/c/fevaltable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "feval.h" 14#include "feval.h"
15/*********************************** 15/***********************************
16* feval (ffeval) 16* feval (ffeval)
@@ -48,6 +48,6 @@ void C2F(ffeval)(int *nn, double *x1, double *x2, double *xres, int *itype, char
48 48
49void C2F(setfeval)(char *name, int *rep) 49void C2F(setfeval)(char *name, int *rep)
50{ 50{
51 fevalfonc = (ffevalf) AddFunctionInTable(name,rep,FTab_ffeval); 51 fevalfonc = (ffevalf) GetFunctionByName(name,rep,FTab_ffeval);
52} 52}
53 53
diff --git a/scilab/modules/differential_equations/src/c/fydot2table.c b/scilab/modules/differential_equations/src/c/fydot2table.c
index cc26c33..eda2dec 100644
--- a/scilab/modules/differential_equations/src/c/fydot2table.c
+++ b/scilab/modules/differential_equations/src/c/fydot2table.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15 15
16extern int C2F(getcodc)(int *nd1, int *iflag1); 16extern int C2F(getcodc)(int *nd1, int *iflag1);
@@ -64,5 +64,5 @@ void C2F(fydot2)(int *n, double *t, double *y, double *ydot)
64 64
65void C2F(setfydot2)(char *name, int *rep) 65void C2F(setfydot2)(char *name, int *rep)
66{ 66{
67 fydot2fonc = (fydot2f) AddFunctionInTable(name,rep,FTab_fydot2); 67 fydot2fonc = (fydot2f) GetFunctionByName(name,rep,FTab_fydot2);
68} 68}
diff --git a/scilab/modules/differential_equations/src/c/fydottable.c b/scilab/modules/differential_equations/src/c/fydottable.c
index 53f1d64..9ee9e12 100644
--- a/scilab/modules/differential_equations/src/c/fydottable.c
+++ b/scilab/modules/differential_equations/src/c/fydottable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "arnol.h" 14#include "arnol.h"
15 /*********************************** 15 /***********************************
16 * ode (fydot and fjac ) 16 * ode (fydot and fjac )
@@ -77,7 +77,7 @@ void C2F(fydot)(int *n, double *t, double *y, double *ydot)
77 77
78void C2F(setfydot)(char *name, int *rep) 78void C2F(setfydot)(char *name, int *rep)
79{ 79{
80 fydotfonc = (fydotf) AddFunctionInTable(name,rep,FTab_fydot); 80 fydotfonc = (fydotf) GetFunctionByName(name,rep,FTab_fydot);
81} 81}
82 82
83 83
@@ -96,5 +96,5 @@ void C2F(fjac)(int *neq, double *t, double *y, int *ml, int *mu, double *pd, int
96 96
97void C2F(setfjac)(char *name, int *rep) 97void C2F(setfjac)(char *name, int *rep)
98{ 98{
99 fjacfonc = (fjacf) AddFunctionInTable(name,rep,FTab_fjac); 99 fjacfonc = (fjacf) GetFunctionByName(name,rep,FTab_fjac);
100} 100}
diff --git a/scilab/modules/differential_equations/src/c/impltable.c b/scilab/modules/differential_equations/src/c/impltable.c
index 0e806fc..af1c105 100644
--- a/scilab/modules/differential_equations/src/c/impltable.c
+++ b/scilab/modules/differential_equations/src/c/impltable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15/*********************************** 15/***********************************
16* impl ( fres, fadda, fj2 ) 16* impl ( fres, fadda, fj2 )
@@ -71,7 +71,7 @@ void C2F(fres)(int *ny, double *t, double *y, double *s, double *r, int *ires)
71 71
72void C2F(setfres)(char *name, int *rep) 72void C2F(setfres)(char *name, int *rep)
73{ 73{
74 fresfonc = (fresf) AddFunctionInTable(name,rep,FTab_fres); 74 fresfonc = (fresf) GetFunctionByName(name,rep,FTab_fres);
75} 75}
76 76
77 77
@@ -88,7 +88,7 @@ void C2F(fadda)(int *ny, double *t, double *y, int *ml, int *mu, double *p, int
88 88
89void C2F(setfadda)(char *name, int *rep) 89void C2F(setfadda)(char *name, int *rep)
90{ 90{
91 faddafonc = (faddaf) AddFunctionInTable(name,rep,FTab_fadda); 91 faddafonc = (faddaf) GetFunctionByName(name,rep,FTab_fadda);
92} 92}
93 93
94 94
@@ -107,5 +107,5 @@ void C2F(fj2)(int *ny, double *t, double *y, double *s, int *ml, int *mu, double
107 107
108void C2F(setfj2)(char *name, int *rep) 108void C2F(setfj2)(char *name, int *rep)
109{ 109{
110 fj2fonc = (fj2f) AddFunctionInTable(name,rep,FTab_fj2); 110 fj2fonc = (fj2f) GetFunctionByName(name,rep,FTab_fj2);
111} 111}
diff --git a/scilab/modules/differential_equations/src/c/int2dtable.c b/scilab/modules/differential_equations/src/c/int2dtable.c
index b8dd058..7de38dc 100644
--- a/scilab/modules/differential_equations/src/c/int2dtable.c
+++ b/scilab/modules/differential_equations/src/c/int2dtable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15/*********************************** 15/***********************************
16* Search Table for int2d 16* Search Table for int2d
@@ -50,5 +50,5 @@ double *C2F(fint2d)(double *x, double *y)
50 50
51void C2F(setfint2d)(char *name, int *rep) 51void C2F(setfint2d)(char *name, int *rep)
52{ 52{
53 fint2dfonc = (fint2df) AddFunctionInTable(name,rep,FTab_fint2d); 53 fint2dfonc = (fint2df) GetFunctionByName(name,rep,FTab_fint2d);
54} 54}
diff --git a/scilab/modules/differential_equations/src/c/int3dtable.c b/scilab/modules/differential_equations/src/c/int3dtable.c
index b70537a..dd38128 100644
--- a/scilab/modules/differential_equations/src/c/int3dtable.c
+++ b/scilab/modules/differential_equations/src/c/int3dtable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15/*********************************** 15/***********************************
16* Search Table for int3d 16* Search Table for int3d
@@ -51,5 +51,5 @@ void C2F(fint3d)(double *xyz, int *numfun, double *v)
51 51
52void C2F(setfint3d)(char *name, int *rep) 52void C2F(setfint3d)(char *name, int *rep)
53{ 53{
54 fint3dfonc = (fint3df) AddFunctionInTable(name,rep,FTab_fint3d); 54 fint3dfonc = (fint3df) GetFunctionByName(name,rep,FTab_fint3d);
55} 55}
diff --git a/scilab/modules/differential_equations/src/c/intgtable.c b/scilab/modules/differential_equations/src/c/intgtable.c
index 41868a6..a327311 100644
--- a/scilab/modules/differential_equations/src/c/intgtable.c
+++ b/scilab/modules/differential_equations/src/c/intgtable.c
@@ -10,7 +10,7 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 */ 12 */
13#include "AddFunctionInTable.h" 13#include "GetFunctionByName.h"
14#include "machine.h" 14#include "machine.h"
15#define ARGS_fintg double * 15#define ARGS_fintg double *
16 16
@@ -49,5 +49,5 @@ double *C2F(fintg)(double *x)
49 49
50void C2F(setfintg)(char *name, int *rep) 50void C2F(setfintg)(char *name, int *rep)
51{ 51{
52 fintgfonc = (fintgf) AddFunctionInTable(name,rep,FTab_fintg); 52 fintgfonc = (fintgf) GetFunctionByName(name,rep,FTab_fintg);
53} 53}