Merge pull request #14 from rajithv/master

Add Constant Wrappers

Author: isuruf

.travis.yml

@@ -38,7 +38,7 @@ install:
   - source bin/install_travis.sh
 
   # Build C++ library
-  - source bin/test_travis.sh
+  - bin/test_travis.sh
 
   # Setup travis for Ruby wrappers
   - cd $RUBY_SOURCE_DIR

ext/symengine/CMakeLists.txt

@@ -3,6 +3,7 @@ set(RUBY_WRAPPER_SRC
     ruby_symbol.c
     ruby_integer.c
     ruby_rational.c
+    ruby_constant.c
     symengine_macros.c
     symengine.c
     )

ext/symengine/ruby_constant.c

@@ -0,0 +1,24 @@
+#include "ruby_constant.h"
+
+VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*)) {
+    basic_struct *cresult;
+    VALUE result;
+
+    cresult = basic_new_heap();
+    cwfunc_ptr(cresult);
+    
+    result = Data_Wrap_Struct(c_constant, NULL, cbasic_free_heap, cresult);
+    return result;
+}
+
+VALUE cconstant_pi() {
+    return cconstant_const(basic_const_pi);
+}
+
+VALUE cconstant_e() {
+    return cconstant_const(basic_const_E);
+}
+
+VALUE cconstant_euler_gamma() {
+    return cconstant_const(basic_const_EulerGamma);
+}

ext/symengine/ruby_constant.h

@@ -0,0 +1,19 @@
+#ifndef RUBY_CONSTANTS_H_
+#define RUBY_CONSTANTS_H_
+
+#include <ruby.h>
+#include <symengine/cwrapper.h>
+
+#include "ruby_basic.h"
+#include "symengine.h"
+#include "symengine_macros.h"
+
+VALUE cconstant_const(void (*cwfunc_ptr)(basic_struct*));
+
+VALUE cconstant_pi();
+
+VALUE cconstant_e();
+
+VALUE cconstant_euler_gamma();
+
+#endif //RUBY_CONSTANTS_H_

ext/symengine/symengine.c

@@ -2,6 +2,7 @@
 #include "ruby_symbol.h"
 #include "ruby_integer.h"
 #include "ruby_rational.h"
+#include "ruby_constant.h"
 #include "symengine.h"
 
 ///////////////////
@@ -46,4 +47,12 @@ void Init_symengine() {
     c_rational = rb_define_class_under(m_symengine, "Rational", c_basic);
     rb_define_alloc_func(c_rational, cbasic_alloc);
     rb_define_method(c_rational, "initialize", crational_init, 1);
+
+    //Constant class
+    c_constant = rb_define_class_under(m_symengine, "Constant", c_basic);
+
+    //Constants as Module Level Constants
+    rb_define_const(m_symengine, "PI", cconstant_pi());
+    rb_define_const(m_symengine, "E", cconstant_e());
+    rb_define_const(m_symengine, "EULER_GAMMA", cconstant_euler_gamma());
 }

ext/symengine/symengine.h

@@ -11,5 +11,6 @@ VALUE c_basic;
 VALUE c_symbol;
 VALUE c_integer;
 VALUE c_rational;
+VALUE c_constant;
 
 #endif //SYMENGINE_H_

ext/symengine/symengine_macros.c

@@ -43,6 +43,8 @@ VALUE Klass_of_Basic(const basic_struct *basic_ptr) {
             return c_integer;
         case SYMENGINE_RATIONAL:
             return c_rational;
+        case SYMENGINE_CONSTANT:
+            return c_constant;
         default:
             return c_basic;
     }

spec/constant_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe SymEngine do
+  before :each do
+  end
+
+  describe 'Constant' do
+    before :each do
+      @a = SymEngine::PI
+      @b = SymEngine::E
+      @c = SymEngine::EULER_GAMMA
+      @d = SymEngine::Integer.new(1);
+      @e = SymEngine::Integer.new(0);
+      @x = SymEngine::Symbol.new("x");
+    end
+
+    describe '#pi' do
+      context 'with summation with one' do
+        it 'returns an initialised Basic object that is equalent to 1 + pi' do
+          f = @a + @d
+          expect(@a).to be_an_instance_of SymEngine::Constant
+          expect(f).to be_an_instance_of SymEngine::Basic
+          expect(f.to_s).to eql('1 + pi')
+        end
+      end
+
+      context 'with plus one and minus one' do
+        it 'returns a Constant' do
+          expect(1 + @a - 1).to be_an_instance_of SymEngine::Constant
+        end
+      end
+
+    end
+
+    describe '#EulerGamma' do
+      context 'with powered to zero' do
+        it 'returns an initialised Basic object that is equalent 1' do
+          f = @c ** @e
+          expect(@c).to be_an_instance_of SymEngine::Constant
+          expect(f).to be_an_instance_of SymEngine::Integer
+          expect(f.to_s).to eql('1')
+        end
+      end
+
+      context 'with plus one and minus one' do
+        it 'returns a Constant' do
+          expect(1 + @c - 1).to be_an_instance_of SymEngine::Constant
+        end
+      end
+
+    end
+
+    describe '#E' do
+      context 'with summation with x' do
+        it 'returns an initialised Basic object that is equalent to x + E' do
+          f = @b + @x
+          expect(@b).to be_an_instance_of SymEngine::Constant
+          expect(f).to be_an_instance_of SymEngine::Basic
+          expect(f.to_s).to eql('x + E')
+        end
+      end
+
+      context 'with plus one and minus one' do
+        it 'returns a Constant' do
+          expect(1 + @b - 1).to be_an_instance_of SymEngine::Constant
+        end
+      end
+
+    end
+
+  end
+end

symengine_version.txt

@@ -1 +1 @@
-3f0c0947ae09bac9545334a6903d9d72c7043a52
+f6f1c89bde0d12ba718a9aeddcdf630f36893756