Next Prime, GCD, LCM, mod and quotient working

Author: rajithv

ext/symengine/CMakeLists.txt

@@ -5,6 +5,7 @@ set(RUBY_WRAPPER_SRC
     ruby_rational.c
     ruby_constant.c
     ruby_function.c
+    ruby_ntheory.c
     symengine_macros.c
     symengine.c
     )

ext/symengine/ruby_ntheory.c

@@ -1,6 +1,6 @@
 #include "ruby_ntheory.h"
 
-VALUE cfunction_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), VALUE operand1) {
+VALUE cntheory_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), VALUE operand1) {
     basic_struct *cresult;
     VALUE result;
 
@@ -16,7 +16,7 @@ VALUE cfunction_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), V
     return result;
 }
 
-VALUE cfunction_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, const basic_struct*), VALUE operand1, VALUE operand2) {
+VALUE cntheory_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, const basic_struct*), VALUE operand1, VALUE operand2) {
     basic_struct *cresult;
     VALUE result;
 
@@ -37,22 +37,22 @@ VALUE cfunction_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, co
     return result;
 }
 
-VALUE cfunction_nextprime(VALUE self, VALUE operand1) {
-    return cfunction_onearg(nthoery_gcd, operand1);
+VALUE cntheory_nextprime(VALUE self, VALUE operand1) {
+    return cntheory_onearg(ntheory_nextprime, operand1);
 }
 
-VALUE cfunction_gcd(VALUE self, VALUE operand1, VALUE operand2) {
-    return cfunction_twoarg(ntheory_gcd, operand1, operand2);
+VALUE cntheory_gcd(VALUE self, VALUE operand1, VALUE operand2) {
+    return cntheory_twoarg(ntheory_gcd, operand1, operand2);
 }
 
-VALUE cfunction_lcm(VALUE self, VALUE operand1, VALUE operand2) {
-    return cfunction_twoarg(ntheory_lcm, operand1, operand2);
+VALUE cntheory_lcm(VALUE self, VALUE operand1, VALUE operand2) {
+    return cntheory_twoarg(ntheory_lcm, operand1, operand2);
 }
 
-VALUE cfunction_mod(VALUE self, VALUE operand1, VALUE operand2) {
-    return cfunction_twoarg(ntheory_mod, operand1, operand2);
+VALUE cntheory_mod(VALUE self, VALUE operand1, VALUE operand2) {
+    return cntheory_twoarg(ntheory_mod, operand1, operand2);
 }
 
-VALUE cfunction_quotient(VALUE self, VALUE operand1, VALUE operand2) {
-    return cfunction_twoarg(ntheory_quotient, operand1, operand2);
+VALUE cntheory_quotient(VALUE self, VALUE operand1, VALUE operand2) {
+    return cntheory_twoarg(ntheory_quotient, operand1, operand2);
 }

ext/symengine/ruby_ntheory.h

@@ -8,16 +8,16 @@
 #include "symengine.h"
 #include "symengine_macros.h"
 
-VALUE cfunction_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), VALUE operand1);
-VALUE cfunction_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, const basic_struct*), VALUE operand1, VALUE operand2);
+VALUE cntheory_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), VALUE operand1);
+VALUE cntheory_twoarg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*, const basic_struct*), VALUE operand1, VALUE operand2);
 
-VALUE cfunction_gcd(VALUE self, VALUE operand1, VALUE operand2);
-VALUE cfunction_lcm(VALUE self, VALUE operand1, VALUE operand2);
-VALUE cfunction_nextprime(VALUE self, VALUE operand1);
-VALUE cfunction_mod(VALUE self, VALUE operand1, VALUE operand2);
-VALUE cfunction_quotient(VALUE self, VALUE operand1, VALUE operand2);
-//VALUE cfunction_fibonacci(VALUE self, VALUE operand1);
-//VALUE cfunction_lucas(VALUE self, VALUE operand1);
-//VALUE cfunction_binomial(VALUE self, VALUE operand1, VALUE operand2);
+VALUE cntheory_gcd(VALUE self, VALUE operand1, VALUE operand2);
+VALUE cntheory_lcm(VALUE self, VALUE operand1, VALUE operand2);
+VALUE cntheory_nextprime(VALUE self, VALUE operand1);
+VALUE cntheory_mod(VALUE self, VALUE operand1, VALUE operand2);
+VALUE cntheory_quotient(VALUE self, VALUE operand1, VALUE operand2);
+//VALUE cntheory_fibonacci(VALUE self, VALUE operand1);
+//VALUE cntheory_lucas(VALUE self, VALUE operand1);
+//VALUE cntheory_binomial(VALUE self, VALUE operand1, VALUE operand2);
 
 #endif //RUBY_NTHEORY_H_

ext/symengine/symengine.c

@@ -147,13 +147,13 @@ void Init_symengine() {
     rb_define_module_function(m_symengine, "gamma", cfunction_gamma, 1); 
 
     //NTheory Functions as Module Level Functions
-    rb_define_module_function(m_symengine, "gcd", cfunction_gcd, 2);
-    rb_define_module_function(m_symengine, "lcm", cfunction_lcm, 2);
-    rb_define_module_function(m_symengine, "nextprime", cfunction_nextprime, 1);
-    rb_define_module_function(m_symengine, "mod", cfunction_mod, 2);
-    rb_define_module_function(m_symengine, "quotient", cfunction_quotient, 2);
-    rb_define_module_function(m_symengine, "fibonacci", cfunction_fibonacci, 1);
-    rb_define_module_function(m_symengine, "lucas", cfunction_lucas, 1);
-    rb_define_module_function(m_symengine, "binomial", cfunction_binomial, 2);
+    rb_define_module_function(m_symengine, "gcd", cntheory_gcd, 2);
+    rb_define_module_function(m_symengine, "lcm", cntheory_lcm, 2);
+    rb_define_module_function(m_symengine, "nextprime", cntheory_nextprime, 1);
+    rb_define_module_function(m_symengine, "mod", cntheory_mod, 2);
+    rb_define_module_function(m_symengine, "quotient", cntheory_quotient, 2);
+    //rb_define_module_function(m_symengine, "fibonacci", cntheory_fibonacci, 1);
+    //rb_define_module_function(m_symengine, "lucas", cntheory_lucas, 1);
+    //rb_define_module_function(m_symengine, "binomial", cntheory_binomial, 2);
 
 }

symengine_version.txt

@@ -1 +1,2 @@
-46f54aeafbf2a93be0c8b1d492666f56f0ccbe73
+5e88e62b42c38200573eecf688d90b46beb38a77
+