[sbml-svn] SF.net SVN: sbml:[23804] trunk/libsbml/src/bindings/matlab

[<sar...@us...>]

Revision: 23804
          http://sourceforge.net/p/sbml/code/23804
Author:   sarahkeating
Date:     2017-02-07 13:38:48 +0000 (Tue, 07 Feb 2017)
Log Message:
-----------
tweaks needed after testing other stuff

Modified Paths:
--------------
    trunk/libsbml/src/bindings/matlab/Arguments.cpp
    trunk/libsbml/src/bindings/matlab/isSBML_Model.m

Modified: trunk/libsbml/src/bindings/matlab/Arguments.cpp
===================================================================
--- trunk/libsbml/src/bindings/matlab/Arguments.cpp	2017-02-03 14:42:41 UTC (rev 23803)
+++ trunk/libsbml/src/bindings/matlab/Arguments.cpp	2017-02-07 13:38:48 UTC (rev 23804)
@@ -152,7 +152,8 @@
   mxArray * mxCheckStructure[2];
   int nStatus = mexCallMATLAB(2, mxCheckStructure, 2, mxModel, "isSBML_Model");
 
-  if ((nStatus != 0) || (mxIsLogicalScalarTrue(mxCheckStructure[0]) != 1))
+  int value = (int)(mxGetScalar(mxCheckStructure[0]));
+  if ((nStatus != 0) || (value != 1))
   {
     /* there are errors - use the pacTempString1 char * to list these to the user */
     size_t nBuflen = (mxGetM(mxCheckStructure[1])*mxGetN(mxCheckStructure[1])+1);

Modified: trunk/libsbml/src/bindings/matlab/isSBML_Model.m
===================================================================
--- trunk/libsbml/src/bindings/matlab/isSBML_Model.m	2017-02-03 14:42:41 UTC (rev 23803)
+++ trunk/libsbml/src/bindings/matlab/isSBML_Model.m	2017-02-07 13:38:48 UTC (rev 23804)
@@ -190,7 +190,9 @@
             value = getfield(SBMLStructure, field);
             if (strcmp(types{index}, 'structure') ~= 1)
                 correctType = getCorrectType(types{index});
-                valid = isa(value, correctType);
+                % need to deal with matlab number types 
+                valid = isValidType(value, correctType);
+%                valid = isa(value, correctType);
             else
                 for i=1:length(value)
                     if (valid == 1)
@@ -296,5 +298,13 @@
     end;
 end;
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+function valid = isValidType(value, correctType)
 
+valid = isIntegralNumber(value);
 
+if (~valid)
+    valid = isa(value, correctType);
+end;
+
+