BF: inf/-inf/nan now work with get_variable

Author: brunobeltran

pymatbridge/matlab/util/json_v0.2.2/json/json_dump.m

@@ -106,7 +106,7 @@
         double_struct = struct;
         double_struct.ndarray = 1;
         value = double(value);
-        if isreal(value) 
+        if isreal(value)
           double_struct.data = base64encode(typecast(value(:), 'uint8'));
         else
           double_struct.real = base64encode(typecast(real(value(:)), 'uint8'));
@@ -142,9 +142,13 @@
       obj.put(dump_data_(value{i}, options));
     end
   elseif isnumeric(value)
-    if isreal(value)
+    if ~isfinite(value)
+      json_non_finite = struct;
+      json_non_finite.json_non_finite = lower(num2str(value));
+      obj = dump_data_(json_non_finite, options);
+    elseif isreal(value)
       obj = value;
-    % Encode complex number as a struct
+    % Encode finite complex number as a struct
     else
       complex_struct = struct;
       complex_struct.real = real(value);
@@ -158,7 +162,7 @@
     keys = fieldnames(value);
     for i = 1:length(keys)
       try
-          obj.put(keys{i},dump_data_(value.(keys{i}), options));
+          obj.put(keys{i}, dump_data_(value.(keys{i}), options));
       catch ME
           obj.put(keys{i}, dump_data_(ME.message, options))
       end

pymatbridge/matlab/util/pymat_eval.m

@@ -1,4 +1,4 @@
-function json_response = pymat_eval(req);
+function json_response = pymat_eval(req)
 % PYMAT_EVAL: Returns a json object of the result of calling the function
 %
 % json_response = pymat_eval(req);

pymatbridge/pymatbridge.py

@@ -108,6 +108,8 @@ def decode_pymat(dct):
         return data.reshape(shape, order='F')
     elif 'real' in dct and 'imag' in dct:
         return complex(dct['real'], dct['imag'])
+    elif 'json_non_finite' in dct:
+        return float(dct['json_non_finite'])
     return dct
 
 MATLAB_FOLDER = '%s/matlab' % os.path.realpath(os.path.dirname(__file__))