narray 0.5.9.8 → 0.5.9.9

data/src/ChangeLog

@@ -1,3 +1,10 @@
+2010-12-14  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* lib/nmatrix.rb (NMatrix#diagonal!):
+	  - failed due to spec change of NArray.to_na.
+	    Thanks to M. Kikkawa.
+	* ver 0.5.9p9
+
 2010-09-13  David MacMahon <davidm at astro.berkeley...>
 
 	* narray.c (na_where2):
@@ -11,17 +18,17 @@
 
 2010-04-30  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* narray.c (na_s_to_na): 
+	* narray.c (na_s_to_na):
 	  - the number of arguments was not checked.
 	    Thanks to S D for report.
 
 2010-01-16  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* na_index.c (na_index_analysis): 
+	* na_index.c (na_index_analysis):
 	  - access out-of-bounds "struct slice" array.
 	* SPEC.en, SPEC.ja:
 	  - fix wrong explanation in count_false/true.
-	* na_random.c (na_random): 
+	* na_random.c (na_random):
 	  - modify random method not to change itself.
 	* lib/narray_ext.rb:
 	  - modify randomn! method to replace itself.
@@ -36,13 +43,13 @@
 
 2009-05-20  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* lib/narray_ext.rb (mean, stddev,rms,rsmdev,covariance): 
+	* lib/narray_ext.rb (mean, stddev,rms,rsmdev,covariance):
 	  - swith to DFLOAT type if integer array.
 	  - thanks to Philip Silva for report.
 
 2009-03-11  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* na_index.c (na_aset_single_dim): 
+	* na_index.c (na_aset_single_dim):
 	  - add check of storing empty array.
 	  - thanks to NISHI Takao for report.
 
@@ -90,8 +97,8 @@
 
 2008-01-28  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* na_array.c (na_range_to_sequence, na_do_mdai): 
-	* na_index.c (na_index_range): 
+	* na_array.c (na_range_to_sequence, na_do_mdai):
+	* na_index.c (na_index_range):
 	  change in internal structure of Ruby 1.9 Range object.
 	  Thanks to Hargobind Khalsa.
 
@@ -99,7 +106,7 @@
 
 2007-12-27  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
-	* narray_local.h, narray.c, na_array.c: 
+	* narray_local.h, narray.c, na_array.c:
 	  use RSTRING_PTR, RSTRING_LEN for Ruby 1.9.0.
 
 	* ver 0.5.9p3
@@ -114,26 +121,26 @@
 
 2007-10-09  David MacMahon <davidm at astro.berkeley...>
 
-	* narray.h, mkop.rb: 
+	* narray.h, mkop.rb:
 	  bug in NArray::NARRAY_VERSION and InspX.
 
 2006-08-09  Masahiro TANAKA  <masahiro.tanaka at nao.ac.jp>
 
-	* na_fftw.c, extconf.rb, narray.c (Init_narray): 
+	* na_fftw.c, extconf.rb, narray.c (Init_narray):
 	  Remove FFTW2 support; it is a separete module.
 
 	* ver 0.5.9
 
 2006-08-08  Masahiro TANAKA  <masahiro.tanaka at nao.ac.jp>
 
-	* na_index.c (na_index_test, na_aset_single_dim): 
+	* na_index.c (na_index_test, na_aset_single_dim):
 	  `nv[1] = nu' should work if nv and nu are NVector.
 	  `NA_IsNArray(nu)' is used for checking NArray.
 	  Thanks to sun@titech.
 
 2006-08-08  Masahiro TANAKA  <masahiro.tanaka at nao.ac.jp>
 
-	* narray_local.h, mknafunc.rb (mksortfuncs): 
+	* narray_local.h, mknafunc.rb (mksortfuncs):
 	  Argument type of comparison function passed to
 	  qsort should be `const void *'.
 	  Thank Daniel Berger for report.
@@ -172,7 +179,7 @@
 
 2005-01-25  Masahiro TANAKA  <masahiro.tanaka at nao.ac.jp>
 
-	* na_array.c (na_ary_to_nary_w_type): 
+	* na_array.c (na_ary_to_nary_w_type):
 	  Bug: "type" is not initialized when an array is empty.
 
 2005-01-07  Masahiro TANAKA  <masahiro.tanaka at nao.ac.jp>
@@ -226,7 +233,7 @@
 
 2003-03-04  Masahiro TANAKA  <masa@ir.isas.ac.jp>
 
-	* narray.c (na_alloc_struct): 
+	* narray.c (na_alloc_struct):
 	  NArray-specific GC is enabled for ruby-1.8.0.
 
 	* ver 0.5.7
@@ -235,7 +242,7 @@
 
 	* na_random.c: created.
 
-	* lib/narray_ext.rb (rank_total): 
+	* lib/narray_ext.rb (rank_total):
 	 Array#indices is obsolete. use Array#select.
 	 Default `to_a' will be obsolete.
 
@@ -244,7 +251,7 @@
 2003-03-01  Masahiro TANAKA  <masa@ir.isas.ac.jp>
 
 	* narray_ext.rb (swap_byte,hton,htov): removed.
-	* mkop.rb, mknafunc.rb, na_func.c, narray_local.h: 
+	* mkop.rb, mknafunc.rb, na_func.c, narray_local.h:
 	  add C-version of swap_byte, hton, htov.
 
 2003-02-28  Masahiro TANAKA  <masa@ir.isas.ac.jp>
@@ -267,7 +274,7 @@
 
 	* extconf.rb: to build in another directory than source tree.
 	* depend: ditto.
-	
+
 2002-05-18  Masahiro TANAKA  <masa@ir.isas.ac.jp>
 
 	* lib/narray_ext.rb (NArray#==): return false unless other is NArray.
@@ -296,7 +303,7 @@
 
 2002-03-24  Masahiro TANAKA  <masa@ir.isas.ac.jp>
 
-	* na_array.c: 
+	* na_array.c:
 	  New multi-dimentional array investigation is introduced.
 	  Scan array only once and check recursive array.
 
@@ -304,7 +311,7 @@
 	  Local definisions in narray.h are moved into narray_local.h.
 
 	* ver 0.5.6
-	
+
 2002-03-17  Masahiro TANAKA  <masa@ir.isas.ac.jp>
 
 	* nmatrix.rb (NMatrix#*): accept Array as an argument.
@@ -345,7 +352,7 @@
 2001-07-01  Masahiro Tanaka  <masa@ir.isas.ac.jp>
 
 	* narray.h: introduce na_index_t.
-	* na_func.c (na_init_slice,na_loop_index_ref,na_loop_general): 
+	* na_func.c (na_init_slice,na_loop_index_ref,na_loop_general):
 	  change to na_index_t.
 	* na_index.c: modify EXCL(range) to use excule_end?.
 	* na_index.c (na_aref_single_dim): remain array if sl->step!=0.
@@ -361,7 +368,7 @@
 	* narray.h: conditional typedef. define NARRAY_H.
 	* na_func.c (Init_na_funcs): change == to eq. add gt,ge,lt,le.
 	* lib/narray_ext.rb: new entry: ==, all?, any?, none?.
-	
+
 	* mkop.rb: new entry: conditional XOR.
 	* na_func.c (na_cond_xor): ditto.
 	* narray.h: ditto.
@@ -376,7 +383,7 @@
 
 2001-06-04  Masahiro Tanaka  <masa@ir.isas.ac.jp>
 
-	* na_index.c (na_aref_multi_dim_single_elm): 
+	* na_index.c (na_aref_multi_dim_single_elm):
 	  do not change class even if a[0..0,0..0] for NMatrix.
 	  Thanks to Daishi Harada.
 	* narray.c (na_inspect): rb_str_cat(str,": \n",4);
@@ -493,7 +500,7 @@
 2000-10-05  Masahiro Tanaka  <masa>
 
 	* nmatrix.rb: created.
-	
+
 	* too many changes are applied to source codes. ^^;
 
 2000-10-03  Masahiro Tanaka  <masa>
@@ -518,7 +525,7 @@
 	(na_reshape_ref,na_newrank_ref): created.
 	(na_inspect): print class name.
 
-	* narray.h: add "VALUE obj" elmt to "struct NARRAY".	 
+	* narray.h: add "VALUE obj" elmt to "struct NARRAY".
 
 2000-09-29  Masahiro Tanaka  <masa>
 
@@ -551,7 +558,7 @@
 	  remove unused variables and functions. (-Wall check)
 	  (Thanks to Robert Feldt)
 
-	* lib/narray_ext.rb (convol): put in module FFTW. 
+	* lib/narray_ext.rb (convol): put in module FFTW.
 	  (Thanks to Robert Feldt)
 
 2000-09-01  Masahiro Tanaka  <masa>

data/src/lib/nmatrix.rb

@@ -132,9 +132,13 @@ class NMatrix < NArray
     shp = self.shape
     idx = NArray.int(shp[0..1].min).indgen! * (shp[0]+1)
     ref = reshape(shp[0]*shp[1],true)
-    val = NArray.to_na(val)
-    raise ArgumentError, "must be 1-d array" if val.dim!=1
-    ref[idx,true] = val.newdim!(-1)
+    if val.kind_of?(Numeric)
+      ref[idx,true] = val
+    else
+      val = NArray.to_na(val)
+      raise ArgumentError, "must be 1-d array" if val.dim!=1
+      ref[idx,true] = val.newdim!(-1)
+    end
     self
   end
 

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.5.9p8"
-#define NARRAY_VERSION_CODE 598
+#define NARRAY_VERSION "0.5.9p9"
+#define NARRAY_VERSION_CODE 599
 
 /*
   Data types used in NArray :
@@ -67,7 +67,7 @@ typedef int                    int32_t;  /* NA_LINT */
 typedef uint32_t			u_int32_t;
 # else
 #  if SIZEOF_LONG == 4
-typedef unsigned long                   u_int32_t;  
+typedef unsigned long                   u_int32_t;
 #  else
 #   if SIZEOF_INT == 4
 typedef unsigned int                    u_int32_t;

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: narray
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.8
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 9
+  - 9
+  version: 0.5.9.9
 platform: ruby
 authors: 
 - Masahiro Tanaka
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +09:00
+date: 2010-12-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -85,21 +91,25 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: narray
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: N-dimensional Numerical Array class for Ruby