Skip to content

Commit

Permalink
Re #1786 changes from review -- more comments and common code
Browse files Browse the repository at this point in the history
  • Loading branch information
@abuts
abuts committed Feb 18, 2025
1 parent ca6ebdc commit 2eed650
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 31 deletions.
2 changes: 1 addition & 1 deletion _test/test_config/test_hpc_config.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function test_get_free_memory_from_empty(obj)
catch
ok = false;
% wait for short period of time to allow other instance
% of the test job release its memory
% of the test job release its memory.
if obj.n_attempts>1; pause(1); end
end
end
Expand Down
52 changes: 22 additions & 30 deletions _test/test_utilities_herbert/test_fast_map.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,9 @@ function test_set_different_key_type(~)
assertEqual(fm.values,1);
end
%------------------------------------------------------------------
function test_get_all_val_for_keys_optimized_no_checks(~)
n_keys = 100;
base_key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
base_key = unique(base_key);
n_keys = numel(base_key);
val = 1:n_keys;
function test_get_all_val_for_keys_optimized_no_checks(obj)
%
[base_key,val] = build_test_key_values(obj,100);

fm = fast_map(base_key,val);
fm.optimized = true;
Expand All @@ -47,12 +44,8 @@ function test_get_all_val_for_keys_optimized_no_checks(~)
assertEqual(val,valm);
end

function test_get_all_val_for_keys_optimized_with_checks(~)
n_keys = 100;
base_key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
base_key = unique(base_key);
n_keys = numel(base_key);
val = 1:n_keys;
function test_get_all_val_for_keys_optimized_with_checks(obj)
[base_key,val] = build_test_key_values(obj,100);

fm = fast_map(base_key,val);
fm.optimized = true;
Expand All @@ -62,25 +55,17 @@ function test_get_all_val_for_keys_optimized_with_checks(~)
assertEqual(val,valm);
end

function test_get_all_val_for_keys(~)
n_keys = 100;
base_key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
base_key = unique(base_key);
n_keys = numel(base_key);
val = 1:n_keys;
function test_get_all_val_for_keys(obj)
[base_key,val] = build_test_key_values(obj,100);

fm = fast_map(base_key,val);
valm = fm.get_values_for_keys(base_key);

assertEqual(val,valm);
end
%------------------------------------------------------------------
function test_insertion_in_optimized(~)
n_keys = 100;
base_key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
base_key = unique(base_key);
n_keys = numel(base_key);
val = 1:n_keys;
function test_insertion_in_optimized(obj)
[base_key,val] = build_test_key_values(obj,100);

fm = fast_map(base_key,val);
fm.optimized = true;
Expand All @@ -95,12 +80,8 @@ function test_insertion_in_optimized(~)
assertFalse(fm.optimized);
end

function test_optimization(~)
n_keys = 100;
base_key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
base_key = unique(base_key);
n_keys = numel(base_key);
val = 1:n_keys;
function test_optimization(obj)
[base_key,val] = build_test_key_values(obj,100);

fm = fast_map(base_key,val);
fmop = fm;
Expand Down Expand Up @@ -163,4 +144,15 @@ function test_fast_map_empty_constructor(~)
assertTrue(isempty(fm.values));
end
end
methods(Access=protected)
function [key,val] = build_test_key_values(~,n_keys)
% generate bunch of random unique keys in some reasonable key range
key = 10+round(rand(1,10*n_keys)*(10*n_keys-1));
key = unique(key);
n_keys = numel(key);
% and build values expected for such keys in real life
val = 1:n_keys;

end
end
end

0 comments on commit 2eed650

Please sign in to comment.