diff --git a/lib/storage/@LevelData/LevelData.m b/lib/storage/@LevelData/LevelData.m index d4461754253b7240b2a3f550f5e0d11ed87ab2be..8275605965d9e2977c04d81ee36f247915ef747b 100644 --- a/lib/storage/@LevelData/LevelData.m +++ b/lib/storage/@LevelData/LevelData.m @@ -94,7 +94,7 @@ classdef LevelData < handle if nargin >= 1 obj.root = rootpath; end - makeDirectory(obj.root); + ensureFolderExists(obj.root); % Set hostname obj.hostname = getHostname(); % Save time of creation diff --git a/lib/storage/@LevelData/plotToFile.m b/lib/storage/@LevelData/plotToFile.m index 55df0f620a1f026dc7d960be52087c203b42fdc0..2efe1f12c844a1dab43d720fb4c7b236c588d6b6 100644 --- a/lib/storage/@LevelData/plotToFile.m +++ b/lib/storage/@LevelData/plotToFile.m @@ -24,10 +24,7 @@ function plotToFile(obj, xVariable, varargin) % Create problem- and method-specific folder - folderExists = makeDirectory(obj.foldername); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(obj.foldername); % Create figure object h = createStandardFigure(); @@ -44,4 +41,4 @@ function plotToFile(obj, xVariable, varargin) % Close figure close(h); -end \ No newline at end of file +end diff --git a/lib/storage/@LevelData/plotTriangulationToFile.m b/lib/storage/@LevelData/plotTriangulationToFile.m index d4f5588633543fb02f91a9e5cf7fba0d50d75157..a5b9827d6934aff4e1b03098565e0549f7eebc1b 100644 --- a/lib/storage/@LevelData/plotTriangulationToFile.m +++ b/lib/storage/@LevelData/plotTriangulationToFile.m @@ -36,10 +36,7 @@ function plotTriangulationToFile(obj, jLevel) end % Create problem- and method-specific folder - folderExists = makeDirectory(obj.foldername); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(obj.foldername); % Create new figure h = createStandardFigure(); diff --git a/lib/storage/@LevelData/saveToFile.m b/lib/storage/@LevelData/saveToFile.m index 4db24e907908b66e6fb0fbed92ed7e64ad28d6f4..b6af1ceeed229a4ea9edcdb4d3250fa1b9ea5b1d 100644 --- a/lib/storage/@LevelData/saveToFile.m +++ b/lib/storage/@LevelData/saveToFile.m @@ -30,14 +30,11 @@ function saveToFile(obj, folder, file) file = obj.filename; end % Create problem- and method-specific folder - folderExists = makeDirectory(folder); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(folder); % Save this object to file if isOctave() save([folder, '/', file, '.mat'], 'obj', '-v7'); else save([folder, '/', file, '.mat'], 'obj', '-v7.3'); end -end \ No newline at end of file +end diff --git a/lib/storage/@LevelData/saveToTable.m b/lib/storage/@LevelData/saveToTable.m index 7dfa4232e55f700078c871bf05e1262e452a9900..9ee04bffe8acc578f4803acf7575ed92eb6f9a48 100644 --- a/lib/storage/@LevelData/saveToTable.m +++ b/lib/storage/@LevelData/saveToTable.m @@ -30,10 +30,7 @@ function saveToTable(obj, separator) end % Create problem- and method-specific folder - folderExists = makeDirectory(obj.foldername); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(obj.foldername); % Open file fid = fopen([obj.foldername, '/', obj.filename, '.csv'], 'w'); diff --git a/lib/storage/@LevelDataCollection/LevelDataCollection.m b/lib/storage/@LevelDataCollection/LevelDataCollection.m index fe67c6a142f2cae1929521c259964e77808d40d3..69c5efe49e8283b0bd58d6f1fefa0d3fdf35e471 100644 --- a/lib/storage/@LevelDataCollection/LevelDataCollection.m +++ b/lib/storage/@LevelDataCollection/LevelDataCollection.m @@ -71,7 +71,7 @@ classdef LevelDataCollection < handle if nargin >= 1 obj.root = rootpath; end - makeDirectory(obj.root); + ensureFolderExists(obj.root); % Set identifier if nargin >= 2 diff --git a/lib/storage/@LevelDataCollection/saveToFile.m b/lib/storage/@LevelDataCollection/saveToFile.m index d922e1608a6594c0367ac0ed4732daeeb08c072e..81d502c4a2705cee5c846e9592f3028578d15040 100644 --- a/lib/storage/@LevelDataCollection/saveToFile.m +++ b/lib/storage/@LevelDataCollection/saveToFile.m @@ -31,10 +31,7 @@ function saveToFile(obj, folder, file) end % Create problem- and method-specific folder - folderExists = makeDirectory(folder); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(folder); % Save this object to file if isOctave() @@ -43,4 +40,4 @@ function saveToFile(obj, folder, file) else save([folder, '/', file, '.mat'], 'obj', '-v7.3'); end -end \ No newline at end of file +end diff --git a/lib/storage/@LevelDataCollection/saveToTable.m b/lib/storage/@LevelDataCollection/saveToTable.m index 264231474e154f1a66c8c895970391c3d0cc0a21..1fe0f076096cd3ca413c6db0302eb956ca04a102 100644 --- a/lib/storage/@LevelDataCollection/saveToTable.m +++ b/lib/storage/@LevelDataCollection/saveToTable.m @@ -30,10 +30,7 @@ function saveToTable(obj, separator) end % Create problem- and method-specific folder - folderExists = makeDirectory(obj.foldername); - if ~folderExists - error('Could not create folder and save to file'); - end + ensureFolderExists(obj.foldername); % Save data for each variable to a separate file data = obj.get(':', obj.timeVariable{:}); @@ -43,4 +40,4 @@ function saveToTable(obj, separator) obj.printTable(fid, obj.timeVariable{j}, data{j}); fclose(fid); end -end \ No newline at end of file +end diff --git a/lib/storage/makeDirectory.m b/lib/storage/ensureFolderExists.m similarity index 78% rename from lib/storage/makeDirectory.m rename to lib/storage/ensureFolderExists.m index 0845d5617299709e3f6ce00aa1599796a32a15cb..d29bd1942e064b5e3107b429554e64c9b533e411 100644 --- a/lib/storage/makeDirectory.m +++ b/lib/storage/ensureFolderExists.m @@ -1,6 +1,6 @@ -function folderExists = makeDirectory(path) -%%MAKEDIRECTORY creates a directory if it does not exist yet -% folderExists = MAKEDIRECTORY(path) +function ensureFolderExists(path) +%%ENSUREFOLDEREXISTS creates a folder if it does not exist yet +% ENSUREFOLDEREXISTS(PATH) % Copyright 2023 Philipp Bringmann % @@ -18,16 +18,13 @@ function folderExists = makeDirectory(path) % along with this program. If not, see <http://www.gnu.org/licenses/>. % - - % Create folder if isfolder(path) folderExists = true; else folderExists = mkdir(path); end - % Throw warning if ~folderExists - warning('Error creating folder') + error('Could not create folder %s', path); end end \ No newline at end of file