From e7d300aed99756a65429fb736b358e381f040e5e Mon Sep 17 00:00:00 2001 From: Michael Innerberger <michael.innerberger@asc.tuwien.ac.at> Date: Mon, 7 Aug 2023 15:35:42 -0400 Subject: [PATCH] Rename makeDirectory to make intent clearer --- lib/storage/@LevelData/LevelData.m | 2 +- lib/storage/@LevelData/plotToFile.m | 7 ++----- lib/storage/@LevelData/plotTriangulationToFile.m | 5 +---- lib/storage/@LevelData/saveToFile.m | 7 ++----- lib/storage/@LevelData/saveToTable.m | 5 +---- .../@LevelDataCollection/LevelDataCollection.m | 2 +- lib/storage/@LevelDataCollection/saveToFile.m | 7 ++----- lib/storage/@LevelDataCollection/saveToTable.m | 7 ++----- lib/storage/{makeDirectory.m => ensureFolderExists.m} | 11 ++++------- 9 files changed, 16 insertions(+), 37 deletions(-) rename lib/storage/{makeDirectory.m => ensureFolderExists.m} (78%) diff --git a/lib/storage/@LevelData/LevelData.m b/lib/storage/@LevelData/LevelData.m index d446175..8275605 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 55df0f6..2efe1f1 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 d4f5588..a5b9827 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 4db24e9..b6af1ce 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 7dfa423..9ee04bf 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 fe67c6a..69c5efe 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 d922e16..81d502c 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 2642314..1fe0f07 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 0845d56..d29bd19 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 -- GitLab