Skip to content

Commit

Permalink
version 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathanael Perraudin committed Dec 29, 2015
1 parent 137f750 commit ca5d520
Show file tree
Hide file tree
Showing 231 changed files with 4,697 additions and 2,337 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions 3rdparty/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
gaimc
sources/flann-1.8.4-src/build/
sources/flann-1.8.4-src/cmake/
2 changes: 1 addition & 1 deletion 3rdparty/LDL/AMD/MATLAB/Contents1.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/Contents1.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/AMD/MATLAB/amd2.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd2.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/AMD/MATLAB/amd_demo.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_demo.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/AMD/MATLAB/amd_install.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_install.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/AMD/MATLAB/amd_make.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/AMD/MATLAB/amd_make.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/Contents1.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/Contents1.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldl_install.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldl_install.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
6 changes: 5 additions & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldl_make.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldl_make.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -38,6 +38,10 @@
end
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsparse ../Source/ldl.c ldlmex.c', d)) ;
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsymbol ../Source/ldl.c ldlsymbolmex.c', d)) ;

eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsparse_short ../Source/ldl.c ldlmex_short.c', d)) ;
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlsymbol_extra ../Source/ldl.c ldlsymbol_extra.c', d)) ;
eval (sprintf ('mex -O %s -DLDL_LONG -I../../SuiteSparse_config -I../Include -output ldlnumeric ../Source/ldl.c ldlnumericmex.c', d)) ;
fprintf ('LDL successfully compiled.\n') ;


2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldldemo.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldldemo.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldlmain2.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlmain2.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldlrow.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlrow.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldlsparse.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlsparse.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldlsymbol.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldlsymbol.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/LDL/LDL/MATLAB/ldltest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/LDL/LDL/MATLAB/ldltest.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.3.1
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 1 addition & 2 deletions 3rdparty/flann/flann_build_index.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_build_index.php

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

% Marius Muja, January 2008

algos = struct( 'linear', 0, 'kdtree', 1, 'kmeans', 2, 'composite', 3, 'kdtree_single', 4, 'hierarchical', 5, 'lsh', 6, 'saved', 254, 'autotuned', 255 );
center_algos = struct('random', 0, 'gonzales', 1, 'kmeanspp', 2 );
log_levels = struct('none', 0, 'fatal', 1, 'error', 2, 'warning', 3, 'info', 4);
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/flann_free_index.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_free_index.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/flann_load_index.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_load_index.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/flann_save_index.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_save_index.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
35 changes: 19 additions & 16 deletions 3rdparty/flann/flann_search.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_search.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -61,19 +61,7 @@
algos = struct( 'linear', 0, 'kdtree', 1, 'kmeans', 2, 'composite', 3, 'saved', 254, 'autotuned', 255 );
center_algos = struct('random', 0, 'gonzales', 1, 'kmeanspp', 2 );
log_levels = struct('none', 0, 'fatal', 1, 'error', 2, 'warning', 3, 'info', 4);
function value = id2value(map, id)
fields = fieldnames(map);
for i = 1:length(fields),
val = cell2mat(fields(i));
if map.(val) == id
value = val;
break;
end
end
end
function id = value2id(map,value)
id = map.(value);
end


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);

Expand All @@ -84,8 +72,8 @@

params = default_params;
fn = fieldnames(search_params);
for i = [1:length(fn)],
name = cell2mat(fn(i));
for ii = 1:length(fn),
name = cell2mat(fn(ii));
params.(name) = search_params.(name);
end
if ~isnumeric(params.algorithm),
Expand All @@ -107,3 +95,18 @@
end
end


function id = value2id(map,value)
id = map.(value);
end

function value = id2value(map, id)
fields = fieldnames(map);
for ii = 1:length(fields),
val = cell2mat(fields(ii));
if map.(val) == id
value = val;
break;
end
end
end
2 changes: 1 addition & 1 deletion 3rdparty/flann/flann_set_distance_type.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/flann_set_distance_type.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/test_flann.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/flann/test_flann.php

% Copyright (C) 2013-2014 Nathanael Perraudin, Johan Paratte, David I Shuman.
% This file is part of GSPbox version 0.4.0
% This file is part of GSPbox version 0.5.0
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 2 additions & 1 deletion 3rdparty/gendist.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
% Url: http://lts2research.epfl.ch/gsp/doc/3rdparty/gendist.php

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

Loading

0 comments on commit ca5d520

Please # to comment.