Remove redundant parameters and improve array conversion functions

Author: kojix2

Diff for: ext/alglib/alglib.cpp

@@ -15,8 +15,7 @@ using namespace Rice;
 Hash rb_pcabuildbasis(Array x)
 {
     Hash result;
-    int rows, cols;
-    auto a = ruby_array_to_real_2d_array(x, rows, cols);
+    auto a = ruby_array_to_real_2d_array(x);
     alglib::real_1d_array s2;
     alglib::real_2d_array v;
     alglib::pcabuildbasis(a, s2, v, alglib::xdefault);
@@ -457,18 +456,18 @@ extern "C" void Init_alglib()
 
     Data_Type<alglib::real_1d_array> rb_cReal1DArray =
         define_class_under<alglib::real_1d_array>(rb_mAlglib, "Real1DArray")
-        .define_constructor(Constructor<alglib::real_1d_array>())
-        .define_method("getcontent", static_cast<double* (alglib::real_1d_array::*)()>(&alglib::real_1d_array::getcontent));
+            .define_constructor(Constructor<alglib::real_1d_array>())
+            .define_method("getcontent", static_cast<double *(alglib::real_1d_array::*)()>(&alglib::real_1d_array::getcontent));
 
     Data_Type<alglib::integer_1d_array> rb_cInteger1DArray =
         define_class_under<alglib::integer_1d_array>(rb_mAlglib, "Integer1DArray")
-        .define_constructor(Constructor<alglib::integer_1d_array>())
-        .define_method("getcontent", static_cast<alglib::ae_int_t* (alglib::integer_1d_array::*)()>(&alglib::integer_1d_array::getcontent));
+            .define_constructor(Constructor<alglib::integer_1d_array>())
+            .define_method("getcontent", static_cast<alglib::ae_int_t *(alglib::integer_1d_array::*)()>(&alglib::integer_1d_array::getcontent));
 
     Data_Type<alglib::real_2d_array> rb_cReal2DArray =
         define_class_under<alglib::real_2d_array>(rb_mAlglib, "Real2DArray")
-        .define_constructor(Constructor<alglib::real_2d_array>())
-        .define_method("getcontent", static_cast<double* (alglib::real_2d_array::*)(alglib::ae_int_t)>(&alglib::real_2d_array::operator[]));
+            .define_constructor(Constructor<alglib::real_2d_array>())
+            .define_method("getcontent", static_cast<double *(alglib::real_2d_array::*)(alglib::ae_int_t)>(&alglib::real_2d_array::operator[]));
 
     rb_mAlglib
         .define_module_function("ruby_array_to_real_1d_array", &ruby_array_to_real_1d_array)

Diff for: ext/alglib/alglib_array_converters.cpp

@@ -1,16 +1,27 @@
-
 #include "alglib_array_converters.h"
 
-// Convert Ruby Array to real_1d_array
 alglib::real_1d_array ruby_array_to_real_1d_array(Array ruby_array)
 {
     alglib::real_1d_array real_array;
     real_array.setlength(ruby_array.size());
-    std::transform(ruby_array.begin(), ruby_array.end(), real_array.getcontent(), [](const Object &o)
-                   { return detail::From_Ruby<double>().convert(o.value()); });
+    for (size_t i = 0; i < ruby_array.size(); i++)
+    {
+        real_array[i] = detail::From_Ruby<double>().convert(ruby_array[i].value());
+    }
     return real_array;
 }
 
+alglib::integer_1d_array ruby_array_to_integer_1d_array(Array ruby_array)
+{
+    alglib::integer_1d_array integer_array;
+    integer_array.setlength(ruby_array.size());
+    for (size_t i = 0; i < ruby_array.size(); i++)
+    {
+        integer_array[i] = detail::From_Ruby<int>().convert(ruby_array[i].value());
+    }
+    return integer_array;
+}
+
 Array real_1d_array_to_ruby_array(const alglib::real_1d_array &arr)
 {
     Array ruby_array;
@@ -31,61 +42,35 @@ Array integer_1d_array_to_ruby_array(const alglib::integer_1d_array &arr)
     return ruby_array;
 }
 
-// Convert Ruby Array to integer_1d_array
-alglib::integer_1d_array ruby_array_to_integer_1d_array(Array ruby_array)
+alglib::real_2d_array ruby_array_to_real_2d_array(Array ruby_array)
 {
-    alglib::integer_1d_array integer_array;
-    integer_array.setlength(ruby_array.size());
-    std::transform(ruby_array.begin(), ruby_array.end(), integer_array.getcontent(), [](const Object &o)
-                   { return detail::From_Ruby<int>().convert(o.value()); });
-    return integer_array;
-}
+    if (ruby_array.size() == 0)
+    {
+        throw std::invalid_argument("Input array is empty");
+    }
 
-/*
-Below functions are experimental implementations.
-Do not expect this to work!
-*/
+    int rows = ruby_array.size();
+    int cols = detail::From_Ruby<Array>().convert(ruby_array.call("first")).size();
 
-// Convert Ruby 2d Array to real_2d_array
-alglib::real_2d_array ruby_array_to_real_2d_array(Array ruby_array, int &rows, int &cols)
-{
     alglib::real_2d_array real_array;
-    rows = ruby_array.size();
-    cols = detail::From_Ruby<Array>().convert(ruby_array.call("first")).size();
-    // debug
     real_array.setlength(rows, cols);
 
-    Array::iterator it = ruby_array.begin();
-    Array::iterator end = ruby_array.end();
-
-    for (int i = 0; it != end; ++it, ++i)
+    for (int i = 0; i < rows; ++i)
     {
-        Array row = detail::From_Ruby<Array>().convert(it->value());
-        // check if all rows have the same size
+        Array row = detail::From_Ruby<Array>().convert(ruby_array[i].value());
         if (row.size() != cols)
         {
             throw std::invalid_argument("All rows must have the same size");
         }
-
-        std::transform(row.begin(), row.end(), real_array[i], [](const Object &o)
-                       { return detail::From_Ruby<double>().convert(o.value()); });
+        for (int j = 0; j < cols; ++j)
+        {
+            real_array[i][j] = detail::From_Ruby<double>().convert(row[j].value());
+        }
     }
     return real_array;
 }
 
-// Convert real_1d_array to Ruby Array
-Array real_1d_array_to_ruby_array(alglib::real_1d_array real_array)
-{
-    Array result;
-    for (int i = 0; i < real_array.length(); i++)
-    {
-        result.push(real_array[i]);
-    }
-    return result;
-}
-
-// Convert real_2d_array to Ruby Array
-Array real_2d_array_to_ruby_array(alglib::real_2d_array real_array)
+Array real_2d_array_to_ruby_array(const alglib::real_2d_array &real_array)
 {
     Array result;
     for (int i = 0; i < real_array.rows(); i++)

Diff for: ext/alglib/alglib_array_converters.h

@@ -4,12 +4,12 @@
 
 using namespace Rice;
 
-alglib::real_1d_array ruby_array_to_real_1d_array(Array ruby_array);
-
-// Experimental implementations - do not expect this to work!
-
-alglib::integer_1d_array ruby_array_to_integer_1d_array(Array ruby_array);
-alglib::real_2d_array ruby_array_to_real_2d_array(Array ruby_array, int &rows, int &cols);
-Array real_1d_array_to_ruby_array(alglib::real_1d_array real_array);
-Array real_2d_array_to_ruby_array(alglib::real_2d_array real_array);
-Array integer_1d_array_to_ruby_array(const alglib::integer_1d_array &arr);
+extern "C"
+{
+  alglib::real_1d_array ruby_array_to_real_1d_array(Array ruby_array);
+  alglib::integer_1d_array ruby_array_to_integer_1d_array(Array ruby_array);
+  alglib::real_2d_array ruby_array_to_real_2d_array(Array ruby_array);
+  Array real_1d_array_to_ruby_array(const alglib::real_1d_array &arr);
+  Array real_2d_array_to_ruby_array(const alglib::real_2d_array &real_array);
+  Array integer_1d_array_to_ruby_array(const alglib::integer_1d_array &arr);
+}

Diff for: test/alglib_array_converters_test.rb

@@ -18,9 +18,7 @@ def test_ruby_array_to_integer_1d_array
 
   def test_ruby_array_to_real_2d_array
     ruby_array = [[1.0, 2.0], [3.0, 4.0]]
-    rows = ruby_array.size
-    cols = ruby_array.first.size
-    alglib_array = Alglib.ruby_array_to_real_2d_array(ruby_array, rows, cols)
+    alglib_array = Alglib.ruby_array_to_real_2d_array(ruby_array)
     assert_equal(ruby_array, Alglib.real_2d_array_to_ruby_array(alglib_array))
   end