fix for type correction.

NeurodataWithoutBorders · Jan 22, 2019 · 11464ae · 11464ae
1 parent 53f9cbf
commit 11464ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/+types/+util/checkDtype.m b/+types/+util/checkDtype.m
@@ -81,7 +81,6 @@
         try
             val = types.util.correctType(val, type);
         catch ME
-            keyboard;
             error('MATNWB:CASTERROR', 'Could not cast type `%s` to `%s` for property `%s`',...
                 class(val), type, name);
         end

diff --git a/+types/+util/correctType.m b/+types/+util/correctType.m
@@ -2,7 +2,9 @@
 %CORRECTTYPE upcasts if type is smaller than minimum
 %   Will error if type is simply incompatible
 %   Will throw if casting is impossible
-
+if nargin < 3
+    allowDowncast = false;
+end
 %check different types and correct
 
 if startsWith(type, 'float') && ~isfloat(val)
@@ -18,8 +20,8 @@
 end
 
 %check different types sizes and upcast to meet minimum (if applicable)
-if any(strcmp(type, {'float64' 'float32'})
-    if issingle(val)
+if any(strcmp(type, {'float64' 'float32'}))
+    if isa(val, 'single')
         val = double(val);
     elseif allowDowncast && strcmp(type, 'float32')
         val = single(val);
@@ -33,7 +35,7 @@
     typsz = sscanf(type, pattern);
     valsz = sscanf(class(val), pattern);
 
-    if valsz < typsz || (nargin > 2 && allowDowncast)
+    if valsz < typsz || allowDowncast
         val = eval([type '(val)']);
     end
 end