diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..45261cf7d8d827362456a71e8c3f8ef95f8a61e5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/modules/matlab-fame-io"] + path = src/modules/matlab-fame-io + url = git@gitlab.com:McModelTeam/matlab-fame-io.git diff --git a/src/initialize_dseries_toolbox.m b/src/initialize_dseries_toolbox.m index 9211488b9b4ddfc8388bc062c5d07b2dc920955d..41aca8975af16fc131334a233de7dc6fdd594371 100644 --- a/src/initialize_dseries_toolbox.m +++ b/src/initialize_dseries_toolbox.m @@ -62,6 +62,16 @@ cd([dseries_src_root '/../externals/x13']) installx13(); cd(opath); +% Add matlab-fame-io (fame connector toolbox) if available. +if exist([dseries_src_root '/modules/matlab-fame-io']) + p{end+1} = '/modules/matlab-fame-io'; + if exist([dseries_src_root '/modules/matlab-fame-io/locals.m']) + initialize_fame_toolbox(); + else + disp('matlab-fame-io submodule is not properly configured!') + end +end + % Set path P = cellfun(@(c)[dseries_src_root(1:end-1) c], p, 'uni', false); addpath(P{:}); \ No newline at end of file diff --git a/src/modules/matlab-fame-io b/src/modules/matlab-fame-io new file mode 160000 index 0000000000000000000000000000000000000000..581f54bf3edce3e57d2c05428375bd3541774f2e --- /dev/null +++ b/src/modules/matlab-fame-io @@ -0,0 +1 @@ +Subproject commit 581f54bf3edce3e57d2c05428375bd3541774f2e diff --git a/src/read/load_data.m b/src/read/load_data.m index 233211d9d378e06e5d1768d137166d5d859c362d..936df441bdafa2cde19dc29898062c332161308e 100644 --- a/src/read/load_data.m +++ b/src/read/load_data.m @@ -46,6 +46,13 @@ elseif check_file_extension(filename,'xls') || check_file_extension(filename,'xl end [freq, init, data, varlist] = load_xls_file_data(filename, sheet, range); tex = []; +elseif check_file_extension(filename,'db') + % Fame database (need to have matlab-fame-io submodule and TimeIQ installed) + FameInfo = fame.open.connector(); + db = fame.open.database(FameInfo, filename); + [data, init, varlist] = fame.getall.timeseries(db); + fame.close.database(fid); + fame.close.connector(FameInfo); else error('dseries:WrongInputArguments', 'I''m not able to load data from %s!', filename); end