narray 0.6.0.7 → 0.6.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56a5e5c60ab2450492b8e19b78387d62e090fdbc
+  data.tar.gz: ff0771dbbde2a98e9e92db8f0b821ffc25658e3c
+SHA512:
+  metadata.gz: 8993262cf562f08738f314e567f3d596c7661c64d4722260db5e0fb809f9fb4e5ce9f1b07ee16bc424d474f5e1b1abd8a51a22949f25b025c45b35998a417a38
+  data.tar.gz: 30166a5c16acd63324282142da10fd6ed2dc8e182fad3fb280b731e0e234e0eb5a787df43b2d8b9d680a51281964747d5a8f4a1f0bba9b44deeca87c85f89eda

data/{src/ChangeLog → ChangeLog}

@@ -1,3 +1,19 @@
+2013-02-27  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* Rakefile: use rubygems/package_task.
+	* narray.gemspec: add --exclude in rdoc_options.
+	* ver 0.6.0.8
+
+2013-02-26  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* test/ld.rb: add require "rubygems".
+	* narray.gemspec: change gem directory from src to ext.
+	* narray.c: avoid warnings in require "complex" and rdoc parsing.
+
+2013-02-13  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* lib/narray_ext.rb: new method: NArray.cast
+
 2013-02-01  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
 	* lib/narray_ext.rb: eql? hash methods implemented.

data/src/depend

@@ -11,4 +11,4 @@ na_math.o: na_math.c narray.h $(hdrdir)/ruby.h
 
 
 cleanall:  clean
-	@$(RM) -r na_op.c na_math.c src pkg
+	@$(RM) -r Makefile narray_config.h na_op.c na_math.c src pkg

data/src/lib/narray_ext.rb

@@ -8,6 +8,21 @@
 #
 class NArray
 
+  def self.cast(array,type=nil)
+    case array
+    when NArray
+    when Array
+      array = NArray.to_na(array)
+    else
+      raise ArgumentError, "1st argument must be NArray or Array"
+    end
+    type = array.typecode if type.nil?
+    shape = array.shape
+    na = self.new(type,*shape)
+    na[] = array
+    na
+  end
+
   def integer?
     self.typecode==NArray::BYTE ||
     self.typecode==NArray::SINT ||

data/src/mkmath.rb

@@ -751,6 +751,10 @@ for i in data
   name=bsname
   print <<EOM
 
+/*
+ *  call-seq:
+ *     NMath.#{name}(arg)  -> narray
+ */
 static VALUE na_math_#{bsname}(VALUE obj, VALUE x)
 { return na_math_func(x,#{name}Funcs); }
 EOM

data/src/na_array.c

@@ -493,6 +493,7 @@ VALUE
 }
 
 
+/* :nodoc: */
 VALUE
  na_to_narray(VALUE obj)
 {
@@ -642,3 +643,8 @@ VALUE
       rb_str_cat(val, "  ", 2);
   }
 }
+
+
+void Init_na_array() {
+    rb_define_method(cNArray, "to_a", na_to_array,0); //
+}

data/src/na_index.c

@@ -523,6 +523,12 @@ static int
   return count;
 }
 
+/*
+ *  call-seq:
+ *     narray.count_true  -> int
+ *
+ *  Returns the number of true (non-zero) in narray
+ */
 VALUE
  na_count_true(VALUE self)
 {
@@ -549,12 +555,19 @@ static int
   return count;
 }
 
+/*
+ *  call-seq:
+ *     narray.count_false  -> int
+ *
+ *  Returns the number of false (zero-value) in narray
+ */
 VALUE
  na_count_false(VALUE self)
 {
   return( INT2NUM(na_count_false_body(self)) );
 }
 
+/* :nodoc: */
 VALUE
  na_aref_mask(VALUE self, VALUE mask)
 {
@@ -984,3 +997,15 @@ VALUE
 
   return idx[nidx];
 }
+
+
+void Init_na_index() {
+    /* slice */
+    rb_define_method(cNArray, "[]", na_aref,-1);
+    rb_define_method(cNArray, "[]=", na_aset,-1);
+    rb_define_method(cNArray, "slice", na_slice,-1);
+    /* mask */
+    rb_define_method(cNArray, "count_false", na_count_false, 0);
+    rb_define_method(cNArray, "count_true", na_count_true, 0);
+    rb_define_method(cNArray, "mask", na_aref_mask, 1);
+}

data/src/na_linalg.c

@@ -286,6 +286,7 @@ static int
 }
 
 
+/* :nodoc: */
 static VALUE
  na_lu_fact_bang(VALUE self)
 { 
@@ -329,6 +330,7 @@ static VALUE
 }
 
 
+/* :nodoc: */
 static VALUE
  na_lu_fact(VALUE self)
 {
@@ -471,6 +473,15 @@ na_shape_max2(int ndim, int *shape, int n1, int *shape1, int n2, int *shape2)
 }
 
 
+
+/*
+ *  call-seq:
+ *     lu.solve(arg)  -> result
+ *
+ *  Solve with the result of LU factorization.
+ *  arg should be NMatrix or NVector instance.
+ *  Returns an instance of same class with arg.
+ */
 static VALUE
 na_lu_solve(VALUE self, volatile VALUE other)
 {
@@ -526,6 +537,7 @@ na_lu_solve(VALUE self, volatile VALUE other)
 }
 
 
+/* :nodoc: */
 static VALUE
 na_lu_init(VALUE self, VALUE lu, VALUE piv)
 {

data/src/narray.c

@@ -58,6 +58,8 @@ static int mem_count = 0;
 static int na_gc_freq = 2500000;   /* Frequency of Garbage Collection */
 #endif
 
+void Init_na_array(void);
+void Init_na_index(void);
 void Init_nmath(void);
 void Init_na_funcs(void);
 void Init_na_linalg(void);
@@ -1173,15 +1175,18 @@ static VALUE
 void
  Init_narray()
 {
-    /* require Complex class */
-    rb_require("complex");
+    ID id_Complex = rb_intern("Complex");
+
+    if (!rb_const_defined( rb_cObject, id_Complex)) {
+	/* require Complex class */
+	rb_require("complex");
+    }
     cComplex = rb_const_get( rb_cObject, rb_intern("Complex") );
 
     /* define NArray class */
     cNArray = rb_define_class("NArray",rb_cObject);
 
     /* class methods */
-    /* rb_define_global_function("NArray",na_to_narray,-1); */
     rb_define_singleton_method(cNArray,"new",na_s_new,-1);
     rb_define_singleton_method(cNArray,"byte",na_s_new_byte,-1);
     rb_define_singleton_method(cNArray,"sint",na_s_new_sint,-1);
@@ -1200,9 +1205,6 @@ void
     rb_define_singleton_method(cNArray,"[]",na_s_bracket,-1);
 
     /* methods */
-    rb_define_method(cNArray, "[]", na_aref,-1);
-    rb_define_method(cNArray, "[]=", na_aset,-1);
-    rb_define_method(cNArray, "slice", na_slice,-1);
     rb_define_method(cNArray, "shape", na_shape,0);
     rb_define_alias(cNArray,  "sizes","shape");
     rb_define_method(cNArray, "size", na_size,0);
@@ -1238,8 +1240,6 @@ void
     rb_define_method(cNArray, "each", na_each,0);
     rb_define_method(cNArray, "collect", na_collect,0);
     rb_define_method(cNArray, "collect!", na_collect_bang,0);
-    /*  rb_define_method(cNArray, "each_index", na_each_index,0); */
-    rb_define_method(cNArray, "to_a", na_to_array,0);
     rb_define_method(cNArray, "to_s", na_to_s, 0);
     rb_define_method(cNArray, "to_f", na_to_float, 0);
     rb_define_method(cNArray, "to_i", na_to_integer, 0);
@@ -1247,10 +1247,6 @@ void
     rb_define_method(cNArray, "to_binary", na_to_binary, 0);
     rb_define_method(cNArray, "to_type_as_binary", na_to_type_as_binary, 1);
     rb_define_method(cNArray, "to_string", na_to_string, 0);
-    /*mask*/
-    rb_define_method(cNArray, "count_false", na_count_false, 0);
-    rb_define_method(cNArray, "count_true", na_count_true, 0);
-    rb_define_method(cNArray, "mask", na_aref_mask, 1);
 
     rb_define_const(cNArray, "NARRAY_VERSION", rb_str_new2(NARRAY_VERSION));
     rb_define_const(cNArray, "BYTE", INT2FIX(NA_BYTE));
@@ -1282,6 +1278,8 @@ void
     rb_define_method(cNArray, "refer", na_refer,0);
     rb_define_method(cNArray, "original", na_original,0);
 
+    Init_na_array();
+    Init_na_index();
     Init_nmath();
     Init_na_funcs();
     Init_na_random();

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.7"
-#define NARRAY_VERSION_CODE 607
+#define NARRAY_VERSION "0.6.0.8"
+#define NARRAY_VERSION_CODE 608
 
 /*
   Data types used in NArray :

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narray
 version: !ruby/object:Gem::Version
-  version: 0.6.0.7
-  prerelease: 
+  version: 0.6.0.8
 platform: ruby
 authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Numerical N-dimensional Array class
 email: masa16.tanaka@gmail.com
@@ -18,12 +17,12 @@ extensions:
 - src/extconf.rb
 extra_rdoc_files: []
 files:
-- src/ChangeLog
-- src/MANIFEST
-- src/README.en
-- src/README.ja
-- src/SPEC.en
-- src/SPEC.ja
+- ChangeLog
+- MANIFEST
+- README.en
+- README.ja
+- SPEC.en
+- SPEC.ja
 - src/depend
 - src/extconf.rb
 - src/mkmath.rb
@@ -43,25 +42,42 @@ files:
 homepage: http://narray.rubyforge.org/
 licenses:
 - Ruby
+metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --title
+- NArray
+- --main
+- NArray
+- --exclude
+- mk.*
+- --exclude
+- extconf\.rb
+- --exclude
+- src/.*\.h
+- --exclude
+- src/lib/
+- --exclude
+- .*\.o
+- --exclude
+- narray\.so
+- --exclude
+- libnarray\.*
 require_paths:
 - .
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: narray
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 2
 summary: N-dimensional Numerical Array class for Ruby