Mercurial > forge

changeset 9093:6ea284542e6d octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-devel: minor changes
author paramaniac
date Mon, 05 Dec 2011 21:39:45 +0000
parents 23300632e8d1
children 32771bd681a0
files extra/control-devel/inst/__conred_sb16ad__.m extra/control-devel/inst/__modred_ab09id__.m extra/control-devel/inst/cfconred.m
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/inst/__conred_sb16ad__.m	Mon Dec 05 21:38:15 2011 +0000
+++ b/extra/control-devel/inst/__conred_sb16ad__.m	Mon Dec 05 21:39:45 2011 +0000
@@ -136,7 +136,7 @@
         scaled = __modred_check_equil__ (val);
 
       otherwise
-        warning ("modred: invalid property name ""%s"" ignored", key);
+        warning ("%sconred: invalid property name ""%s"" ignored", method, key);
     endswitch
   endfor
 
@@ -151,7 +151,7 @@
   elseif (method == "spa" && bf)            # 'P':  use the balancing-free square-root Singular Perturbation Approximation method
     jobmr = 3;
   else
-    error ("modred: invalid jobmr option"); # this should never happen
+    error ("%smodred: invalid jobmr option"); # this should never happen
   endif
   
   
--- a/extra/control-devel/inst/__modred_ab09id__.m	Mon Dec 05 21:38:15 2011 +0000
+++ b/extra/control-devel/inst/__modred_ab09id__.m	Mon Dec 05 21:39:45 2011 +0000
@@ -119,7 +119,7 @@
         scaled = __modred_check_equil__ (val);
 
       otherwise
-        warning ("modred: invalid property name ""%s"" ignored", key);
+        warning ("%smodred: invalid property name ""%s"" ignored", method, key);
     endswitch
   endfor
 
--- a/extra/control-devel/inst/cfconred.m	Mon Dec 05 21:38:15 2011 +0000
+++ b/extra/control-devel/inst/cfconred.m	Mon Dec 05 21:39:45 2011 +0000
@@ -98,7 +98,7 @@
   nkv = numel (varargin);                          # number of keys and values
 
   if (rem (nkv, 2))
-    error ("%sconred: keys and values must come in pairs", method);
+    error ("cfconred: keys and values must come in pairs");
   endif
 
   [a, b, c, d, tsam, scaled] = ssdata (Go);
@@ -146,7 +146,7 @@
           case {"b", "p"}                   # both, performance
             weight = 3;
           otherwise
-            error ("%sconred: ""%s"" is an invalid value for key weight", method, val);
+            error ("cfconred: ""%s"" is an invalid value for key weight", val);
         endswitch
 
       case {"order", "ncr", "nr"}
@@ -177,7 +177,7 @@
         scaled = __modred_check_equil__ (val);
 
       otherwise
-        warning ("modred: invalid property name ""%s"" ignored", key);
+        warning ("cfconred: invalid property name ""%s"" ignored", key);
     endswitch
   endfor