Merge commit 'origin/master' into sas
Bruno JOFRET [Tue, 15 Sep 2009 11:41:58 +0000 (13:41 +0200)]
Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/config/ltmain.sh
scilab/configure
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/m4/libtool.m4
scilab/m4/ltoptions.m4
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/metanet/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/msgs.h
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scipad/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in

65 files changed:
1  2 
scilab/Scilab.sln
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/action_binding/Makefile.am
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/cacsd/Makefile.am
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/completion/Makefile.am
scilab/modules/core/Makefile.am
scilab/modules/core/includes/stack-c.h
scilab/modules/core/includes/stack1.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack3.c
scilab/modules/differential_equations/Makefile.am
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/includes/AddFunctionInTable.h
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/fftw/Makefile.am
scilab/modules/fileio/Makefile.am
scilab/modules/functions/Makefile.am
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphics/Makefile.am
scilab/modules/gui/Makefile.am
scilab/modules/helptools/Makefile.am
scilab/modules/history_manager/Makefile.am
scilab/modules/integer/Makefile.am
scilab/modules/interpolation/Makefile.am
scilab/modules/io/Makefile.am
scilab/modules/jvm/Makefile.am
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/localization/Makefile.am
scilab/modules/matio/Makefile.am
scilab/modules/metanet/Makefile.am
scilab/modules/optimization/Makefile.am
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/includes/msgs.h
scilab/modules/polynomials/Makefile.am
scilab/modules/pvm/Makefile.am
scilab/modules/randlib/Makefile.am
scilab/modules/shell/Makefile.am
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/includes/ipmpar1.h
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/string/Makefile.am
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbolic/Makefile.am
scilab/modules/tclsci/Makefile.am
scilab/modules/time/time.vcproj
scilab/modules/umfpack/Makefile.am

Simple merge
@@@ -1464,8 -1466,8 +1466,9 @@@ modules/genetic_algorithms/Makefil
  modules/simulated_annealing/Makefile
  modules/parameters/Makefile
  modules/matio/Makefile
 +modules/operations/Makefile
  modules/atoms/Makefile
+ modules/xpad/Makefile
  modules/Makefile
  libs/Makefile
  Makefile
Simple merge
Simple merge
@@@ -44,7 -44,7 +44,7 @@@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
 -                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
++                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
++                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
 -                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
++                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
 -                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
++                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
  #include "stack-c.h"
  #include "core_math.h"
  #include "gw_arnoldi.h"
 +#include "doublecomplex.h"
+ #include "localization.h"
+ #include "Scierror.h"
  /*--------------------------------------------------------------------------*/
- #define CHAR(x)         (cstk(x))
- #define INT(x)        (istk(x))
- #define DOUBLE(x)     ( stk(x))
- #define CMPLX(x)      (zstk(x))
+ extern int C2F(znaupd)(int * ido, char * bmat, int * n, char * which, 
+                      int * nev, double * tol, doublecomplex * resid, 
+                      int * ncv, doublecomplex * v, int * ldv, int * iparam,
+                      int * ipntr, doublecomplex * workd, 
+                      doublecomplex * workl, int * lworkl, double * rwork, 
+                      int * info);
  /*--------------------------------------------------------------------------*/
- extern int C2F(znaupd)();
- /*--------------------------------------------------------------------------*/
- int C2F(intznaupd)(char *fname,unsigned long fname_len)
+ int sci_znaupd(char *fname,unsigned long fname_len)
  {
    int IDO,   mIDO,   nIDO,    pIDO;
    int BMAT,  mBMAT,  nBMAT,   pBMAT;
  #include "stack-c.h"
  #include "gw_arnoldi.h"
  #include "core_math.h"
 +#include "doublecomplex.h"
+ #include "localization.h"
+ #include "Scierror.h"
  /*--------------------------------------------------------------------------*/
- #define CHAR(x)         (cstk(x))
- #define INT(x)        (istk(x))
- #define DOUBLE(x)     ( stk(x))
- #define CMPLX(x)      (zstk(x))
+ extern int C2F(zneupd)(int * rvec, char * howmny, int * select, 
+                      doublecomplex * d, doublecomplex * z, int * ldz, 
+                      doublecomplex * sigma, doublecomplex * workev, 
+                      char * bmat, int * n, char * which, int * nev, 
+                      double *  tol, doublecomplex * resid, int * ncv,
+                      doublecomplex * v, int * ldv, int * iparam, int * ipntr,
+                      doublecomplex * workd, doublecomplex * workl, 
+                      int * lworkl, double * rwork, int * info);
  /*--------------------------------------------------------------------------*/
- extern int C2F(zneupd)();
- /*--------------------------------------------------------------------------*/
- int C2F(intzneupd)(char *fname,unsigned long fname_len)
+ int sci_zneupd(char *fname,unsigned long fname_len)
  {
    int RVEC,     mRVEC,     nRVEC,      pRVEC;
    int HOWMANY,  mHOWMANY,  nHOWMANY,   pHOWMANY;
Simple merge
@@@ -38,10 -38,9 +38,11 @@@ libscicompletion_la_CFLAGS=         $(JAVA_JN
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
 +                              -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/functions/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
 -                              -I$(top_srcdir)/modules/output_stream/includes
 +                              -I$(top_srcdir)/modules/operations/includes
 +
  
  # Name of the future library (.la will be replace by .so, .a, etc regarding
  # the system)
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1981,9 -1972,8 +1972,8 @@@ int iGetStringFromPointer(int* _piAddr
        return 0;
  }
  
 -void vGetPointerFromDoubleComplex(doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg)
 +/*void vGetPointerFromDoubleComplex(doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg)
  {
-       int iIndex = 0;
  
        int iTwo        = 2;
        int iOne        = 1;
@@@ -63,9 -62,10 +63,10 @@@ libscidynamic_link_la_include_HEADERS 
  includes/addinter.h \
  includes/dynamic_link.h \
  includes/gw_dynamic_link.h \
+ includes/dynlib_dynamic_link.h \
  includes/ilib_verbose.h 
  
 -#### dynamic_link : compilation scripts #### 
 +#### dynamic_link : compilation scripts ####
  libscidynamic_link_la_scriptdir = $(mydatadir)/src/scripts/
  libscidynamic_link_la_script_DATA = src/scripts/Makefile.in \
  src/scripts/configure.ac \
@@@ -30,11 -31,11 +31,11 @@@ typedef struct 
  * Add a C or fortran function in functions hashtable
  *
  * @param name  function name
 -* @param[OUT] rep  result 1 (OK) or 0 (Problem)
 +* @param[OUT] rep  result 0 (OK) or 1 (Problem)
  * @param table functions hashtable
 -* @return a pointer on function in functions hashtable
 +* @return a pointer on function in functions table
  */
- voidf AddFunctionInTable (char *name, int *rep, FTAB *table);  
+ DYNAMIC_LINK_IMPEXP voidf AddFunctionInTable (char *name, int *rep, FTAB *table);  
  
  #endif /* __ADDFUNCTIONINTABLE_H__ */
  /*--------------------------------------------------------------------------*/
@@@ -274,7 -268,7 +290,8 @@@ src/fortran/ribesl.f 
  src/fortran/rjbesl.f \
  src/fortran/rkbesl.f \
  src/fortran/rybesl.f \
- src/fortran/old_pythag.f
++src/fortran/old_pythag.f \
+ src/fortran/sdot.f
  
  GATEWAY_C_SOURCES = sci_gateway/c/sci_isequal.c \
  sci_gateway/c/sci_matrix.c \
@@@ -81,7 -73,10 +74,10 @@@ FFTW_C_SOURCES = src/nofftw/nofftw.
  
  libscifftw_la_SOURCES = $(FFTW_C_SOURCES)
  
- libscifftw_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes
+ libscifftw_la_CFLAGS=         -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/output_stream/includes
  endif
  
 -include $(top_srcdir)/Makefile.incl.am
 +include $(top_srcdir)/Makefile.incl.am
Simple merge
@@@ -25,10 -31,11 +31,12 @@@ libscifunctions_la_CFLAGS=         -I$(srcdir)
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
+                               -I$(top_srcdir)/modules/fileio/includes \
+                               -I$(top_srcdir)/modules/call_scilab/includes \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/string/includes \
 -                              -I$(top_srcdir)/modules/localization/includes
 +                              -I$(top_srcdir)/modules/localization/includes \
 +                              -I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libscifunctions.la
  
Simple merge
@@@ -240,12 -239,14 +240,14 @@@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCL
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
                        -I$(top_srcdir)/modules/graphic_export/includes/ \
 +                      -I$(top_srcdir)/modules/string/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
 -                      -I$(top_srcdir)/modules/string/includes/
 -
 +                      -I$(top_srcdir)/modules/operations/includes/
  
 -# Without the GUI module 
 +# Without the GUI module
  libscigui_disable_la_CFLAGS = -Iincludes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes
  
  GUI_DISABLE_C_SOURCES = src/nogui/nogui.c
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -104,12 -88,11 +100,13 @@@ sci_gateway/c/sci_zheev.
  GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/bschur.f
  
  libscilinear_algebra_la_CFLAGS=       -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
  -I$(top_srcdir)/modules/output_stream/includes \
  -I$(top_srcdir)/modules/dynamic_link/includes \
 --I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/elementary_functions/includes
 +-I$(top_srcdir)/modules/operations/includes \
 +-I$(top_srcdir)/modules/elementary_functions/includes \
 +-I$(top_srcdir)/modules/api_scilab/includes
 +
  
  pkglib_LTLIBRARIES = libscilinear_algebra.la
  
Simple merge
Simple merge
   * @param ierr  
   * @return <ReturnValue>
   */
- int C2F(msgs)(int *n, int *ierr);
+ OUTPUT_STREAM_IMPEXP int C2F(msgs)(int *n, int *ierr);
 +/*
 + * print a message
 + * @param n int message number see modules/output_stream/src/c/msgs.c 
 + * for the list of messages 
 + * some message append a buffer to the message (@see printToBuffer)
 + */
 +void Msgs(int n,int ierr);
 +
 +/*
 + * print to the char buffer used to add custom info to some messages
 + * (@see Msgs). Buffer is of size bsize as #defined in stack-def.h (i.e. 4096)
 + *
 + * @param same as sprintf
 + * @return same as sprintf
 + */
 +int printToBuffer(const char* format,...);
+ #endif /* __MSGS_H__ */
@@@ -106,11 -103,9 +103,9 @@@ sci_gateway/fortran/sci_f_simpmd.
  
  
  
  libscipolynomials_la_CFLAGS=  -I$(srcdir)/includes/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes \
 -                              -I$(top_srcdir)/modules/output_stream/includes
 +                              -I$(top_srcdir)/modules/output_stream/includes \
 +                              -I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libscipolynomials.la
  
Simple merge
Simple merge
Simple merge
  #ifndef __GW_SIGNAL__
  #define __GW_SIGNAL__
  /*--------------------------------------------------------------------------*/
+ #include "dynlib_signal_processing.h"
  #include "machine.h"
  /*--------------------------------------------------------------------------*/
- int gw_signal(void);
+ SIGNAL_PROCESSING_IMPEXP int gw_signal_processing(void);
  /*--------------------------------------------------------------------------*/
- int sci_ffir(char *fname,unsigned long fname_len);
- int sci_fft(char *fname,unsigned long fname_len);
- int sci_corr(char *fname,unsigned long fname_len);
- int sci_fiir(char *fname,unsigned long fname_len);
- int sci_rpem(char *fname,unsigned long fname_len);
- int sci_amell(char *fname,unsigned long fname_len);
- int sci_delip(char *fname,unsigned long fname_len);
- int sci_remez(char *fname,unsigned long fname_len);
- int sci_syredi(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_ffir)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_fft)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_corr)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_fiir)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_rpem)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_amell)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_delip)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_remez)(char *fname,unsigned long fname_len);
 -SIGNAL_PROCESSING_IMPEXP int C2F(sci_syredi)(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_ffir(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_fft(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_corr(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_fiir(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_rpem(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_amell(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_delip(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_remez(char *fname,unsigned long fname_len);
++SIGNAL_PROCESSING_IMPEXP int sci_syredi(char *fname,unsigned long fname_len);
  
 -void dfft2 ( double* a , double* b , int nseg , int n , int nspn ,
 -             int isn , int ierr, int* iw , int lw );
 +/* commented out by VL 04/03/2009 : should'nt be used outside of the module [ */
  
 +/* void dfft2 ( double* a , double* b , int nseg , int n , int nspn , */
 +/*              int isn , int ierr, int* iw , int lw ); */
 +/* void dfftbi ( double* a , double* b , int nseg , int n , int nspn , */
 +/*               int isn , int ierr, int lout , int lnow , */
 +/*               int lused ,int lmax , int lbook , int* rstak , int* istakk ); */
 +/* void fft842 ( int _iDirect , int _iDimen , int* _pdblReal , int* _pdblImag , int _err ); */
 +/* void r2tx ( int _iDimen , double* _pdblReal, double* _pdblImag ); */
 +/* void r4tx ( int _iDimen , double* _pdblReal, double* _pdblImag) ; */
 +/* void r8tx ( int _iTempDimen , int _iDimen , int _iLengt ,  double* _pdblReal, double* _pdblImag ); */
  
  
 -void dfftbi ( double* a , double* b , int nseg , int n , int nspn ,
 -              int isn , int ierr, int lout , int lnow ,
 -              int lused ,int lmax , int lbook , int* rstak , int* istakk );
 -
 -void fft842 ( int _iDirect , int _iDimen , int* _pdblReal , int* _pdblImag , int _err );
 -
 -void r2tx ( int _iDimen , double* _pdblReal, double* _pdblImag );
 -void r4tx ( int _iDimen , double* _pdblReal, double* _pdblImag) ;
 -void r8tx ( int _iTempDimen , int _iDimen , int _iLengt ,  double* _pdblReal, double* _pdblImag );
 -
 -
 -int dfftmx ( double* _pdblA , double* _pdblB , int _iNtot, int _iN, int _iNspan,
 -             int _iIsn, int _iM, int _iKt, int* _piWt, int* _piCk,
 -             int* _piBt, int* _piSk ,int* _piNp, int* _piNfac);
 -/* under functions used by dfftmx */
 -   void preliminaryWork (void);
 -   void permute_stage1 (void);
 -   void permute_stage2 (void);
 -   void f4t_150 (void);
 -   void factorOf3Transform (void) ;
 -   void factorOf5Transform (void) ;
 -   void preFOtherTransform (void);
 -   void factorOfOtherTransform (void);
 -   void pre_sqFactor2NormlOrder (void);
 -   void nonSqFactor2NormOrder (void) ;
 -   void detPermutCycles (void);
 -   void reorderMatrix (void ) ;
 +/* int dfftmx ( double* _pdblA , double* _pdblB , int _iNtot, int _iN, int _iNspan, */
 +/*              int _iIsn, int _iM, int _iKt, int* _piWt, int* _piCk, */
 +/*              int* _piBt, int* _piSk ,int* _piNp, int* _piNfac); */
 +/* /\* under functions used by dfftmx *\/ */
 +/*    void preliminaryWork (void); */
 +/*    void permute_stage1 (void); */
 +/*    void permute_stage2 (void); */
 +/*    void f4t_150 (void); */
 +/*    void factorOf3Transform (void) ; */
 +/*    void factorOf5Transform (void) ; */
 +/*    void preFOtherTransform (void); */
 +/*    void factorOfOtherTransform (void); */
 +/*    void pre_sqFactor2NormlOrder (void); */
 +/*    void nonSqFactor2NormOrder (void) ; */
 +/*    void detPermutCycles (void); */
 +/*    void reorderMatrix (void ) ; */
     
 -   int f4t_170 (void);
 -   int factorTransform (void);
 -   int pre_fOf2Trans (void);
 -   int factorOf2Transform (void);
 -   int factorOf4Transform (void);
 -   int  mulByRotationFactor (void );
 -   int  post_sqFactor2NormlOrder (void);
 -   int  single_sqFactor2NormlOrder (void);
 -   int  preF2transform (void) ;
 -   int  multi_sqFactor2NormlOrder (void);
 -   int  end (void) ;
 -
 -
 +/*    int f4t_170 (void); */
 +/*    int factorTransform (void); */
 +/*    int pre_fOf2Trans (void); */
 +/*    int factorOf2Transform (void); */
 +/*    int factorOf4Transform (void); */
 +/*    int  mulByRotationFactor (void ); */
 +/*    int  post_sqFactor2NormlOrder (void); */
 +/*    int  single_sqFactor2NormlOrder (void); */
 +/*    int  preF2transform (void) ; */
 +/*    int  multi_sqFactor2NormlOrder (void); */
 +/*    int  end (void) ; */
  
 +/* ] VL 04/03/2009 end of commented out part */
  
  #endif /*  __GW_SIGNAL__ */
  /*--------------------------------------------------------------------------*/
  #include "gw_signal.h"
  #include "callFunctionFromGateway.h"
  /*--------------------------------------------------------------------------*/
- #define SIGNAL_TAB_SIZE 9
- static gw_generic_table Tab[SIGNAL_TAB_SIZE]=
+ static gw_generic_table Tab[]=
  {
 -      {C2F(sci_ffir),"ffir"},
 -      {C2F(sci_fft),"fft"},
 -      {C2F(sci_fiir),"fiir"},
 -      {C2F(sci_corr),"corr"},
 -      {C2F(sci_rpem),"rpem"},
 -      {C2F(sci_amell),"amell"},
 -      {C2F(sci_delip),"delip"},
 -      {C2F(sci_remez),"remez"},
 -      {C2F(sci_syredi),"syredi"}
 +  {NULL,       ""}, // placeholder
 +  {sci_fft,    "fft"},
 +  {NULL,       ""}, // placeholder
 +  {sci_corr,   "corr"},
 +  {sci_rpem,   "rpem"},
 +  {sci_amell,  "amell"},
 +  {sci_delip,  "delip"},
 +  {sci_remez,  "remez"},
 +  {sci_syredi, "syredi"}
  };
 -/*--------------------------------------------------------------------------*/
 +/****************************************************************/
  int gw_signal_processing(void)
  {  
-       callFunctionFromGateway(Tab,SIGNAL_TAB_SIZE);
+       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
        return 0;
  }
 -/*--------------------------------------------------------------------------*/
 +/****************************************************************/
Simple merge
@@@ -8,25 -7,29 +8,27 @@@
   * you should have received as part of this distribution.  The terms
   * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 - *
   */
 -/*--------------------------------------------------------------------------*/ 
 +
  #ifndef __GW_STATISTICS__
  #define __GW_STATISTICS__
- #include "machine.h"
- int gw_statistics(void);
- int cdfbetI(char* fname,unsigned long l);
- int cdfbinI(char* fname,unsigned long l);
- int cdfchiI(char* fname,unsigned long l);
- int cdfchnI(char* fname,unsigned long l);
- int cdffI(char* fname,unsigned long l);
- int cdffncI(char* fname,unsigned long l);
- int cdfgamI(char* fname,unsigned long l);
- int cdfnbnI(char* fname,unsigned long l);
- int cdfnorI(char* fname,unsigned long l);
- int cdfpoiI(char* fname,unsigned long l);
- int cdftI(char* fname,unsigned long l);
+ /*--------------------------------------------------------------------------*/ 
+ #include "dynlib_statistics.h"
+ #include "api_common.h"
+ /*--------------------------------------------------------------------------*/ 
+ STATISTICS_IMPEXP int gw_statistics(void);
+ /*--------------------------------------------------------------------------*/ 
+ STATISTICS_IMPEXP int cdfbetI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfbinI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfchiI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfchnI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdffI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdffncI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfgamI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfnbnI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfnorI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdfpoiI(char* fname,unsigned long l);
+ STATISTICS_IMPEXP int cdftI(char* fname,unsigned long l);
+ /*--------------------------------------------------------------------------*/ 
  #endif /*  __GW_STATISTICS__ */
+ /*--------------------------------------------------------------------------*/
 -
index 0000000,e04d101..89e640e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,26 +1,30 @@@
+ /*
+  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+  * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
++ * Copyright (C) 2009 - Digiteo - Vincent LIARD
+  *
+  * This file must be used under the terms of the CeCILL.
+  * This source file is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at
+  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+  *
+  */
+ /*--------------------------------------------------------------------------*/
++
+ #ifndef  __IPMPAR1_H__
+ #define __IPMPAR1_H__
+ #include "dynlib_statistics.h"
+ #include "machine.h"
+ /**
 - * TODO : add comment
 - * @return
++ * Get machine's largest integer
++ * called by dcdlib in ipmpar.f
++ * Should be replaced with appropriate compile-time value
++ * @return largest machine's integer
+  */
+ STATISTICS_IMPEXP int C2F(largestint)(void);
+ #endif /* __IPMPAR1_H__ */
  #include "gw_statistics.h"
  #include "stack-c.h"
  #include "callFunctionFromGateway.h"
- #define GWTABLE_LENGTH(t) (sizeof(Tab) / sizeof(gw_generic_table))
- static gw_generic_table Tab[] = { 
-   {cdfbetI, "cdfbet"},
-   {cdfbinI, "cdfbin"},
-   {cdfchiI, "cdfchi"},
-   {cdfchnI, "cdfchn"},
-   {cdffI  , "cdff"  },
-   {cdffncI, "cdffnc"},
-   {cdfgamI, "cdfgam"},
-   {cdfnbnI, "cdfnbn"},
-   {cdfnorI, "cdfnor"},
-   {cdfpoiI, "cdfpoi"},
-   {cdftI  , "cdft"  }};
- int
- gw_statistics(void)
+ /*--------------------------------------------------------------------------*/
+ static gw_generic_table Tab[] =
+ { 
+       {cdfbetI, "cdfbet"},
+       {cdfbinI, "cdfbin"},
+       {cdfchiI, "cdfchi"},
+       {cdfchnI, "cdfchn"},
+       {cdffI, "cdff"},
+       {cdffncI, "cdffnc"},
+       {cdfgamI, "cdfgam"},
+       {cdfnbnI, "cdfnbn"},
+       {cdfnorI, "cdfnor"},
+       {cdfpoiI, "cdfpoi"},
+       {cdftI, "cdft"}
+ };
+ /*--------------------------------------------------------------------------*/
+ int gw_statistics()
  {  
-   Rhs = Max(0, Rhs);
-   callFunctionFromGateway(Tab, GWTABLE_LENGTH(Tab));
-   return 0;
+       Rhs = Max(0, Rhs);
+       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
+       return 0;
  }
 -/*--------------------------------------------------------------------------*/
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -84,7 -84,9 +85,10 @@@ els
  UMFPACK_C_SOURCES = src/noumfpack/noumfpack.c
  
  libsciumfpack_la_SOURCES = $(UMFPACK_C_SOURCES)
- libsciumfpack_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes
++
+ libsciumfpack_la_CFLAGS= -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/umfpack/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes
  endif
  
  include $(top_srcdir)/Makefile.incl.am