Switch from use of fprintf() to redirectable mp_printf().

Author: rdzman

CHANGES.md

@@ -6,6 +6,8 @@ since 8.1
 ---------
 
 #### 7/23/26
+  - Use recently added `mp_printf()` in place of `fprintf()` everywhere to
+    allow redirecting of console output.
   - Add `mp.logger` class, and `mp_printf()` and `mp_disp()` functions
     which can be used as drop-in replacements for `fprintf()` and `disp()`.
     By default they behave identically, but can use an `mp.logger` object to

lib/mptestver.m

@@ -32,5 +32,5 @@
         rv = v.Version;
     end
 else
-    fprintf('%-22s Version %-10s %-11s\n', v.Name, v.Version, v.Date);
+    mp_printf('%-22s Version %-10s %-11s\n', v.Name, v.Version, v.Date);
 end

lib/t/test_mptest.m

@@ -15,7 +15,7 @@
 % See also t_run_tests.
 
 %   MP-Test
-%   Copyright (c) 2016-2025, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2016-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.

lib/t_begin.m

@@ -28,7 +28,7 @@ function t_begin(num_of_tests, quiet)
 % See also t_end, t_ok, t_is, t_str_match, t_file_match, t_skip, t_run_tests.
 
 %   MP-Test
-%   Copyright (c) 2004-2024, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2004-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.
@@ -56,5 +56,5 @@ function t_begin(num_of_tests, quiet)
 t_clock = tic;
 
 if ~t_quiet
-    fprintf('1..%d\n', num_of_tests);
+    mp_printf('1..%d\n', num_of_tests);
 end

lib/t_end.m

@@ -20,7 +20,7 @@
 % See also t_begin, t_ok, t_is, t_str_match, t_file_match, t_skip, t_run_tests.
 
 %   MP-Test
-%   Copyright (c) 2004-2024, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2004-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.
@@ -47,33 +47,33 @@
 
 if t_quiet
     if all_ok
-        fprintf('ok');
+        mp_printf('ok');
         if t_skip_cnt
-            fprintf(' (%d of %d skipped)', t_skip_cnt, t_num_of_tests);
+            mp_printf(' (%d of %d skipped)', t_skip_cnt, t_num_of_tests);
         end
     else
-        fprintf('not ok\n');
-        fprintf('\t#####  Ran %d of %d tests: %d passed, %d failed', ...
+        mp_printf('not ok\n');
+        mp_printf('\t#####  Ran %d of %d tests: %d passed, %d failed', ...
             t_counter, t_num_of_tests, t_ok_cnt, t_not_ok_cnt);
         if t_skip_cnt
-            fprintf(', %d skipped', t_skip_cnt);
+            mp_printf(', %d skipped', t_skip_cnt);
         end
     end
-    fprintf('\n');
+    mp_printf('\n');
 else
     if all_ok
         if t_skip_cnt
-            fprintf('All tests successful (%d passed, %d skipped of %d)', ...
+            mp_printf('All tests successful (%d passed, %d skipped of %d)', ...
                 t_ok_cnt, t_skip_cnt, t_num_of_tests);
         else
-            fprintf('All tests successful (%d of %d)', t_ok_cnt, t_num_of_tests);
+            mp_printf('All tests successful (%d of %d)', t_ok_cnt, t_num_of_tests);
         end
     else
-        fprintf('Ran %d of %d tests: %d passed, %d failed', ...
+        mp_printf('Ran %d of %d tests: %d passed, %d failed', ...
             t_counter, t_num_of_tests, t_ok_cnt, t_not_ok_cnt);
         if t_skip_cnt
-            fprintf(', %d skipped', t_skip_cnt);
+            mp_printf(', %d skipped', t_skip_cnt);
         end
     end
-    fprintf('\nElapsed time %.2f seconds.\n', toc(t_clock));
+    mp_printf('\nElapsed time %.2f seconds.\n', toc(t_clock));
 end

lib/t_is.m

@@ -129,8 +129,8 @@
     if max_diff > 0
         k = find(~(abs(got_minus_expected(:)) < 10^(-prec)) & ~isnan(got_minus_expected(:)));
         nk = length(k);
-        fprintf('    index              got             expected      abs(got - exp)\n');
-        fprintf('---------------  ----------------  ----------------  ----------------');
+        mp_printf('    index              got             expected      abs(got - exp)\n');
+        mp_printf('---------------  ----------------  ----------------  ----------------');
         if nk > 15
             [~, kk] = sort(abs(got_minus_expected(k)), 'descend');
             k = k(kk(1:10));
@@ -153,33 +153,33 @@
                 idxstr = sprintf('(%s%d)', idxstr, idx{end});
             end
             if cplx
-                fprintf('\n%14s  %16s  %16s  %16g', ...
+                mp_printf('\n%14s  %16s  %16s  %16g', ...
                     idxstr, format_complex(full(got(k(u))), '%g'), ...
                             format_complex(full(ex), '%g'), full(abs(got(k(u)) - ex)));
             else
-                fprintf('\n%14s  %16g  %16g  %16g', ...
+                mp_printf('\n%14s  %16g  %16g  %16g', ...
                     idxstr, full(got(k(u))), full(ex), full(abs(got(k(u)) - ex)));
             end
             if u == kk
-                fprintf('  *');
+                mp_printf('  *');
                 idxstrkk = idxstr;
             end
         end
         if nk > 15
-            fprintf('\n ... and %d more ...', nk-10);
+            mp_printf('\n ... and %d more ...', nk-10);
         end
-        fprintf('\nmax diff @ %s = %g > allowed tol of %g\n\n', ...
+        mp_printf('\nmax diff @ %s = %g > allowed tol of %g\n\n', ...
             idxstrkk, full(max_diff), 10^(-prec));
     elseif max_diff == -1
-        fprintf('    mismatch in locations of NaNs\n');
+        mp_printf('    mismatch in locations of NaNs\n');
     else
         gidxstr = sprintf('%d x ', gdims(1:end-1));
         gidxstr = sprintf('%s%d', gidxstr, gdims(end));
         eidxstr = sprintf('%d x ', edims(1:end-1));
         eidxstr = sprintf('%s%d', eidxstr, edims(end));
-        fprintf('    dimension mismatch:\n');
-        fprintf('             got: %s\n', gidxstr);
-        fprintf('        expected: %s\n\n', eidxstr);
+        mp_printf('    dimension mismatch:\n');
+        mp_printf('             got: %s\n', gidxstr);
+        mp_printf('        expected: %s\n\n', eidxstr);
     end
 end
 if nargout

lib/t_ok.m

@@ -33,7 +33,7 @@
 % See also t_is, t_file_match, t_str_match, t_skip, t_begin, t_end, t_run_tests.
 
 %   MP-Test
-%   Copyright (c) 2004-2024, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2004-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.
@@ -55,11 +55,11 @@
 else
     t_not_ok_cnt = t_not_ok_cnt + 1;
     if ~t_quiet
-        fprintf('not ');
+        mp_printf('not ');
     end
 end
 if ~t_quiet
-    fprintf('ok %d%s\n', t_counter, msg);
+    mp_printf('ok %d%s\n', t_counter, msg);
 end
 t_counter = t_counter + 1;
 if nargout

lib/t_run_tests.m

@@ -28,7 +28,7 @@
 % See also t_begin, t_end.
 
 %   MP-Test
-%   Copyright (c) 2004-2024, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2004-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.
@@ -64,11 +64,10 @@
 t0 = tic;
 for k = 1:length(test_names)
     if verbose
-        fprintf('\n----------  %s  ----------\n', test_names{k});
+        mp_printf('\n----------  %s  ----------\n', test_names{k});
     else
         pad = maxlen + 4 - length(test_names{k});
-        fprintf('%s', test_names{k});
-        for m = 1:pad, fprintf('.'); end
+        mp_printf('%s%s', test_names{k}, repmat('.', [1 pad]));
     end
     feval( test_names{k}, ~verbose );
 
@@ -80,25 +79,25 @@
 end
 
 if verbose
-    fprintf('\n\n----------  Summary  ----------\n');
+    mp_printf('\n\n----------  Summary  ----------\n');
 end
 if counter == num_of_tests && counter == ok_cnt + skip_cnt && not_ok_cnt == 0
     all_ok = 1;
     if skip_cnt
-        fprintf('All tests successful (%d passed, %d skipped of %d)', ...
+        mp_printf('All tests successful (%d passed, %d skipped of %d)', ...
             ok_cnt, skip_cnt, num_of_tests);
     else
-        fprintf('All tests successful (%d of %d)', ok_cnt, num_of_tests);
+        mp_printf('All tests successful (%d of %d)', ok_cnt, num_of_tests);
     end
 else
     all_ok = 0;
-    fprintf('Ran %d of %d tests: %d passed, %d failed', ...
+    mp_printf('Ran %d of %d tests: %d passed, %d failed', ...
         counter, num_of_tests, ok_cnt, not_ok_cnt);
     if skip_cnt
-        fprintf(', %d skipped', skip_cnt);
+        mp_printf(', %d skipped', skip_cnt);
     end
 end
-fprintf('\nElapsed time %.2f seconds.\n', toc(t0));
+mp_printf('\nElapsed time %.2f seconds.\n', toc(t0));
 
 if nargout
     all_ok_ = all_ok;   %% copy to optional output arg

lib/t_skip.m

@@ -26,7 +26,7 @@ function t_skip(cnt, msg)
 % See also t_ok, t_is, t_file_match, t_str_match, t_begin, t_end, t_run_tests.
 
 %   MP-Test
-%   Copyright (c) 2004-2024, Power Systems Engineering Research Center (PSERC)
+%   Copyright (c) 2004-2026, Power Systems Engineering Research Center (PSERC)
 %   by Ray Zimmerman, PSERC Cornell
 %
 %   This file is part of MP-Test.
@@ -46,9 +46,9 @@ function t_skip(cnt, msg)
 t_skip_cnt = t_skip_cnt + cnt;
 if ~t_quiet
     if cnt == 1
-        fprintf('skipped %d%s\n', t_counter, msg);
+        mp_printf('skipped %d%s\n', t_counter, msg);
     else
-        fprintf('skipped %d..%d%s\n', t_counter, t_counter+cnt-1, msg);
+        mp_printf('skipped %d..%d%s\n', t_counter, t_counter+cnt-1, msg);
     end
 end
 t_counter = t_counter + cnt;

lib/toggle_debug_mode.m

@@ -16,7 +16,7 @@ function toggle_debug_mode(on_off, quiet)
 %
 % See also debug_assert.
 
-%   Copyright (c) 2024-2025, Ray Zimmerman
+%   Copyright (c) 2024-2026, Ray Zimmerman
 
 global DEBUG_MODE
 if nargin && ~isempty(on_off)
@@ -32,8 +32,8 @@ function toggle_debug_mode(on_off, quiet)
 end
 if nargin < 2 || ~quiet
     if DEBUG_MODE
-        fprintf('DEBUG_MODE is ON\n');
+        mp_printf('DEBUG_MODE is ON\n');
     else
-        fprintf('DEBUG_MODE is OFF\n');
+        mp_printf('DEBUG_MODE is OFF\n');
     end
 end