adapt to new names/arguments for mathieu and elliptic functions

SciRuby · Feb 29, 2016 · 00cbe74 · 00cbe74
1 parent 7486827
commit 00cbe74
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/ext/gsl_native/sf_ellint.c b/ext/gsl_native/sf_ellint.c
@@ -82,17 +82,17 @@ static VALUE rb_gsl_sf_ellint_P_e(VALUE obj, VALUE phi, VALUE k,
 static VALUE rb_gsl_sf_ellint_D(int argc, VALUE *argv, VALUE obj)
 {
   if (argc == 3)
-    return rb_gsl_sf_eval_double3_m(gsl_sf_ellint_D, argv[0], argv[1], argv[2],
+    return rb_gsl_sf_eval_double2_m(gsl_sf_ellint_D, argv[0], argv[1],
                                     INT2FIX(GSL_PREC_DOUBLE));
   else
-    return rb_gsl_sf_eval_double3_m(gsl_sf_ellint_D, argv[0], argv[1], argv[2],
+    return rb_gsl_sf_eval_double2_m(gsl_sf_ellint_D, argv[0], argv[1],
                                     argv[3]);
 }
 
 static VALUE rb_gsl_sf_ellint_D_e(VALUE obj, VALUE phi, VALUE k,
-                                  VALUE n, VALUE m)
+                                  VALUE m)
 {
-  return rb_gsl_sf_eval_e_double3_m(gsl_sf_ellint_D_e, phi, k, n, m);
+  return rb_gsl_sf_eval_e_double2_m(gsl_sf_ellint_D_e, phi, k, m);
 }
 
 static VALUE rb_gsl_sf_ellint_RC(int argc, VALUE *argv, VALUE obj)

diff --git a/ext/gsl_native/sf_mathieu.c b/ext/gsl_native/sf_mathieu.c
@@ -133,47 +133,47 @@ static VALUE sf_mathieu_eval_e_int2_double2(VALUE n1, VALUE n2, VALUE qq, VALUE
 /**********/
 static VALUE rb_gsl_sf_mathieu_a_e(VALUE module, VALUE order, VALUE qq)
 {
-  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_a, order, qq);
+  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_a_e, order, qq);
 }
 static VALUE rb_gsl_sf_mathieu_a(VALUE module, VALUE order, VALUE qq)
 {
-  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_a);
+  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_a_e);
 }
 static VALUE rb_gsl_sf_mathieu_a_array(VALUE module, int argc, VALUE *argv)
 {
   return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_a_array);
 }
 static VALUE rb_gsl_sf_mathieu_b_e(VALUE module, VALUE order, VALUE qq)
 {
-  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_b, order, qq);
+  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_b_e, order, qq);
 }
 static VALUE rb_gsl_sf_mathieu_b(VALUE module, VALUE order, VALUE qq)
 {
-  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_b);
+  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_b_e);
 }
 static VALUE rb_gsl_sf_mathieu_b_array(VALUE module, int argc, VALUE *argv)
 {
   return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_b_array);
 }
 static VALUE rb_gsl_sf_mathieu_ce_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
 {
-  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_ce);
+  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_ce_e);
 }
 static VALUE rb_gsl_sf_mathieu_ce(VALUE module, VALUE order, VALUE qq, VALUE zz)
 {
-  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_ce);
+  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_ce_e);
 }
 static VALUE rb_gsl_sf_mathieu_ce_array(VALUE module, int argc, VALUE *argv)
 {
   return sf_mathieu_array_eval2(argc, argv, gsl_sf_mathieu_ce_array);
 }
 static VALUE rb_gsl_sf_mathieu_se_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
 {
-  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_se);
+  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_se_e);
 }
 static VALUE rb_gsl_sf_mathieu_se(VALUE module, VALUE order, VALUE qq, VALUE zz)
 {
-  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_se);
+  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_se_e);
 }
 static VALUE rb_gsl_sf_mathieu_se_array(VALUE module, int argc, VALUE *argv)
 {
@@ -183,23 +183,23 @@ static VALUE rb_gsl_sf_mathieu_se_array(VALUE module, int argc, VALUE *argv)
 /*****/
 static VALUE rb_gsl_sf_mathieu_Mc_e(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
 {
-  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Mc);
+  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Mc_e);
 }
 static VALUE rb_gsl_sf_mathieu_Mc(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
 {
-  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Mc);
+  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Mc_e);
 }
 static VALUE rb_gsl_sf_mathieu_Mc_array(VALUE module, int argc, VALUE *argv)
 {
   return sf_mathieu_array_eval3(argc, argv, gsl_sf_mathieu_Mc_array);
 }
 static VALUE rb_gsl_sf_mathieu_Ms_e(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
 {
-  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Ms);
+  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Ms_e);
 }
 static VALUE rb_gsl_sf_mathieu_Ms(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
 {
-  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Ms);
+  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Ms_e);
 }
 static VALUE rb_gsl_sf_mathieu_Ms_array(VALUE module, int argc, VALUE *argv)
 {