File tree 3 files changed +22
-4
lines changed
3 files changed +22
-4
lines changed Original file line number Diff line number Diff line change 18
18
% First, print the help information for AMD
19
19
help amd2
20
20
21
+ have_octave = (exist (' OCTAVE_VERSION' , ' builtin' ) == 5 ) ;
22
+
21
23
% Get the Harwell/Boeing can_24 matrix.
22
24
23
25
load can_24
56
58
title (' Cholesky factor, L' ) ;
57
59
58
60
subplot (2 ,2 ,4 ) ;
59
- treeplot (parent ) ;
61
+ if (have_octave )
62
+ treeplot (parent ' ) ;
63
+ else
64
+ treeplot (parent ) ;
65
+ end
60
66
title (' elimination tree' ) ;
61
67
62
68
% results from symbfact
Original file line number Diff line number Diff line change 10
10
% Iain S. Duff. All Rights Reserved.
11
11
% SPDX-License-Identifier: BSD-3-clause
12
12
13
+ have_octave = (exist (' OCTAVE_VERSION' , ' builtin' ) == 5 ) ;
14
+
13
15
details = 0 ; % 1 if details of each command are to be printed
14
16
15
17
d = ' ' ;
16
- if (~isempty (strfind (computer , ' 64' )))
18
+
19
+ if (~isempty (strfind (computer , ' 64' )) && ~have_octave )
17
20
d = ' -largeArrayDims' ;
18
21
end
19
22
20
- % MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
21
- if (~verLessThan (' matlab' , ' 8.3.0' ))
23
+ if (have_octave )
24
+ d = [' -DOCTAVE ' d ] ;
25
+ end
26
+
27
+ if (have_octave )
28
+ d = [' --silent ' d ] ;
29
+ elseif (~verLessThan (' matlab' , ' 8.3.0' ))
30
+ % MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
22
31
d = [' -silent ' d ] ;
23
32
end
24
33
Original file line number Diff line number Diff line change 28
28
29
29
#include "amd.h"
30
30
#include "mex.h"
31
+
32
+ #ifndef OCTAVE
31
33
#include "matrix.h"
34
+ #endif
32
35
33
36
void mexFunction
34
37
(
You can’t perform that action at this time.
0 commit comments