Update cart sphere testing (waltsims#583)

Author: waltsims

tests/matlab_test_data_collectors/matlab_collectors/collect_makeCartSphere.m

@@ -2,19 +2,21 @@
 all_params = {
     {5, 100, [1,1,8]}, ...
     {1, 10, [5,5,0]}, ...
-    {0.5, 10, [0,0,0]}
+    {0.5, 10, [0,0,0]}, ...
+    {4e-3, 100, [0, 0, 0]}  % Case from interpCartData
     };
-output_folder = 'collectedValues/makeCartSphere/';
+output_file = 'collectedValues/make_cart_sphere.mat';
+
+recorder = utils.TestRecorder(output_file);
 
 for idx=1:length(all_params)
-        sphere = makeCartSphere(all_params{idx}{1}, all_params{idx}{2}, all_params{idx}{3});
-        params = all_params{idx};
-        idx_padded = sprintf('%06d', idx - 1);
-        filename = [output_folder idx_padded '.mat'];
-        idx_padded = sprintf('%06d', idx - 1);
-        if ~exist(output_folder, 'dir')
-            mkdir(output_folder);
-        end
-        save(filename, 'params', 'sphere');
+    params = all_params{idx};
+    cart_sphere = makeCartSphere(params{1}, params{2}, params{3});
+
+    recorder.recordVariable('params', params);
+    recorder.recordVariable('cart_sphere', cart_sphere);
+
+    recorder.increment();
 end
+recorder.saveRecordsToDisk();
 disp('Done.')

tests/matlab_test_data_collectors/python_testers/makeCartSphere_test.py

@@ -3,27 +3,31 @@
 from pathlib import Path
 
 import numpy as np
-from scipy.io import loadmat
 
 from kwave.data import Vector
 from kwave.utils.mapgen import make_cart_sphere
+from tests.matlab_test_data_collectors.python_testers.utils.record_reader import TestRecordReader
 
 
 def test_makeCartSphere():
-    collected_values_folder = os.path.join(Path(__file__).parent, "collectedValues/makeCartSphere")
-    num_collected_values = len(os.listdir(collected_values_folder))
+    collected_values_file = os.path.join(Path(__file__).parent, "collectedValues/make_cart_sphere.mat")
+    reader = TestRecordReader(collected_values_file)
 
-    for i in range(num_collected_values):
+    for i in range(len(reader)):
         logging.log(logging.INFO, i)
-        filepath = os.path.join(collected_values_folder, f"{i:06d}.mat")
-        recorded_data = loadmat(filepath, simplify_cells=True)
-
-        radius, num_points, center = recorded_data["params"]
+        params = reader.expected_value_of("params")
+        radius = params[0]
+        num_points = params[1]
+        center = params[2]
         center = Vector(center.astype(int))
-        expected_value = recorded_data["sphere"]
+        expected_value = reader.expected_value_of("cart_sphere")
 
         sphere = make_cart_sphere(radius, num_points, center)
 
         assert np.allclose(expected_value, sphere)
+        reader.increment()
 
     logging.log(logging.INFO, "makeCartSphere(..) works as expected!")
+
+    if __name__ == "__main__":
+        test_makeCartSphere()