From 0799137afef18f1b84c96508c35ab39d0582c312 Mon Sep 17 00:00:00 2001
From: Marco Ratto <marco.ratto@jrc.ec.europa.eu>
Date: Fri, 18 Mar 2011 11:46:56 +0100
Subject: [PATCH] skipped print of multicollinearity on the command window
 (cherry picked from commit 52cc078de5416be2b3c125041c8674f80c941f6e)

resolved conflict with obsolete | and & replaced with || and &&
---
 matlab/disp_identification.m | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/matlab/disp_identification.m b/matlab/disp_identification.m
index 38e8da1af..63910277c 100644
--- a/matlab/disp_identification.m
+++ b/matlab/disp_identification.m
@@ -19,7 +19,7 @@ function disp_identification(pdraws, idemodel, idemoments, name, advanced)
 
 global options_
 
-if nargin<5 | isempty(advanced),
+if nargin<5 || isempty(advanced),
     advanced=0;
 end
 
@@ -192,19 +192,19 @@ if ~any(idemoments.ino) && ~any(any(idemoments.ind==0))
     disp(' ')
 end
 
-if ~ options_.noprint & advanced,
-    disp('Press KEY to continue with identification analysis')
-    pause;
-    dyntable('Multi collinearity in the model:',char('param','min','mean','max'), ...
-             char(name(kok)),[mmin, mmean, mmax],10,10,6);
-    disp(' ')
-    dyntable('Multi collinearity for moments in J:',char('param','min','mean','max'), ...
-             char(name(kokJ)),[mminJ, mmeanJ, mmaxJ],10,10,6);
-    disp(' ')
-end
+% if ~ options_.noprint && advanced,
+%     disp('Press KEY to continue with identification analysis')
+%     pause;
+%     dyntable('Multi collinearity in the model:',char('param','min','mean','max'), ...
+%              char(name(kok)),[mmin, mmean, mmax],10,10,6);
+%     disp(' ')
+%     dyntable('Multi collinearity for moments in J:',char('param','min','mean','max'), ...
+%              char(name(kokJ)),[mminJ, mmeanJ, mmaxJ],10,10,6);
+%     disp(' ')
+% end
 
 
-% if advanced & (~options_.noprint),
+% if advanced && (~options_.noprint),
 %     for j=1:length(kokP),
 %         dyntable([name{kokP(j)},' pairwise correlations in the model'],char(' ','min','mean','max'), ...
 %                  char(name{jpM{j}}),[pminM{j}' pmeanM{j}' pmaxM{j}'],10,10,3);  
-- 
GitLab