From b8094a2e8494e4cb65eebd710c9ac47adee5aa7f Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Thu, 7 Jun 2018 19:29:24 +0200
Subject: [PATCH] Correct display of identification message if parameters are
only collinear
Closes #1614
---
matlab/disp_identification.m | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/matlab/disp_identification.m b/matlab/disp_identification.m
index b8a3421d5..1bb246ce4 100644
--- a/matlab/disp_identification.m
+++ b/matlab/disp_identification.m
@@ -84,7 +84,11 @@ end
disp([' ']),
-if any(idemodel.ino)
+
+no_warning_message_display=1;
+
+if any(idemodel.ino) || any(any(idemodel.ind0==0)) || any(idemodel.jweak_pair)
+ no_warning_message_display=0;
disp('WARNING !!!')
if SampleSize>1
disp(['The rank of H (model) is deficient for ', num2str(length(find(idemodel.ino))),' out of ',int2str(SampleSize),' MC runs!' ]),
@@ -152,12 +156,15 @@ if any(idemodel.ino)
% end
end
-if ~any(idemodel.ino) && ~any(any(idemodel.ind0==0))
+if no_warning_message_display
disp(['All parameters are identified in the model (rank of H).' ]),
skipline()
end
-if any(idemoments.ino)
+no_warning_message_display = 1;
+
+if any(idemoments.ino) || any(any(idemoments.ind0==0)) || any(idemoments.jweak_pair)
+ no_warning_message_display = 0;
skipline()
disp('WARNING !!!')
if SampleSize > 1
@@ -234,7 +241,7 @@ if any(idemoments.ino)
% end
% end
end
-if ~any(idemoments.ino) && ~any(any(idemoments.ind0==0))
+if no_warning_message_display
skipline()
disp(['All parameters are identified by J moments (rank of J)' ]),
skipline()
--
GitLab