carray-gsl 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8b74785542cb1662a05431117c483ed7a56e487
-  data.tar.gz: 20c52d8cf11146d6109400b8fcb382e90d8a4b68
+SHA256:
+  metadata.gz: '0427847b4968614e038e8396dde48bba089a7e65a47b0dc82bf6417cf6af9974'
+  data.tar.gz: 53a89928adbebaffa9b3e2b5f0f3c2ee29acd811d4ac086a96ab3399ffe45f0b
 SHA512:
-  metadata.gz: 18f6da917bde79bc5eced98db907d046e99341f009835c739a56f5d97d9d92abcd2a84d7dfc9f9f8c058960bbd0e194456e5168bffd18ee76a1b3e3253695880
-  data.tar.gz: b9798ba5a9feb0a873e38eaaebf110378346e09af57f0e69b5a9d13ca14f135a86fc70f0be58b5dcedd945939b9f4d7f6ea16fb1359185147b94d45a774fced4
+  metadata.gz: 6ab534743740183c20c0b94ffa053ebcac0738e74f9c43ee02da98ef5c40009d1b5bd1dfb57edc70446cc7b7838135aaf872453c90da59ea7de42a416c366b92
+  data.tar.gz: 82c77eadd821c234d1a568d4f3227c4eb0bfdd189417aaa3784e9333737b4a90339fec6ac8844ea4586de5b50c319a89ca4dcc1c650c07795c9165bf1770efa9

data/Rakefile

@@ -0,0 +1,17 @@
+#
+#
+#
+
+GEMSPEC = "carray-gsl.gemspec"
+
+task :install do
+  spec = eval File.read(GEMSPEC)
+  system %{
+    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
+  }
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+

data/carray-gsl.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.0"
+  version = "1.1.0"
 
   files = Dir.glob("**/*") - [ 
                                Dir.glob("carray*.gem"), 
@@ -17,7 +17,8 @@ Gem::Specification::new do |s|
   s.email       = ""
   s.homepage    = 'https://github.com/himotoyoshi/carray-gsl'
   s.files       = files
-  s.extensions  = [ "extconf.rb" ]
-  s.has_rdoc    = false
-  s.required_ruby_version = ">= 1.8.1"
+  s.extensions  = [ "ext/extconf.rb" ]
+  s.required_ruby_version = ">= 2.4.0"
+  s.add_runtime_dependency 'carray', '~> 1.4.0', '>=1.4.0'
+  s.add_runtime_dependency 'gsl', '~> 2.1.0.3', '>=2.1.0.3'
 end

data/examples/lu_decomp.rb

@@ -0,0 +1,42 @@
+require "carray-gsl"
+
+class CArray
+  
+  def mat_to_mat
+    Matrix[*self]
+  end
+  
+end
+
+data = [
+  [1, 2],
+  [3, 4]
+]
+
+mat = CA_DOUBLE(data)
+
+out = mat.lu_decomp
+
+p out
+
+data = [
+  [1, 0],
+  [1.0/3.0,1]
+]
+l = CA_DOUBLE(data).gm
+
+data = [
+  [3, 4],
+  [0,2.0/3.0]
+]
+u = CA_DOUBLE(data).gm
+
+p out.upper
+p out.lower
+
+p l*u
+
+__END__
+require 'matrix'
+a = Matrix[[1, 2], [3, 4]]
+p a.lup.solve([3,-1])

data/examples/test_graph.rb

@@ -0,0 +1,6 @@
+require "carray-gsl"
+
+x = CA_DOUBLE(0..1,0.1)
+y = x**2
+
+CAMath.graph(x,y)

data/examples/test_integ.rb

@@ -0,0 +1,26 @@
+require "carray-gsl"
+
+f = GSL::Function.alloc { |x| Math::sin(x)/x }
+p f.qag([0, 1])
+
+include GSL
+
+f = GSL::Function.alloc { |x|
+  pow(x,1.5)
+}
+
+printf ("f(x) = x^(3/2)\n");
+
+x = 2.0
+h = 1e-8
+result, abserr = f.deriv_central(x, h)
+printf("x = 2.0\n");
+printf("f'(x) = %.12f +/- %.12f\n", result, abserr);
+printf("exact = %.12f\n\n", 1.5 * Math::sqrt(2.0));
+
+x = 0.0
+result, abserr = Deriv.forward(f, x, h) # equivalent to f.deriv_forward(x, h)
+printf("x = 0.0\n");
+printf("f'(x) = %.10f +/- %.10f\n", result, abserr);
+printf("exact = %.10f\n", 0.0);
+

data/{carray_gsl.c → ext/carray_gsl.c}

@@ -26,7 +26,7 @@ rb_gsl_vector_ca (VALUE self)
   volatile VALUE obj, block;
   gsl_vector *v;
   int data_type;
-  int32_t dim[2], dim0;
+  ca_size_t dim[2], dim0;
 
   Data_Get_Struct(self, gsl_vector, v);
 
@@ -44,7 +44,7 @@ rb_gsl_vector_ca (VALUE self)
   }
 
   if ( v->stride > 1 ) {
-    int32_t start0, step0, count0;
+    ca_size_t start0, step0, count0;
     if ( rb_obj_is_kind_of(self, rb_cVectorCol) ||
          rb_obj_is_kind_of(self, rb_cVectorIntCol) ||
          rb_obj_is_kind_of(self, rb_cVectorComplexCol) ) {
@@ -168,7 +168,7 @@ rb_gsl_matrix_ca (VALUE self)
   volatile VALUE obj, block;
   gsl_matrix *v;
   int data_type;
-  int32_t dim[2];
+  ca_size_t dim[2];
 
   Data_Get_Struct(self, gsl_matrix, v);
 
@@ -186,7 +186,7 @@ rb_gsl_matrix_ca (VALUE self)
   }
 
   if ( v->tda != v->size2 ) {
-    int32_t start[2], step[2], count[2];
+    ca_size_t start[2], step[2], count[2];
     dim[0] = v->size1;
     dim[1] = v->tda;
     block = rb_carray_wrap_ptr(data_type, 2, dim, 0, NULL, 

data/{carray_mathfunc_gsl.c → ext/carray_mathfunc_gsl.c}

@@ -439,7 +439,7 @@ rb_camath_random_dir_2d (VALUE mod, VALUE vn)
 {
   CArray *cx, *cy;
   double *px, *py;
-  int32_t elements = NUM2INT(vn), i;
+  ca_size_t elements = NUM2SIZE(vn), i;
   cx = carray_new(CA_DOUBLE, 1, &elements, 0, NULL);
   cy = carray_new(CA_DOUBLE, 1, &elements, 0, NULL);
   px = (double*) cx->ptr;
@@ -465,7 +465,7 @@ rb_camath_random_dir_3d (VALUE mod, VALUE vn)
 {
   CArray *cx, *cy, *cz;
   double *px, *py, *pz;
-  int32_t elements = NUM2INT(vn), i;
+  ca_size_t elements = NUM2SIZE(vn), i;
   cx = carray_new(CA_DOUBLE, 1, &elements, 0, NULL);
   cy = carray_new(CA_DOUBLE, 1, &elements, 0, NULL);
   cz = carray_new(CA_DOUBLE, 1, &elements, 0, NULL);
@@ -499,7 +499,7 @@ rb_camath_random_dir_nd (VALUE mod, VALUE vn, VALUE vd)
   CArray **ca;
   double **p;
   double *pv;
-  int32_t d = NUM2INT(vd), elements = NUM2INT(vn), k, i;
+  ca_size_t d = NUM2SIZE(vd), elements = NUM2SIZE(vn), k, i;
   if ( d < 0 ) {
     rb_raise(rb_eArgError, "dimension should be positive number");
   }
@@ -547,12 +547,12 @@ rb_camath_random_multinomial (VALUE mod,
   CArray **ca;
   unsigned int **pn;
   unsigned int *pv;
-  int32_t elements, i, k, d, m;
-  m = NUM2INT(vm);
+  ca_size_t elements, i, k, d, m;
+  m = NUM2SIZE(vm);
   if ( m <0 ) {
     rb_raise(rb_eArgError, "# of tries should be positive number");
   }
-  elements = NUM2INT(vn);
+  elements = NUM2SIZE(vn);
   if ( elements < 0 ) {
     rb_raise(rb_eArgError, "elements should be positive number");
   }
@@ -571,7 +571,7 @@ rb_camath_random_multinomial (VALUE mod,
   
   ca_attach(cpk);
   for (i=0; i<elements; i++) {
-    gsl_ran_multinomial(camath_gsl_rng, d, m, (double*)cpk->ptr, pv);
+    gsl_ran_multinomial(camath_gsl_rng, d, (unsigned int)m, (double*)cpk->ptr, pv);
     for (k=0; k<d; k++) {
       *(pn[k]) = pv[k];
       pn[k]++;
@@ -582,7 +582,7 @@ rb_camath_random_multinomial (VALUE mod,
   out = rb_ary_new();
   if ( elements == 1 ) {
     for (k=0; k<d; k++) {
-      rb_ary_store(out, k, INT2NUM(*(unsigned int*)ca[k]->ptr));
+      rb_ary_store(out, k, UINT2NUM(*(unsigned int*)ca[k]->ptr));
       ca_free(ca[k]);
     }
    }
@@ -607,7 +607,7 @@ rb_camath_multinomial_pdf (VALUE mod,
   unsigned int **pn;
   unsigned int *pv;
   double *py;
-  int32_t elements, i, k, d;
+  ca_size_t elements, i, k, d;
 
   Check_Type(vnk, T_ARRAY);
 
@@ -681,7 +681,7 @@ rb_camath_multinomial_lnpdf (VALUE mod,
   unsigned int **pn;
   unsigned int *pv;
   double *py;
-  int32_t elements, i, k, d;
+  ca_size_t elements, i, k, d;
 
   Check_Type(vnk, T_ARRAY);
 
@@ -757,6 +757,8 @@ rb_camath_gsl_func_d_di(sf, airy_Ai_deriv_scaled);
 rb_camath_gsl_func_d_di(sf, airy_Bi_deriv_scaled);
 rb_camath_gsl_func_d_i(sf, airy_zero_Ai);
 rb_camath_gsl_func_d_i(sf, airy_zero_Bi);
+rb_camath_gsl_func_d_i(sf, airy_zero_Ai_deriv);
+rb_camath_gsl_func_d_i(sf, airy_zero_Bi_deriv);
 
 rb_camath_gsl_func_d_d(sf, bessel_J0);
 rb_camath_gsl_func_d_d(sf, bessel_J1);
@@ -805,6 +807,7 @@ rb_camath_gsl_func_d_dd(sf, bessel_Ynu);
 rb_camath_gsl_func_d_dd(sf, bessel_Inu);
 rb_camath_gsl_func_d_dd(sf, bessel_Inu_scaled);
 rb_camath_gsl_func_d_dd(sf, bessel_Knu);
+rb_camath_gsl_func_d_dd(sf, bessel_lnKnu);
 rb_camath_gsl_func_d_dd(sf, bessel_Knu_scaled);
 
 rb_camath_gsl_func_d_i(sf, bessel_zero_J0);
@@ -821,6 +824,7 @@ rb_camath_gsl_func_d_iidd(sf, hydrogenicR);
 rb_camath_gsl_func_d_iiiiii(sf, coupling_3j);
 rb_camath_gsl_func_d_iiiiii(sf, coupling_6j);
 
+/* not implemented : 9j symbols */
 /* rb_camath_gsl_func_d_iiiiiiiii(sf, coupling_9j); */
 
 rb_camath_gsl_func_d_d(sf, dawson);
@@ -833,7 +837,7 @@ rb_camath_gsl_func_d_d(sf, debye_5);
 rb_camath_gsl_func_d_d(sf, debye_6);
 
 rb_camath_gsl_func_d_d(sf, dilog);
-/* rb_camath_gsl_func_d_d(sf, complex_dilog); */
+/* not implemented: rb_camath_gsl_func_d_d(sf, complex_dilog); */
 
 rb_camath_gsl_func_d_di(sf, ellint_Kcomp);
 rb_camath_gsl_func_d_di(sf, ellint_Ecomp);
@@ -841,7 +845,7 @@ rb_camath_gsl_func_d_ddi(sf, ellint_Pcomp);
 rb_camath_gsl_func_d_ddi(sf, ellint_F);
 rb_camath_gsl_func_d_ddi(sf, ellint_E);
 rb_camath_gsl_func_d_dddi(sf, ellint_P);
-rb_camath_gsl_func_d_dddi(sf, ellint_D);
+rb_camath_gsl_func_d_ddi(sf, ellint_D);
 rb_camath_gsl_func_d_ddi(sf, ellint_RC);
 rb_camath_gsl_func_d_dddi(sf, ellint_RD);
 rb_camath_gsl_func_d_dddi(sf, ellint_RF);
@@ -850,18 +854,18 @@ rb_camath_gsl_func_d_ddddi(sf, ellint_RJ);
 rb_camath_gsl_func_ddd_dd(sf, elljac, _e);
 
 rb_camath_gsl_func_d_d(sf, erf);
-rb_camath_gsl_func_d_d(sf, erf_Z);
-rb_camath_gsl_func_d_d(sf, erf_Q);
 rb_camath_gsl_func_d_d(sf, erfc);
 rb_camath_gsl_func_d_d(sf, log_erfc);
+rb_camath_gsl_func_d_d(sf, erf_Z);
+rb_camath_gsl_func_d_d(sf, erf_Q);
 rb_camath_gsl_func_d_d(sf, hazard);
 
 /* rb_camath_gsl_func_d_dd(sf, exp); */
-/* rb_camath_gsl_func_d_dd(sf, exp_mult); */
-/* rb_camath_gsl_func_d_dd(sf, expm1); */
-/* rb_camath_gsl_func_d_dd(sf, exprel); */
-/* rb_camath_gsl_func_d_dd(sf, exprel_2); */
-/* rb_camath_gsl_func_d_dd(sf, exprel_n); */
+rb_camath_gsl_func_d_dd(sf, exp_mult);
+rb_camath_gsl_func_d_d(sf, expm1); 
+rb_camath_gsl_func_d_d(sf, exprel); 
+rb_camath_gsl_func_d_d(sf, exprel_2); 
+rb_camath_gsl_func_d_id(sf, exprel_n); 
 
 rb_camath_gsl_func_d_d(sf, expint_E1);
 rb_camath_gsl_func_d_d(sf, expint_E2);
@@ -889,10 +893,6 @@ rb_camath_gsl_func_d_d(sf, lngamma);
 rb_camath_gsl_func_d_d(sf, gammastar);
 rb_camath_gsl_func_d_d(sf, gammainv);
 
-rb_camath_gsl_func_d_dd(sf, gamma_inc);
-rb_camath_gsl_func_d_dd(sf, gamma_inc_Q);
-rb_camath_gsl_func_d_dd(sf, gamma_inc_P);
-
 rb_camath_gsl_func_d_i(sf, fact);
 rb_camath_gsl_func_d_i(sf, doublefact);
 rb_camath_gsl_func_d_i(sf, lnfact);
@@ -901,6 +901,14 @@ rb_camath_gsl_func_d_ii(sf, choose);
 rb_camath_gsl_func_d_ii(sf, lnchoose);
 rb_camath_gsl_func_d_id(sf, taylorcoeff);
 
+rb_camath_gsl_func_d_dd(sf, poch);
+rb_camath_gsl_func_d_dd(sf, lnpoch);
+rb_camath_gsl_func_d_dd(sf, pochrel);
+
+rb_camath_gsl_func_d_dd(sf, gamma_inc);
+rb_camath_gsl_func_d_dd(sf, gamma_inc_Q);
+rb_camath_gsl_func_d_dd(sf, gamma_inc_P);
+
 rb_camath_gsl_func_d_dd(sf, beta);
 rb_camath_gsl_func_d_dd(sf, lnbeta);
 rb_camath_gsl_func_d_ddd(sf, beta_inc);
@@ -910,6 +918,19 @@ rb_camath_gsl_func_d_dd(sf, gegenpoly_2);
 rb_camath_gsl_func_d_dd(sf, gegenpoly_3);
 rb_camath_gsl_func_d_idd(sf, gegenpoly_n);
 
+rb_camath_gsl_func_d_id(sf, hermite);
+/* not implemented: herimite_series */
+rb_camath_gsl_func_d_id(sf, hermite_prob);
+/* not implemented: herimite_prob_series */
+rb_camath_gsl_func_d_iid(sf, hermite_deriv);
+rb_camath_gsl_func_d_iid(sf, hermite_prob_deriv);
+rb_camath_gsl_func_d_id(sf, hermite_func);
+rb_camath_gsl_func_d_id(sf, hermite_func_fast);
+rb_camath_gsl_func_d_iid(sf, hermite_func_der);
+rb_camath_gsl_func_d_ii(sf, hermite_zero);
+rb_camath_gsl_func_d_ii(sf, hermite_prob_zero);
+rb_camath_gsl_func_d_ii(sf, hermite_func_zero);
+
 rb_camath_gsl_func_d_dd(sf, hyperg_0F1);
 rb_camath_gsl_func_d_iid(sf, hyperg_1F1_int);
 rb_camath_gsl_func_d_ddd(sf, hyperg_1F1);
@@ -1185,7 +1206,7 @@ rb_camath_gsl_func_d_id(ran, logarithmic_pdf);
 void
 Init_carray_mathfunc_gsl ()
 {
-  uint32_t seed;
+  unsigned long seed;
 
   camath_gsl_rng = gsl_rng_alloc(gsl_rng_mt19937);
 
@@ -1206,6 +1227,8 @@ Init_carray_mathfunc_gsl ()
   rb_define_camath_gsl_func2_(airy_Bi_deriv_scaled, 2);
   rb_define_camath_gsl_func2u(airy_zero_Ai, 1); /* not func2 */
   rb_define_camath_gsl_func2u(airy_zero_Bi, 1); /* not func2 */
+  rb_define_camath_gsl_func2u(airy_zero_Ai_deriv, 1); /* not func2 */
+  rb_define_camath_gsl_func2u(airy_zero_Bi_deriv, 1); /* not func2 */
 
   rb_define_camath_gsl_func2(bessel_J0, 1);
   rb_define_camath_gsl_func2(bessel_J1, 1);
@@ -1254,25 +1277,13 @@ Init_carray_mathfunc_gsl ()
   rb_define_camath_gsl_func2(bessel_Inu, 2);
   rb_define_camath_gsl_func2(bessel_Inu_scaled, 2);
   rb_define_camath_gsl_func2(bessel_Knu, 2);
+  rb_define_camath_gsl_func2(bessel_lnKnu, 2);
   rb_define_camath_gsl_func2(bessel_Knu_scaled, 2);
 
   rb_define_camath_gsl_func2u(bessel_zero_J0, 1); /* not func2 */
   rb_define_camath_gsl_func2u(bessel_zero_J1, 1); /* not func2 */
   rb_define_camath_gsl_func2u(bessel_zero_Jnu, 2); /* not func2 */
 
-  rb_define_camath_gsl_func2(gamma, 1);
-  rb_define_camath_gsl_func2(lngamma, 1);
-  rb_define_camath_gsl_func2(gammastar, 1);
-  rb_define_camath_gsl_func2(gammainv, 1);
-
-  rb_define_camath_gsl_func2(gamma_inc, 2);
-  rb_define_camath_gsl_func2(gamma_inc_P, 2);
-  rb_define_camath_gsl_func2(gamma_inc_Q, 2);
-
-  rb_define_camath_gsl_func2(beta, 2);
-  rb_define_camath_gsl_func2(lnbeta, 2);
-  rb_define_camath_gsl_func2(beta_inc, 3);
-
   rb_define_camath_gsl_func2(clausen, 1);
 
   rb_define_camath_gsl_func2(hydrogenicR_1, 2);
@@ -1306,14 +1317,6 @@ Init_carray_mathfunc_gsl ()
 
   rb_define_camath_gsl_func(elljac, 2); /* not func2 */
 
-  rb_define_camath_gsl_func2(fact, 1);
-  rb_define_camath_gsl_func2(doublefact, 1);
-  rb_define_camath_gsl_func2(lnfact, 1);
-  rb_define_camath_gsl_func2(lndoublefact, 1);
-  rb_define_camath_gsl_func2(choose, 2);
-  rb_define_camath_gsl_func2(lnchoose, 2);
-  rb_define_camath_gsl_func2(taylorcoeff, 2);
-
   rb_define_camath_gsl_func2(erf, 1);
   rb_define_camath_gsl_func2(erf_Z, 1);
   rb_define_camath_gsl_func2(erf_Q, 1);
@@ -1321,6 +1324,12 @@ Init_carray_mathfunc_gsl ()
   rb_define_camath_gsl_func2(log_erfc, 1);
   rb_define_camath_gsl_func2(hazard, 1);
 
+  rb_define_camath_gsl_func2(exp_mult, 2);
+  rb_define_camath_gsl_func2(expm1, 1);
+  rb_define_camath_gsl_func2(exprel, 1);
+  rb_define_camath_gsl_func2(exprel_2, 1);
+  rb_define_camath_gsl_func2(exprel_n, 2);
+
   rb_define_camath_gsl_func2(expint_E1, 1);
   rb_define_camath_gsl_func2(expint_E2, 1);
   rb_define_camath_gsl_func2(expint_En, 2);
@@ -1342,11 +1351,49 @@ Init_carray_mathfunc_gsl ()
   rb_define_camath_gsl_func2(fermi_dirac_3half, 1);
   rb_define_camath_gsl_func2(fermi_dirac_inc_0, 2);
 
+  rb_define_camath_gsl_func2(gamma, 1);
+  rb_define_camath_gsl_func2(lngamma, 1);
+  rb_define_camath_gsl_func2(gammastar, 1);
+  rb_define_camath_gsl_func2(gammainv, 1);
+
+  rb_define_camath_gsl_func2(fact, 1);
+  rb_define_camath_gsl_func2(doublefact, 1);
+  rb_define_camath_gsl_func2(lnfact, 1);
+  rb_define_camath_gsl_func2(lndoublefact, 1);
+  rb_define_camath_gsl_func2(choose, 2);
+  rb_define_camath_gsl_func2(lnchoose, 2);
+  rb_define_camath_gsl_func2(taylorcoeff, 2);
+
+  rb_define_camath_gsl_func2(poch, 2);
+  rb_define_camath_gsl_func2(lnpoch, 2);
+  rb_define_camath_gsl_func2(pochrel, 2);
+
+  rb_define_camath_gsl_func2(gamma_inc, 2);
+  rb_define_camath_gsl_func2(gamma_inc_P, 2);
+  rb_define_camath_gsl_func2(gamma_inc_Q, 2);
+
+  rb_define_camath_gsl_func2(beta, 2);
+  rb_define_camath_gsl_func2(lnbeta, 2);
+  rb_define_camath_gsl_func2(beta_inc, 3);
+
   rb_define_camath_gsl_func2(gegenpoly_1, 2);
   rb_define_camath_gsl_func2(gegenpoly_2, 2);
   rb_define_camath_gsl_func2(gegenpoly_3, 2);
   rb_define_camath_gsl_func2(gegenpoly_n, 3);
 
+  rb_define_camath_gsl_func2(hermite, 2);
+  rb_define_camath_gsl_func2(hermite_deriv, 3);
+  rb_define_camath_gsl_func2(hermite_zero, 2);
+
+  rb_define_camath_gsl_func2(hermite_prob, 2);
+  rb_define_camath_gsl_func2(hermite_prob_deriv, 3);
+  rb_define_camath_gsl_func2(hermite_prob_zero, 2);
+
+  rb_define_camath_gsl_func2(hermite_func, 2);
+  rb_define_camath_gsl_func2(hermite_func_fast, 2);
+  rb_define_camath_gsl_func2(hermite_func_der, 3);
+  rb_define_camath_gsl_func2(hermite_func_zero, 2);
+
   rb_define_camath_gsl_func2(hyperg_0F1, 2);
   rb_define_camath_gsl_func2(hyperg_1F1_int, 3);
   rb_define_camath_gsl_func2(hyperg_1F1, 3);

data/{extconf.rb → ext/extconf.rb}

@@ -21,7 +21,7 @@ $CFLAGS << " -Wall "
 
 if have_carray()
   if have_header("gsl/gsl_matrix.h") and have_gsl
-    create_makefile("carray/carray_gsl")
+    create_makefile("carray_gsl")
   else
     open("Makefile", "w") { |io|
       io << "all:"       << "\n"

data/lib/carray-gsl.rb

@@ -1,2 +1,4 @@
-require "carray"
-require "carray/math/gsl"
+require 'gsl'
+require 'carray'
+require 'carray_gsl'
+require 'carray-gsl/core'

data/lib/{math/gsl.rb → carray-gsl/core.rb}

@@ -10,9 +10,6 @@
 #
 # ----------------------------------------------------------------------------
 
-require 'gsl'
-require 'carray'
-require 'carray/carray_gsl'
 
 module CA::GSL
 end
@@ -51,40 +48,40 @@ class CArray
   end
 
   [
-   ["random_gaussian", ["sigma"]],
-   ["random_ugaussian", []],
-   ["random_gaussian_tail", ["a", "sigma"]],
-   ["random_ugaussian_tail", ["a"]],
-   ["random_exponential", ["mu"]],
-   ["random_laplace", ["a"]],
-   ["random_exppaw", ["a", "b"]],
-   ["random_cauchy", ["a"]],
-   ["random_rayleigh", ["sigma"]],
-   ["random_rayleigh_tail", ["a", "sigma"]],
-   ["random_landau", []],
-   ["random_levy", ["c", "alpha"]],
-   ["random_levy_skew", ["c", "alpha", "beta"]],
-   ["random_gamma", ["a", "b"]],
-   ["random_erlang", ["a", "n"]],
-   ["random_flat", ["a", "b"]],
-   ["random_lognormal", ["zeta", "sigma"]],
-   ["random_chisq", ["nu"]],
-   ["random_fdist", ["nu1", "nu2"]],
-   ["random_tdist", ["nu"]],
-   ["random_beta", ["a", "b"]],
-   ["random_logistic", ["a"]],
-   ["random_pareto", ["a", "b"]],
-   ["random_weibull", ["a", "b"]],
-   ["random_gumbel1", ["a", "b"]],
-   ["random_gumbel2", ["a", "b"]],
-   ["random_poisson", ["mu"]],
-   ["random_bernoulli", ["p"]],
-   ["random_binomial", ["p", "n"]],
-   ["random_negative_binomial", ["p", "n"]],
-   ["random_pascal", ["p", "n"]],
-   ["random_geometric", ["p"]],
-   ["random_hypergeometric", ["n1", "n2", "t"]],
-   ["random_logarithmic", ["p"]],
+    ["random_gaussian", ["sigma"]],
+    ["random_ugaussian", []],
+    ["random_gaussian_tail", ["a", "sigma"]],
+    ["random_ugaussian_tail", ["a"]],
+    ["random_exponential", ["mu"]],
+    ["random_laplace", ["a"]],
+    ["random_exppaw", ["a", "b"]],
+    ["random_cauchy", ["a"]],
+    ["random_rayleigh", ["sigma"]],
+    ["random_rayleigh_tail", ["a", "sigma"]],
+    ["random_landau", []],
+    ["random_levy", ["c", "alpha"]],
+    ["random_levy_skew", ["c", "alpha", "beta"]],
+    ["random_gamma", ["a", "b"]],
+    ["random_erlang", ["a", "n"]],
+    ["random_flat", ["a", "b"]],
+    ["random_lognormal", ["zeta", "sigma"]],
+    ["random_chisq", ["nu"]],
+    ["random_fdist", ["nu1", "nu2"]],
+    ["random_tdist", ["nu"]],
+    ["random_beta", ["a", "b"]],
+    ["random_logistic", ["a"]],
+    ["random_pareto", ["a", "b"]],
+    ["random_weibull", ["a", "b"]],
+    ["random_gumbel1", ["a", "b"]],
+    ["random_gumbel2", ["a", "b"]],
+    ["random_poisson", ["mu"]],
+    ["random_bernoulli", ["p"]],
+    ["random_binomial", ["p", "n"]],
+    ["random_negative_binomial", ["p", "n"]],
+    ["random_pascal", ["p", "n"]],
+    ["random_geometric", ["p"]],
+    ["random_hypergeometric", ["n1", "n2", "t"]],
+    ["random_logarithmic", ["p"]],
   ].each do |name, parms|
     eval %{
       def #{name} (#{parms.join(",")})
@@ -100,19 +97,19 @@ class CArray
     attach {
       lu, perm, sign = *GSL::Linalg::LU.decomp(self.gm)
       out = lu.ca.m
-      out.attribute[:A]    = self.gm
-      out.attribute[:LU]   = lu
-      out.attribute[:perm] = perm
-      out.attribute[:sign] = sign
+      out.attribute["@A"]    = self.gm
+      out.attribute["@LU"]   = lu
+      out.attribute["@perm"] = perm
+      out.attribute["@sign"] = sign
       return out
     }
   end
 
   def lu_solve (b)
-    if self.attribute[:LU]
+    if self["@LU"]
       CArray.attach(self, b) {
-        lu   = self.attribute[:LU]
-        perm = self.attribute[:perm]
+        lu   = self["@LU"]
+        perm = self["@perm"]
         return GSL::Linalg::LU.solve(lu, perm, b.gv).ca.v
       }
     else
@@ -124,9 +121,9 @@ class CArray
 
   def lu_refine (b, x)
     CArray.attach(self, b, x) {
-      a    = self.attribute[:A]
-      lu   = self.attribute[:LU]
-      perm = self.attribute[:perm]
+      a    = self["@A"]
+      lu   = self["@LU"]
+      perm = self["@perm"]
       return GSL::Linalg::LU.refine(a, lu, perm, b.gv, x.gv).first.ca.v
     }
   end
@@ -147,8 +144,8 @@ class CArray
     attach {
       qr, tau = *GSL::Linalg::QR.decomp(self.gm)
       out = qr.ca.m
-      out.attribute[:qr] = qr
-      out.attribute[:tau] = tau
+      out["@qr"] = qr
+      out["@tau"] = tau
       return out
     }
   end
@@ -161,8 +158,8 @@ class CArray
 
   def qr_unpack 
     attach {
-      qr  = self.attribute[:qr]
-      tau = self.attribute[:tau]
+      qr  = self["@qr"]
+      tau = self["@tau"]
       q, r = *GSL::Linalg::QR.unpack(qr, tau)
       return q.ca.m, r.ca.m
     }
@@ -185,7 +182,7 @@ class CArray
     attach {
       c = GSL::Linalg::Cholesky.decomp(self.gm)
       out = c.ca.m
-      out.attribute[:cholesky] = c
+      out["@cholesky"] = c
       return out
     }
   end
@@ -591,15 +588,15 @@ module CAMath
 
   def lu_solve (lu, b)
     CArray.attach(lu, b) {
-      perm = lu.attribute[:perm]
+      perm = lu["@perm"]
       return GSL::Linalg::LU.solve(lu.gm, perm, b.gv).ca.v
     }
   end
 
   def qr_solve (qr, b)
     CArray.attach(qr, b) {
-      qrm = qr.attribute[:qr]
-      tau = qr.attribute[:tau]
+      qrm = qr["@qr"]
+      tau = qr["@tau"]
       return GSL::Linalg::QR.solve(qrm, tau, b.gv).ca.v
     }
   end
@@ -612,7 +609,7 @@ module CAMath
 
   def cholesky_solve (c, b)
     CArray.attach(c, b) {
-      cholesky = c.attribute[:cholesky]
+      cholesky = c["@cholesky"]
       return GSL::Linalg::Cholesky.solve(cholesky, b.gv).ca.v
     }
   end
@@ -687,7 +684,7 @@ class CAMatrix
 
   def upper
     attach {
-      return self.gm.lower.ca.m
+      return self.gm.upper.ca.m
     }
   end
 

metadata

@@ -1,32 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: carray-gsl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
-dependencies: []
-description: |2
-      Extension for accessing Ruby/GSL with CArray
+date: 2020-06-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: carray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: gsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0.3
+description: "    Extension for accessing Ruby/GSL with CArray\n"
 email: ''
 executables: []
 extensions:
-- extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - README.md
+- Rakefile
 - carray-gsl.gemspec
-- carray_gsl.c
-- carray_mathfunc_gsl.c
-- extconf.rb
-- lib/autoload/autoload_math_gsl.rb
+- examples/lu_decomp.rb
+- examples/test_graph.rb
+- examples/test_integ.rb
+- ext/carray_gsl.c
+- ext/carray_mathfunc_gsl.c
+- ext/extconf.rb
 - lib/carray-gsl.rb
-- lib/math/gsl.rb
-- lib/math/interp/adapter_gsl_spline.rb
+- lib/carray-gsl/core.rb
 homepage: https://github.com/himotoyoshi/carray-gsl
 licenses: []
 metadata: {}
@@ -38,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -46,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Extension for accessing Ruby/GSL with CArray
 test_files: []
-has_rdoc: false

data/lib/autoload/autoload_math_gsl.rb

@@ -1,5 +0,0 @@
-module CA
-  autoload :GSL, "carray/math/gsl"
-end
-
-

data/lib/math/interp/adapter_gsl_spline.rb

@@ -1,44 +0,0 @@
-#
-#
-#
-
-#
-# :type => type
-#
-#   * "linear"
-#   * "polynomial"
-#   * "cspline"
-#   * "cspline_periodic"
-#   * "akima"
-#   * "akima_periodic"
-#
-
-require "carray/math/interp"
-require "gsl"
-
-class CA::Interp::GSLSpline < CA::Interp::Adapter
-  
-  install_adapter "gsl:spline"
-  
-  def initialize (scales, value, options={})
-    @y  = value
-    @x  = scales
-    type = options[:type] || "linear"
-    CArray.attach(@x, @y) {
-      @interp = GSL::Spline.alloc(type, @x.na, @y.na)
-    }
-  end
-  
-  def evaluate (x0)
-    case x0
-    when CArray
-      return x0.attach { @interp.eval(x0.na).ca }
-    else
-      return @interp.eval(x0)
-    end
-  end
-  
-  alias grid evaluate
-
-end
-