diff m-toolbox/classes/@ssm/ssm.m @ 45:a59cdb8aaf31 database-connection-manager

Merge
author Daniele Nicolodi <nicolodi@science.unitn.it>
date Tue, 06 Dec 2011 19:07:22 +0100
parents a71a40911c27 bc767aaa99a8
children
line wrap: on
line diff
--- a/m-toolbox/classes/@ssm/ssm.m	Mon Dec 05 18:04:34 2011 +0100
+++ b/m-toolbox/classes/@ssm/ssm.m	Tue Dec 06 19:07:22 2011 +0100
@@ -107,7 +107,7 @@
 %
 % <a href="matlab:utils.helper.displayMethodInfo('ssm', 'ssm')">Parameters Description</a>
 %
-% VERSION: $Id: ssm.m,v 1.199 2011/05/13 15:14:39 ingo Exp $
+% VERSION: $Id: ssm.m,v 1.200 2011/12/02 09:02:35 hewitson Exp $
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -716,7 +716,7 @@
     end
     
     function out = VEROUT()
-      out = '$Id: ssm.m,v 1.199 2011/05/13 15:14:39 ingo Exp $';
+      out = '$Id: ssm.m,v 1.200 2011/12/02 09:02:35 hewitson Exp $';
     end
     
     function out = SETS()
@@ -753,7 +753,7 @@
         case 'from built-in model'
           % Built-in
           % This is inherited
-          pl = plist.FROM_BUILT_IN;
+          pl = combine(pl, plist.FROM_BUILT_IN);
           % withParams --> withparams changed to 'symbolic params'
           p = param({'symbolic params',['Give a cell-array of parameter names to keep in the expression.<br>',...
             'By default this is empty and the model will be returned fully numeric.',...