diff --git a/.gitignore b/.gitignore index 7831570..0cccbcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.xlsx \ No newline at end of file +csv/ +TR_VD_Lotus-SuspGen-data.docx \ No newline at end of file diff --git a/SuspensionData_Exported.xlsx b/SuspensionData_Exported.xlsx deleted file mode 100644 index cbdb25a..0000000 Binary files a/SuspensionData_Exported.xlsx and /dev/null differ diff --git a/dataExport.asv b/dataExport.asv deleted file mode 100644 index d84d939..0000000 --- a/dataExport.asv +++ /dev/null @@ -1,23 +0,0 @@ -clear; -clc; - -prompt = 'Press "1" for front or "2" for rear: '; -side = input(prompt, 's'); - -[frontrear, fileName, sheetName] = selectSide(side); - -if frontrear == 'front' - Parameter = who('-file', 'M22H_FrontSuspension_Data.mat'); -elseif frontrear == 'rear' - Parameter = who('-file', 'M22H_RearSuspension_Data.mat'); - end; - -t = array2table(Parameter); - -fprintf('Initializing exporting process \n'); - -for i=1:length(61) - writetable(t, fileName, 'Sheet', sheetName, 'WriteVariableNames', false); - end; - -fprintf('Finished exporting!\n') diff --git a/dataExport.m b/dataExport.m deleted file mode 100644 index a17ac15..0000000 --- a/dataExport.m +++ /dev/null @@ -1,23 +0,0 @@ -clear; -clc; - -prompt = 'Press "1" for front or "2" for rear: '; -side = input(prompt, 's'); - -[fileName, frontrear, sheetName] = selectSide(side); - -if strcmp(frontrear, 'front') - Parameter = who('-file', 'M22H_FrontSuspension_Data.mat'); -elseif strcmp(frontrear, 'rear') - Parameter = who('-file', 'M22H_RearSuspension_Data.mat'); - end; - -t = array2table(Parameter); - -fprintf('Initializing exporting process \n'); - -for i=1:length(61) - writetable(t, fileName, 'Sheet', sheetName, 'WriteVariableNames', false); - end; - -fprintf('Finished exporting!\n') diff --git a/plot.m b/plot.m new file mode 100644 index 0000000..c698f19 --- /dev/null +++ b/plot.m @@ -0,0 +1,3 @@ +load('M22H_RearSuspension_Data.mat'); + +f = fplot(CamberLeft) \ No newline at end of file diff --git a/selectSide.asv b/selectSide.asv deleted file mode 100644 index a3189d1..0000000 --- a/selectSide.asv +++ /dev/null @@ -1,18 +0,0 @@ -function [content, filename, sheetName] = selectSide(input); - -%0 is front, 1 is rear - -if rem(input, 2) == 0 - content = who('-file', 'M22H_FrontSuspension_Data.mat'); - filename = 'FrontSuspension_Exported.xlsx'; - sheetName = 'Front'; -elseif input/2 != 0 - content = who('-file', 'M22H_RearSuspension_Data.mat'); - filename = 'RearSuspension_Exported.xlsx'; - sheetName = 'Rear'; -else - fprintf = 'Input must be "front" or "rear"; - break; - end; - - diff --git a/selectSide.m b/selectSide.m index 35ea1b9..a02ba77 100644 --- a/selectSide.m +++ b/selectSide.m @@ -5,11 +5,9 @@ function [fileName, frontrear, sheetName] = selectSide(input); fileName = 'SuspensionData_Exported.xlsx'; if rem(input, 2) == 1 - frontrear = 'front'; - sheetName = 'Front'; + carSide = 'front'; elseif rem(input, 2) == 0 - frontrear = 'rear'; - sheetName = 'Rear'; + carSide = 'rear'; else fprintf = 'An error occured!'; end; \ No newline at end of file diff --git a/test.m b/test.m new file mode 100644 index 0000000..dee2569 --- /dev/null +++ b/test.m @@ -0,0 +1,27 @@ +selectSide(front); +%selectSide(rear); + +if carSide == 'front' + FileData = load('M22H_FrontSuspension_Data.mat'); +elseif carSide == 'rear' + FileData = load('M22H_RearSuspension_Data.mat'); +else + error('Error: %s is not a valid input', carSide) +end + +fields = fieldnames(FileData); +fields = fieldnames(FileData); +for K = 1 : length(fields) + thisvar = fields{K}; + thisdata = FileData.(thisvar); + if ~isnumeric(thisdata) + warning('Skipping field %s which is type %s instead of numeric', thisvar, class(thisvar)) + else + if carSide == 'front' + thisfile = sprintf('Front_%s.csv', thisvar); + else + thisfile = sprintf('Rear_%s.csv', thisvar); + end + csvwrite(thisfile, thisdata); + end +end diff --git a/Lotus_Hybrid_Plot_NoArb_v2.xlsx b/xslx/Lotus_Hybrid_Plot_NoArb_v2.xlsx similarity index 59% rename from Lotus_Hybrid_Plot_NoArb_v2.xlsx rename to xslx/Lotus_Hybrid_Plot_NoArb_v2.xlsx index 63567fd..9f7da69 100644 Binary files a/Lotus_Hybrid_Plot_NoArb_v2.xlsx and b/xslx/Lotus_Hybrid_Plot_NoArb_v2.xlsx differ diff --git a/xslx/plotdata.xlsx b/xslx/plotdata.xlsx new file mode 100644 index 0000000..cc6117e Binary files /dev/null and b/xslx/plotdata.xlsx differ