Reorganization
Allan Cornet [Wed, 30 Aug 2006 13:45:51 +0000 (13:45 +0000)]
integer module

routines/int
man
macros/int

188 files changed:
scilab/Scilab.sln
scilab/libs/LibScilab/DllmainLibscilab.c
scilab/macros/buildmacros.sce
scilab/modules/core/sci_gateway/fundef
scilab/modules/integer/changelog.txt [new file with mode: 0644]
scilab/modules/integer/etc/integer.quit [new file with mode: 0644]
scilab/modules/integer/etc/integer.start [new file with mode: 0644]
scilab/modules/integer/help/eng/helpbuildereng.sce [new file with mode: 0644]
scilab/modules/integer/help/eng/iconvert.xml [new file with mode: 0644]
scilab/modules/integer/help/eng/inttype.xml [new file with mode: 0644]
scilab/modules/integer/help/fr/helpbuilderfr.sce [new file with mode: 0644]
scilab/modules/integer/help/fr/iconvert.xml [new file with mode: 0644]
scilab/modules/integer/help/fr/inttype.xml [new file with mode: 0644]
scilab/modules/integer/help/helpbuilder.sce [new file with mode: 0644]
scilab/modules/integer/includes/def.h [moved from scilab/routines/int/def.h with 100% similarity]
scilab/modules/integer/includes/gw_integer.h [moved from scilab/routines/int/gw_integer.h with 89% similarity]
scilab/modules/integer/licence.txt [new file with mode: 0644]
scilab/modules/integer/macros/%i_1_s.sci [moved from scilab/macros/int/%i_1_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_2_s.sci [moved from scilab/macros/int/%i_2_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_3_s.sci [moved from scilab/macros/int/%i_3_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_4_s.sci [moved from scilab/macros/int/%i_4_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_Matplot.sci [moved from scilab/macros/int/%i_Matplot.sci with 100% similarity]
scilab/modules/integer/macros/%i_a_s.sci [moved from scilab/macros/int/%i_a_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_champ.sci [moved from scilab/macros/int/%i_champ.sci with 100% similarity]
scilab/modules/integer/macros/%i_champ1.sci [moved from scilab/macros/int/%i_champ1.sci with 100% similarity]
scilab/modules/integer/macros/%i_contour.sci [moved from scilab/macros/int/%i_contour.sci with 100% similarity]
scilab/modules/integer/macros/%i_contour2d.sci [moved from scilab/macros/int/%i_contour2d.sci with 100% similarity]
scilab/modules/integer/macros/%i_d_s.sci [moved from scilab/macros/int/%i_d_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_fft.sci [moved from scilab/macros/int/%i_fft.sci with 100% similarity]
scilab/modules/integer/macros/%i_j_i.sci [moved from scilab/macros/int/%i_j_i.sci with 100% similarity]
scilab/modules/integer/macros/%i_j_s.sci [moved from scilab/macros/int/%i_j_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_l_s.sci [moved from scilab/macros/int/%i_l_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_m_s.sci [moved from scilab/macros/int/%i_m_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_mfprintf.sci [moved from scilab/macros/int/%i_mfprintf.sci with 100% similarity]
scilab/modules/integer/macros/%i_mprintf.sci [moved from scilab/macros/int/%i_mprintf.sci with 100% similarity]
scilab/modules/integer/macros/%i_msprintf.sci [moved from scilab/macros/int/%i_msprintf.sci with 100% similarity]
scilab/modules/integer/macros/%i_n_s.sci [moved from scilab/macros/int/%i_n_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_o_s.sci [moved from scilab/macros/int/%i_o_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_p_i.sci [moved from scilab/macros/int/%i_p_i.sci with 100% similarity]
scilab/modules/integer/macros/%i_p_s.sci [moved from scilab/macros/int/%i_p_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_plot2d.sci [moved from scilab/macros/int/%i_plot2d.sci with 100% similarity]
scilab/modules/integer/macros/%i_plot2d1.sci [moved from scilab/macros/int/%i_plot2d1.sci with 100% similarity]
scilab/modules/integer/macros/%i_plot2d2.sci [moved from scilab/macros/int/%i_plot2d2.sci with 100% similarity]
scilab/modules/integer/macros/%i_q_s.sci [moved from scilab/macros/int/%i_q_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_r_s.sci [moved from scilab/macros/int/%i_r_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_s_s.sci [moved from scilab/macros/int/%i_s_s.sci with 100% similarity]
scilab/modules/integer/macros/%i_sign.sci [moved from scilab/macros/int/%i_sign.sci with 100% similarity]
scilab/modules/integer/macros/%i_string.sci [moved from scilab/macros/int/%i_string.sci with 100% similarity]
scilab/modules/integer/macros/%i_x_s.sci [moved from scilab/macros/int/%i_x_s.sci with 100% similarity]
scilab/modules/integer/macros/%s_1_i.sci [moved from scilab/macros/int/%s_1_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_2_i.sci [moved from scilab/macros/int/%s_2_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_3_i.sci [moved from scilab/macros/int/%s_3_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_4_i.sci [moved from scilab/macros/int/%s_4_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_a_i.sci [moved from scilab/macros/int/%s_a_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_d_i.sci [moved from scilab/macros/int/%s_d_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_i_i.sci [moved from scilab/macros/int/%s_i_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_j_i.sci [moved from scilab/macros/int/%s_j_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_l_i.sci [moved from scilab/macros/int/%s_l_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_m_i.sci [moved from scilab/macros/int/%s_m_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_n_i.sci [moved from scilab/macros/int/%s_n_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_o_i.sci [moved from scilab/macros/int/%s_o_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_p_i.sci [moved from scilab/macros/int/%s_p_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_q_i.sci [moved from scilab/macros/int/%s_q_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_r_i.sci [moved from scilab/macros/int/%s_r_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_s_i.sci [moved from scilab/macros/int/%s_s_i.sci with 100% similarity]
scilab/modules/integer/macros/%s_x_i.sci [moved from scilab/macros/int/%s_x_i.sci with 100% similarity]
scilab/modules/integer/macros/buildmacros.sce [moved from scilab/macros/int/buildmacros.sce with 82% similarity]
scilab/modules/integer/readme.txt [new file with mode: 0644]
scilab/modules/integer/sci_gateway/c/gw_integer.c [moved from scilab/routines/int/gw_integer.c with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_double.f [moved from scilab/routines/int/sci_double.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_abs.f [moved from scilab/routines/int/sci_i_abs.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_cumprod.f [moved from scilab/routines/int/sci_i_cumprod.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_cumsum.f [moved from scilab/routines/int/sci_i_cumsum.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_diag.f [moved from scilab/routines/int/sci_i_diag.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_matrix.f [moved from scilab/routines/int/sci_i_matrix.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_max.f [moved from scilab/routines/int/sci_i_max.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_maxi.f [moved from scilab/routines/int/sci_i_maxi.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_min.f [moved from scilab/routines/int/sci_i_min.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_mini.f [moved from scilab/routines/int/sci_i_mini.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_mput.f [moved from scilab/routines/int/sci_i_mput.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_p.f [moved from scilab/routines/int/sci_i_p.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_prod.f [moved from scilab/routines/int/sci_i_prod.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_sum.f [moved from scilab/routines/int/sci_i_sum.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_tril.f [moved from scilab/routines/int/sci_i_tril.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_i_triu.f [moved from scilab/routines/int/sci_i_triu.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_iconvert.f [moved from scilab/routines/int/sci_iconvert.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_int16.f [moved from scilab/routines/int/sci_int16.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_int32.f [moved from scilab/routines/int/sci_int32.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_int8.f [moved from scilab/routines/int/sci_int8.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_inttype.f [moved from scilab/routines/int/sci_inttype.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_mgeti.f [moved from scilab/routines/int/sci_mgeti.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_uint16.f [moved from scilab/routines/int/sci_uint16.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_uint32.f [moved from scilab/routines/int/sci_uint32.f with 100% similarity]
scilab/modules/integer/sci_gateway/fortran/sci_uint8.f [moved from scilab/routines/int/sci_uint8.f with 100% similarity]
scilab/modules/integer/sci_gateway/integer.fundef [moved from scilab/routines/int/int.fundef with 100% similarity]
scilab/modules/integer/src/c/Makefile [moved from scilab/routines/int/Makefile with 100% similarity]
scilab/modules/integer/src/c/db2int.c [moved from scilab/routines/int/db2int.c with 96% similarity]
scilab/modules/integer/src/c/genabs.c [moved from scilab/routines/int/genabs.c with 97% similarity]
scilab/modules/integer/src/c/genadd.c [moved from scilab/routines/int/genadd.c with 97% similarity]
scilab/modules/integer/src/c/genbitops.c [moved from scilab/routines/int/genbitops.c with 98% similarity]
scilab/modules/integer/src/c/gencheck.c [moved from scilab/routines/int/gencheck.c with 98% similarity]
scilab/modules/integer/src/c/genconcatcol.c [moved from scilab/routines/int/genconcatcol.c with 97% similarity]
scilab/modules/integer/src/c/genconcatrow.c [moved from scilab/routines/int/genconcatrow.c with 96% similarity]
scilab/modules/integer/src/c/gencopy.c [moved from scilab/routines/int/gencopy.c with 97% similarity]
scilab/modules/integer/src/c/gencuprod.c [moved from scilab/routines/int/gencuprod.c with 96% similarity]
scilab/modules/integer/src/c/gencusum.c [moved from scilab/routines/int/gencusum.c with 96% similarity]
scilab/modules/integer/src/c/gendiag.c [moved from scilab/routines/int/gendiag.c with 97% similarity]
scilab/modules/integer/src/c/gendot.c [moved from scilab/routines/int/gendot.c with 97% similarity]
scilab/modules/integer/src/c/genextrac1.c [moved from scilab/routines/int/genextrac1.c with 96% similarity]
scilab/modules/integer/src/c/genextrac2.c [moved from scilab/routines/int/genextrac2.c with 97% similarity]
scilab/modules/integer/src/c/genimpl.c [moved from scilab/routines/int/genimpl.c with 99% similarity]
scilab/modules/integer/src/c/geninsert1.c [moved from scilab/routines/int/geninsert1.c with 96% similarity]
scilab/modules/integer/src/c/geninsert2.c [moved from scilab/routines/int/geninsert2.c with 97% similarity]
scilab/modules/integer/src/c/genisany.c [moved from scilab/routines/int/genisany.c with 97% similarity]
scilab/modules/integer/src/c/genkron.c [moved from scilab/routines/int/genkron.c with 98% similarity]
scilab/modules/integer/src/c/genmax2.c [moved from scilab/routines/int/genmax2.c with 99% similarity]
scilab/modules/integer/src/c/genmcopy.c [moved from scilab/routines/int/genmcopy.c with 97% similarity]
scilab/modules/integer/src/c/genmcuprod.c [moved from scilab/routines/int/genmcuprod.c with 97% similarity]
scilab/modules/integer/src/c/genmcusum.c [moved from scilab/routines/int/genmcusum.c with 97% similarity]
scilab/modules/integer/src/c/genmdiag.c [moved from scilab/routines/int/genmdiag.c with 97% similarity]
scilab/modules/integer/src/c/genmdsp.c [moved from scilab/routines/int/genmdsp.c with 98% similarity]
scilab/modules/integer/src/c/genmin2.c [moved from scilab/routines/int/genmin2.c with 99% similarity]
scilab/modules/integer/src/c/genmmax.c [moved from scilab/routines/int/genmmax.c with 98% similarity]
scilab/modules/integer/src/c/genmmin.c [moved from scilab/routines/int/genmmin.c with 98% similarity]
scilab/modules/integer/src/c/genmmul.c [moved from scilab/routines/int/genmmul.c with 97% similarity]
scilab/modules/integer/src/c/genmprod.c [moved from scilab/routines/int/genmprod.c with 97% similarity]
scilab/modules/integer/src/c/genmsum.c [moved from scilab/routines/int/genmsum.c with 97% similarity]
scilab/modules/integer/src/c/genmtran.c [moved from scilab/routines/int/genmtran.c with 97% similarity]
scilab/modules/integer/src/c/genprod.c [moved from scilab/routines/int/genprod.c with 97% similarity]
scilab/modules/integer/src/c/genrdiv.c [moved from scilab/routines/int/genrdiv.c with 98% similarity]
scilab/modules/integer/src/c/genscal.c [moved from scilab/routines/int/genscal.c with 97% similarity]
scilab/modules/integer/src/c/genset.c [moved from scilab/routines/int/genset.c with 97% similarity]
scilab/modules/integer/src/c/gensubst.c [moved from scilab/routines/int/gensubst.c with 97% similarity]
scilab/modules/integer/src/c/gensum.c [moved from scilab/routines/int/gensum.c with 97% similarity]
scilab/modules/integer/src/c/gentril.c [moved from scilab/routines/int/gentril.c with 97% similarity]
scilab/modules/integer/src/c/gentriu.c [moved from scilab/routines/int/gentriu.c with 97% similarity]
scilab/modules/integer/src/c/genvmul.c [moved from scilab/routines/int/genvmul.c with 97% similarity]
scilab/modules/integer/src/c/i_nextj.c [moved from scilab/routines/int/i_nextj.c with 97% similarity]
scilab/modules/integer/src/c/integer.vcproj [moved from scilab/routines/int/int.vcproj with 81% similarity]
scilab/modules/integer/src/c/mgeti.c [moved from scilab/routines/int/mgeti.c with 97% similarity]
scilab/modules/integer/src/c/mputi.c [moved from scilab/routines/int/mputi.c with 97% similarity]
scilab/modules/integer/src/c/tpconv.c [moved from scilab/routines/int/tpconv.c with 99% similarity]
scilab/modules/integer/src/fortran/bitops.f [moved from scilab/routines/int/bitops.f with 98% similarity]
scilab/modules/integer/src/fortran/convert.f [moved from scilab/routines/int/convert.f with 98% similarity]
scilab/modules/integer/src/fortran/i_a_i.f [moved from scilab/routines/int/i_a_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_abs.f [moved from scilab/routines/int/i_abs.f with 97% similarity]
scilab/modules/integer/src/fortran/i_b_i.f [moved from scilab/routines/int/i_b_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_c_i.f [moved from scilab/routines/int/i_c_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_convert.f [moved from scilab/routines/int/i_convert.f with 95% similarity]
scilab/modules/integer/src/fortran/i_cumprod.f [moved from scilab/routines/int/i_cumprod.f with 97% similarity]
scilab/modules/integer/src/fortran/i_cumsum.f [moved from scilab/routines/int/i_cumsum.f with 97% similarity]
scilab/modules/integer/src/fortran/i_d_i.f [moved from scilab/routines/int/i_d_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_diag.f [moved from scilab/routines/int/i_diag.f with 98% similarity]
scilab/modules/integer/src/fortran/i_e.f [moved from scilab/routines/int/i_e.f with 99% similarity]
scilab/modules/integer/src/fortran/i_f_i.f [moved from scilab/routines/int/i_f_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_i_i.f [moved from scilab/routines/int/i_i_i.f with 99% similarity]
scilab/modules/integer/src/fortran/i_kron.f [moved from scilab/routines/int/i_kron.f with 98% similarity]
scilab/modules/integer/src/fortran/i_l_i.f [moved from scilab/routines/int/i_l_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_logic.f [moved from scilab/routines/int/i_logic.f with 99% similarity]
scilab/modules/integer/src/fortran/i_m_i.f [moved from scilab/routines/int/i_m_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_matrix.f [moved from scilab/routines/int/i_matrix.f with 99% similarity]
scilab/modules/integer/src/fortran/i_maxi.f [moved from scilab/routines/int/i_maxi.f with 99% similarity]
scilab/modules/integer/src/fortran/i_mget.f [moved from scilab/routines/int/i_mget.f with 98% similarity]
scilab/modules/integer/src/fortran/i_mini.f [moved from scilab/routines/int/i_mini.f with 99% similarity]
scilab/modules/integer/src/fortran/i_mput.f [moved from scilab/routines/int/i_mput.f with 98% similarity]
scilab/modules/integer/src/fortran/i_p.f [moved from scilab/routines/int/i_p.f with 95% similarity]
scilab/modules/integer/src/fortran/i_prod.f [moved from scilab/routines/int/i_prod.f with 98% similarity]
scilab/modules/integer/src/fortran/i_q_i.f [moved from scilab/routines/int/i_q_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_r_i.f [moved from scilab/routines/int/i_r_i.f with 97% similarity]
scilab/modules/integer/src/fortran/i_s_i.f [moved from scilab/routines/int/i_s_i.f with 98% similarity]
scilab/modules/integer/src/fortran/i_sum.f [moved from scilab/routines/int/i_sum.f with 98% similarity]
scilab/modules/integer/src/fortran/i_t.f [moved from scilab/routines/int/i_t.f with 96% similarity]
scilab/modules/integer/src/fortran/i_tril.f [moved from scilab/routines/int/i_tril.f with 98% similarity]
scilab/modules/integer/src/fortran/i_triu.f [moved from scilab/routines/int/i_triu.f with 98% similarity]
scilab/modules/integer/src/fortran/i_x_i.f [moved from scilab/routines/int/i_x_i.f with 98% similarity]
scilab/modules/integer/src/fortran/integer_f.vfproj [new file with mode: 0644]
scilab/modules/integer/src/fortran/intinttype.f [moved from scilab/routines/int/intinttype.f with 95% similarity]
scilab/modules/integer/src/fortran/intops.f [moved from scilab/routines/int/intops.f with 99% similarity]
scilab/modules/integer/src/fortran/memused.f [moved from scilab/routines/int/memused.f with 100% similarity]
scilab/modules/integer/src/fortran/unarybit.f [moved from scilab/routines/int/unarybit.f with 96% similarity]
scilab/modules/integer/src/fortran/uppertype.f [moved from scilab/routines/int/uppertype.f with 100% similarity]
scilab/modules/scicos/macros/genmoc.sce
scilab/routines/int/genbitor.c [deleted file]
scilab/routines/int/genrowconc.c [deleted file]
scilab/routines/int/i_Gray.c [deleted file]
scilab/routines/int/int_f/int_f.vfproj [deleted file]
scilab/routines/int/iread.f [deleted file]
scilab/scilab.start

index 75e6b5c..f065810 100644 (file)
@@ -2,12 +2,12 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\gui\src\c\wsci\WScilex\WScilex.vcproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
        ProjectSection(ProjectDependencies) = postProject
-               {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
-               {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3} = {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
-               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77} = {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
+               {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3} = {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}
+               {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BEpsf", "imp\BEpsf\BEpsf.vcproj", "{114F3B77-2A32-4EC8-AC23-B3F910622BD9}"
@@ -69,85 +69,85 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\stati
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab\LibScilab.vcproj", "{64BC155E-292F-484F-9404-76EE6AE67A43}"
        ProjectSection(ProjectDependencies) = postProject
-               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
-               {798D5602-CF39-4B2F-B780-0EF282E7CEA0} = {798D5602-CF39-4B2F-B780-0EF282E7CEA0}
-               {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049} = {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049}
-               {51240B08-5E4E-439B-B745-C870D5B513BF} = {51240B08-5E4E-439B-B745-C870D5B513BF}
-               {05D8F60B-332A-4161-B946-B8AB30ED439C} = {05D8F60B-332A-4161-B946-B8AB30ED439C}
-               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
-               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
-               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
-               {73AA7612-4297-4339-B521-8C2870E7BEC1} = {73AA7612-4297-4339-B521-8C2870E7BEC1}
-               {836EC214-02DD-474F-91C9-C8C46C183D48} = {836EC214-02DD-474F-91C9-C8C46C183D48}
-               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
-               {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
-               {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
-               {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC} = {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}
-               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
-               {B3805031-D315-4275-9D1D-5C43F8E92616} = {B3805031-D315-4275-9D1D-5C43F8E92616}
-               {B7A0273E-8E71-4663-8497-0895945ED54D} = {B7A0273E-8E71-4663-8497-0895945ED54D}
-               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
-               {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}
-               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
-               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
-               {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
-               {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0} = {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0}
-               {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
-               {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
-               {03773159-155A-48E0-9B26-119D0BF35B2B} = {03773159-155A-48E0-9B26-119D0BF35B2B}
-               {2652D55A-391C-4341-A299-6B7BDCE45F0C} = {2652D55A-391C-4341-A299-6B7BDCE45F0C}
-               {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
-               {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190} = {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190}
-               {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
-               {1D5E735D-176E-4C6D-B980-3C2EC7051F90} = {1D5E735D-176E-4C6D-B980-3C2EC7051F90}
-               {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
-               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
-               {B50F726C-8536-4DAC-8CEF-D97706ACACCC} = {B50F726C-8536-4DAC-8CEF-D97706ACACCC}
-               {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
-               {B5945471-7E91-43B1-8728-37E37ADB7EE2} = {B5945471-7E91-43B1-8728-37E37ADB7EE2}
-               {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
-               {25F06272-3E27-46E4-BEE0-8D24F60CE451} = {25F06272-3E27-46E4-BEE0-8D24F60CE451}
-               {E9741474-5C3A-4101-8B85-AC5221018C05} = {E9741474-5C3A-4101-8B85-AC5221018C05}
-               {114F3B77-2A32-4EC8-AC23-B3F910622BD9} = {114F3B77-2A32-4EC8-AC23-B3F910622BD9}
-               {3396F078-1296-47EB-B817-78CB36265DD1} = {3396F078-1296-47EB-B817-78CB36265DD1}
-               {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
-               {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
-               {425B887B-9FC5-4CD2-B632-DBFC000E3E25} = {425B887B-9FC5-4CD2-B632-DBFC000E3E25}
-               {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
-               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
-               {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
-               {495C9E8A-439A-426E-AA2C-0B22653875F9} = {495C9E8A-439A-426E-AA2C-0B22653875F9}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {3DBBFF93-F344-4484-A317-14F985434BBC} = {3DBBFF93-F344-4484-A317-14F985434BBC}
-               {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
-               {104D88A6-C72A-411C-B32F-D6819DDBB737} = {104D88A6-C72A-411C-B32F-D6819DDBB737}
-               {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
-               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
-               {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
-               {6F1E57AB-01D9-488D-9E7A-A5065848D693} = {6F1E57AB-01D9-488D-9E7A-A5065848D693}
-               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
-               {D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6} = {D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6}
-               {500443BC-F67D-442B-8713-8E2A03BB3C8D} = {500443BC-F67D-442B-8713-8E2A03BB3C8D}
-               {53AAB5BC-2C08-4BBA-9793-C36140A404F8} = {53AAB5BC-2C08-4BBA-9793-C36140A404F8}
-               {6638C3BC-D85D-414D-8AC3-9BD514CA23E1} = {6638C3BC-D85D-414D-8AC3-9BD514CA23E1}
-               {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
-               {B678A0CA-E006-415A-83E4-46F6060282C4} = {B678A0CA-E006-415A-83E4-46F6060282C4}
-               {28E4E9CA-3EEC-43EE-9F15-56259C6677B8} = {28E4E9CA-3EEC-43EE-9F15-56259C6677B8}
-               {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
-               {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4} = {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4}
-               {FD0F48D8-9D0B-42A8-A743-B57198FAB41E} = {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}
-               {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
-               {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A} = {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A}
-               {3FF921DF-3084-4F09-BD14-362F60B0D037} = {3FF921DF-3084-4F09-BD14-362F60B0D037}
-               {34F953E3-9A2C-4359-A8C5-41CEBD0ECE45} = {34F953E3-9A2C-4359-A8C5-41CEBD0ECE45}
-               {4467FBE5-45A6-4CA7-AD8C-48419B656137} = {4467FBE5-45A6-4CA7-AD8C-48419B656137}
-               {E3A01BE7-815F-4A06-9F0A-C95E80873966} = {E3A01BE7-815F-4A06-9F0A-C95E80873966}
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304} = {FAF6A7EB-8A36-4278-B34E-34EA89E55304}
-               {B0817AEC-2DA0-4C95-9599-4E01F2B547CD} = {B0817AEC-2DA0-4C95-9599-4E01F2B547CD}
-               {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
-               {D407D7F1-A4D4-40F2-A5A1-D291B5D28C35} = {D407D7F1-A4D4-40F2-A5A1-D291B5D28C35}
-               {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
                {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
+               {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
+               {D407D7F1-A4D4-40F2-A5A1-D291B5D28C35} = {D407D7F1-A4D4-40F2-A5A1-D291B5D28C35}
+               {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
+               {B0817AEC-2DA0-4C95-9599-4E01F2B547CD} = {B0817AEC-2DA0-4C95-9599-4E01F2B547CD}
+               {FAF6A7EB-8A36-4278-B34E-34EA89E55304} = {FAF6A7EB-8A36-4278-B34E-34EA89E55304}
+               {E3A01BE7-815F-4A06-9F0A-C95E80873966} = {E3A01BE7-815F-4A06-9F0A-C95E80873966}
+               {4467FBE5-45A6-4CA7-AD8C-48419B656137} = {4467FBE5-45A6-4CA7-AD8C-48419B656137}
+               {34F953E3-9A2C-4359-A8C5-41CEBD0ECE45} = {34F953E3-9A2C-4359-A8C5-41CEBD0ECE45}
+               {3FF921DF-3084-4F09-BD14-362F60B0D037} = {3FF921DF-3084-4F09-BD14-362F60B0D037}
+               {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A} = {3A131FDF-BDA9-4216-91AD-DFFCEF46F89A}
+               {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
+               {FD0F48D8-9D0B-42A8-A743-B57198FAB41E} = {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}
+               {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4} = {4C0B22D1-F74D-42DF-B90D-71CBC1B43DC4}
+               {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
+               {28E4E9CA-3EEC-43EE-9F15-56259C6677B8} = {28E4E9CA-3EEC-43EE-9F15-56259C6677B8}
+               {B678A0CA-E006-415A-83E4-46F6060282C4} = {B678A0CA-E006-415A-83E4-46F6060282C4}
+               {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
+               {6638C3BC-D85D-414D-8AC3-9BD514CA23E1} = {6638C3BC-D85D-414D-8AC3-9BD514CA23E1}
+               {53AAB5BC-2C08-4BBA-9793-C36140A404F8} = {53AAB5BC-2C08-4BBA-9793-C36140A404F8}
+               {500443BC-F67D-442B-8713-8E2A03BB3C8D} = {500443BC-F67D-442B-8713-8E2A03BB3C8D}
+               {D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6} = {D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6}
+               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
+               {6F1E57AB-01D9-488D-9E7A-A5065848D693} = {6F1E57AB-01D9-488D-9E7A-A5065848D693}
+               {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
+               {104D88A6-C72A-411C-B32F-D6819DDBB737} = {104D88A6-C72A-411C-B32F-D6819DDBB737}
+               {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
+               {3DBBFF93-F344-4484-A317-14F985434BBC} = {3DBBFF93-F344-4484-A317-14F985434BBC}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {495C9E8A-439A-426E-AA2C-0B22653875F9} = {495C9E8A-439A-426E-AA2C-0B22653875F9}
+               {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
+               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
+               {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
+               {425B887B-9FC5-4CD2-B632-DBFC000E3E25} = {425B887B-9FC5-4CD2-B632-DBFC000E3E25}
+               {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
+               {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
+               {3396F078-1296-47EB-B817-78CB36265DD1} = {3396F078-1296-47EB-B817-78CB36265DD1}
+               {114F3B77-2A32-4EC8-AC23-B3F910622BD9} = {114F3B77-2A32-4EC8-AC23-B3F910622BD9}
+               {E9741474-5C3A-4101-8B85-AC5221018C05} = {E9741474-5C3A-4101-8B85-AC5221018C05}
+               {25F06272-3E27-46E4-BEE0-8D24F60CE451} = {25F06272-3E27-46E4-BEE0-8D24F60CE451}
+               {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
+               {B5945471-7E91-43B1-8728-37E37ADB7EE2} = {B5945471-7E91-43B1-8728-37E37ADB7EE2}
+               {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
+               {B50F726C-8536-4DAC-8CEF-D97706ACACCC} = {B50F726C-8536-4DAC-8CEF-D97706ACACCC}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
+               {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
+               {1D5E735D-176E-4C6D-B980-3C2EC7051F90} = {1D5E735D-176E-4C6D-B980-3C2EC7051F90}
+               {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
+               {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190} = {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190}
+               {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
+               {2652D55A-391C-4341-A299-6B7BDCE45F0C} = {2652D55A-391C-4341-A299-6B7BDCE45F0C}
+               {03773159-155A-48E0-9B26-119D0BF35B2B} = {03773159-155A-48E0-9B26-119D0BF35B2B}
+               {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
+               {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
+               {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0} = {DAA1FD4E-02E2-4E85-B60A-81B067E8FBA0}
+               {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
+               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
+               {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}
+               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
+               {B7A0273E-8E71-4663-8497-0895945ED54D} = {B7A0273E-8E71-4663-8497-0895945ED54D}
+               {B3805031-D315-4275-9D1D-5C43F8E92616} = {B3805031-D315-4275-9D1D-5C43F8E92616}
+               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC} = {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}
+               {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
+               {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
+               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
+               {836EC214-02DD-474F-91C9-C8C46C183D48} = {836EC214-02DD-474F-91C9-C8C46C183D48}
+               {73AA7612-4297-4339-B521-8C2870E7BEC1} = {73AA7612-4297-4339-B521-8C2870E7BEC1}
+               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {05D8F60B-332A-4161-B946-B8AB30ED439C} = {05D8F60B-332A-4161-B946-B8AB30ED439C}
+               {51240B08-5E4E-439B-B745-C870D5B513BF} = {51240B08-5E4E-439B-B745-C870D5B513BF}
+               {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049} = {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049}
+               {798D5602-CF39-4B2F-B780-0EF282E7CEA0} = {798D5602-CF39-4B2F-B780-0EF282E7CEA0}
+               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\core.vcproj", "{C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}"
@@ -174,12 +174,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphic
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "int", "routines\int\int.vcproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
        ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "int_f", "routines\int\int_f\int_f.vfproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "integer_f", "modules\integer\src\fortran\integer_f.vfproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -240,8 +241,8 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "optim_f", "modules\optimiza
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "polynomials_f", "modules\polynomials\src\fortran\polynomials_f.vfproj", "{3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcproj", "{63352867-3983-48E3-94FE-DD8F0D6E921F}"
@@ -306,10 +307,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdr", "modules\graphics\src
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CScilex", "modules\gui\src\c\wsci\CScilex\CScilex.vcproj", "{9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}"
        ProjectSection(ProjectDependencies) = postProject
-               {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3} = {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
-               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
+               {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3} = {7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Forwin", "tools\forwin\Forwin.vcproj", "{500443BC-F67D-442B-8713-8E2A03BB3C8D}"
@@ -332,23 +333,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modelicac", "modules\scicos
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmex", "modules\mexlib\src\libmex\libmex.vcproj", "{0AEC8745-BB5B-4E66-A59A-7251412C3605}"
        ProjectSection(ProjectDependencies) = postProject
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmx", "modules\mexlib\src\libmx\libmx.vcproj", "{CEF88C5F-6820-46D4-BCCD-44D5581481C5}"
        ProjectSection(ProjectDependencies) = postProject
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmat", "modules\mexlib\src\libmat\libmat.vcproj", "{8A508625-C2AA-4295-AA76-16E4E456D13D}"
        ProjectSection(ProjectDependencies) = postProject
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupAtlas", "tools\SetupAtlas\SetupAtlas.vcproj", "{AAFF2053-3F1E-4B8B-B174-4407A6B98FA5}"
@@ -367,8 +368,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tclsci", "modules\tclsci\tc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Javasci", "modules\Javasci\Javasci.vcproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
        ProjectSection(ProjectDependencies) = postProject
-               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildChm", "modules\helptools\src\BuildChm\BuildChm.vcproj", "{D319F719-F429-4842-A6F9-B1227FE2A54D}"
@@ -378,15 +379,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildChm", "modules\helptoo
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "lapack_DLL", "libs\lapack\lapack_f\lapack_DLL.vfproj", "{69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}"
        ProjectSection(ProjectDependencies) = postProject
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "arpack_DLL", "modules\arpack\src\arpack\arpack_f\arpack_DLL.vfproj", "{34F953E3-9A2C-4359-A8C5-41CEBD0ECE45}"
        ProjectSection(ProjectDependencies) = postProject
-               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time", "modules\time\time.vcproj", "{05D8F60B-332A-4161-B946-B8AB30ED439C}"
@@ -401,21 +402,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "modules\sound\soun
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization", "modules\localization\src\localization.vcproj", "{ECFFEB0C-1EDA-45EE-9A10-B18143852E17}"
        ProjectSection(ProjectDependencies) = postProject
-               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashtable", "libs\hashtable\hashtable.vcproj", "{2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm", "modules\jvm\src\libjvm.vcproj", "{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciGUIConsole", "modules\gui\src\c\SciGUIConsole\SciGUIConsole.vcproj", "{B3805031-D315-4275-9D1D-5C43F8E92616}"
@@ -441,8 +442,8 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "io_f", "modules\io\src\fort
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "modules\string\src\c\string.vcproj", "{8D45767A-9B03-4905-97F6-D2F3F79141EA}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "string_f", "modules\string\src\fortran\string_f.vfproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
@@ -452,32 +453,32 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "string_f", "modules\string\
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "symbolic_f", "modules\symbolic\src\fortran\symbolic_f.vfproj", "{D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbolic", "modules\symbolic\src\c\symbolic.vcproj", "{A2207388-FB55-46B2-A24D-D76C0FE796F8}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polynomials", "modules\polynomials\src\c\polynomials.vcproj", "{620D8FA7-3704-438E-BB1E-391C84401A2E}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arpack", "modules\arpack\arpack.vcproj", "{D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal", "modules\signal_processing\src\c\signal.vcproj", "{A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "cacsd_f", "modules\cacsd\src\fortran\cacsd_f.vfproj", "{0BB16C71-0FCD-4FB9-B7C0-F2601330C980}"
@@ -487,8 +488,8 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "cacsd_f", "modules\cacsd\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd", "modules\cacsd\src\c\cacsd.vcproj", "{D5DD1407-3926-4F6C-AD7B-3A6B2DE56049}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "dcd_f", "modules\statistics\src\dcdflib\dcd_f\dcd_f.vfproj", "{18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}"
@@ -505,14 +506,14 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "linear_algebra_f", "modules
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra", "modules\linear_algebra\src\c\linear_algebra.vcproj", "{BC462A57-C5B3-4F93-8067-80363827DCDA}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions", "modules\special_functions\src\c\special_functions.vcproj", "{C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "special_functions_f", "modules\special_functions\src\fortran\special_functions_f.vfproj", "{E3A01BE7-815F-4A06-9F0A-C95E80873966}"
@@ -522,8 +523,8 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "special_functions_f", "modu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations", "modules\differential_equations\src\c\differential_equations.vcproj", "{F0190B5D-FB21-47A2-99AC-06627CDD0F8A}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "differential_equations_f", "modules\differential_equations\src\fortran\differential_equations_f.vfproj", "{28E4E9CA-3EEC-43EE-9F15-56259C6677B8}"
index ec2c982..8531e7f 100644 (file)
@@ -35,8 +35,9 @@
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef USE_F2C
 #pragma comment(lib,"../../libs/interf_f.lib")
-#pragma comment(lib,"../../libs/int_f.lib")
 
+
+#pragma comment(lib,"../../libs/integer_f.lib")
 #pragma comment(lib,"../../libs/differential_equations_f.lib")
 #pragma comment(lib,"../../libs/special_functions_f.lib")
 #pragma comment(lib,"../../libs/linear_algebra_f.lib")
index 279cfce..1eab09c 100644 (file)
@@ -5,11 +5,11 @@ CurrentDirectory=pwd();
 
  Directories=["util",
  "percent",
- "int",
  "sci2for",
  "tdcs",
   ];
  
+ Directories=[Directories;"SCI/modules/integer/macros"];        
  Directories=[Directories;"SCI/modules/differential_equations/macros"];        
  Directories=[Directories;"SCI/modules/core/macros"];        
  Directories=[Directories;"SCI/modules/linear_algebra/macros"];        
index 003b47a..6949396 100644 (file)
 #endif
 
 #define  IN_intelm  43
-#include "../../../../routines/int/int.fundef"
+#include "../../integer/sci_gateway/integer.fundef"
 
 #define  IN_intlapack  44
 #include "../../linear_algebra/sci_gateway/linear_algebra2.fundef"
diff --git a/scilab/modules/integer/changelog.txt b/scilab/modules/integer/changelog.txt
new file mode 100644 (file)
index 0000000..95f6169
--- /dev/null
@@ -0,0 +1 @@
+changelog integer module
\ No newline at end of file
diff --git a/scilab/modules/integer/etc/integer.quit b/scilab/modules/integer/etc/integer.quit
new file mode 100644 (file)
index 0000000..e969b9a
--- /dev/null
@@ -0,0 +1,16 @@
+// ====================================================================
+// This file contains command to be executed at the end 
+// of a scilab session for integer module
+// Copyright INRIA 2006
+// ====================================================================
+// delete help chapter
+global LANGUAGE
+
+if LANGUAGE == 'fr' then
+       del_help_chapter("Entiers");
+elseif LANGUAGE == 'eng' then
+       del_help_chapter("Integers");
+end
+
+clear del_help_chapter LANGUAGE;
+// ====================================================================
diff --git a/scilab/modules/integer/etc/integer.start b/scilab/modules/integer/etc/integer.start
new file mode 100644 (file)
index 0000000..f7955cc
--- /dev/null
@@ -0,0 +1,23 @@
+// ====================================================================\r
+// integer module initialisation file \r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+//Load  functions librarie\r
+load('SCI/modules/integer/macros/lib');\r
+// ====================================================================\r
+//add help chapter\r
+global LANGUAGE\r
+\r
+path = get_absolute_file_path('integer.start');\r
+path = getshortpathname(path);\r
+\r
+if LANGUAGE == 'fr' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);\r
+       add_help_chapter("Entiers",path);\r
+elseif LANGUAGE == 'eng' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);\r
+       add_help_chapter("Integers",path);\r
+end\r
+\r
+clear path get_absolute_file_path add_help_chapter LANGUAGE;\r
+// ====================================================================\r
diff --git a/scilab/modules/integer/help/eng/helpbuildereng.sce b/scilab/modules/integer/help/eng/helpbuildereng.sce
new file mode 100644 (file)
index 0000000..be7b4e4
--- /dev/null
@@ -0,0 +1,6 @@
+mode(-1); //force silent execution
+path=get_absolute_file_path('helpbuildereng.sce');//get the absolute path of this file
+add_help_chapter("Integers",path);//add help chapter
+xmltohtml(path,"Integers");
+//clear the variable stack
+clear path add_help_chapter get_absolute_file_path; 
\ No newline at end of file
diff --git a/scilab/modules/integer/help/eng/iconvert.xml b/scilab/modules/integer/help/eng/iconvert.xml
new file mode 100644 (file)
index 0000000..c4f5ad3
--- /dev/null
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<!DOCTYPE MAN SYSTEM "../../manrev.dtd">
+<MAN>
+  <LANGUAGE>eng</LANGUAGE>
+  <TITLE>iconvert</TITLE>
+  <TYPE>Scilab Function</TYPE>
+  <DATE>October 99</DATE>
+  <SHORT_DESCRIPTION name="iconvert"> conversion to 1 or 4 byte integer representation</SHORT_DESCRIPTION>
+  <CALLING_SEQUENCE>
+    <CALLING_SEQUENCE_ITEM>y=iconvert(X,itype)  </CALLING_SEQUENCE_ITEM>
+  </CALLING_SEQUENCE>
+  <PARAM>
+    <PARAM_INDENT>
+      <PARAM_ITEM>
+        <PARAM_NAME>X</PARAM_NAME>
+        <PARAM_DESCRIPTION>
+          <SP>: matrix of floats or integers</SP>
+        </PARAM_DESCRIPTION>
+      </PARAM_ITEM>
+      <PARAM_ITEM>
+        <PARAM_NAME>y</PARAM_NAME>
+        <PARAM_DESCRIPTION>
+          <SP>: matrix of integers coded on one, two or four bytes.</SP>
+        </PARAM_DESCRIPTION>
+      </PARAM_ITEM>
+    </PARAM_INDENT>
+  </PARAM>
+  <DESCRIPTION>
+    <P>
+    converts and stores data two one, two or four bytes integers. 
+  </P>
+    <DESCRIPTION_INDENT>
+      <DESCRIPTION_ITEM label="itype=0">
+        <SP>: return floating point numbers</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=1">
+        <SP>: return int8 numbers in the range [-128,127]</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=11">
+        <SP>: return uint8 numbers in the range [0,255]</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=2">
+        <SP>: return int16 numbers in the range [-32768,32767]</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=12">
+        <SP>: return uint16 numbers in the range [0, 65535]</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=4">
+        <SP>: return int32 numbers in the range [-2147483648,2147483647]</SP>
+      </DESCRIPTION_ITEM>
+      <DESCRIPTION_ITEM label="itype=14">
+        <SP>: return uint32 numbers in the range [0, 4294967295]</SP>
+      </DESCRIPTION_ITEM>
+    </DESCRIPTION_INDENT>
+  </DESCRIPTION>
+  <EXAMPLE>
+<![CDATA[
+b=int32([1 -120 127 312])
+y=iconvert(b,1)
+
+ ]]>
+  </EXAMPLE>
+  <SEE_ALSO>
+    <SEE_ALSO_ITEM>
+      <LINK>double</LINK>
+    </SEE_ALSO_ITEM>
+    <SEE_ALSO_ITEM>
+      <LINK>inttype</LINK>
+    </SEE_ALSO_ITEM>
+  </SEE_ALSO>
+</MAN>
diff --git a/scilab/modules/integer/help/eng/inttype.xml b/scilab/modules/integer/help/eng/inttype.xml
new file mode 100644 (file)
index 0000000..ed5072b
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<!DOCTYPE MAN SYSTEM "../../manrev.dtd">
+<MAN>
+  <LANGUAGE>eng</LANGUAGE>
+  <TITLE>inttype</TITLE>
+  <TYPE>Scilab Function</TYPE>
+  <DATE>April 1993</DATE>
+  <SHORT_DESCRIPTION name="inttype">  type integers used in integer data types</SHORT_DESCRIPTION>
+  <CALLING_SEQUENCE>
+    <CALLING_SEQUENCE_ITEM>[i]=inttype(x)  </CALLING_SEQUENCE_ITEM>
+  </CALLING_SEQUENCE>
+  <PARAM>
+    <PARAM_INDENT>
+      <PARAM_ITEM>
+        <PARAM_NAME>x</PARAM_NAME>
+        <PARAM_DESCRIPTION>
+          <SP>: an matrix of integers (see int8,..)</SP>
+        </PARAM_DESCRIPTION>
+      </PARAM_ITEM>
+      <PARAM_ITEM>
+        <PARAM_NAME>i</PARAM_NAME>
+        <PARAM_DESCRIPTION>
+          <SP>: integer</SP>
+        </PARAM_DESCRIPTION>
+      </PARAM_ITEM>
+    </PARAM_INDENT>
+  </PARAM>
+  <DESCRIPTION>
+    <P><VERB>inttype(x)</VERB>  returns an integer which is the type of the entries
+    of <VERB>x</VERB> as following :</P>
+    <P>
+     1 
+    :  one byte integer representation</P>
+    <P>
+     2 
+    :  two bytes integer representation</P>
+    <P>
+     4 
+    :  four bytes integer representation</P>
+    <P>
+     11 
+    :  one byte unsigned integer representation</P>
+    <P>
+     12 
+    :  two bytes unsigned integer representation</P>
+    <P>
+     14 
+    :  four bytes unsigned integer representation</P>
+  </DESCRIPTION>
+  <EXAMPLE>
+<![CDATA[
+x=uint16(1:10);
+inttype(x)
+ ]]>
+  </EXAMPLE>
+  <SEE_ALSO>
+    <SEE_ALSO_ITEM>
+      <LINK>int8</LINK>
+    </SEE_ALSO_ITEM>
+  </SEE_ALSO>
+</MAN>
diff --git a/scilab/modules/integer/help/fr/helpbuilderfr.sce b/scilab/modules/integer/help/fr/helpbuilderfr.sce
new file mode 100644 (file)
index 0000000..054e4f2
--- /dev/null
@@ -0,0 +1,6 @@
+mode(-1); //force silent execution
+path=get_absolute_file_path('helpbuilderfr.sce');//get the absolute path of this file
+add_help_chapter("Entiers",path);//add help chapter
+xmltohtml(path,"Entiers",'html-rev.xsl');
+//clear the variable stack
+clear path add_help_chapter get_absolute_file_path; 
\ No newline at end of file
diff --git a/scilab/modules/integer/help/fr/iconvert.xml b/scilab/modules/integer/help/fr/iconvert.xml
new file mode 100644 (file)
index 0000000..0a07f12
--- /dev/null
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> 
+<!DOCTYPE MAN SYSTEM "../../manrev.dtd">
+<MAN>
+  <LANGUAGE>fr</LANGUAGE>
+  <TITLE>iconvert  </TITLE>
+  <TYPE>Scilab Function  </TYPE>
+  <DATE>October 99  </DATE>
+  <SHORT_DESCRIPTION name="iconvert "> conversion au codage entier à 1,2 ou 4 octets  </SHORT_DESCRIPTION>
+  <CALLING_SEQUENCE>
+  <CALLING_SEQUENCE_ITEM>y=iconvert(X,itype)  </CALLING_SEQUENCE_ITEM>
+  </CALLING_SEQUENCE>
+  <PARAM>
+ <PARAM_INDENT>
+  <PARAM_ITEM>
+  <PARAM_NAME>X  </PARAM_NAME>
+  <PARAM_DESCRIPTION>
+  <SP>
+    : matrice de flottants ou d&apos;entiers
+</SP>
+  </PARAM_DESCRIPTION> 
+  </PARAM_ITEM>
+  <PARAM_ITEM>
+  <PARAM_NAME>y  </PARAM_NAME>
+  <PARAM_DESCRIPTION>
+  <SP>
+    : matrice d&apos;entiers codés sur 1,2 ou 4 octets.
+</SP>
+  </PARAM_DESCRIPTION> 
+  </PARAM_ITEM>
+ </PARAM_INDENT>
+  </PARAM>
+  <DESCRIPTION>
+  <P>
+    Convertit et stocke sous forme d&apos;entiers à 1,2 ou 4 octets.
+  </P>
+  <DESCRIPTION_INDENT>
+  <DESCRIPTION_ITEM  label='itype=0'> 
+  <SP>
+    : renvoie des nombres à virgule flottante
+</SP>
+  </DESCRIPTION_ITEM>
+
+  <DESCRIPTION_ITEM  label='itype=1'> 
+  <SP>
+    : renvoie et stocke dans y des entiers int8 dans l&apos;intervalle [-128,127] 
+</SP>
+  </DESCRIPTION_ITEM>
+
+  <DESCRIPTION_ITEM  label='itype=11'> 
+  <SP>
+    : renvoie et stocke dans y des entiers uint8 dans l&apos;intervalle [0,255] 
+</SP>
+  </DESCRIPTION_ITEM>
+
+  <DESCRIPTION_ITEM  label='itype=2'> 
+  <SP>
+    : renvoie et stocke dans y des entiers int16 dans l&apos;intervalle [-32768,32767] 
+</SP>
+  </DESCRIPTION_ITEM>
+
+  <DESCRIPTION_ITEM  label='itype=12'> 
+  <SP>
+    : renvoie et stocke dans y des entiers uint16 dans l&apos;intervalle [0, 65535] 
+</SP>
+  </DESCRIPTION_ITEM>
+
+  <DESCRIPTION_ITEM  label='itype=4'> 
+  <SP>
+    : renvoie et stocke dans y des entiers int32 dans
+       l&apos;intervalle[-2147483648,2147483647] 
+</SP>
+  </DESCRIPTION_ITEM>
+  <DESCRIPTION_ITEM  label='itype=14'>
+  <SP>
+ : renvoie et stocke dans y des entiers uint32 dans l&apos;intervalle [0, 4294967295] 
+</SP>
+  </DESCRIPTION_ITEM>
+  </DESCRIPTION_INDENT>
+
+  </DESCRIPTION>
+  <EXAMPLE><![CDATA[
+b=int32([1 -120 127 312])
+y=iconvert(b,1)
+
+ ]]></EXAMPLE>
+  <SEE_ALSO>
+    <SEE_ALSO_ITEM> <LINK>double</LINK> </SEE_ALSO_ITEM>     <SEE_ALSO_ITEM> <LINK>inttype</LINK> </SEE_ALSO_ITEM>
+  </SEE_ALSO>
+</MAN>
diff --git a/scilab/modules/integer/help/fr/inttype.xml b/scilab/modules/integer/help/fr/inttype.xml
new file mode 100644 (file)
index 0000000..3e9288a
--- /dev/null
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> 
+<!DOCTYPE MAN SYSTEM "../../manrev.dtd">
+<MAN>
+  <LANGUAGE>fr</LANGUAGE>
+  <TITLE>inttype  </TITLE>
+  <TYPE>Scilab Function  </TYPE>
+  <DATE>April 1993  </DATE>
+  <SHORT_DESCRIPTION name="inttype">  type des entiers utilisés dans les types entiers de données.  </SHORT_DESCRIPTION>
+  <CALLING_SEQUENCE>
+  <CALLING_SEQUENCE_ITEM>[i]=inttype(x)  </CALLING_SEQUENCE_ITEM>
+  </CALLING_SEQUENCE>
+  <PARAM>
+ <PARAM_INDENT>
+  <PARAM_ITEM>
+  <PARAM_NAME>x  </PARAM_NAME>
+  <PARAM_DESCRIPTION>
+  <SP>
+    : matrice d&apos;entiers (voir int8)
+</SP>
+  </PARAM_DESCRIPTION> 
+  </PARAM_ITEM>
+  <PARAM_ITEM>
+  <PARAM_NAME>i  </PARAM_NAME>
+  <PARAM_DESCRIPTION>
+  <SP>
+    : un entier
+</SP>
+  </PARAM_DESCRIPTION> 
+  </PARAM_ITEM>
+ </PARAM_INDENT>
+  </PARAM>
+  <DESCRIPTION>
+  <P>
+    renvoie un entier donnant le type de données stockées dans
+    <VERB>x</VERB> avec la convention suivante :
+  </P>
+  <P>
+     1 
+    :  codage entier à 1 octet
+  </P>
+  <P>
+     2 
+    :  codage entier à 2 octets
+  </P>
+  <P>
+     4 
+    :  codage entier à 4 octets
+  </P>
+  <P>
+     11 
+    :  codage entier non-signé à 1 octet
+  </P>
+  <P>
+     12 
+    :  codage entier non-signé à 2 octets
+  </P>
+  <P>
+     14 
+    :  codage entier non-signé à 4 octets
+  </P>
+  </DESCRIPTION>
+  <EXAMPLE><![CDATA[
+x=uint16(1:10);
+inttype(x)
+ ]]></EXAMPLE>
+  <SEE_ALSO>
+    <SEE_ALSO_ITEM> <LINK>int8</LINK> </SEE_ALSO_ITEM>
+  </SEE_ALSO>
+</MAN>
diff --git a/scilab/modules/integer/help/helpbuilder.sce b/scilab/modules/integer/help/helpbuilder.sce
new file mode 100644 (file)
index 0000000..491c364
--- /dev/null
@@ -0,0 +1,9 @@
+mode(-1) //force silent execution
+
+cd 'eng'
+exec helpbuildereng.sce
+cd '..'
+
+cd 'fr'
+exec helpbuilderfr.sce
+cd '..'
similarity index 89%
rename from scilab/routines/int/gw_integer.h
rename to scilab/modules/integer/includes/gw_integer.h
index ab83b77..0a84d33 100644 (file)
@@ -12,8 +12,8 @@
 \r
 #include <string.h>\r
 \r
-#include "../machine.h"\r
-#include "../stack-c.h"\r
+#include "machine.h"\r
+#include "stack-c.h"\r
 \r
 \r
 typedef int (*Integer_Interf) __PARAMS((char *fname));\r
diff --git a/scilab/modules/integer/licence.txt b/scilab/modules/integer/licence.txt
new file mode 100644 (file)
index 0000000..5aaa4cb
--- /dev/null
@@ -0,0 +1,3 @@
+licence file
+
+INRIA 2006
\ No newline at end of file
similarity index 82%
rename from scilab/macros/int/buildmacros.sce
rename to scilab/modules/integer/macros/buildmacros.sce
index b2232db..e88c133 100644 (file)
@@ -4,5 +4,5 @@
 SCI=getenv('SCI'); 
 TMPDIR=getenv('TMPDIR');
 //------------------------------------
-genlib('intlib','SCI/macros/int');
+genlib('intlib','SCI/modules/integer/macros');
 //------------------------------------
diff --git a/scilab/modules/integer/readme.txt b/scilab/modules/integer/readme.txt
new file mode 100644 (file)
index 0000000..b998e19
--- /dev/null
@@ -0,0 +1 @@
+readme.txt about integer module
\ No newline at end of file
similarity index 96%
rename from scilab/routines/int/db2int.c
rename to scilab/modules/integer/src/c/db2int.c
index 5a48e52..405803b 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
@@ -45,5 +45,6 @@ int *dy;
     CONV(integer);
     break;
   }
+  return 0;
 }
 
similarity index 97%
rename from scilab/routines/int/genabs.c
rename to scilab/modules/integer/src/c/genabs.c
index 4172940..6d541c8 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genadd.c
rename to scilab/modules/integer/src/c/genadd.c
index 44596f5..5dbef9d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genbitops.c
rename to scilab/modules/integer/src/c/genbitops.c
index 09d0402..63cb4c9 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/gencheck.c
rename to scilab/modules/integer/src/c/gencheck.c
index 13ed63d..c82151b 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genconcatcol.c
rename to scilab/modules/integer/src/c/genconcatcol.c
index 83082e8..269ca50 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 96%
rename from scilab/routines/int/genconcatrow.c
rename to scilab/modules/integer/src/c/genconcatrow.c
index b36bc68..4e3e5d3 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gencopy.c
rename to scilab/modules/integer/src/c/gencopy.c
index 2e9c575..cc39d1d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 96%
rename from scilab/routines/int/gencuprod.c
rename to scilab/modules/integer/src/c/gencuprod.c
index 95d153e..e8eca64 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 96%
rename from scilab/routines/int/gencusum.c
rename to scilab/modules/integer/src/c/gencusum.c
index 8120b64..1ccaf2a 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gendiag.c
rename to scilab/modules/integer/src/c/gendiag.c
index d1ae4e9..b0d13ea 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gendot.c
rename to scilab/modules/integer/src/c/gendot.c
index 587bb5e..b06eb3f 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 96%
rename from scilab/routines/int/genextrac1.c
rename to scilab/modules/integer/src/c/genextrac1.c
index 404e96a..d419bd6 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genextrac2.c
rename to scilab/modules/integer/src/c/genextrac2.c
index 9e2d7f2..00b05ee 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 99%
rename from scilab/routines/int/genimpl.c
rename to scilab/modules/integer/src/c/genimpl.c
index 2616829..759389f 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 96%
rename from scilab/routines/int/geninsert1.c
rename to scilab/modules/integer/src/c/geninsert1.c
index 372c74a..8e8c71f 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/geninsert2.c
rename to scilab/modules/integer/src/c/geninsert2.c
index 0394af2..6ce2a95 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genisany.c
rename to scilab/modules/integer/src/c/genisany.c
index ae70377..b406a06 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genkron.c
rename to scilab/modules/integer/src/c/genkron.c
index be9218a..4336f66 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 99%
rename from scilab/routines/int/genmax2.c
rename to scilab/modules/integer/src/c/genmax2.c
index f7f17d5..3c7e29a 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Author: Serge Steer, Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmcopy.c
rename to scilab/modules/integer/src/c/genmcopy.c
index aa39572..55186a0 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmcuprod.c
rename to scilab/modules/integer/src/c/genmcuprod.c
index dc162b3..43548ab 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmcusum.c
rename to scilab/modules/integer/src/c/genmcusum.c
index 014f3c5..3682d65 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmdiag.c
rename to scilab/modules/integer/src/c/genmdiag.c
index fd9d597..accbd32 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genmdsp.c
rename to scilab/modules/integer/src/c/genmdsp.c
index b39f1f9..a931178 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
similarity index 99%
rename from scilab/routines/int/genmin2.c
rename to scilab/modules/integer/src/c/genmin2.c
index dcb18dc..e983de1 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Author: Serge Steer, Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genmmax.c
rename to scilab/modules/integer/src/c/genmmax.c
index a1dd41b..7f0bf0d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genmmin.c
rename to scilab/modules/integer/src/c/genmmin.c
index d1856af..2283079 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmmul.c
rename to scilab/modules/integer/src/c/genmmul.c
index cd003a0..0acfb02 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmprod.c
rename to scilab/modules/integer/src/c/genmprod.c
index 798d8d2..eaa26b5 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmsum.c
rename to scilab/modules/integer/src/c/genmsum.c
index c5b899b..cbe5a44 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genmtran.c
rename to scilab/modules/integer/src/c/genmtran.c
index 11345ce..97c0e2f 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genprod.c
rename to scilab/modules/integer/src/c/genprod.c
index dafb796..6c1d0c4 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/genrdiv.c
rename to scilab/modules/integer/src/c/genrdiv.c
index 4ce0b70..83aad1d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genscal.c
rename to scilab/modules/integer/src/c/genscal.c
index 0aad1c1..1bb4ea0 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genset.c
rename to scilab/modules/integer/src/c/genset.c
index aad339c..f75ccd3 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gensubst.c
rename to scilab/modules/integer/src/c/gensubst.c
index c0b0218..f9f02e4 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gensum.c
rename to scilab/modules/integer/src/c/gensum.c
index 4ef356e..1d603d0 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gentril.c
rename to scilab/modules/integer/src/c/gentril.c
index 69fe61d..e0b2fd5 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/gentriu.c
rename to scilab/modules/integer/src/c/gentriu.c
index 5cdfa6d..4c45d69 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/genvmul.c
rename to scilab/modules/integer/src/c/genvmul.c
index 2d5e519..c611b95 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 97%
rename from scilab/routines/int/i_nextj.c
rename to scilab/modules/integer/src/c/i_nextj.c
index 6d06972..6ce314e 100644 (file)
@@ -1,8 +1,8 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
-#include "../stack-c.h"
+#include "stack-c.h"
 extern integer C2F(memused)(integer  *it,integer *n);
 int gengetcol(integer typ, integer j,integer m,integer n,integer *a,integer *b);
 
similarity index 81%
rename from scilab/routines/int/int.vcproj
rename to scilab/modules/integer/src/c/integer.vcproj
index 1903286..3851267 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="int"
-       ProjectGUID="{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1036"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/int.lib"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def int.def &gt;nul&#x0D;&#x0A;copy int.def ..\..\..\libs\int.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               EnableEnhancedInstructionSet="1"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1036"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/int.lib"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def int.def &gt;nul&#x0D;&#x0A;copy int.def ..\..\..\libs\int.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-                       >
-                       <File
-                               RelativePath=".\genabs.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genadd.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genbitops.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gencheck.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genconcatcol.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genconcatrow.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gencopy.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gencuprod.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gencusum.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gendiag.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gendot.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genextrac1.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genextrac2.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genimpl.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\geninsert1.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\geninsert2.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genisany.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genkron.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmax2.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmcopy.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmcuprod.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmcuprod.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmcusum.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmdiag.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmdsp.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmin2.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmmax.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmmin.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmmul.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmprod.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmsum.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genmtran.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genprod.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genrdiv.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genscal.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genset.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gensubst.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gensum.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gentril.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gentriu.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\genvmul.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gw_integer.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\i_nextj.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\mgeti.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\mputi.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\tpconv.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl"
-                       >
-                       <File
-                               RelativePath="def.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\gw_integer.h"
-                               >
-                       </File>
-               </Filter>
-               <File
-                       RelativePath=".\int.fundef"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="integer"\r
+       ProjectGUID="{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"\r
+                               PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(ConfigurationName)/"\r
+                               ObjectFile="$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(ConfigurationName)/"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1036"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="../../../../libs/integer.lib"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def integer.def &gt;nul&#x0D;&#x0A;copy integer.def ..\..\..\..\..\libs\integer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="1"\r
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"\r
+                               PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(ConfigurationName)/"\r
+                               ObjectFile="$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(ConfigurationName)/"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1036"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="../../../../libs/integer.lib"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def integer.def &gt;nul&#x0D;&#x0A;copy integer.def ..\..\..\..\..\libs\integer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\db2int.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genabs.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genadd.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genbitops.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gencheck.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genconcatcol.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genconcatrow.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gencopy.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gencuprod.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gencusum.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gendiag.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gendot.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genextrac1.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genextrac2.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genimpl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\geninsert1.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\geninsert2.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genisany.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genkron.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmax2.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmcopy.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmcuprod.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmcusum.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmdiag.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmdsp.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmin2.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmmax.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmmin.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmmul.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmprod.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmsum.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmtran.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genprod.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genrdiv.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genscal.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genset.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gensubst.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gensum.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gentril.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gentriu.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genvmul.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\sci_gateway\c\gw_integer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\i_nextj.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mgeti.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mputi.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tpconv.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\includes\def.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\includes\gw_integer.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath="..\..\sci_gateway\integer.fundef"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
similarity index 97%
rename from scilab/routines/int/mgeti.c
rename to scilab/modules/integer/src/c/mgeti.c
index 0d00002..b6440c3 100644 (file)
@@ -5,10 +5,9 @@
 #ifdef __STDC__
 #include <stdlib.h>
 #endif
-#include "../machine.h"
+#include "machine.h"
 
-/* REORGANISATION TEMPORAIRE */
-#include "../../modules/fileio/src/misc.h"
+#include "../../../fileio/src/misc.h"
 
 int SWAP(char type[],integer *fd); /* Defined at the end of this file */
 
similarity index 97%
rename from scilab/routines/int/mputi.c
rename to scilab/modules/integer/src/c/mputi.c
index 53c6186..ea86d1f 100644 (file)
@@ -5,10 +5,9 @@
 #ifdef __STDC__
 #include <stdlib.h>
 #endif
-#include "../machine.h"
+#include "machine.h"
 
-/* REORGANISATION TEMPORAIRE */
-#include "../../modules/fileio/src/misc.h"
+#include "../../../fileio/src/misc.h"
 
 struct soundstream ftf;
 extern FILE *GetFile();
similarity index 99%
rename from scilab/routines/int/tpconv.c
rename to scilab/modules/integer/src/c/tpconv.c
index 46ee4e4..8e9d12d 100644 (file)
@@ -1,4 +1,4 @@
-#include "../machine.h"
+#include "machine.h"
 typedef signed char integer1;
 typedef short integer2;
 /*     Copyright INRIA */
similarity index 98%
rename from scilab/routines/int/bitops.f
rename to scilab/modules/integer/src/fortran/bitops.f
index 9ac509d..1dd8b12 100644 (file)
@@ -1,6 +1,6 @@
       subroutine bitops(op)
 c     addition
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       integer is1,top0,op
       external memused
similarity index 98%
rename from scilab/routines/int/convert.f
rename to scilab/modules/integer/src/fortran/convert.f
index 044e033..e015ee9 100644 (file)
@@ -7,7 +7,7 @@ C     0,1,2,4,11,12,14 :
 C     (double,char, short,int,uchar, ushort,uint)
 C     ----------------------------------------------
 
-      include '../stack.h'
+      include 'stack.h'
       logical checkrhs,checklhs
       integer iadr,sadr,memused
 c     
similarity index 98%
rename from scilab/routines/int/i_a_i.f
rename to scilab/modules/integer/src/fortran/i_a_i.f
index 9046a82..4b27bd6 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_a_i
 c     addition
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       character*8 fct
       integer is1
similarity index 97%
rename from scilab/routines/int/i_abs.f
rename to scilab/modules/integer/src/fortran/i_abs.f
index 5ae6f2a..c20dc56 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_abs(id)
 c     WARNING : argument of this interface may be passed by reference
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       double precision pythag
       logical ref
similarity index 98%
rename from scilab/routines/int/i_b_i.f
rename to scilab/modules/integer/src/fortran/i_b_i.f
index e4581ab..c14f3e8 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_b_i
 c     implicit vector
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       character*8 fct
       integer is1
similarity index 98%
rename from scilab/routines/int/i_c_i.f
rename to scilab/modules/integer/src/fortran/i_c_i.f
index 2f6d2da..419cff8 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_c_i
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       integer top0
       external memused
similarity index 95%
rename from scilab/routines/int/i_convert.f
rename to scilab/modules/integer/src/fortran/i_convert.f
index e370345..d7723b8 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_convert
-      include '../stack.h'
+      include 'stack.h'
 c
       logical checkrhs,checklhs
       integer iadr,sadr
similarity index 97%
rename from scilab/routines/int/i_cumprod.f
rename to scilab/modules/integer/src/fortran/i_cumprod.f
index ce92f23..d601776 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_cumprod(id)
 c     WARNING : argument of this interface may be passed by reference
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       logical ref
       integer sel,tops
similarity index 97%
rename from scilab/routines/int/i_cumsum.f
rename to scilab/modules/integer/src/fortran/i_cumsum.f
index f3e7daa..56f920c 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_cumsum(id)
 c     WARNING : argument of this interface may be passed by reference
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       logical ref
       integer sel,tops
similarity index 98%
rename from scilab/routines/int/i_d_i.f
rename to scilab/modules/integer/src/fortran/i_d_i.f
index 2397df1..ed82021 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_d_i
 c     element wise right division
-      include '../stack.h'
+      include 'stack.h'
       integer is1
       external memused
       integer memused
similarity index 98%
rename from scilab/routines/int/i_diag.f
rename to scilab/modules/integer/src/fortran/i_diag.f
index 3d455aa..d74cdf8 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_diag(id)
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       external memused
       integer memused
similarity index 99%
rename from scilab/routines/int/i_e.f
rename to scilab/modules/integer/src/fortran/i_e.f
index 7484ef8..962d7fb 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_e
-      include '../stack.h'
+      include 'stack.h'
       external memused
       integer memused
       integer iadr,sadr
similarity index 98%
rename from scilab/routines/int/i_f_i.f
rename to scilab/modules/integer/src/fortran/i_f_i.f
index 4677b9a..2e4f452 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_f_i
 c     concatenation [a;b]
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       integer top0
       external memused
similarity index 99%
rename from scilab/routines/int/i_i_i.f
rename to scilab/modules/integer/src/fortran/i_i_i.f
index 1d2ed4c..deb65bc 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_i_i
 c     insertion
-      include '../stack.h'
+      include 'stack.h'
       logical ref
       integer top0
       integer is2
similarity index 98%
rename from scilab/routines/int/i_kron.f
rename to scilab/modules/integer/src/fortran/i_kron.f
index 59bffc2..5264169 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_kron()
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       external memused,uppertype
       integer memused,uppertype
 c
similarity index 98%
rename from scilab/routines/int/i_l_i.f
rename to scilab/modules/integer/src/fortran/i_l_i.f
index 388b0ee..858aab7 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_l_i
 c     left division
-      include '../stack.h'
+      include 'stack.h'
       integer is1
       external memused
       integer memused
similarity index 99%
rename from scilab/routines/int/i_logic.f
rename to scilab/modules/integer/src/fortran/i_logic.f
index c229b9b..4675fe1 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_logic(op)
-      include '../stack.h'
+      include 'stack.h'
       integer less,great,equal
       integer op,is1(2)
       external memused
similarity index 98%
rename from scilab/routines/int/i_m_i.f
rename to scilab/modules/integer/src/fortran/i_m_i.f
index 3ebcc59..b88c7cb 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_m_i
 c     multiplication
-      include '../stack.h'
+      include 'stack.h'
       integer is1
       external memused
       integer memused
similarity index 99%
rename from scilab/routines/int/i_matrix.f
rename to scilab/modules/integer/src/fortran/i_matrix.f
index 985ad9a..59464e3 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_matrix()
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 
       integer tops,top2
       integer iadr,sadr
similarity index 99%
rename from scilab/routines/int/i_maxi.f
rename to scilab/modules/integer/src/fortran/i_maxi.f
index 0741874..8916739 100644 (file)
@@ -3,7 +3,7 @@ c     -------------------------------
 c     max interface 
 c     Author: Serge Steer, Copyright INRIA
 c     -------------------------------
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       logical checkrhs,checklhs
       integer gettype,itype,topk,sel
       integer iadr,sadr
similarity index 98%
rename from scilab/routines/int/i_mget.f
rename to scilab/modules/integer/src/fortran/i_mget.f
index 8621281..c905307 100644 (file)
@@ -4,7 +4,7 @@ c
        integer topk,rhsk,topl,fd
        logical checkrhs,checklhs,getscalar,getsmat,checkval
        character*4 ityp
-       include '../stack.h'
+       include 'stack.h'
 c
        integer iadr, sadr
        iadr(l)=l+l-1
similarity index 99%
rename from scilab/routines/int/i_mini.f
rename to scilab/modules/integer/src/fortran/i_mini.f
index 1c64c63..9a11e5a 100644 (file)
@@ -3,7 +3,7 @@ c     -------------------------------
 c     min interface 
 c     Author: Serge Steer, Copyright INRIA
 c     -------------------------------
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       logical checkrhs,checklhs
       integer gettype,itype,topk,sel
       integer iadr,sadr
similarity index 98%
rename from scilab/routines/int/i_mput.f
rename to scilab/modules/integer/src/fortran/i_mput.f
index fe346e0..789526f 100644 (file)
@@ -5,7 +5,7 @@ c
        logical checkrhs,checklhs,getsmat,checkval,getscalar
        character*4 ityp
 
-       include '../stack.h'
+       include 'stack.h'
 c
        integer iadr, sadr
        iadr(l)=l+l-1
similarity index 95%
rename from scilab/routines/int/i_p.f
rename to scilab/modules/integer/src/fortran/i_p.f
index fc78d59..c9fc1c5 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_p
-      include '../stack.h'
+      include 'stack.h'
       logical checkrhs,checklhs,crewimat
       integer iadr,topk
 c     
similarity index 98%
rename from scilab/routines/int/i_prod.f
rename to scilab/modules/integer/src/fortran/i_prod.f
index 6bcc447..f747cc3 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_prod(id)
 c     WARNING : argument of this interface may be passed by reference
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       logical ref
       integer sel,tops
similarity index 98%
rename from scilab/routines/int/i_q_i.f
rename to scilab/modules/integer/src/fortran/i_q_i.f
index 5dd5de1..05e3ee6 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_q_i
 c     element wise left division
-      include '../stack.h'
+      include 'stack.h'
       integer is1
       external memused
       integer memused
similarity index 97%
rename from scilab/routines/int/i_r_i.f
rename to scilab/modules/integer/src/fortran/i_r_i.f
index 6ed9785..1f1e6b1 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_r_i
 c     division a droite
-      include '../stack.h'
+      include 'stack.h'
       integer iadr,sadr
 c     
       iadr(l)=l+l-1
similarity index 98%
rename from scilab/routines/int/i_s_i.f
rename to scilab/modules/integer/src/fortran/i_s_i.f
index c7203ba..49af82b 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_s_i
 c     substraction
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       integer is1
       integer is2
similarity index 98%
rename from scilab/routines/int/i_sum.f
rename to scilab/modules/integer/src/fortran/i_sum.f
index 605b758..bc9bad6 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_sum(id)
 c     WARNING : argument of this interface may be passed by reference
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       logical ref
       integer sel,tops
similarity index 96%
rename from scilab/routines/int/i_t.f
rename to scilab/modules/integer/src/fortran/i_t.f
index 8663be2..1d05662 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_t
 c     substraction
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       integer vol
       integer iadr,sadr
similarity index 98%
rename from scilab/routines/int/i_tril.f
rename to scilab/modules/integer/src/fortran/i_tril.f
index 4521bae..e65b712 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_tril(id)
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       external memused
       integer memused
similarity index 98%
rename from scilab/routines/int/i_triu.f
rename to scilab/modules/integer/src/fortran/i_triu.f
index f63b238..6c5cc9a 100644 (file)
@@ -1,5 +1,5 @@
       subroutine i_triu(id)
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer id(nsiz)
       external memused
       integer memused
similarity index 98%
rename from scilab/routines/int/i_x_i.f
rename to scilab/modules/integer/src/fortran/i_x_i.f
index 0bc19f3..2b2bfab 100644 (file)
@@ -1,6 +1,6 @@
       subroutine i_x_i
 c     element wise product
-      include '../stack.h'
+      include 'stack.h'
       integer is1
       external memused
       integer memused
diff --git a/scilab/modules/integer/src/fortran/integer_f.vfproj b/scilab/modules/integer/src/fortran/integer_f.vfproj
new file mode 100644 (file)
index 0000000..651bf77
--- /dev/null
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="9.10" ProjectIdGuid="{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}">\r
+       <Platforms>\r
+               <Platform Name="Win32"/></Platforms>\r
+       <Configurations>\r
+               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">\r
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
+                               <Tool Name="VFPreBuildEventTool"/>\r
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>\r
+                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)\r
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul\r
+copy *.def integer_f.def &gt;nul\r
+copy integer_f.def ..\..\..\..\..\libs\integer_f.def &gt;nul\r
+del *.def &gt;nul\r
+cd .."/>\r
+                               <Tool Name="VFCustomBuildTool"/>\r
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>\r
+                               <Tool Name="VFPreLinkEventTool"/>\r
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/integer_f.lib" SuppressStartupBanner="true"/></Configuration>\r
+               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">\r
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
+                               <Tool Name="VFPreBuildEventTool"/>\r
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="static /threads" DisableDefaultLibSearch="true" CompileOnly="true"/>\r
+                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)\r
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul\r
+copy *.def integer_f.def &gt;nul\r
+copy integer_f.def ..\..\..\..\..\libs\integer_f.def &gt;nul\r
+del *.def &gt;nul\r
+cd .."/>\r
+                               <Tool Name="VFCustomBuildTool"/>\r
+                               <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>\r
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>\r
+                               <Tool Name="VFPreLinkEventTool"/>\r
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/integer_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>\r
+       <Files>\r
+               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">\r
+               <File RelativePath="bitops.f"/>\r
+               <File RelativePath="convert.f"/>\r
+               <File RelativePath="i_a_i.f"/>\r
+               <File RelativePath="i_abs.f"/>\r
+               <File RelativePath="i_b_i.f"/>\r
+               <File RelativePath="i_c_i.f"/>\r
+               <File RelativePath="i_convert.f"/>\r
+               <File RelativePath="i_cumprod.f"/>\r
+               <File RelativePath="i_cumsum.f"/>\r
+               <File RelativePath="i_d_i.f"/>\r
+               <File RelativePath="i_diag.f"/>\r
+               <File RelativePath="i_e.f"/>\r
+               <File RelativePath="i_f_i.f"/>\r
+               <File RelativePath="i_i_i.f"/>\r
+               <File RelativePath="i_kron.f"/>\r
+               <File RelativePath="i_l_i.f"/>\r
+               <File RelativePath="i_logic.f"/>\r
+               <File RelativePath="i_m_i.f"/>\r
+               <File RelativePath="i_matrix.f"/>\r
+               <File RelativePath="i_maxi.f"/>\r
+               <File RelativePath="i_mget.f"/>\r
+               <File RelativePath="i_mini.f"/>\r
+               <File RelativePath="i_mput.f"/>\r
+               <File RelativePath="i_p.f"/>\r
+               <File RelativePath="i_prod.f"/>\r
+               <File RelativePath="i_q_i.f"/>\r
+               <File RelativePath="i_r_i.f"/>\r
+               <File RelativePath="i_s_i.f"/>\r
+               <File RelativePath="i_sum.f"/>\r
+               <File RelativePath="i_t.f"/>\r
+               <File RelativePath="i_tril.f"/>\r
+               <File RelativePath="i_triu.f"/>\r
+               <File RelativePath="i_x_i.f"/>\r
+               <File RelativePath="intinttype.f"/>\r
+               <File RelativePath="intops.f"/>\r
+               <File RelativePath="memused.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_double.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_abs.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_cumprod.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_cumsum.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_diag.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_matrix.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_max.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_maxi.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_min.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_mini.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_mput.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_p.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_prod.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_sum.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_tril.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_i_triu.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_iconvert.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_int16.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_int32.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_int8.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_inttype.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_mgeti.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_uint16.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_uint32.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\sci_uint8.f"/>\r
+               <File RelativePath="unarybit.f"/>\r
+               <File RelativePath="uppertype.f"/></Filter>\r
+               <Filter Name="Header Files" Filter="fi;fd"/>\r
+               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>\r
+               <File RelativePath="..\..\sci_gateway\integer.fundef"/></Files>\r
+       <Globals/></VisualStudioProject>\r
similarity index 95%
rename from scilab/routines/int/intinttype.f
rename to scilab/modules/integer/src/fortran/intinttype.f
index fcf80e1..876fd2a 100644 (file)
@@ -1,5 +1,5 @@
       subroutine intinttype
-      include '../stack.h'
+      include 'stack.h'
       logical checkrhs,checklhs
       integer iadr,sadr
 c     
similarity index 99%
rename from scilab/routines/int/intops.f
rename to scilab/modules/integer/src/fortran/intops.f
index 0f5675a..74599a2 100644 (file)
@@ -3,7 +3,7 @@ c
 c     operations matricielles
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer op
 c     
       integer star,dstar,slash,bslash,dot,colon,quote
similarity index 96%
rename from scilab/routines/int/unarybit.f
rename to scilab/modules/integer/src/fortran/unarybit.f
index 3629864..962b640 100644 (file)
@@ -1,6 +1,6 @@
       subroutine unarybit(op)
 c     addition
-      include '../stack.h'
+      include 'stack.h'
       common /mtlbc/ mmode
       character*8 fct
       integer op
index df9df58..55e7f8a 100644 (file)
@@ -3,9 +3,9 @@ mode(-1)
 //blocks
 //mprintf('Compiling Modelica models in '+pwd()')
 load('SCI/macros/util/lib')
-load('SCI/macros/int/lib')
 load('SCI/macros/percent/lib')
 
+load('SCI/modules/integer/macros/lib')
 load('SCI/modules/elementaries_functions/macros/lib')
 load('SCI/modules/polynomials/macros/lib')
 
diff --git a/scilab/routines/int/genbitor.c b/scilab/routines/int/genbitor.c
deleted file mode 100644 (file)
index b39828d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "../machine.h"
-typedef signed char integer1;
-typedef short integer2;
-/*     Copyright INRIA */
-
-#define BIT(Type,Op) {\
-Type *DX;\
-Type *DY;\
-    DX=(Type *)dx;\
-    --DX;\
-    DY=(Type *)dy;\
-    --DY;\
-    if (*incx == 1 && *incy == 1)\
-       for (i = 1; i <= nv; ++i) \
-        DY[i] = DX[i] Op DY[i];\
-    else {\
-      ix = 1; iy = 1;\
-      if (*incx < 0) ix = (-nv + 1) * *incx + 1;\
-      if (*incy < 0) iy = (-nv + 1) * *incy + 1;\
-      for (i = 1; i <= nv; ++i) {\
-       DY[iy] = DX[ix] Op DY[iy];\
-       ix += *incx; iy += *incy;\
-      }\
-    }\
-}
-
-int C2F(genbitops)(typ,op, n, dx, incx, dy, incy)
-integer *n;
-integer *incx;
-integer *incy;
-integer *typ;
-integer *op;
-int *dx;
-int *dy;
-{
-  static integer i, ix, iy, nv;
-  nv=*n;
-  if (nv <= 0) return 0;
-
-  switch (*op) {
-  case 57:
-    switch (*typ) {
-    case 1:
-      BIT(integer1,|);
-      break;
-    case 2:
-      BIT(integer2,|);
-      break;
-    case 4:
-      BIT(integer,|);
-      break;
-    case 11:
-      BIT(unsigned char,|);
-      break;
-    case 12:
-      BIT(unsigned short,|);
-      break;
-    case 14:
-      BIT(unsigned int,|);
-      break;
-    }
-    break;
-  case 58:
-    switch (*typ) {
-    case 1:
-      BIT(integer1,&);
-      break;
-    case 2:
-      BIT(integer2,&);
-      break;
-    case 4:
-      BIT(integer,&);
-      break;
-    case 11:
-      BIT(unsigned char,&);
-      break;
-    case 12:
-      BIT(unsigned short,&);
-      break;
-    case 14:
-      BIT(unsigned int,&);
-      break;
-    }
-    break;
-  }
-}
-
-
diff --git a/scilab/routines/int/genrowconc.c b/scilab/routines/int/genrowconc.c
deleted file mode 100644 (file)
index f55582e..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "../machine.h"
-typedef signed char integer1;
-typedef short integer2;
-/*     Copyright INRIA */
-
-#define COPYINT(Type) {\
-Type *DX;\
-Type *DY;\
-    DX=(Type *)dx;\
-    --DX;\
-    DY=(Type *)dy;\
-    --DY;\
-    if (*n <= 0) return 0;\
-    if (*incx == 1 && *incy == 1)\
-       for (i = 1; i <= *n; ++i) \
-        DY[i] = DX[i];\
-    else {\
-      ix = 1;\
-      iy = 1;\
-      if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;\
-      if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;\
-      for (i = 1; i <= *n; ++i) {\
-       DY[iy] = DX[ix];\
-       ix += *incx;\
-       iy += *incy;\
-      }\
-        };}
-
-
-
-int C2F(gencopy)(typ,n, dx, incx, dy, incy)
-integer *n;
-integer *incx;
-integer *incy;
-integer *typ;
-int *dx;
-int *dy;
-{
-  static integer i, ix, iy;
-  switch (*typ) {
-  case 1:
-    COPYINT(integer1);
-    break;
-  case 2:
-    COPYINT(integer2);
-    break;
-  case 4:
-    COPYINT(integer);
-    break;
-  case 11:
-    COPYINT(unsigned char);
-    break;
-  case 12:
-    COPYINT(unsigned short);
-    break;
-  case 14:
-    COPYINT(unsigned int);
-    break;
-  }
-}
-
diff --git a/scilab/routines/int/i_Gray.c b/scilab/routines/int/i_Gray.c
deleted file mode 100644 (file)
index fb376fb..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*------------------------------------------------------------------------
-    Graphic library for 2D and 3D plotting 
-    Copyright (C) 1998 Chancelier Jean-Philippe
-    jpc@cergrene.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include "Math.h"
-
-static void GraySquare();
-static void GraySquare1();
-/*------------------------------------------------------------
- - z is a (n1,n2) matrix 
- - x is a (1,n1) matrix 
- - y is a (1,n2) matrix 
- - x,y,z are stored as one dimensionnal array in C 
-
-  z : is the value of a function on the grid defined by x,y 
-  on each rectangle the average value of z is computed 
-  and [zmin,zmax] is linearly remapped to the [colormin,colormap]
-  values of colors in the current colormap 
-  the color associated to zmoy is used for filling a specific rectangle 
----------------------------------------------------------------*/
-
-int C2F(i_xgray)(x,y,z,n1,n2,strflag,brect,aaint,l1)
-     double x[],y[],z[],brect[];
-     integer *n1,*n2,aaint[];
-     long int l1;
-     char strflag[];
-{
-  double FRect[4],scx,scy,xofset,yofset;
-  static char logflag[]="nn";
-  integer IRect[4],Xdec[3],Ydec[3];
-  double xx[2],yy[2];
-  static integer *xm,*ym,err=0;
-  integer j,job=1;
-  integer nn1=1,nn2=2;
-  /** If Record is on **/
-  if (GetDriver()=='R') 
-    i_StoreGray("gray",x,y,z,n1,n2,strflag,brect,aaint);
-  xx[0]=Mini(x,*n1);xx[1]=Maxi(x,*n1);
-  yy[0]=Mini(y,*n2);yy[1]=Maxi(y,*n2);
-  /** Boundaries of the frame **/
-  FrameBounds("gnn",xx,yy,&nn1,&nn2,aaint,strflag,brect,FRect,Xdec,Ydec);
-  if ( (int)strlen(strflag) >=2 && strflag[1]=='0') job=0;
-  Scale2D(job,FRect,IRect,aaint,&scx,&scy,&xofset,&yofset,logflag,&xm,&ym,Max((*n1),(*n2)),&err);
-  if ( err == 0) return(0);
-  /** Draw Axis or only rectangle **/
-  AxisDraw(FRect,IRect,Xdec,Ydec,aaint,scx,scy,xofset,yofset,strflag,logflag);
-  /** Drawing the curves **/
-  C2F(dr)("xset","clipping",&IRect[0],&IRect[1],&IRect[2],&IRect[3],PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for ( j =0 ; j < (*n1) ; j++)         
-    xm[j]= (int)(scx*(x[j]-FRect[0])  +xofset);
-  for ( j =0 ; j < (*n2) ; j++)         
-    ym[j]= (int)(scy*(-y[j]+FRect[3]) +yofset);
-  i_GraySquare(xm,ym,z,*n1,*n2);
-  C2F(dr)("xset","clipoff",PI0,PI0,PI0,PI0, PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xrect","v",&IRect[0],&IRect[1],&IRect[2],&IRect[3]
-      ,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  return(0);
-}
-
-
-static void i_GraySquare(x, y, z, n1, n2)
-     integer *x;
-     integer *y;
-     double *z;
-     integer n1;
-     integer n2;
-{
-  double zmoy,zmax,zmin,zmaxmin;
-  integer i,j,verbose=0,whiteid,narg,fill[1],cpat,xz[2];
-  zmin=Mini(z,(n1)*(n2));
-  zmax=Maxi(z,(n1)*(n2));
-  zmaxmin=zmax-zmin;
-  if (zmaxmin <= SMDOUBLE) zmaxmin=SMDOUBLE;
-  C2F(dr)("xget","lastpattern",&verbose,&whiteid,&narg,
-      PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xget","pattern",&verbose,&cpat,&narg,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xget","wdim",&verbose,xz,&narg, PI0, PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for (i = 0 ; i < (n1)-1 ; i++)
-  for (j = 0 ; j < (n2)-1 ; j++)
-    {
-      integer w,h;
-      zmoy=1/4.0*(z[i+n1*j]+z[i+n1*(j+1)]+z[i+1+n1*j]+z[i+1+n1*(j+1)]);
-      fill[0]=1 + inint((whiteid-1)*(zmoy-zmin)/(zmaxmin));
-      C2F(dr)("xset","pattern",&(fill[0]),PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      w=Abs(x[i+1]-x[i]);h=Abs(y[j+1]-y[j]);
-      /* We don't trace rectangle which are totally out **/
-      if ( w != 0 && h != 0 && x[i] < xz[0] && y[j+1] < xz[1] && x[i]+w > 0 && y[j+1]+h > 0 )
-       {
-         if ( Abs(x[i]) < int16max && Abs(y[j+1]) < int16max && w < uns16max && h < uns16max)
-           {
-             /* fprintf(stderr,"Rectangle %d,%d : %d,%d,%d,%d\n",i,j,x[i],y[j+1],w,h); */
-             C2F(dr)("xfrect","v",&x[i],&y[j+1],&w,&h,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-           }
-         else 
-           {
-             /* fprintf(stderr,"Rectangle too large \n"); */
-           }
-       }
-    }
-  C2F(dr)("xset","pattern",&cpat,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-/*-------------------------------------------------------
-  z : of size n1*n2 
-  the z value is interpreted as a color number inside the current colormap
-  z[i,j] is used as the color of a square [i-0.5,i+0.5] [j-0.5,j+0.5]
--------------------------------------------------------*/
-
-
-int C2F(i_xgray1)(z,n1,n2,strflag,brect,aaint,l1)
-     double z[],brect[];
-     integer *n1,*n2,aaint[];
-     long int l1;
-     char strflag[];
-{
-  double FRect[4],scx,scy,xofset,yofset;
-  static char logflag[]="nn";
-  integer IRect[4],Xdec[3],Ydec[3];
-  double xx[2],yy[2];
-  static integer *xm,*ym,err=0;
-  integer j,job=1;
-  integer nn1=1,nn2=2;
-  /** If Record is on **/
-  if (GetDriver()=='R') 
-    i_StoreGray1("gray1",z,n1,n2,strflag,brect,aaint);
-  xx[0]=0.5;xx[1]= *n2+0.5;
-  yy[0]=0.5;yy[1]= *n1+0.5;
-  /** Boundaries of the frame **/
-  FrameBounds("gnn",xx,yy,&nn1,&nn2,aaint,strflag,brect,FRect,Xdec,Ydec);
-  if ( (int)strlen(strflag) >=2 && strflag[1]=='0') job=0;
-  Scale2D(job,FRect,IRect,aaint,&scx,&scy,&xofset,&yofset,logflag,&xm,&ym,Max((*n1+1),(*n2+1)),&err);
-  if ( err == 0) return(0);
-  /** Draw Axis or only rectangle **/
-  AxisDraw(FRect,IRect,Xdec,Ydec,aaint,scx,scy,xofset,yofset,strflag,logflag);
-  /** Drawing the curves **/
-  C2F(dr)("xset","clipping",&IRect[0],&IRect[1],&IRect[2],&IRect[3],PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for ( j =0 ; j < (*n2+1) ; j++)       
-    xm[j]= (int)(scx*(j+0.5 -FRect[0])  +xofset);
-  for ( j =0 ; j < (*n1+1) ; j++)       
-    ym[j]= (int)(scy*(-((*n1)-j+0.5+1)+FRect[3]) +yofset);
-  i_GraySquare1(xm,ym,z,*n1+1,*n2+1);
-  C2F(dr)("xset","clipoff",PI0,PI0,PI0,PI0, PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xrect","v",&IRect[0],&IRect[1],&IRect[2],&IRect[3]
-      ,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  return(0);
-}
-
-
-/*-------------------------------------------------------
-  x : of size n1 gives the x-values of the grid 
-  y : of size n2 gives the y-values of the grid 
-  z : of size (n1-1)*(n2-1)  gives the f-values on the middle 
-  of each rectangle. 
-  z[i,j] is the value on the middle of rectangle 
-        P1= x[i],y[j] x[i+1],y[j+1]
--------------------------------------------------------*/
-
-static void i_GraySquare1(x, y, z, n1, n2)
-     integer *x;
-     integer *y;
-     double *z;
-     integer n1;
-     integer n2;
-{
-  double zmoy,zmax,zmin,zmaxmin;
-  integer i,j,verbose=0,whiteid,narg,fill[1],cpat,xz[2];
-  zmin=Mini(z,(n1-1)*(n2-1));
-  zmax=Maxi(z,(n1-1)*(n2-1));
-  zmaxmin=zmax-zmin;
-  if (zmaxmin <= SMDOUBLE) zmaxmin=SMDOUBLE;
-  C2F(dr)("xget","lastpattern",&verbose,&whiteid,&narg,
-      PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xget","pattern",&verbose,&cpat,&narg,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  C2F(dr)("xget","wdim",&verbose,xz,&narg, PI0, PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-  for (i = 0 ; i < (n1)-1 ; i++)
-  for (j = 0 ; j < (n2)-1 ; j++)
-    {
-      integer w,h;
-      fill[0]=Max(Min(z[i+(n1-1)*j],whiteid),0); 
-      C2F(dr)("xset","pattern",&(fill[0]),PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-      w=Abs(x[j+1]-x[j]);h=Abs(y[i+1]-y[i]);
-      /* We don't trace rectangle which are totally out **/
-      if ( w != 0 && h != 0 && x[j] < xz[0] && y[i+1] < xz[1] && x[j]+w > 0 && y[i+1]+h > 0 )
-       {
-         if ( Abs(x[j]) < int16max && Abs(y[i+1]) < int16max && w < uns16max && h < uns16max)
-           {
-             /* fprintf(stderr,"Rectangle %d,%d : %d,%d,%d,%d\n",i,j,x[i],y[j+1],w,h); */
-             C2F(dr)("xfrect","v",&x[j],&y[i+1],&w,&h,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-           }
-         else 
-           {
-             /* fprintf(stderr,"Rectangle too large \n"); */
-           }
-       }
-    }
-  C2F(dr)("xset","pattern",&cpat,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
-}
-
-/*---------------------------------------------------------------------
-\encadre{Le cas des niveaux de gris }
----------------------------------------------------------------------------*/
-
-
-/* Store the plot in the plot list 
-   same arguments as gray */
-
-void i_StoreGray(name, x, y, z, n1, n2, strflag, brect, aaint)
-     char *name;
-     double *x;
-     double *y;
-     double *z;
-     integer *n1;
-     integer *n2;
-     char *strflag;
-     double *brect;
-     integer *aaint;
-{
-  struct gray_rec *lplot;
-  lplot= ((struct gray_rec *) MALLOC(sizeof(struct gray_rec)));
-  if (lplot != NULL)
-    {
-      lplot->n1= *n1;
-      lplot->n2= *n2;
-      if ( 
-         CopyVectC(&(lplot->name), name,((int)strlen(name))+1) &&
-         CopyVectF(&(lplot->x), x,*n1) &&
-         CopyVectF(&(lplot->y), y,*n2) &&
-         CopyVectF(&(lplot->z), z,(*n1)*(*n2)) &&
-         CopyVectC(&(lplot->strflag),strflag,((int)strlen(strflag))+1) &&
-         CopyVectC(&(lplot->strflag_kp),strflag,((int)strlen(strflag))+1) &&
-         CopyVectF(&(lplot->brect),brect,4L) &&
-         CopyVectF(&(lplot->brect_kp),brect,4L) &&
-         CopyVectLI(&(lplot->aaint),aaint,4)  &&
-         CopyVectLI(&(lplot->aaint_kp),aaint,4) 
-         ) 
-       {
-         Store(name,(char *) lplot);
-         return;}
-    }
-  Scistring("\n Store Plot (storegray): No more place \n");
-}
-
-/** For matrices  z(i,j) **/
-
-void i_StoreGray1(name,  z, n1, n2, strflag, brect, aaint)
-     char *name;
-     double *z;
-     integer *n1;
-     integer *n2;
-     char *strflag;
-     double *brect;
-     integer *aaint;
-{
-  struct gray_rec *lplot;
-  lplot= ((struct gray_rec *) MALLOC(sizeof(struct gray_rec)));
-  if (lplot != NULL)
-    {
-      lplot->n1= *n1;
-      lplot->n2= *n2;
-      lplot->x = NULL;
-      lplot->y = NULL;
-      if ( 
-         CopyVectC(&(lplot->name), name,((int)strlen(name))+1) &&
-         CopyVectF(&(lplot->z), z,(*n1)*(*n2)) &&
-         CopyVectC(&(lplot->strflag),strflag,((int)strlen(strflag))+1) &&
-         CopyVectC(&(lplot->strflag_kp),strflag,((int)strlen(strflag))+1) &&
-         CopyVectF(&(lplot->brect),brect,4L) &&
-         CopyVectF(&(lplot->brect_kp),brect,4L) &&
-         CopyVectLI(&(lplot->aaint),aaint,4)  &&
-         CopyVectLI(&(lplot->aaint_kp),aaint,4) 
-         ) 
-       {
-         Store(name,(char *) lplot);
-         return;}
-    }
-  Scistring("\n Store Plot (storegray): No more place \n");
-}
-
-
-/*---------------------------------------------------------------------
-\encadre{Routines de recopie de Vecteurs avec alocation dynamique}
-  a appeller avec l > 0 
----------------------------------------------------------------------------*/
-
-int i_CopyVectI(nx, x, l)
-     int **nx;
-     int *x;
-     integer l;
-{ 
-  int i;
-  if ( x != ( int *) 0) 
-    {
-      *nx = (int *)  MALLOC(l*sizeof(int));
-      if ( *nx == NULL) return(0);
-      for ( i=0 ; i < l ; i++) (*nx)[i]= x[i];
-    }
-  return(1);
-}
diff --git a/scilab/routines/int/int_f/int_f.vfproj b/scilab/routines/int/int_f/int_f.vfproj
deleted file mode 100644 (file)
index 2e398ea..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="9.10" ProjectIdGuid="{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}">
-       <Platforms>
-               <Platform Name="Win32"/></Platforms>
-       <Configurations>
-               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul
-copy *.def int_f.def &gt;nul
-copy int_f.def ..\..\..\..\libs\int_f.def &gt;nul
-del *.def &gt;nul
-cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
-                               <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../libs/int_f.lib" SuppressStartupBanner="true"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
-               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
-copy *.def int_f.def &gt;nul
-copy int_f.def ..\..\..\..\libs\int_f.def &gt;nul
-del *.def &gt;nul
-cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" PreprocessorDefinitions="WIN32" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
-                               <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../libs/int_f.lib" SuppressStartupBanner="true"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
-       <Files>
-               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-               <File RelativePath="..\bitops.f"/>
-               <File RelativePath="..\convert.f"/>
-               <File RelativePath="..\i_a_i.f"/>
-               <File RelativePath="..\i_abs.f"/>
-               <File RelativePath="..\i_b_i.f"/>
-               <File RelativePath="..\i_c_i.f"/>
-               <File RelativePath="..\i_convert.f"/>
-               <File RelativePath="..\i_cumprod.f"/>
-               <File RelativePath="..\i_cumsum.f"/>
-               <File RelativePath="..\i_d_i.f"/>
-               <File RelativePath="..\i_diag.f"/>
-               <File RelativePath="..\i_e.f"/>
-               <File RelativePath="..\i_f_i.f"/>
-               <File RelativePath="..\i_i_i.f"/>
-               <File RelativePath="..\i_kron.f"/>
-               <File RelativePath="..\i_l_i.f"/>
-               <File RelativePath="..\i_logic.f"/>
-               <File RelativePath="..\i_m_i.f"/>
-               <File RelativePath="..\i_matrix.f"/>
-               <File RelativePath="..\i_maxi.f"/>
-               <File RelativePath="..\i_mget.f"/>
-               <File RelativePath="..\i_mini.f"/>
-               <File RelativePath="..\i_mput.f"/>
-               <File RelativePath="..\i_p.f"/>
-               <File RelativePath="..\i_prod.f"/>
-               <File RelativePath="..\i_q_i.f"/>
-               <File RelativePath="..\i_r_i.f"/>
-               <File RelativePath="..\i_s_i.f"/>
-               <File RelativePath="..\i_sum.f"/>
-               <File RelativePath="..\i_t.f"/>
-               <File RelativePath="..\i_tril.f"/>
-               <File RelativePath="..\i_triu.f"/>
-               <File RelativePath="..\i_x_i.f"/>
-               <File RelativePath="..\intinttype.f"/>
-               <File RelativePath="..\intops.f"/>
-               <File RelativePath="..\memused.f"/>
-               <File RelativePath="..\sci_double.f"/>
-               <File RelativePath="..\sci_i_abs.f"/>
-               <File RelativePath="..\sci_i_cumprod.f"/>
-               <File RelativePath="..\sci_i_cumsum.f"/>
-               <File RelativePath="..\sci_i_diag.f"/>
-               <File RelativePath="..\sci_i_matrix.f"/>
-               <File RelativePath="..\sci_i_max.f"/>
-               <File RelativePath="..\sci_i_maxi.f"/>
-               <File RelativePath="..\sci_i_min.f"/>
-               <File RelativePath="..\sci_i_mini.f"/>
-               <File RelativePath="..\sci_i_mput.f"/>
-               <File RelativePath="..\sci_i_p.f"/>
-               <File RelativePath="..\sci_i_prod.f"/>
-               <File RelativePath="..\sci_i_sum.f"/>
-               <File RelativePath="..\sci_i_tril.f"/>
-               <File RelativePath="..\sci_i_triu.f"/>
-               <File RelativePath="..\sci_iconvert.f"/>
-               <File RelativePath="..\sci_int16.f"/>
-               <File RelativePath="..\sci_int32.f"/>
-               <File RelativePath="..\sci_int8.f"/>
-               <File RelativePath="..\sci_inttype.f"/>
-               <File RelativePath="..\sci_mgeti.f"/>
-               <File RelativePath="..\sci_uint16.f"/>
-               <File RelativePath="..\sci_uint32.f"/>
-               <File RelativePath="..\sci_uint8.f"/>
-               <File RelativePath="..\unarybit.f"/>
-               <File RelativePath="..\uppertype.f"/></Filter>
-               <Filter Name="Header Files" Filter="fi;fd"/>
-               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>
-       <Globals/></VisualStudioProject>
diff --git a/scilab/routines/int/iread.f b/scilab/routines/int/iread.f
deleted file mode 100644 (file)
index fc44665..0000000
+++ /dev/null
@@ -1,520 +0,0 @@
-      subroutine iread(it)
-c     Copyright INRIA
-c
-      INCLUDE '../stack.h'
-c     
-      integer top2,tops,id(nlgh),h(nsiz)
-      integer ftyp,fmttyp,mode(2)
-      logical opened,eptover
-      integer iadr,sadr
-      logical checkrhs,checklhs
-c
-      save opened,lunit,job,icomp
-c     
-
-      iadr(l)=l+l-1
-      sadr(l)=(l/2)+1
-c     
-      if (ddt .eq. 4) then
-         write(buf(1:4),'(i4)') fin
-         call basout(io,wte,' matio '//buf(1:4))
-      endif
-c     
-      tops=top
-c
- 120  continue
-      lw=lstk(top+1)
-      if(.not.checkrhs('iread',3,5)) return
-      if(.not.checklhs('iread',1,1)) return
-
-c
-c     opening file
-      top2 = top
-      top = top-rhs+1
-      il=iadr(lstk(top))
-      mode(1)=-1
-      mode(2)=0
-      call v2unit(top,mode,lunit,opened,ierr)
-      if(ierr.gt.0) return
-c     
-      iacces=0
-      if(rhs.gt.3) then
-         il=iadr(lstk(top2))
-         if(rhs.eq.5) then
-            iacces=top2-1
-         else
-            if(istk(il).eq.1) then
-               call error(61)
-               goto 996
-            endif
-         endif
-c     analyse du format
-         if(istk(il).ne.10) then
-            err=rhs
-            call error(55)
-            goto 996
-         endif
-         nc=istk(il+5)-1
-         l=il+5+istk(il+1)*istk(il+2)
-         ftyp=fmttyp(istk(l),nc)
-         if(ftyp.eq.0) then
-            call error(49)
-            goto 996
-         endif
-         call cvstr(nc,istk(l),buf,1)
-         top2=top2-1
-         fin=-fin
-      endif
-c
- 121  if(iacces.ne.0) then
-c     get record numbers
-         ilb=iadr(lstk(iacces))
-         if(istk(ilb+3).ne.0) then
-            err=top2-top+1
-            call error(52)
-            goto 996
-         endif
-         nb=istk(ilb+1)*istk(ilb+2)
-         lb=sadr(ilb+4)
-         ilb=iadr(lw)
-         err=sadr(ilb+nb)-lstk(bot)
-         if(err.gt.0) then
-            call error(17)
-            goto 996
-         endif
-         do 122 i=1,nb
-            istk(ilb+i-1)=int(stk(lb+i-1))
- 122     continue
-         top2=iacces-1
-      endif
-
- 123  continue
-c     number of rows
-      il=iadr(lstk(top2))
-      l=sadr(il+4)
-      n=int(stk(l))
-      top2=top2-1
-c     number of columns
-      il=iadr(lstk(top2))
-      l=sadr(il+4)
-      m=int(stk(l))
-      il=iadr(lstk(top))
-      l=sadr(il+4)
-
-      if(m.eq.0.or.n.le.0) then
-c     terminate if nothing to read
-         istk(il)=1
-         istk(il+1)=0
-         istk(il+2)=0
-         istk(il+3)=0
-         lstk(top+1)=sadr(il+4)
-         if(.not.opened) then
-            mode(1)=0
-            mode(2)=0
-            call clunit(-lunit,buf,mode)
-         endif
-         goto 999
-      endif
-c     create header of variable to return
-      istk(il)=8
-      istk(il+1)=m
-      istk(il+2)=n
-      istk(il+3)=it
-      l=il+4
-
-      lw=l+(m*n*it/4+1)
-      err=sadr(lw+n*it/4+1)-lstk(bot)
-      if(err.gt.0) then
-         call error(17)
-         return
-      endif
-
-      if(fin.lt.0.and.ftyp.ne.1) then
-         buf='incorrect format'
-         call error(9999)
-         return
-      endif
-      if(fin.gt.0) then 
-         buf(1:1)='*'
-         nc=1
-      endif
-c     
-      if(iacces.eq.0) then
-c     sequential acces 
-         if(m.gt.0) then
-c     .     specified number of rows
-            if(it.eq.4) then
-               call mibasin(ierr,lunit,buf(1:nc),istk(l),m,n)
-            elseif(it.eq.2) then
-               call mi2basin(ierr,lunit,buf(1:nc),istk(l),m,n)
-            elseif(it.eq.1) then
-               call mi2basin(ierr,lunit,buf(1:nc),istk(l),m,n)
-               call i22i1(m*n,istk(l),1,istk(l),1)
-            endif
-            if(ierr.eq.1) then
-               goto 997
-            elseif(ierr.eq.2) then
-               goto 998
-            endif
-
-         else
-c     .     unspecified number of rows
-            m=-(iadr(lstk(bot))-li)*it/4
-            if(it.eq.4) then
-               call mibasin(ierr,lunit,buf(1:nc),istk(l),n,m)
-            elseif(it.eq.2) then
-               call mi2basin(ierr,lunit,buf(1:nc),istk(l),n,m)
-            elseif(it.eq.1) then
-               call mi2basin(ierr,lunit,buf(1:nc),istk(l),n,m)
-               call i22i1(n*m,istk(l),1,istk(l),1)
-            endif
-            if(ierr.eq.0) goto 1241
-            if(ierr.eq.2) goto 998
-            if(m.ne.0) then
-               if(m.ge.1.and.n.ge.1) then
-                  err=sadr(l+2*m*n*it/4)-lstk(bot)
-                  if(err.gt.0) then
-                     call error(17)
-                     return
-                  endif
-                  l1=l+m*n
-                  if(it.eq.4) then
-                     call icopy(m*n,istk(l),1,istk(l1),1)
-                     call imtran(istk(l1),n,istk(l),m,n,m)
-                  elseif(it.eq.2) then
-                     call i2copy(m*n,istk(l),1,istk(l1),1)
-                     call i2mtran(istk(l1),n,istk(l),m,n,m)
-                  elseif(it.eq.1) then
-                     call i1copy(m*n,istk(l),1,istk(l1),1)
-                     call i1mtran(istk(l1),n,istk(l),m,n,m)
-                  endif
-                  istk(il+1)=m
-               endif
-            else
-               istk(il+1)=0
-               istk(il+2)=0
-            endif
-         endif         
-      else
-c     acces direct
-         if(nb.ne.m) then
-            call error(42)
-            goto 996
-         endif
-         if(fin.gt.0) then
-            call error(61)
-            goto 996
-         endif
-         if(m.lt.0) then
-            call  error(43)
-            return
-         endif
-         if(it.eq.4) then
-            call irecread(lunit,buf(1:nc),istk(ilb),n,m,istk(l),ierr)
-         elseif(it.eq.2) then
-            call i2recread(lunit,buf(1:nc),istk(ilb),n,m,istk(l),ierr)
-         elseif(it.eq.1) then
-            call i2recread(lunit,buf(1:nc),istk(ilb),n,m,istk(l),ierr)
-            call i22i1(m*n, istk(l),1, istk(l),1)
-         endif
-         if(ierr.eq.1) goto 998
-      endif
-      lstk(top+1)=sadr(l+m*n*it/4+1)
-      if(.not.opened) then
-         mode(1)=0
-         mode(2)=0
-         call clunit(-lunit,buf,mode)
-      endif
-      goto 999
- 996  if(.not.opened) call clunit(-lunit,buf,mode)
-      return
- 997  err=i
-      call error(62)
-      if(.not.opened) call clunit(-lunit,buf,mode)
-      return
- 998  call error(49)
-      if(.not.opened) call clunit(-lunit,buf,mode)
-      return
-c     
- 999  return
-      end
-
-      subroutine irecread(lunit,fmt,records,n,m,a,ierr)
-      integer lunit,records(*),n,m,ia,a(m,*),ierr
-      character*(*) fmt
-
-      do 10 i=1,m
-         read(lunit,fmt,rec=records(i),err=20) (a(i,j),j=1,n)
- 10   continue
-      ierr=0
-      return
- 20   ierr=1
-      return
-      end
-
-      subroutine i2recread(lunit,fmt,records,n,m,a,ierr)
-      integer lunit,records(*),n,m,ia,ierr
-      integer*2 a(m,*)
-      character*(*) fmt
-
-      do 10 i=1,m
-         read(lunit,fmt,rec=records(i),err=20) (a(i,j),j=1,n)
- 10   continue
-      ierr=0
-      return
- 20   ierr=1
-      return
-      end
-
-
-      subroutine mibasin(ierr,lunit,fmt,v,m,n)
-c     Copyright INRIA
-      include '../stack.h'
-      character*(*) fmt
-      integer v(*)
-      integer ierr,lunit
-      character*512 string
-c
-      ierr=0
-      if(lunit.eq.rte) then
-         string=' '
-         call xscion(iflag)
-         if(m.gt.0) then
-         do 01 l=1,m
-            call zzledt(string,len(string),lline,status,0,iflag)
-            if(status.ne.0) goto 10
-            if (lline.eq.0) then
-               string(1:1)=' '
-               lline=1
-            endif
-            if(fmt(1:1).ne.'*') then
-               read(string(1:lline),fmt,end=10,err=20) (v(l-1+i),
-     $              i=1,n*iv,iv)
-            else
-               call rldint(string(1:lline),v(l),iv,n1,n,ierr)
-               if(ierr.ne.0) goto 20
-               if(n1.lt.n) goto 10
-            endif
- 01      continue
-      else
-         if(fmt(1:1).ne.'*') then
-            read(lunit,fmt,end=10,err=20) (v(i),i=1,n*iv,iv)
-         else
-            read(lunit,*,end=10,err=20) (v(i),i=1,n*iv,iv)
-         endif
-      endif
-c
-      return
-c
- 10   ierr=1
-      return
- 20   ierr=2
-      return
-      end
-
-      subroutine i2basin(ierr,lunit,fmt,v,iv,n)
-c     Copyright INRIA
-      include '../stack.h'
-      character*(*) fmt
-      integer*2 v(*)
-      integer ierr,lunit
-      character*512 string
-c
-      ierr=0
-      if(lunit.eq.rte) then
-         string=' '
-         call xscion(iflag)
-         call zzledt(string,len(string),lline,status,0,iflag)
-         if(status.ne.0) goto 10
-         if (lline.eq.0) then
-            string(1:1)=' '
-            lline=1
-        endif
-         if(fmt(1:1).ne.'*') then
-            read(string(1:lline),fmt,end=10,err=20) (v(i),i=1,n*iv,iv)
-         else
-            call rldi2(string(1:lline),v,iv,n1,n,ierr)
-            if(ierr.ne.0) goto 20
-            if(n1.lt.n) goto 10
-         endif
-      else
-         if(fmt(1:1).ne.'*') then
-            read(lunit,fmt,end=10,err=20) (v(i),i=1,n*iv,iv)
-         else
-            read(lunit,*,end=10,err=20) (v(i),i=1,n*iv,iv)
-         endif
-      endif
-c
-      return
-c
- 10   ierr=1
-      return
- 20   ierr=2
-      return
-      end
-
-
-      subroutine rldint(str,v,iv,n,maxv,ierr)
-c!purpose
-c     internal "list-directed" read mode is not standard fortran. 
-c     This routine emulates :read(str,*) (v(1,i),i=1,n)
-c!
-      integer v(iv,maxv),vv
-      character*(*) str
-      character*1 si
-      logical del
-c
-      ls=len(str)
-      del=.true.
-c
-      ierr=0
-      n0=n
-      n=0
-      i=0
- 10   i=i+1
-c     loop on descriptors
-      if(i.gt.ls) goto 20
-      si=str(i:i)
-      if(si.eq.'/'.or.si.eq.',') then
-         if(del) then
-            if(n+1.gt.maxv) return
-            v(1,n+1)=0
-            n=n+1
-            goto 10
-         else
-            del=.true.
-         endif
-      endif
-      if(si.ne.' '.and.si.ne.'/'.and.si.ne.',') then
-c     conversion of a descriptor to a (repeated) value
-         call nextint(str(i:),vv,nv,ir,ierr)
-         if(ierr.ne.0) return
-         if(n+nv.gt.maxv) nv=maxv-n
-         if(nv.le.0)  return
-         call iset(nv,vv,v(1,n+1),iv)
-         n=n+nv
-         i=i+ir-2
-         del=.false.
-      endif
-      goto 10
- 20   continue 
-      if(del) then
-         if(n+1.gt.maxv) return
-         v(1,n+1)=0
-         n=n+1
-      endif
-      return
-      end
-
-      subroutine rldi2(str,v,iv,n,maxv,ierr)
-c!purpose
-c     internal "list-directed" read mode is not standard fortran. 
-c     This routine emulates :read(str,*) (v(1,i),i=1,n)
-c!
-      integer*2 v(iv,maxv),vv2
-      integer vv
-      character*(*) str
-      character*1 si
-      logical del
-c
-      ls=len(str)
-      del=.true.
-c
-      ierr=0
-      n0=n
-      n=0
-      i=0
- 10   i=i+1
-c     loop on descriptors
-      if(i.gt.ls) goto 20
-      si=str(i:i)
-      if(si.eq.'/'.or.si.eq.',') then
-         if(del) then
-            if(n+1.gt.maxv) return
-            v(1,n+1)=0
-            n=n+1
-            goto 10
-         else
-            del=.true.
-         endif
-      endif
-      if(si.ne.' '.and.si.ne.'/'.and.si.ne.',') then
-c     conversion of a descriptor to a (repeated) value
-         call nextint(str(i:),vv,nv,ir,ierr)
-         if(ierr.ne.0) return
-         if(n+nv.gt.maxv) nv=maxv-n
-         if(nv.le.0)  return
-         call i42i2(1,vv,1,vv2,1)
-         call i2set(nv,vv2,v(1,n+1),iv)
-         n=n+nv
-         i=i+ir-2
-         del=.false.
-      endif
-      goto 10
- 20   continue 
-      if(del) then
-         if(n+1.gt.maxv) return
-         v(1,n+1)=0
-         n=n+1
-      endif
-      return
-      end
-
-      subroutine nextint(str,v,nv,ir,ierr)
-c     form integer number described by a string with format:
-c      [nn*][+|-][mmmmm]
-      character*(*) str
-      character*1 next
-      integer v
-      integer sgn
-
-      ls=len(str)
-      nv=1
-      i=1
-      ic=0
-c
- 01   if(str(i:i).eq.'-') then
-         sgn=-1
-         i=i+1
-      elseif(str(i:i).eq.'+') then
-         sgn=1
-         i=i+1
-      else
-         sgn=1
-      endif
-
- 10   if(i.gt.ls) goto 20
-      call s2int(str(i:),nlz,iv,ir,ierr)
-
-      if(ierr.ne.0) iv=0
-      i=i-1+ir
-      if(i.le.ls) then
-         next=str(i:i)
-      else
-         next=' '
-      endif
-      if (next.eq.','.or.next.eq.'/') next=' '
-c
-      if(next.eq.'*') then
-         if(ic.eq.0.and.iv.gt.0.and.sgn.gt.0) then
-c     number of values
-            nv=iv
-            i=i+1
-            goto 10
-         else
-            ierr=2
-            return
-         endif
-      elseif(next.eq.' ') then
-c     end of number definition
-         goto 20
-      else
-         ierr=2
-         return
-      endif
-      
- 20   continue
-      ir=i
-      v=sgn*iv
-      return
-      end
index 7f6e934..f6f8163 100644 (file)
@@ -55,7 +55,6 @@ MSDOS = (getos() == "Windows")
 load('SCI/macros/sci2for/lib')
 load('SCI/macros/tdcs/lib')
 load('SCI/macros/util/lib')
-load('SCI/macros/int/lib')
 load('SCI/macros/percent/lib')
 // Create some configuration variables ================================
 // path of scilab main directory
@@ -94,6 +93,7 @@ clear  larg L
 
  exec("SCI/modules/helptools/etc/helptools.start",-1);
  
+ exec("SCI/modules/integer/etc/integer.start",-1);
  exec("SCI/modules/intersci/etc/intersci.start",-1);
  exec("SCI/modules/differential_equations/etc/differential_equations.start",-1);
  exec("SCI/modules/core/etc/core.start",-1);
@@ -122,6 +122,7 @@ clear  larg L
  exec("SCI/modules/scicos/etc/scicos.start",-1);
  exec("SCI/modules/pvm/etc/pvm.start",-1);
  exec("SCI/modules/texmacs/etc/texmacs.start",-1);
  // Define Initial demo tables, ========================================
 //demolist is a two column matrix of strings
 global demolist