Fixes bad text output (#165)

RascalSoftware · Nov 2, 2023 · d44dc1f · d44dc1f
1 parent 9da2745
commit d44dc1f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/minimisers/DE/RAT_deopt.m b/minimisers/DE/RAT_deopt.m
@@ -329,8 +329,7 @@
 
   if (I_refresh > 0)
      if ((rem(I_iter,I_refresh) == 0) || I_iter == 1) && strcmpi(controls.display,'iter')
-       %fprintf('Iteration: %d,  Best: %f,  fWeight: %f,  F_CR: %f,  I_NP: %d\n',I_iter,S_bestval.FVr_oa(1),fWeight,F_CR,I_NP);
-       fprintf('Iteration: %g,  Best: %f,  fWeight: %f,  F_CR: %f,  I_NP: %g\n', I_iter,S_bestval.FVr_oa(1),fWeight,F_CR,I_NP);
+       fprintf('Iteration: %g,  Best: %f,  fWeight: %f,  F_CR: %f,  I_NP: %g\n\n', I_iter,S_bestval.FVr_oa(1),fWeight,F_CR,I_NP);
 
        %disp(S_bestval);
        %var(FM_pop)

diff --git a/minimisers/NSMain/drawMCMC.m b/minimisers/NSMain/drawMCMC.m
@@ -184,7 +184,7 @@
 
 % print out acceptance ratio
 if verbose
-    fprintf('Acceptance ratio: %1.4f, \n', acctot/(Ntimes*Nmcmc));
+    fprintf('Acceptance ratio: %1.4f, \n\n', acctot/(Ntimes*Nmcmc));
 end
 
 return
diff --git a/minimisers/NSMain/nestedSampler.m b/minimisers/NSMain/nestedSampler.m
@@ -262,7 +262,7 @@
 
     % display progress (optional)
     if verbose
-        fprintf('log(Z): %.5e, tol = %.5e, K = %d, iteration = %d, H = %.5e', ...
+        fprintf('log(Z): %.5e, tol = %.5e, K = %d, iteration = %d, H = %.5e\n', ...
                  logZ, tol, int32(K), int32(j), H);
     end
 

diff --git a/minimisers/simplex/RATFminSearch.m b/minimisers/simplex/RATFminSearch.m
@@ -235,8 +235,8 @@
 
 % Print out initial f(x) as 0th iteration
 if prnt == 3
-    fprintf('\n%s', header)
-    fprintf(' %5.0f        %5.0f     %12.6g         %s', itercount, func_evals, fv(1), how);
+    fprintf('\n%s\n', header);
+    fprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how);
 elseif prnt == 4
     % Option never used in RAT
 
@@ -294,7 +294,7 @@
 itercount = itercount + 1;
 func_evals = n+1;
 if prnt == 3
-    fprintf(' %5.0f        %5.0f     %12.6g         %s', itercount, func_evals, fv(1), how);
+    fprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how);
 elseif prnt == 4
 %     sendTextOutput(' ')
 %     sendTextOutput(how)
@@ -406,7 +406,7 @@
     v = v(:,j);
     itercount = itercount + 1;
     if prnt == 3
-        fprintf(' %5.0f        %5.0f     %12.6g         %s', itercount, func_evals, fv(1), how);
+        fprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how);
     elseif prnt == 4
 %         sendTextOutput(' ')
 %         sendTextOutput(num2str(how))
@@ -471,7 +471,7 @@
 end
 
 if printMsg
-    fprintf('\n%s', msg)
+    fprintf('\n%s\n', msg);
 end
 
 %--------------------------------------------------------------------------