Skip to content

Commit ca5d520

Browse files
author
Nathanael Perraudin
committed
version 0.5.0
1 parent 137f750 commit ca5d520

File tree

231 files changed

+4697
-2337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+4697
-2337
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎3rdparty/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
gaimc
2+
sources/flann-1.8.4-src/build/
3+
sources/flann-1.8.4-src/cmake/

‎3rdparty/LDL/AMD/MATLAB/Contents1.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/Contents1.php
1717

1818
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
19-
% This file is part of GSPbox version 0.3.1
19+
% This file is part of GSPbox version 0.5.0
2020
%
2121
% This program is free software: you can redistribute it and/or modify
2222
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/AMD/MATLAB/amd2.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd2.php
6767

6868
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
69-
% This file is part of GSPbox version 0.3.1
69+
% This file is part of GSPbox version 0.5.0
7070
%
7171
% This program is free software: you can redistribute it and/or modify
7272
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/AMD/MATLAB/amd_demo.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_demo.php
1212

1313
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
14-
% This file is part of GSPbox version 0.3.1
14+
% This file is part of GSPbox version 0.5.0
1515
%
1616
% This program is free software: you can redistribute it and/or modify
1717
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/AMD/MATLAB/amd_install.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_install.php
1111

1212
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
13-
% This file is part of GSPbox version 0.3.1
13+
% This file is part of GSPbox version 0.5.0
1414
%
1515
% This program is free software: you can redistribute it and/or modify
1616
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/AMD/MATLAB/amd_make.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_make.php
1010

1111
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
12-
% This file is part of GSPbox version 0.3.1
12+
% This file is part of GSPbox version 0.5.0
1313
%
1414
% This program is free software: you can redistribute it and/or modify
1515
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/Contents1.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/Contents1.php
2222

2323
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
24-
% This file is part of GSPbox version 0.3.1
24+
% This file is part of GSPbox version 0.5.0
2525
%
2626
% This program is free software: you can redistribute it and/or modify
2727
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldl_install.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldl_install.php
1111

1212
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
13-
% This file is part of GSPbox version 0.3.1
13+
% This file is part of GSPbox version 0.5.0
1414
%
1515
% This program is free software: you can redistribute it and/or modify
1616
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldl_make.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldl_make.php
1010

1111
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
12-
% This file is part of GSPbox version 0.3.1
12+
% This file is part of GSPbox version 0.5.0
1313
%
1414
% This program is free software: you can redistribute it and/or modify
1515
% it under the terms of the GNU General Public License as published by
@@ -38,6 +38,10 @@
3838
end
3939
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsparse ../Source/ldl.c ldlmex.c', d)) ;
4040
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsymbol ../Source/ldl.c ldlsymbolmex.c', d)) ;
41+
42+
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsparse_short ../Source/ldl.c ldlmex_short.c', d)) ;
43+
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsymbol_extra ../Source/ldl.c ldlsymbol_extra.c', d)) ;
44+
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlnumeric ../Source/ldl.c ldlnumericmex.c', d)) ;
4145
fprintf ('LDL successfully compiled.\n') ;
4246

4347

‎3rdparty/LDL/LDL/MATLAB/ldldemo.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldldemo.php
1010

1111
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
12-
% This file is part of GSPbox version 0.3.1
12+
% This file is part of GSPbox version 0.5.0
1313
%
1414
% This program is free software: you can redistribute it and/or modify
1515
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldlmain2.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlmain2.php
1010

1111
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
12-
% This file is part of GSPbox version 0.3.1
12+
% This file is part of GSPbox version 0.5.0
1313
%
1414
% This program is free software: you can redistribute it and/or modify
1515
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldlrow.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlrow.php
5858

5959
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
60-
% This file is part of GSPbox version 0.3.1
60+
% This file is part of GSPbox version 0.5.0
6161
%
6262
% This program is free software: you can redistribute it and/or modify
6363
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldlsparse.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlsparse.php
3232

3333
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
34-
% This file is part of GSPbox version 0.3.1
34+
% This file is part of GSPbox version 0.5.0
3535
%
3636
% This program is free software: you can redistribute it and/or modify
3737
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldlsymbol.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlsymbol.php
3434

3535
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
36-
% This file is part of GSPbox version 0.3.1
36+
% This file is part of GSPbox version 0.5.0
3737
%
3838
% This program is free software: you can redistribute it and/or modify
3939
% it under the terms of the GNU General Public License as published by

‎3rdparty/LDL/LDL/MATLAB/ldltest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldltest.php
99

1010
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
11-
% This file is part of GSPbox version 0.3.1
11+
% This file is part of GSPbox version 0.5.0
1212
%
1313
% This program is free software: you can redistribute it and/or modify
1414
% it under the terms of the GNU General Public License as published by

‎3rdparty/flann/flann_build_index.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_build_index.php
88

99
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
10-
% This file is part of GSPbox version 0.4.0
10+
% This file is part of GSPbox version 0.5.0
1111
%
1212
% This program is free software: you can redistribute it and/or modify
1313
% it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
2929
% http://arxiv.org/abs/1408.5781
3030

3131
% Marius Muja, January 2008
32-
3332
algos = struct( 'linear', 0, 'kdtree', 1, 'kmeans', 2, 'composite', 3, 'kdtree_single', 4, 'hierarchical', 5, 'lsh', 6, 'saved', 254, 'autotuned', 255 );
3433
center_algos = struct('random', 0, 'gonzales', 1, 'kmeanspp', 2 );
3534
log_levels = struct('none', 0, 'fatal', 1, 'error', 2, 'warning', 3, 'info', 4);

‎3rdparty/flann/flann_free_index.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_free_index.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by

‎3rdparty/flann/flann_load_index.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_load_index.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by

‎3rdparty/flann/flann_save_index.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_save_index.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by

‎3rdparty/flann/flann_search.m

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_search.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by
@@ -61,19 +61,7 @@
6161
algos = struct( 'linear', 0, 'kdtree', 1, 'kmeans', 2, 'composite', 3, 'saved', 254, 'autotuned', 255 );
6262
center_algos = struct('random', 0, 'gonzales', 1, 'kmeanspp', 2 );
6363
log_levels = struct('none', 0, 'fatal', 1, 'error', 2, 'warning', 3, 'info', 4);
64-
function value = id2value(map, id)
65-
fields = fieldnames(map);
66-
for i = 1:length(fields),
67-
val = cell2mat(fields(i));
68-
if map.(val) == id
69-
value = val;
70-
break;
71-
end
72-
end
73-
end
74-
function id = value2id(map,value)
75-
id = map.(value);
76-
end
64+
7765

7866
default_params = struct('algorithm', 'kdtree' ,'checks', 32, 'eps', 0.0, 'sorted', 1, 'max_neighbors', -1, 'cores', 1, 'trees', 4, 'branching', 32, 'iterations', 5, 'centers_init', 'random', 'cb_index', 0.4, 'target_precision', 0.9,'build_weight', 0.01, 'memory_weight', 0, 'sample_fraction', 0.1, 'log_level', 'warning', 'random_seed', 0);
7967

@@ -84,8 +72,8 @@
8472

8573
params = default_params;
8674
fn = fieldnames(search_params);
87-
for i = [1:length(fn)],
88-
name = cell2mat(fn(i));
75+
for ii = 1:length(fn),
76+
name = cell2mat(fn(ii));
8977
params.(name) = search_params.(name);
9078
end
9179
if ~isnumeric(params.algorithm),
@@ -107,3 +95,18 @@
10795
end
10896
end
10997

98+
99+
function id = value2id(map,value)
100+
id = map.(value);
101+
end
102+
103+
function value = id2value(map, id)
104+
fields = fieldnames(map);
105+
for ii = 1:length(fields),
106+
val = cell2mat(fields(ii));
107+
if map.(val) == id
108+
value = val;
109+
break;
110+
end
111+
end
112+
end

‎3rdparty/flann/flann_set_distance_type.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_set_distance_type.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by

‎3rdparty/flann/test_flann.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/test_flann.php
2828

2929
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
30-
% This file is part of GSPbox version 0.4.0
30+
% This file is part of GSPbox version 0.5.0
3131
%
3232
% This program is free software: you can redistribute it and/or modify
3333
% it under the terms of the GNU General Public License as published by

‎3rdparty/gendist.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/gendist.php
5353

5454
% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
55-
% This file is part of GSPbox version 0.3.1
55+
% This file is part of GSPbox version 0.5.0
5656
%
5757
% This program is free software: you can redistribute it and/or modify
5858
% it under the terms of the GNU General Public License as published by
@@ -121,3 +121,4 @@
121121
box on
122122
end
123123
end
124+

0 commit comments

Comments
 (0)