summaryrefslogtreecommitdiffstats
path: root/scilab/modules/sparse
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-02-04 15:19:53 +0100
committerClément DAVID <clement.david@scilab.org>2010-02-04 15:19:53 +0100
commit5f99c8a201bbf5ebd899a2bceffa76560cc453ab (patch)
tree5472aaca6383c890244fbfc2e6a6d596ed9266c4 /scilab/modules/sparse
parent4101bbab96f26089034a0526eaa39230c0317982 (diff)
parent4d5e7eb6507a17dbeb7705b02310c9e94a1d7146 (diff)
downloadscilab-5f99c8a201bbf5ebd899a2bceffa76560cc453ab.zip
scilab-5f99c8a201bbf5ebd899a2bceffa76560cc453ab.tar.gz
Merge branch '5.2'
Conflicts: scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskRemoveAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPaletteManager.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteComponent.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/PaletteComponent.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosComponent.java
Diffstat (limited to 'scilab/modules/sparse')
-rw-r--r--scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f9
-rw-r--r--scilab/modules/sparse/src/fortran/ta2lpd.f9
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref19
-rw-r--r--scilab/modules/sparse/tests/nonreg_tests/bug_6412.tst22
4 files changed, 59 insertions, 0 deletions
diff --git a/scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f b/scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f
index e129443..9167a52 100644
--- a/scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f
+++ b/scilab/modules/sparse/sci_gateway/fortran/sci_ta2lpd.f
@@ -1,3 +1,12 @@
1c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2c Copyright (C) DIGITEO 2010 - Yann COLLETTE
3c
4c This file must be used under the terms of the CeCILL.
5c This source file is licensed as described in the file COPYING, which
6c you should have received as part of this distribution. The terms
7c are also available at
8c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
1 subroutine sci_ta2lpd(fname) 10 subroutine sci_ta2lpd(fname)
2c 11c
3 character*(*) fname 12 character*(*) fname
diff --git a/scilab/modules/sparse/src/fortran/ta2lpd.f b/scilab/modules/sparse/src/fortran/ta2lpd.f
index 24fccf6..59dd54b 100644
--- a/scilab/modules/sparse/src/fortran/ta2lpd.f
+++ b/scilab/modules/sparse/src/fortran/ta2lpd.f
@@ -1,3 +1,12 @@
1c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2c Copyright (C) DIGITEO 2010 - Yann COLLETTE
3c
4c This file must be used under the terms of the CeCILL.
5c This source file is licensed as described in the file COPYING, which
6c you should have received as part of this distribution. The terms
7c are also available at
8c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
1 subroutine ta2lpd(tail,head,ma,n,lp,la,ls) 10 subroutine ta2lpd(tail,head,ma,n,lp,la,ls)
2c 11c
3c ta2lpd computes the adjacency vectors lp, la and ls 12c ta2lpd computes the adjacency vectors lp, la and ls
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref
new file mode 100644
index 0000000..b364f09
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref
@@ -0,0 +1,19 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Yann COLLETTE <yann.collette@scilab.fr>
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 6412 -->
9//
10// <-- Bugzilla URL -->
11// http://bugzilla.scilab.org/show_bug.cgi?id=6412
12//
13// <-- Short Description -->
14// the function sp2adj was not working
15A = sprand(100,50,.05);
16[xadj,adjncy,anz]= sp2adj(A);
17[n,m]=size(A);
18p = adj2sp(xadj,adjncy,anz,[n,m]);
19if norm(A-p)~=0 then bugmes();quit;end
diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_6412.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_6412.tst
new file mode 100644
index 0000000..1ba5428
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_6412.tst
@@ -0,0 +1,22 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Yann COLLETTE <yann.collette@scilab.fr>
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 6412 -->
11//
12// <-- Bugzilla URL -->
13// http://bugzilla.scilab.org/show_bug.cgi?id=6412
14//
15// <-- Short Description -->
16// the function sp2adj was not working
17
18A = sprand(100,50,.05);
19[xadj,adjncy,anz]= sp2adj(A);
20[n,m]=size(A);
21p = adj2sp(xadj,adjncy,anz,[n,m]);
22if norm(A-p)~=0 then pause, end