From 9fb05005aa8786a043622b9f97a3ed444ff75da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Sand=20Jensen?= <bjje@dtu.dk> Date: Thu, 30 Jan 2025 20:20:27 +0100 Subject: [PATCH] Updated structure of lecture plan and file names (needs to be double checked) --- exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m | 11 ++++++++++- exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m | 12 +++++++++++- exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m | 2 +- exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m | 2 +- 24 files changed, 43 insertions(+), 24 deletions(-) diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m index b5391b7..e0a1df5 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m @@ -1,4 +1,4 @@ -%% exercise 3.1.2 +%% exercise 1.6.2 cdir = fileparts(mfilename('fullpath')); [A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt')); X = full(A)'; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m index fdd498e..a9c1368 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m @@ -1 +1,10 @@ -%% exercise 3.1.3 cdir = fileparts(mfilename('fullpath')); TMGOpts.stoplist = fullfile(cdir,'../Data/stopWords.txt'); [A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts); X = full(A)'; attributeNames = cellstr(D); %% Display the result display(attributeNames); display(X); \ No newline at end of file +%% exercise 1.6.3 +cdir = fileparts(mfilename('fullpath')); +TMGOpts.stoplist = fullfile(cdir,'../Data/stopWords.txt'); +[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts); +X = full(A)'; +attributeNames = cellstr(D); + +%% Display the result +display(attributeNames); +display(X); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m index 0518cd4..28ecde8 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m @@ -1 +1,11 @@ -%% exercise 3.1.4 cdir = fileparts(mfilename('fullpath')); TMGOpts.stoplist = '../Data/stopWords.txt'; TMGOpts.stemming = 1; [A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts); X = full(A)'; attributeNames = cellstr(D); %% Display the result display(attributeNames); display(X); \ No newline at end of file +%% exercise 1.6.4 +cdir = fileparts(mfilename('fullpath')); +TMGOpts.stoplist = '../Data/stopWords.txt'; +TMGOpts.stemming = 1; +[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts); +X = full(A)'; +attributeNames = cellstr(D); + +%% Display the result +display(attributeNames); +display(X); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m index ffa4d21..0b1193a 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m @@ -1,4 +1,4 @@ -%% exercise 3.1.5 +%% exercise 1.6.5 % Query vector q = [0; 0; 0; 0; 0; 0; 0; 1; 0; 0; 0; 0; 1; 1; 0; 0; 0]'; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m index f411501..3da6f59 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m @@ -1,4 +1,4 @@ -% exercise 3.2.1 +% exercise 2.1.1 x = [-0.68; -2.11; 2.39; 0.26; 1.46; 1.33; 1.03; -0.41; -0.33; 0.47]; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m index 0098173..4b8267c 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m @@ -1,4 +1,4 @@ -% exercise 3.3.1 +% exercise 2.2.1 % Image to use as query i = 1; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m index 52eb65d..bf8f722 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m @@ -1,4 +1,4 @@ -% exercise 3.3.2 +% exercise 2.2.2 % Generate two data objects with M random attributes M = 5; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m index 9a68ff4..a416529 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m @@ -1,4 +1,4 @@ -% exercise 4.2.1 +% exercise 2.3.1 % Disable xlsread warning warning('off', 'MATLAB:xlsread:ActiveX'); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m index 205a5dd..8a2b818 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m @@ -1,4 +1,4 @@ -% exercise 4.2.2 +% exercise 2.3.2 mfig('Histogram for attributes'); clf; for m = 1:M diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m index 517a692..e0ab862 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m @@ -1,4 +1,4 @@ -% exercise 4.2.3 +% exercise 2.3.3 %% Boxplot of each attribute mfig('Boxplot'); clf; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m index c4921d8..28023c0 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m @@ -1,4 +1,4 @@ -% exercise 4.2.4 +% exercise 2.3.4 %% Boxplot of each attribute for each class mfig('Boxplot per class'); clf; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m index 0a3c8a3..9726e8f 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m @@ -1,4 +1,4 @@ -% exercise 4.2.5 +% exercise 2.3.5 mfig('Matrix of scatter plots'); clf; for m1 = 1:M diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m index 1c5847d..829243b 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m @@ -1,4 +1,4 @@ -% exercise 4.2.6 +% exercise 2.3.6 ind = [1 2 3]; % Indices of the variables to plot mfig('3D scatter plot'); clf; hold all; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m index 2756f69..b336954 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m @@ -1,4 +1,4 @@ -% exercise 4.2.7 +% exercise 2.3.7 mfig('Data matrix (standardized)'); clf; imagesc(zscore(X)); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m index 4d75b13..444166c 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m @@ -1,4 +1,4 @@ -% exercise 4.3.1 +% exercise 2.4.1 % Load the data cdir = fileparts(mfilename('fullpath')); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m index cccae6c..4449c52 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m @@ -1,4 +1,4 @@ -% exercise 4.3.2 +% exercise 2.4.2 % Load Matlab data file and extract variables of interest mat_data = load('../Data/wine.mat') diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m index c5f1186..db92c3e 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m @@ -1,4 +1,4 @@ -%% exercise 2.1.1 +%% exercise 3.1.1 % Load the data into Matlab cdir = fileparts(mfilename('fullpath')); [NUMERIC, TXT, RAW] = xlsread(fullfile(cdir,'../Data/nanonose.xls')); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m index 5b6eee8..2ffbf3b 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m @@ -1,4 +1,4 @@ -%% exercise 2.1.2 +%% exercise 3.1.2 % Data attributes to be plotted i = 1; j = 2; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m index 145ff5c..d93ad0b 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m @@ -1,5 +1,5 @@ -%% exercise 2.1.3 +%% exercise 3.1.3 % Subtract the mean from the data Y = bsxfun(@minus, X, mean(X)); diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m index cf767df..2b7362d 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m @@ -1,4 +1,4 @@ -%% exercise 2.1.4 +%% exercise 3.1.4 % Index of the principal components i = 1; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m index 2c3daad..175a5f7 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m @@ -1,4 +1,4 @@ -%% exercise 2.1.6 +%% exercise 3.1.6 mfig('NanoNose: Attribute standard deviations'); clf; hold all; bar(1:size(X,2), std(X)); xticks(1:size(X,2)) diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m index 2f064b5..16adbab 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m @@ -1,4 +1,4 @@ -%% exercise 2.2.1 +%% exercise 3.2.1 % Digit number to display i = 1; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m index 0db965d..7861400 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m @@ -1,4 +1,4 @@ -%% exercise 2.2.2 +%% exercise 3.2.2 % Digits to include in analysis (to include all, n = 1:10); n = [0,1]; diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m index 2a8135e..249b324 100644 --- a/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m +++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m @@ -1,4 +1,4 @@ -%% exercise 2.3.1 +%% exercise 3.3.1 %% Load data cdir = fileparts(mfilename('fullpath')); load(fullfile(cdir,'../Data/zipdata.mat')); -- GitLab