Skip to content

Commit fd12dd0

Browse files
Merge pull request #1494 from softmatterlab/eg-TestDistanceBug
Small changes detected in test_braph2
2 parents 08897db + 0bc24df commit fd12dd0

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

braph2genesis/measures/_Distance.gen.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
distance = cell(g.layernumber(), 1);
4141
connectivity_type = g.getConnectivityType(g.layernumber());
4242
connectivity_type = diag(connectivity_type);
43+
Aii_tmp = {};
4344
for li = 1:g.layernumber()
4445
Aii_tmp{li} = A{li, li}; %#ok<AGROW>
4546
end

braph2genesis/measures/_PathLengthAv.gen.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
0 0 .1 0
6161
];
6262

63-
known_path_length_av = {mean([18/11 18/15 18/15 18/11])};
63+
known_path_length_av = {harmmean([18/11 18/15 18/15 18/11])};
6464

6565
g = GraphBU('B', A);
6666
path_length_av = PathLengthAv('G', g).get('M');
@@ -88,8 +88,8 @@
8888
A = {A11 A22};
8989

9090
known_path_length_av = {
91-
mean([18/11 18/15 18/15 18/11])
92-
mean([18/11 18/15 18/15 18/11])
91+
harmmean([18/11 18/15 18/15 18/11])
92+
harmmean([18/11 18/15 18/15 18/11])
9393
};
9494

9595
g = MultiplexBU('B', A);

braph2genesis/pipelines/connectivity-functional multiplex group_average/_AnalyzeGroup_CON_FUN_MP_GA_BUD.gen.m

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@
4242
%%% ¡prop!
4343
DENSITIES (parameter, rvector) is the vector of densities.
4444
%%%% ¡default!
45-
0
45+
[1:1:10]
46+
%%%% ¡gui!
47+
pr = PanelPropRVectorSmart('EL', a, 'PROP', AnalyzeGroup_CON_FUN_MP_GA_BUD.DENSITIES, ...
48+
'MIN', 0, 'MAX', 100, ...
49+
'DEFAULT', AnalyzeGroup_CON_FUN_MP_GA_BUD.getPropDefault('DENSITIES'), ...
50+
varargin{:});
4651

4752
%% ¡props_update!
4853

@@ -70,6 +75,7 @@
7075
densities = a.get('DENSITIES'); % this is a vector
7176
A = cell(1, 2);
7277
data = cell(1, 2);
78+
layerlabels = {};
7379

7480
for i = 1:1:gr.get('SUB_DICT').length()
7581
sub = gr.get('SUB_DICT').getItem(i);
@@ -98,7 +104,6 @@
98104
data(2) = {data{2} + A_fun};
99105
end
100106

101-
layerlabels = {};
102107
for i = 1:length(densities)
103108
layerlabels = [...
104109
layerlabels, ['C ' num2str(densities(i)) '%'], ...

0 commit comments

Comments
 (0)