summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan Cornet <allan.cornet@scilab.org>2008-09-26 12:14:58 +0000
committerAllan Cornet <allan.cornet@scilab.org>2008-09-26 12:14:58 +0000
commit3f220abb92a4bff77e0f9dda66991859b98dd7e6 (patch)
treefb96da061c5112b73454cf6931a70a530bf1be83 /scilab/modules
parent95a2c716f9a395d099f3cac75f11f2cc28ccecf0 (diff)
downloadscilab-3f220abb92a4bff77e0f9dda66991859b98dd7e6.zip
scilab-3f220abb92a4bff77e0f9dda66991859b98dd7e6.tar.gz
interpolation, statistics, signal_processing are loaded dynamically by scilab only when we need
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am6
-rw-r--r--scilab/modules/Makefile.in6
-rw-r--r--scilab/modules/core/includes/callinterf.h6
-rw-r--r--scilab/modules/core/src/c/callinterf.c6
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.c48
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.h23
-rw-r--r--scilab/modules/signal_processing/sci_gateway/c/gw_signal.c2
7 files changed, 84 insertions, 13 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index c3fab43..2761808 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -126,15 +126,12 @@ $(top_builddir)/modules/mexlib/libmex.la \
126 $(top_builddir)/modules/renderer/libscirenderer.la \ 126 $(top_builddir)/modules/renderer/libscirenderer.la \
127 $(top_builddir)/modules/gui/libscigui.la \ 127 $(top_builddir)/modules/gui/libscigui.la \
128 $(top_builddir)/modules/integer/libsciinteger.la \ 128 $(top_builddir)/modules/integer/libsciinteger.la \
129 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
130 $(top_builddir)/modules/intersci/libsciintersci.la \ 129 $(top_builddir)/modules/intersci/libsciintersci.la \
131 $(top_builddir)/modules/io/libsciio.la \ 130 $(top_builddir)/modules/io/libsciio.la \
132 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 131 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
133 $(top_builddir)/modules/localization/libscilocalization.la \ 132 $(top_builddir)/modules/localization/libscilocalization.la \
134 $(top_builddir)/modules/polynomials/libscipolynomials.la \ 133 $(top_builddir)/modules/polynomials/libscipolynomials.la \
135 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
136 $(top_builddir)/modules/special_functions/libscispecial_functions.la \ 134 $(top_builddir)/modules/special_functions/libscispecial_functions.la \
137 $(top_builddir)/modules/statistics/libscistatistics.la \
138 $(top_builddir)/modules/time/libscitime.la \ 135 $(top_builddir)/modules/time/libscitime.la \
139 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \ 136 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \
140 $(top_builddir)/modules/tclsci/libscitclsci.la \ 137 $(top_builddir)/modules/tclsci/libscitclsci.la \
@@ -158,6 +155,9 @@ $(top_builddir)/modules/mexlib/libmex.la \
158# $(top_builddir)/modules/symbolic/libscisymbolic.la 155# $(top_builddir)/modules/symbolic/libscisymbolic.la
159# $(top_builddir)/modules/metanet/libscimetanet.la 156# $(top_builddir)/modules/metanet/libscimetanet.la
160# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la 157# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la
158# $(top_builddir)/modules/statistics/libscistatistics.la
159# $(top_builddir)/modules/signal_processing/libscisignal_processing.la
160# $(top_builddir)/modules/interpolation/libsciinterpolation.la
161 161
162# Dev in progress 162# Dev in progress
163 163
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index f7d3ccf..efbba86 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -371,15 +371,12 @@ $(top_builddir)/modules/mexlib/libmex.la \
371 $(top_builddir)/modules/renderer/libscirenderer.la \ 371 $(top_builddir)/modules/renderer/libscirenderer.la \
372 $(top_builddir)/modules/gui/libscigui.la \ 372 $(top_builddir)/modules/gui/libscigui.la \
373 $(top_builddir)/modules/integer/libsciinteger.la \ 373 $(top_builddir)/modules/integer/libsciinteger.la \
374 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
375 $(top_builddir)/modules/intersci/libsciintersci.la \ 374 $(top_builddir)/modules/intersci/libsciintersci.la \
376 $(top_builddir)/modules/io/libsciio.la \ 375 $(top_builddir)/modules/io/libsciio.la \
377 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 376 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
378 $(top_builddir)/modules/localization/libscilocalization.la \ 377 $(top_builddir)/modules/localization/libscilocalization.la \
379 $(top_builddir)/modules/polynomials/libscipolynomials.la \ 378 $(top_builddir)/modules/polynomials/libscipolynomials.la \
380 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
381 $(top_builddir)/modules/special_functions/libscispecial_functions.la \ 379 $(top_builddir)/modules/special_functions/libscispecial_functions.la \
382 $(top_builddir)/modules/statistics/libscistatistics.la \
383 $(top_builddir)/modules/time/libscitime.la \ 380 $(top_builddir)/modules/time/libscitime.la \
384 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \ 381 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \
385 $(top_builddir)/modules/tclsci/libscitclsci.la \ 382 $(top_builddir)/modules/tclsci/libscitclsci.la \
@@ -404,6 +401,9 @@ $(top_builddir)/modules/mexlib/libmex.la \
404# $(top_builddir)/modules/symbolic/libscisymbolic.la 401# $(top_builddir)/modules/symbolic/libscisymbolic.la
405# $(top_builddir)/modules/metanet/libscimetanet.la 402# $(top_builddir)/modules/metanet/libscimetanet.la
406# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la 403# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la
404# $(top_builddir)/modules/statistics/libscistatistics.la
405# $(top_builddir)/modules/signal_processing/libscisignal_processing.la
406# $(top_builddir)/modules/interpolation/libsciinterpolation.la
407 407
408# Dev in progress 408# Dev in progress
409 409
diff --git a/scilab/modules/core/includes/callinterf.h b/scilab/modules/core/includes/callinterf.h
index 227f427..4e4984f 100644
--- a/scilab/modules/core/includes/callinterf.h
+++ b/scilab/modules/core/includes/callinterf.h
@@ -38,8 +38,8 @@
38/* 15 */ #include "dynamic_gateways.h" /* metanet */ 38/* 15 */ #include "dynamic_gateways.h" /* metanet */
39/* 16 */ #include "../../polynomials/includes/gw_polynomials.h" 39/* 16 */ #include "../../polynomials/includes/gw_polynomials.h"
40/* 17 */ #include "../../data_structures/includes/gw_data_structures1.h" 40/* 17 */ #include "../../data_structures/includes/gw_data_structures1.h"
41/* 18 */ #include "../../signal_processing/includes/gw_signal.h" 41/* 18 */ #include "dynamic_gateways.h" /* signal_processing */
42/* 19 */ #include "../../interpolation/includes/gw_interpolation.h" 42/* 19 */ #include "dynamic_gateways.h" /* interpolation */
43/* 20 */ #include "../../cacsd/includes/gw_cacsd3.h" 43/* 20 */ #include "../../cacsd/includes/gw_cacsd3.h"
44/* 21 */ #include "../../string/includes/gw_string.h" 44/* 21 */ #include "../../string/includes/gw_string.h"
45/* 22 */ #include "dynamic_gateways.h" /* symbolic */ 45/* 22 */ #include "dynamic_gateways.h" /* symbolic */
@@ -57,7 +57,7 @@
57/* 34 */ #include "../../fileio/includes/gw_fileio.h" 57/* 34 */ #include "../../fileio/includes/gw_fileio.h"
58/* 35 */ #include "dynamic_gateways.h" /* arnoldi */ 58/* 35 */ #include "dynamic_gateways.h" /* arnoldi */
59/* 36 */ #include "../../special_functions/includes/gw_special_functions1.h" 59/* 36 */ #include "../../special_functions/includes/gw_special_functions1.h"
60/* 37 */ #include "../../statistics/includes/gw_statistics.h" 60/* 37 */ #include "dynamic_gateways.h" /* statistics */
61/* 38 */ #include "dynamic_gateways.h" /* randlib */ 61/* 38 */ #include "dynamic_gateways.h" /* randlib */
62/* 39 */ #include "../../special_functions/includes/gw_special_functions2.h" 62/* 39 */ #include "../../special_functions/includes/gw_special_functions2.h"
63 63
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 50ce9e2..51d75a2 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -48,8 +48,8 @@ static OpTab Interfaces[] = {
48 /* 15 */ {gw_dynamic_metanet}, 48 /* 15 */ {gw_dynamic_metanet},
49 /* 16 */ {gw_polynomials}, 49 /* 16 */ {gw_polynomials},
50 /* 17 */ {gw_data_structures1}, 50 /* 17 */ {gw_data_structures1},
51 /* 18 */ {gw_signal}, 51 /* 18 */ {gw_dynamic_signal_processing},
52 /* 19 */ {gw_interpolation}, 52 /* 19 */ {gw_dynamic_interpolation},
53 /* 20 */ {gw_cacsd3}, 53 /* 20 */ {gw_cacsd3},
54 /* 21 */ {gw_string}, 54 /* 21 */ {gw_string},
55 /* 22 */ {gw_dynamic_symbolic}, 55 /* 22 */ {gw_dynamic_symbolic},
@@ -67,7 +67,7 @@ static OpTab Interfaces[] = {
67 /* 34 */ {gw_fileio}, 67 /* 34 */ {gw_fileio},
68 /* 46 */ {gw_dynamic_arnoldi}, 68 /* 46 */ {gw_dynamic_arnoldi},
69 /* 36 */ {gw_special_functions1}, 69 /* 36 */ {gw_special_functions1},
70 /* 37 */ {gw_statistics}, 70 /* 37 */ {gw_dynamic_statistics},
71 /* 38 */ {gw_dynamic_randlib}, 71 /* 38 */ {gw_dynamic_randlib},
72 /* 39 */ {gw_special_functions2}, 72 /* 39 */ {gw_special_functions2},
73 /* 40 */ {gw_tclsci}, 73 /* 40 */ {gw_tclsci},
diff --git a/scilab/modules/core/src/c/dynamic_gateways.c b/scilab/modules/core/src/c/dynamic_gateways.c
index 6dbd085..b3c663c 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.c
+++ b/scilab/modules/core/src/c/dynamic_gateways.c
@@ -190,3 +190,51 @@ int gw_dynamic_metanet(void)
190 &ptr_gw_metanet); 190 &ptr_gw_metanet);
191} 191}
192/*--------------------------------------------------------------------------*/ 192/*--------------------------------------------------------------------------*/
193/* interpolation module */
194#define INTERPOLATION_MODULE_NAME "interpolation"
195static DynLibHandle hInterpolationLib = NULL;
196static PROC_GATEWAY ptr_gw_interpolation = NULL;
197static char* dynlibname_interpolation = NULL;
198static char* gatewayname_interpolation = NULL;
199/*--------------------------------------------------------------------------*/
200int gw_dynamic_interpolation(void)
201{
202 return gw_dynamic_generic(INTERPOLATION_MODULE_NAME,
203 &dynlibname_interpolation,
204 &gatewayname_interpolation,
205 &hInterpolationLib,
206 &ptr_gw_interpolation);
207}
208/*--------------------------------------------------------------------------*/
209/* statistics module */
210#define STATISTICS_MODULE_NAME "statistics"
211static DynLibHandle hStatisticsLib = NULL;
212static PROC_GATEWAY ptr_gw_statistics = NULL;
213static char* dynlibname_statistics = NULL;
214static char* gatewayname_statistics = NULL;
215/*--------------------------------------------------------------------------*/
216int gw_dynamic_statistics(void)
217{
218 return gw_dynamic_generic(STATISTICS_MODULE_NAME,
219 &dynlibname_statistics,
220 &gatewayname_statistics,
221 &hStatisticsLib,
222 &ptr_gw_statistics);
223}
224/*--------------------------------------------------------------------------*/
225/* statistics module */
226#define SIGNAL_PROCESSING_MODULE_NAME "signal_processing"
227static DynLibHandle hSignal_processingLib = NULL;
228static PROC_GATEWAY ptr_gw_signal_processing = NULL;
229static char* dynlibname_signal_processing = NULL;
230static char* gatewayname_signal_processing = NULL;
231/*--------------------------------------------------------------------------*/
232int gw_dynamic_signal_processing(void)
233{
234 return gw_dynamic_generic(SIGNAL_PROCESSING_MODULE_NAME,
235 &dynlibname_signal_processing,
236 &gatewayname_signal_processing,
237 &hSignal_processingLib,
238 &ptr_gw_signal_processing);
239}
240/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/src/c/dynamic_gateways.h b/scilab/modules/core/src/c/dynamic_gateways.h
index 63cfac8..0ed4d59 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.h
+++ b/scilab/modules/core/src/c/dynamic_gateways.h
@@ -13,6 +13,29 @@
13#define __DYNAMIC_GATEWAYS_H__ 13#define __DYNAMIC_GATEWAYS_H__
14 14
15/** 15/**
16* interpolation gateway
17* interpolation is loaded dynamically at runtime
18* load gw_interpolation in SCI/modules/interpolation/sci_gateway/gw_interpolation.c
19*/
20int gw_dynamic_interpolation(void);
21
22/**
23* statistics gateway
24* statistics is loaded dynamically at runtime
25* load gw_statistics in SCI/modules/statistics/sci_gateway/gw_statistics.c
26*/
27int gw_dynamic_statistics(void);
28
29
30/**
31* signal_processing gateway
32* signal_processing is loaded dynamically at runtime
33* load gw_signal_processing in SCI/modules/signal_processing/sci_gateway/gw_signal_processing.c
34*/
35int gw_dynamic_signal_processing(void);
36
37
38/**
16* helptools gateway 39* helptools gateway
17* helptools is loaded dynamically at runtime 40* helptools is loaded dynamically at runtime
18* load gw_helptools in SCI/modules/helptools/sci_gateway/gw_helptools.c 41* load gw_helptools in SCI/modules/helptools/sci_gateway/gw_helptools.c
diff --git a/scilab/modules/signal_processing/sci_gateway/c/gw_signal.c b/scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
index 48f0186..e0cfe51 100644
--- a/scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
+++ b/scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
@@ -27,7 +27,7 @@ static gw_generic_table Tab[]=
27 {C2F(sci_syredi),"syredi"} 27 {C2F(sci_syredi),"syredi"}
28}; 28};
29/*--------------------------------------------------------------------------*/ 29/*--------------------------------------------------------------------------*/
30int gw_signal(void) 30int gw_signal_processing(void)
31{ 31{
32 callFunctionFromGateway(Tab); 32 callFunctionFromGateway(Tab);
33 return 0; 33 return 0;