From 13522202fc575795e29047725d9bc307a3a701ad Mon Sep 17 00:00:00 2001
From: Claudio Maggioni <maggicl@usi.ch>
Date: Tue, 3 Nov 2020 14:40:49 +0100
Subject: [PATCH] mp3: other corrections
---
.../src/Bench_rec_bisection.m | 42 +-
.../src/bisection_inertial.m | 18 +-
mp3/ex4_Coordinate.tex | 6 -
mp3/ex4_Coordinate_8.tex | 182555 ++++++++++++++
mp3/ex4_Inertial.tex | 6 -
mp3/ex4_Inertial_8.tex | 182552 ++++++++++++++
mp3/ex4_METIS.tex | 6 -
mp3/ex4_METIS_8.tex | 182552 ++++++++++++++
mp3/ex4_Spectral.tex | 6 -
mp3/ex4_Spectral_8.tex | 182556 +++++++++++++++
mp3/project_3_Maggioni_Claudio.pdf | Bin 2356340 -> 3367549 bytes
mp3/project_3_Maggioni_Claudio.tex | 85 +-
12 files changed, 730309 insertions(+), 75 deletions(-)
create mode 100644 mp3/ex4_Coordinate_8.tex
create mode 100644 mp3/ex4_Inertial_8.tex
create mode 100644 mp3/ex4_METIS_8.tex
create mode 100644 mp3/ex4_Spectral_8.tex
diff --git a/mp3/Project_3_Maggioni_Claudio/src/Bench_rec_bisection.m b/mp3/Project_3_Maggioni_Claudio/src/Bench_rec_bisection.m
index 24677a2..e208cf6 100755
--- a/mp3/Project_3_Maggioni_Claudio/src/Bench_rec_bisection.m
+++ b/mp3/Project_3_Maggioni_Claudio/src/Bench_rec_bisection.m
@@ -79,29 +79,33 @@ for c = 1:nc
% 2. Recursive routines
% i. Spectral
sp8 = runtest(W, coords, @(a, b) bisection_spectral(a, b, 0), ...
- 3, '', 0);
+ 3, 'Spectral_8', g);
sp16 = runtest(W, coords, @(a, b) bisection_spectral(a, b, 0), ...
4, 'Spectral', g);
% ii. Metis
m8 = runtest(W, coords, @(a, b) bisection_metis(a, b, 0), ...
- 3, '', 0);
+ 3, 'METIS_8', g);
m16 = runtest(W, coords, @(a, b) bisection_metis(a, b, 0), ...
4, 'METIS', g);
% iii. Coordinate
c8 = runtest(W, coords, @(a, b) bisection_coordinate(a, b, 0), ...
- 3, '', 0);
+ 3, 'Coordinate_8', g);
c16 = runtest(W, coords, @(a, b) bisection_coordinate(a, b, 0), ...
4, 'Coordinate', g);
% iv. Inertial
i8 = runtest(W, coords, @(a, b) bisection_inertial(a, b, 0), ...
- 3, '', 0);
+ 3, 'Inertial_8', g);
i16 = runtest(W, coords, @(a, b) bisection_inertial(a, b, 0), ...
4, 'Inertial', g);
close;
+ for ignored = 1:8
+ % close;
+ end
+
% 3. Calculate number of cut edges
% 4. Visualize the partitioning result
@@ -111,31 +115,31 @@ for c = 1:nc
end
-%Bisection Spectral Metis 5.0.2 Coordinate Inertial
-%Partitions 8 16 8 16 8 16 8 16
-%------------------------------------------------------------------------------------
-%airfoil1.mat ... 327 578 320 563 516 819 577 897
-%3elt.mat ....... 372 671 395 651 733 1168 880 1342
-%barth4.mat ..... 505 758 405 689 875 1306 891 1350
-%mesh3e1.mat .... 75 124 75 117 75 122 67 102
-%crack.mat ...... 804 1303 784 1290 1343 1860 1061 1618
+%Bisection Spectral Metis 5.0.2 Coordinate Inertial
+%Partitions 8 16 8 16 8 16 8 16
+%--------------------------------------------------------------------------
+%airfoil1.mat ... 327 578 320 563 516 819 578 903
+%3elt.mat ....... 372 671 395 651 733 1168 880 1342
+%barth4.mat ..... 505 758 405 689 875 1306 888 1348
+%mesh3e1.mat .... 75 124 75 117 75 122 76 116
+%crack.mat ...... 804 1303 784 1290 1343 1860 1061 1618
function n = runtest(A, xy, algorithm, depth, t, show_graphs)
g = 0;
if show_graphs == 1
g = 1;
- title(strcat(t, ' bisection for crack with n=16'));
+ %title(strcat(t, ' bisection for crack with n=16'));
hold on;
end
n = recurse(A, xy, algorithm, 0.5, depth, g);
if show_graphs == 1
hold off;
- %matlab2tikz(sprintf('../../ex4_%s.tex', t));
+ %matlab2tikz('showInfo', false, sprintf('../../ex4_%s.tex', t));
figure;
end
end
-function n = recurse(A, xy, algorithm, color, depth, show_graphs)
+function n = recurse(A, xy, algorithm, color, depth, show_g)
warning('off','MATLAB:eigs:IllConditionedA')
[partA, partB] = algorithm(A, xy);
warning('on', 'MATLAB:eigs:IllConditionedA')
@@ -147,14 +151,14 @@ function n = recurse(A, xy, algorithm, color, depth, show_graphs)
depth = depth - 1;
if depth > 0
- n = n + recurse(A1, xy1, algorithm, color * 1.5, depth, show_graphs);
- n = n + recurse(A2, xy2, algorithm, color * 0.5, depth, show_graphs);
- elseif show_graphs == 1
+ n = n + recurse(A1, xy1, algorithm, color * 1.5, depth, show_g);
+ n = n + recurse(A2, xy2, algorithm, color * 0.5, depth, show_g);
+ elseif show_g == 1
gplot(A1, xy1);
gplot(A2, xy2);
end
- if show_graphs == 1
+ if show_g == 1
A12 = sparse(size(A));
A12(partA, partB) = A(partA, partB);
A12(partB, partA) = A(partB, partA);
diff --git a/mp3/Project_3_Maggioni_Claudio/src/bisection_inertial.m b/mp3/Project_3_Maggioni_Claudio/src/bisection_inertial.m
index 066dbaf..335ff5f 100755
--- a/mp3/Project_3_Maggioni_Claudio/src/bisection_inertial.m
+++ b/mp3/Project_3_Maggioni_Claudio/src/bisection_inertial.m
@@ -20,16 +20,17 @@
% Steps
% 1. Calculate the center of mass.
-m = sum(xy, 1) ./ size(xy, 1);
+m = mean(xy);
xm = m(1);
ym = m(2);
% 2. Construct the matrix M.
% (Consult the pdf of the assignment for the creation of M)
-h = [(xy(:, 1) - xm) (xy(:, 2) - ym)];
-X1 = sum(h(:, 1) .^ 2);
-X2 = sum(h(:, 1) .* h(:, 2));
-X3 = sum(h(:, 2) .^ 2);
+sx = (xy(:, 1) - xm);
+sy = (xy(:, 2) - ym);
+X1 = sum(sx .^ 2);
+X2 = dot(sx, sy);
+X3 = sum(sy .^ 2);
M = [X1 X2; X2 X3];
@@ -39,13 +40,12 @@ a = u(1);
b = u(2);
% 4. Find the line L on which the center of mass lies.
-S = -b * (xy(:, 1) - xm) + a * (xy(:, 2) - ym);
-Sm = median(S);
+v = [-b; a];
+v = v / norm(v, 2);
% 5. Partition the points around the line L.
% (you may use the function partition.m)
-part1 = find(S < Sm);
-part2 = find(S >