Changeset 716

Timestamp:

06/02/09 13:39:08 (15 years ago)

Author:

Mathieu Morlighem

Message:

take into account NaN in controlconstraints

File:

• issm/trunk/src/m/classes/public/isresultconsistent.m (modified) (1 diff)

issm/trunk/src/m/classes/public/isresultconsistent.m

@@ -80 +80 @@
 
         %check inversed parameter
-        if any(md.results.control.parameter<md.mincontrolconstraint | md.results.control.parameter>md.maxcontrolconstraint)
-                disp(['''control'' result not consistent: inverse parameter out of range [' md.mincontrolconstraint ' ' md.maxcontrolconstraint ']']);
-                bool=0; return; 
+        if ~isnan(md.maxcontrolconstraint),
+                if any(md.results.control.parameter>md.maxcontrolconstraint)
+                        disp(['''control'' result not consistent: inverse parameter is greater than ' md.maxcontrolconstraint]);
+                        bool=0; return; 
+                end
+        end
+        if ~isnan(md.mincontrolconstraint),
+                if any(md.results.control.parameter<md.mincontrolconstraint)
+                        disp(['''control'' result not consistent: inverse parameter is smaller than ' md.mincontrolconstraint]);
+                        bool=0; return; 
+                end
         end