Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
HoloceneSampling
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maria Engel
HoloceneSampling
Commits
437d04bc
Commit
437d04bc
authored
1 year ago
by
Maria Engel
Browse files
Options
Downloads
Patches
Plain Diff
Nomenclature and figure prettynesss
parent
b45bab24
No related branches found
Branches containing commit
No related tags found
1 merge request
!6
Master
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ComputeMostHexagonalSampling.m
+9
-4
9 additions, 4 deletions
ComputeMostHexagonalSampling.m
MakeGridAndAlpGif.m
+5
-2
5 additions, 2 deletions
MakeGridAndAlpGif.m
MakeOptDvsRPlot.m
+1
-1
1 addition, 1 deletion
MakeOptDvsRPlot.m
with
15 additions
and
7 deletions
ComputeMostHexagonalSampling.m
+
9
−
4
View file @
437d04bc
...
...
@@ -122,6 +122,7 @@ d_min = zeros(size(LArray));
if
doDebug
figure
(
'Name'
,
'Sampling grid and alps'
);
set
(
gcf
,
'Position'
,
[
680
693
621
285
])
ah
=
subplot
(
1
,
2
,
1
);
end
...
...
@@ -140,7 +141,8 @@ for iL = 1:numel(LArray)
if
doDebug
[
kyArray
,
kzArray
]
=
GetGridPoints
(
3
*
Lmax
,
deltak_inplane
,
sliceSpacing
,
LArray
(
iL
));
PlotGrid
(
kyArray
,
kzArray
,
sliceSpacing
,
ah
);
title
(
sprintf
(
'L = %.2f %s = %.2f'
,
LArray
(
iL
),
char
(
hex2dec
(
'0394'
)),
nSlicesSimultaneously
/
LArray
(
iL
)));
subplot
(
1
,
2
,
2
);
hold
on
;
plot
(
LArray
(
iL
),
packingDensityArray
(
iL
),
'.'
,
'Color'
,
'k'
);
...
...
@@ -151,8 +153,8 @@ for iL = 1:numel(LArray)
end
xlabel
(
'L'
);
ylabel
(
'Packing density [%]'
);
xlim
([
Lmin
Lmax
]);
ylim
([
min
(
packingDensityArray
)
90.7
]);
sgtitle
(
sprintf
(
'L = %.2f'
,
LArray
(
iL
)))
;
xlim
([
Lmin
Lmax
]);
ylim
([
0
90.7
]);
axis
square
;
%% Make GIF
if
~
isempty
(
gifName
)
...
...
@@ -213,7 +215,7 @@ if doPlot
plot
(
L_CAIPI_B
,
packingDensityCAIPI_B
,
'x'
,
'MarkerSize'
,
10
,
'LineWidth'
,
3
,
...
'Color'
,
GetSamplingPatternColour
(
2
),
'DisplayName'
,
'Blipped-CAIPIRINHA - B'
);
plot
(
L_optimum
,
packingDensity
,
'x'
,
'MarkerSize'
,
10
,
'LineWidth'
,
3
,
...
'Color'
,
GetSamplingPatternColour
(
0
),
'DisplayName'
,
'
Optimum sampling
'
);
'Color'
,
GetSamplingPatternColour
(
0
),
'DisplayName'
,
'
Proposed method
'
);
legend
;
xlabel
(
'L'
);
ylabel
(
'Packing density [%]'
);
...
...
@@ -240,6 +242,9 @@ scatter(ky, kz, 'MarkerEdgeColor', [0.5 0.5 0.5], 'MarkerFaceColor', [0.5 0.5 0.
hold
on
;
ind0
=
find
(
ky
==
0
);
scatter
(
ky
(
ind0
:
ind0
+
1
),
kz
(
ind0
:
ind0
+
1
),
'MarkerEdgeColor'
,
[
0
0
0
],
'MarkerFaceColor'
,
[
0
0
0
],
'LineWidth'
,
5
);
slabBorderColour
=
[
100
149
237
]/
255
;
% light blue
yline
(
0
,
'r'
,
'LineWidth'
,
3
,
'Color'
,
slabBorderColour
);
yline
(
2
*
pi
/
sliceSpacing
,
'r'
,
'LineWidth'
,
3
,
'Color'
,
slabBorderColour
);
...
...
This diff is collapsed.
Click to expand it.
MakeGridAndAlpGif.m
+
5
−
2
View file @
437d04bc
...
...
@@ -5,6 +5,8 @@ baseFolder = pwd;
doSave = true;
if doSave
gifName = fullfile(baseFolder,'GridAndAlpsGif.gif');
dfws = get(0,'DefaultFigureWindowStyle');
set(0,'DefaultFigureWindowStyle','normal');
else
gifName = [];
end
...
...
@@ -18,5 +20,6 @@ sliceSpacing = FOVinplane/2/Nsim;
[packingDensity, L_optimum, isDegenerate, packingDensityCAIPItmp, L_CAIPItmp] = ...
ComputeMostHexagonalSampling(R, FOVinplane, sliceSpacing, Nsim, [], [], [], [], true, gifName, 0.02);
[packingDensityCAIPI, indCAIPI] = max(packingDensityCAIPItmp);
L_CAIPI = L_CAIPItmp(indCAIPI);
if doSave
set(0,'DefaultFigureWindowStyle',dfws);
end
This diff is collapsed.
Click to expand it.
MakeOptDvsRPlot.m
+
1
−
1
View file @
437d04bc
...
...
@@ -52,7 +52,7 @@ for iNSim = 1:numel(NSimArray)
end
nexttile
;
hold
on
;
plot
(
RArray
(
1
:
numel
(
packingDensity
))
*
Nsim
,
packingDensity
,
'LineWidth'
,
2
,
...
'DisplayName'
,
[
'
As hexagonal as possible
'
name
],
'Color'
,
GetSamplingPatternColour
(
0
));
'DisplayName'
,
[
'
Proposed method
'
name
],
'Color'
,
GetSamplingPatternColour
(
0
));
plot
(
RArray
(
1
:
numel
(
packingDensity
))
*
Nsim
,
packingDensityCAIPI_A
,
'LineWidth'
,
2
,
...
'DisplayName'
,
[
'Blipped-CAIPIRINHA - A'
name
],
'Color'
,
GetSamplingPatternColour
(
1
));
plot
(
RArray
(
1
:
min
(
numel
(
packingDensity
),
numel
(
packingDensityCAIPI_B
)))
*
Nsim
,
packingDensityCAIPI_B
,
'LineWidth'
,
2
,
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment