Skip to content

Commit dc4837b

Browse files
committed
Uploaded new sample behavior vector and updated variable names in Chi Square and Hypergeometric tests (take 2)
1 parent 7b44590 commit dc4837b

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

+nla/+net/+test/ChiSquaredTest.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
network_pair_ROI_significance = edge_test_results.prob_sig.get(network_atlas.nets(network).indexes,...
4343
network_atlas.nets(network2).indexes);
4444
network_ROI_count = numel(network_pair_ROI_significance);
45-
observed_significance = sum(network_pair_ROI_significance);
45+
observed_hits = sum(network_pair_ROI_significance);
4646
% expected_significance = edge_test_results.avg_prob_sig * network_ROI_count;
47-
expected_significance = (sum(edge_test_results.prob_sig.v)/size(edge_test_results.prob_sig.v,1)) * network_ROI_count; % expected sig should be based off HITS, AS 250210
48-
chi2_value = ((observed_significance - expected_significance) .^ 2) .* ((expected_significance .^ -1)); %legacy style, AS 240529
47+
expected_hits = (sum(edge_test_results.prob_sig.v)/size(edge_test_results.prob_sig.v,1)) * network_ROI_count; % expected sig should be based off HITS, AS 250210
48+
chi2_value = ((observed_hits - expected_hits) .^ 2) .* ((expected_hits .^ -1)); %legacy style, AS 240529
4949
result.(permutation_results).(chi2_statistic).set(network, network2, chi2_value);
50-
result.(permutation_results).(greater_than_expected).set(network, network2, observed_significance > expected_significance);
50+
result.(permutation_results).(greater_than_expected).set(network, network2, observed_hits > expected_hits);
5151
end
5252
end
5353

+nla/+net/+test/HyperGeometricTest.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
network_pair_ROI_significance = edge_test_results.prob_sig.get(network_atlas.nets(network).indexes,...
4444
network_atlas.nets(network2).indexes);
4545
network_ROI_count = numel(network_pair_ROI_significance);
46-
observed_significance = sum(network_pair_ROI_significance);
46+
observed_hits = sum(network_pair_ROI_significance);
4747
% expected_significance = edge_test_results.avg_prob_sig * network_ROI_count;
48-
expected_significance = (sum(edge_test_results.prob_sig.v)/size(edge_test_results.prob_sig.v,1)) * network_ROI_count; % expected sig should be based off HITS, AS 250210
49-
result.(permutation_results).(greater_than_expected).set(network, network2, observed_significance > expected_significance)
48+
expected_hits = (sum(edge_test_results.prob_sig.v)/size(edge_test_results.prob_sig.v,1)) * network_ROI_count; % expected sig should be based off HITS, AS 250210
49+
result.(permutation_results).(greater_than_expected).set(network, network2, observed_hits > expected_hits)
5050
% Matlab function for hypergeometric cdf to get p-value. "Upper" calculates the upper tail instead of
5151
% using 1 - lower tail
52-
result.(permutation_results).(p_value).set(network, network2, hygecdf(observed_significance, numel(edge_test_results.prob_sig.v),...
52+
result.(permutation_results).(p_value).set(network, network2, hygecdf(observed_hits, numel(edge_test_results.prob_sig.v),...
5353
sum(edge_test_results.prob_sig.v), network_ROI_count, "upper"));
5454
end
5555
end
-9 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)