summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in5
-rw-r--r--scilab/modules/compatibility_functions/compatibility_functions.iss2
-rw-r--r--scilab/modules/compatibility_functions/etc/compatibility_functions.quit5
-rw-r--r--scilab/modules/compatibility_functions/etc/compatibility_functions.start5
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_l.sci37
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_repmat.sci7
-rw-r--r--scilab/modules/compatibility_functions/version.xml2
7 files changed, 19 insertions, 44 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index fd5ae4f..587bc5f 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -123,6 +123,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
123AWK = @AWK@ 123AWK = @AWK@
124BATIK = @BATIK@ 124BATIK = @BATIK@
125BLAS_LIBS = @BLAS_LIBS@ 125BLAS_LIBS = @BLAS_LIBS@
126BSH = @BSH@
126CC = @CC@ 127CC = @CC@
127CCDEPMODE = @CCDEPMODE@ 128CCDEPMODE = @CCDEPMODE@
128CFLAGS = @CFLAGS@ 129CFLAGS = @CFLAGS@
@@ -192,9 +193,11 @@ JGRAPHX = @JGRAPHX@
192JHALL = @JHALL@ 193JHALL = @JHALL@
193JHDF5 = @JHDF5@ 194JHDF5 = @JHDF5@
194JLATEXMATH = @JLATEXMATH@ 195JLATEXMATH = @JLATEXMATH@
196JLATEXMATH_FOP = @JLATEXMATH_FOP@
195JOGL = @JOGL@ 197JOGL = @JOGL@
196JROSETTA_API = @JROSETTA_API@ 198JROSETTA_API = @JROSETTA_API@
197JROSETTA_ENGINE = @JROSETTA_ENGINE@ 199JROSETTA_ENGINE = @JROSETTA_ENGINE@
200JUNIT = @JUNIT@
198LAPACK_LIBS = @LAPACK_LIBS@ 201LAPACK_LIBS = @LAPACK_LIBS@
199LD = @LD@ 202LD = @LD@
200LDFLAGS = @LDFLAGS@ 203LDFLAGS = @LDFLAGS@
@@ -252,6 +255,7 @@ PVM_ENABLE = @PVM_ENABLE@
252PVM_INCLUDE = @PVM_INCLUDE@ 255PVM_INCLUDE = @PVM_INCLUDE@
253PVM_LIB = @PVM_LIB@ 256PVM_LIB = @PVM_LIB@
254PYTHON = @PYTHON@ 257PYTHON = @PYTHON@
258QDOX = @QDOX@
255RANLIB = @RANLIB@ 259RANLIB = @RANLIB@
256RELOCATABLE = @RELOCATABLE@ 260RELOCATABLE = @RELOCATABLE@
257RT_LIB = @RT_LIB@ 261RT_LIB = @RT_LIB@
@@ -270,6 +274,7 @@ SWIG_JAVA = @SWIG_JAVA@
270SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 274SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
271TCLTK_LIBS = @TCLTK_LIBS@ 275TCLTK_LIBS = @TCLTK_LIBS@
272TCL_INC_PATH = @TCL_INC_PATH@ 276TCL_INC_PATH = @TCL_INC_PATH@
277TESTNG = @TESTNG@
273TK_INC_PATH = @TK_INC_PATH@ 278TK_INC_PATH = @TK_INC_PATH@
274UMFPACK_ENABLE = @UMFPACK_ENABLE@ 279UMFPACK_ENABLE = @UMFPACK_ENABLE@
275UMFPACK_LIB = @UMFPACK_LIB@ 280UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/compatibility_functions/compatibility_functions.iss b/scilab/modules/compatibility_functions/compatibility_functions.iss
index 8651dc5..50da292 100644
--- a/scilab/modules/compatibility_functions/compatibility_functions.iss
+++ b/scilab/modules/compatibility_functions/compatibility_functions.iss
@@ -21,8 +21,6 @@ Source: modules\{#COMPATFUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#COMPA
21Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS} 21Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
22Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS} 22Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
23; 23;
24Source: modules\{#COMPATFUNCTIONS}\help\addchapter.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\help; Flags: recursesubdirs; Components: {#COMPN_COMPATFUNCTIONS}
25;
26;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_COMPATFUNCTIONS} 24;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_COMPATFUNCTIONS}
27; 25;
28Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS} 26Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
diff --git a/scilab/modules/compatibility_functions/etc/compatibility_functions.quit b/scilab/modules/compatibility_functions/etc/compatibility_functions.quit
index 06d0d2f..8a0f997 100644
--- a/scilab/modules/compatibility_functions/etc/compatibility_functions.quit
+++ b/scilab/modules/compatibility_functions/etc/compatibility_functions.quit
@@ -8,8 +8,3 @@
8// are also available at 8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 10
11// Delete help chapter
12// =============================================================================
13if WITH_HELPTOOLS then
14 del_help_chapter("compatibility_functions",%t);
15end
diff --git a/scilab/modules/compatibility_functions/etc/compatibility_functions.start b/scilab/modules/compatibility_functions/etc/compatibility_functions.start
index 95b3a2d..6f3ec8e 100644
--- a/scilab/modules/compatibility_functions/etc/compatibility_functions.start
+++ b/scilab/modules/compatibility_functions/etc/compatibility_functions.start
@@ -11,8 +11,3 @@
11// ============================================================================= 11// =============================================================================
12load(SCI+"/modules/compatibility_functions/macros/lib"); 12load(SCI+"/modules/compatibility_functions/macros/lib");
13 13
14// Add help chapter
15// =============================================================================
16if WITH_HELPTOOLS then
17 add_module_help_chapter("compatibility_functions");
18end
diff --git a/scilab/modules/compatibility_functions/macros/mtlb_l.sci b/scilab/modules/compatibility_functions/macros/mtlb_l.sci
index e17f232..3887f74 100644
--- a/scilab/modules/compatibility_functions/macros/mtlb_l.sci
+++ b/scilab/modules/compatibility_functions/macros/mtlb_l.sci
@@ -10,31 +10,20 @@
10function y=mtlb_l(a,b) 10function y=mtlb_l(a,b)
11// Emulation function for Matlab left division 11// Emulation function for Matlab left division
12 12
13// Warning: this function should not work if only a or b is a string matrix... 13if type(a)==10 then
14// In these case Matlab result is very strange ! 14 a=asciimat(a)
15end
16if type(b)==10 then
17 b=asciimat(b)
18end
15 19
16 transpose=%F 20if or(type(a)==[4,6]) then
21 a=bool2s(a)
22end
23if or(type(b)==[4,6]) then
24 b=bool2s(b)
25end
17 26
18 if type(a)==10 & type(b)==10 then 27y=a\b
19 transpose=%T
20 end
21 if type(a)==10 then
22 a=asciimat(a)'
23 end
24 if type(b)==10 then
25 b=asciimat(b)'
26 end
27 28
28 if or(type(a)==[4,6]) then
29 a=bool2s(a)
30 end
31 if or(type(b)==[4,6]) then
32 b=bool2s(b)
33 end
34
35 y=a\b
36
37 if transpose then
38 y=y($:-1:1,$:-1:1)'
39 end
40endfunction 29endfunction
diff --git a/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci b/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
index d3ad8dd..e067bc6 100644
--- a/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
+++ b/scilab/modules/compatibility_functions/macros/mtlb_repmat.sci
@@ -16,10 +16,6 @@ if type(M)==10 then
16 M=asciimat(M) 16 M=asciimat(M)
17end 17end
18 18
19if ~isreal(m) then
20 m=real(m)
21end
22
23if or(type(M)==[4,6]) then 19if or(type(M)==[4,6]) then
24 M=bool2s(M) 20 M=bool2s(M)
25end 21end
@@ -39,9 +35,6 @@ if rhs==2 & size(m,"*")<>1 then
39 repm=ones(tmp(1:$)).*.M 35 repm=ones(tmp(1:$)).*.M
40// repmat(M,m,n) 36// repmat(M,m,n)
41else 37else
42 if ~isreal(n) then
43 n=real(n)
44 end
45 if or(type(n)==[4,6]) then 38 if or(type(n)==[4,6]) then
46 n=bool2s(n) 39 n=bool2s(n)
47 end 40 end
diff --git a/scilab/modules/compatibility_functions/version.xml b/scilab/modules/compatibility_functions/version.xml
index 779a576..2c79d84 100644
--- a/scilab/modules/compatibility_functions/version.xml
+++ b/scilab/modules/compatibility_functions/version.xml
@@ -8,5 +8,5 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="compatibility_functions"> 10<MODULE_VERSION name="compatibility_functions">
11<VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>