refactoring to mknix step 1

Author: asobolev

src/utils/arguments.h

@@ -74,15 +74,8 @@ class extractor : public argument_helper<const mxArray> {
 	T num(size_t pos) const {
 		nix::DataType dtype = nix::to_data_type<T>::value;
 		check_arg_type(pos, dtype);
-		
-		if (mxGetNumberOfElements(array[pos]) < 1) {
-			throw std::runtime_error("array empty");
-		}
 
-		const void *data = mxGetData(array[pos]);
-		T res;
-		memcpy(&res, data, sizeof(T));
-		return res;
+        return mx_array_to_num<T>(array[pos]);
 	}
 
     template<typename T>
@@ -131,6 +124,21 @@ class extractor : public argument_helper<const mxArray> {
         return res;
     }
 
+    std::vector<nix::Value> vec(size_t pos) const {
+        mwSize size = mxGetNumberOfElements(array[pos]);
+
+        mwIndex index;
+        std::vector<nix::Value> vals;
+        const mxArray *cell_element_ptr;
+
+        for (index = 0; index < size; index++)  {
+            cell_element_ptr = mxGetCell(array[pos], index);
+            vals.push_back(mx_array_to_value(cell_element_ptr));
+        }
+
+        return vals;
+    }
+
     nix::NDSize ndsize(size_t pos) const {
         return mx_array_to_ndsize(array[pos]);
     }

src/utils/nix2mx.cc

@@ -9,6 +9,7 @@
 #include "handle.h"
 #include "arguments.h"
 #include "struct.h"
+#include "datatypes.h"
 
 
 mxArray *nmCreateScalar(uint32_t val) {
@@ -72,3 +73,47 @@ nix::NDSize mx_array_to_ndsize(const mxArray *arr) {
     return size;
 }
 
+template<typename T>
+T mx_array_to_num(const mxArray *arr) {
+    nix::DataType dtype = nix::to_data_type<T>::value;
+    
+    if (dtype_mex2nix(arr) != dtype) {
+        throw std::invalid_argument("wrong type");
+    }
+
+    if (mxGetNumberOfElements(arr) < 1) {
+        throw std::runtime_error("array empty");
+    }
+
+    const void *data = mxGetData(arr);
+    T res;
+    memcpy(&res, data, sizeof(T));
+    return res;
+}
+
+nix::Value mx_array_to_value(const mxArray *arr) {
+    nix::Value val;
+
+    switch (mxGetClassID(arr)) {
+    case mxLOGICAL_CLASS: val.set(mx_array_to_num<bool>(arr)); break;
+
+    case mxCHAR_CLASS: val.set(mx_array_to_num<std::string>(arr)); break;
+
+    case mxDOUBLE_CLASS: val.set(mx_array_to_num<double>(arr)); break;
+    case mxSINGLE_CLASS: val.set(mx_array_to_num<float>(arr)); break;
+
+    case mxUINT8_CLASS:  val.set(mx_array_to_num<uint8_t>(arr)); break;
+    case mxINT8_CLASS:   val.set(mx_array_to_num<int8_t>(arr)); break;
+    case mxUINT16_CLASS: val.set(mx_array_to_num<uint16_t>(arr)); break;
+    case mxINT16_CLASS:  val.set(mx_array_to_num<int16_t>(arr)); break;
+    case mxUINT32_CLASS: val.set(mx_array_to_num<uint32_t>(arr)); break;
+    case mxINT32_CLASS:  val.set(mx_array_to_num<int32_t>(arr)); break;
+    case mxUINT64_CLASS: val.set(mx_array_to_num<uint64_t>(arr)); break;
+    case mxINT64_CLASS:  val.set(mx_array_to_num<int64_t>(arr)); break;
+
+    default: throw std::invalid_argument("Element type is not recognized");
+    }
+
+    return val;
+}
+

src/utils/nix2mx.h

@@ -3,9 +3,15 @@
 
 #include "mex.h"
 #include <nix.hpp>
+#include "datatypes.h"
 
 nix::NDSize mx_array_to_ndsize(const mxArray *arr);
 
+template<typename T>
+T mx_array_to_num(const mxArray *arr);
+
+nix::Value mx_array_to_value(const mxArray *arr);
+
 mxArray *nmCreateScalar(uint32_t val);
 
 mxArray *dim_to_struct(nix::SetDimension dim);