summaryrefslogtreecommitdiffstats
path: root/scilab/modules/sparse
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-01-11 13:07:20 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-01-11 13:07:20 +0100
commite10b0e6eb05c58fead1083016ef8d41dd86c741f (patch)
treeba71cdb7383067c71e95cf8b4cfbe15ec179aefc /scilab/modules/sparse
parent7a0c4233b458747b27902fb0fad941aaf0b7387d (diff)
parent7535c7e816df981138103b99de2637a6c2f252f7 (diff)
downloadscilab-e10b0e6eb05c58fead1083016ef8d41dd86c741f.zip
scilab-e10b0e6eb05c58fead1083016ef8d41dd86c741f.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/sparse')
-rw-r--r--scilab/modules/sparse/sci_gateway/sparse_gateway.xml24
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6401.dia.ref31
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6401.tst39
3 files changed, 82 insertions, 12 deletions
diff --git a/scilab/modules/sparse/sci_gateway/sparse_gateway.xml b/scilab/modules/sparse/sci_gateway/sparse_gateway.xml
index c9583ba..fe2b748 100644
--- a/scilab/modules/sparse/sci_gateway/sparse_gateway.xml
+++ b/scilab/modules/sparse/sci_gateway/sparse_gateway.xml
@@ -44,16 +44,16 @@
44<PRIMITIVE gatewayId="27" primitiveId="7" primitiveName="luget" /> 44<PRIMITIVE gatewayId="27" primitiveId="7" primitiveName="luget" />
45<PRIMITIVE gatewayId="27" primitiveId="9" primitiveName="nnz" /> 45<PRIMITIVE gatewayId="27" primitiveId="9" primitiveName="nnz" />
46<PRIMITIVE gatewayId="27" primitiveId="13" primitiveName="spchol" /> 46<PRIMITIVE gatewayId="27" primitiveId="13" primitiveName="spchol" />
47<PRIMITIVE gatewayId="27" primitiveId="15" primitiveName="fadj2sp" /> 47<PRIMITIVE gatewayId="27" primitiveId="14" primitiveName="fadj2sp" />
48<PRIMITIVE gatewayId="27" primitiveId="16" primitiveName="spcompack" /> 48<PRIMITIVE gatewayId="27" primitiveId="15" primitiveName="spcompack" />
49<PRIMITIVE gatewayId="27" primitiveId="17" primitiveName="ordmmd" /> 49<PRIMITIVE gatewayId="27" primitiveId="16" primitiveName="ordmmd" />
50<PRIMITIVE gatewayId="27" primitiveId="18" primitiveName="blkfc1i" /> 50<PRIMITIVE gatewayId="27" primitiveId="17" primitiveName="blkfc1i" />
51<PRIMITIVE gatewayId="27" primitiveId="19" primitiveName="blkslvi" /> 51<PRIMITIVE gatewayId="27" primitiveId="18" primitiveName="blkslvi" />
52<PRIMITIVE gatewayId="27" primitiveId="20" primitiveName="inpnvi" /> 52<PRIMITIVE gatewayId="27" primitiveId="19" primitiveName="inpnvi" />
53<PRIMITIVE gatewayId="27" primitiveId="21" primitiveName="sfinit" /> 53<PRIMITIVE gatewayId="27" primitiveId="20" primitiveName="sfinit" />
54<PRIMITIVE gatewayId="27" primitiveId="22" primitiveName="symfcti" /> 54<PRIMITIVE gatewayId="27" primitiveId="21" primitiveName="symfcti" />
55<PRIMITIVE gatewayId="27" primitiveId="23" primitiveName="bfinit" /> 55<PRIMITIVE gatewayId="27" primitiveId="22" primitiveName="bfinit" />
56<PRIMITIVE gatewayId="27" primitiveId="24" primitiveName="mtlb_sparse" /> 56<PRIMITIVE gatewayId="27" primitiveId="23" primitiveName="mtlb_sparse" />
57<PRIMITIVE gatewayId="27" primitiveId="25" primitiveName="%msp_spget" /> 57<PRIMITIVE gatewayId="27" primitiveId="24" primitiveName="%msp_spget" />
58<PRIMITIVE gatewayId="27" primitiveId="26" primitiveName="%msp_full" /> 58<PRIMITIVE gatewayId="27" primitiveId="25" primitiveName="%msp_full" />
59</GATEWAY> 59</GATEWAY>
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_6401.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_6401.dia.ref
new file mode 100644
index 0000000..41741a8
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_6401.dia.ref
@@ -0,0 +1,31 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- JVM NOT MANDATORY -->
8// <-- Non-regression test for bug 6401 -->
9//
10// <-- Bugzilla URL -->
11// http://bugzilla.scilab.org/show_bug.cgi?id=6401
12//
13// <-- Short Description -->
14// chfact() returned a error
15a = [1,0,0;
160,1,0;
170,0,1];
18aa = sparse(a);
19ierr = execstr('chfact(aa)','errcatch');
20if ierr <> 0 then bugmes();quit;end
21xadj= [ 1. ; 1. ; 1. ; 1. ];
22adjncy = [];
23neqns = 3. ;
24ierr = execstr('[perm,invp,nofsub]=ordmmd(xadj,adjncy,neqns)','errcatch');
25if ierr <> 0 then bugmes();quit;end
26refperm = [ 3. ; 2. ; 1. ];
27refinvp = [ 3. ; 2. ; 1. ];
28refnofsub = 0;
29if refperm <> perm then bugmes();quit;end
30if refinvp <> invp then bugmes();quit;end
31if refnofsub <> nofsub then bugmes();quit;end
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_6401.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_6401.tst
new file mode 100644
index 0000000..60f3f10
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_6401.tst
@@ -0,0 +1,39 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- JVM NOT MANDATORY -->
9
10// <-- Non-regression test for bug 6401 -->
11//
12// <-- Bugzilla URL -->
13// http://bugzilla.scilab.org/show_bug.cgi?id=6401
14//
15// <-- Short Description -->
16// chfact() returned a error
17
18a = [1,0,0;
190,1,0;
200,0,1];
21
22aa = sparse(a);
23ierr = execstr('chfact(aa)','errcatch');
24if ierr <> 0 then pause,end
25
26xadj= [ 1. ; 1. ; 1. ; 1. ];
27adjncy = [];
28neqns = 3. ;
29ierr = execstr('[perm,invp,nofsub]=ordmmd(xadj,adjncy,neqns)','errcatch');
30if ierr <> 0 then pause,end
31
32refperm = [ 3. ; 2. ; 1. ];
33refinvp = [ 3. ; 2. ; 1. ];
34refnofsub = 0;
35if refperm <> perm then pause,end
36if refinvp <> invp then pause,end
37if refnofsub <> nofsub then pause,end
38
39