convert() can convert 2D arrays into DenseMatrices

Author: rajithv

ext/symengine/ruby_matrix.c

@@ -100,6 +100,12 @@ VALUE cmatrix_dense_init(VALUE self, VALUE args)
             for (i = 0; i < rows; i++) {
                 int j;
                 VALUE row = rb_ary_shift(operand);
+
+                s = rb_obj_classname(row);
+                if(strcmp(s, "Array") != 0){
+                    rb_raise(rb_eTypeError, "Not a 2D Array");
+                }
+
                 if ( cols == -1 ) {
                     cols = RARRAY_LEN(row); 
                 // Checking all rows for same col length

ext/symengine/ruby_utils.c

@@ -4,13 +4,56 @@ VALUE cutils_sympify(VALUE self, VALUE operand)
 {
 
     VALUE result;
+    char *s = rb_obj_classname(operand);
+
+    if(strcmp(s, "Array") == 0) {
+
+        CDenseMatrix *mat_result = dense_matrix_new();
+        int counter = 0;
+
+        int rows = RARRAY_LEN(operand);
+        int cols = -1;
+        CVecBasic *cargs = vecbasic_new();
+        basic x;
+        basic_new_stack(x);
+        int i;
+
+        for (i = 0; i < rows; i++) {
+            int j;
+            VALUE row = rb_ary_shift(operand);
+            s = rb_obj_classname(row);
+            if(strcmp(s, "Array") != 0){
+                rb_raise(rb_eTypeError, "2D Array is required");
+            }
+
+            if ( cols == -1 ) {
+                cols = RARRAY_LEN(row);
+            // Checking all rows for same col length
+            } else if (cols != RARRAY_LEN(row)) {
+                rb_raise(rb_eTypeError, "2D Array's rows contain different column counts");
+            }
+
+            for(j = 0; j < cols; j++) {
+                sympify(rb_ary_shift(row), x);
+                vecbasic_push_back(cargs, x);
+                counter++;
+            }
+        }
+
+        dense_matrix_set_vec(mat_result, rows, cols, cargs);
+
+        basic_free_stack(x);
+        vecbasic_free(cargs);
+
+        result = Data_Wrap_Struct(c_dense_matrix, NULL, dense_matrix_free, mat_result);
+    } else {
 
     basic_struct *cbasic_operand;
     cbasic_operand = basic_new_heap();
 
     sympify(operand, cbasic_operand);
     result = Data_Wrap_Struct(Klass_of_Basic(cbasic_operand), NULL,
                               cbasic_free_heap, cbasic_operand);
-
+    }
     return result;
 }

ext/symengine/ruby_utils.h

@@ -1,6 +1,8 @@
 #ifndef RUBY_UTILS_H_
 #define RUBY_UTILS_H_
 
+
+#include "symengine.h"
 #include "symengine_utils.h"
 
 // Returns the Ruby Value after going through sympify

ext/symengine/symengine_utils.c

@@ -83,7 +83,7 @@ void sympify(VALUE operand2, basic_struct *cbasic_operand2)
 {
     VALUE ret = check_sympify(operand2, cbasic_operand2);
     if (ret == Qfalse) {
-        rb_raise(rb_eTypeError, "%s can't be coerced into SymEngine::Basic",
+        rb_raise(rb_eTypeError, "%s can't be coerced into a SymEngine type.",
                  rb_obj_classname(operand2));
     }
 }