carray 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb090c276425cdbf6c4ec2f3a4788be1b41cb56
-  data.tar.gz: 8b30432918e5dd2bd072b5918b26b020680e972b
+  metadata.gz: e750df14d398beba90298203a253b80bf9f3f8a1
+  data.tar.gz: 372405f4be4af7621011dc3e725aad673903d618
 SHA512:
-  metadata.gz: c89864281f670d3d541af28e841ff5aa2300843c274d62cdb1aeb50cbe55c1a37128f2fde5b83809e3d60d50bc43b2a9041c18dfa0c6a603874e652231411001
-  data.tar.gz: dfcc259e3337e102a6e798829b2f2438f82556a16fb2bbda4275b1acc28a50f04b9b94851775efdc1927e3a73f6aba41b9578abd51cbcd5870fc728febc3c188
+  metadata.gz: 2d3eaf9c183473c1ae7a65120ee54d5f32b369229b29282936b5bcbb32b482a39e7da011b8b51479ef8f9dd4f941c58571455759065bce6eb81889b061bc11c4
+  data.tar.gz: 5283d53bae1c583c57fbe5459505a10f4d6bc5b45fc7647863c2ca4927f18ed205a70e4ade244b39f1ac3f5f403fbc83896dfd5fedf9d9444ec9ef51db70493e

data/carray.gemspec

@@ -31,12 +31,17 @@ Gem::Specification::new do |s|
                      Dir["ext/*/extconf.rb"].select{|f| File.exist?(f) }
   s.has_rdoc    = true
   s.rdoc_options = [
-		"--main=rdoc_main.rb", 
+		"--main rdoc_main.rb", 
 		"rdoc_main.rb", 
 		"rdoc_ext.rb",
 		"rdoc_math.rb", 
 		"rdoc_stat.rb", 
-		Dir.glob("lib/carray/**/*.rb")
+		Dir.glob("lib/carray/**/*.rb"),
 	].flatten
   s.required_ruby_version = ">= 1.8.1"
+  s.add_runtime_dependency 'narray', '~> 0.6.1.1'
+  s.add_runtime_dependency 'narray_miss', '~> 1.3'
+  s.add_runtime_dependency 'axlsx', '~> 2.0'
+  s.add_runtime_dependency 'spreadsheet', '~> 1.1'
+  s.add_runtime_dependency 'sqlite3', '~> 1.3'
 end

data/carray.h

@@ -681,6 +681,7 @@ enum {
   CA_REG_NONE,
   CA_REG_ALL,
   CA_REG_ADDRESS,
+  CA_REG_FLATTEN,
   CA_REG_ADDRESS_COMPLEX,
   CA_REG_POINT,
   CA_REG_BLOCK,

data/carray_access.c

@@ -348,7 +348,7 @@ rb_ary_flatten_for_elements (VALUE ary, int32_t elements, void *ap)
       rb_raise(rb_eRuntimeError, "invalid shape array for conversion to carray");
     }
     else {
-      VALUE out = rb_ary_new2(elements);
+      VALUE out = rb_ary_new2(0);
       int len = 0;
       ary_flatten_upto_level(ary, max_level, 0, out, &len);
       if ( len != elements ) {
@@ -374,7 +374,7 @@ rb_ary_flatten_for_elements (VALUE ary, int32_t elements, void *ap)
     }
 
     if ( same_shape ) {
-      VALUE out = rb_ary_new2(elements);
+      VALUE out = rb_ary_new2(0);
       int len = 0;
       ary_flatten_upto_level(ary, ca->rank-1, 0, out, &len);
 
@@ -396,7 +396,7 @@ rb_ary_flatten_for_elements (VALUE ary, int32_t elements, void *ap)
       }
 
       if ( level >= 0 ) {
-        VALUE out = rb_ary_new2(elements);
+        VALUE out = rb_ary_new2(0);
         int len = 0;
         ary_flatten_upto_level(ary, level, 0, out, &len);
         if ( len != elements ) {
@@ -512,6 +512,10 @@ rb_ca_scan_index (int ca_rank, int32_t *ca_dim, int32_t ca_elements,
         info->index[0].scalar = addr;
         return;
       }
+      else if ( arg == Qnil ) {
+        info->type = CA_REG_FLATTEN;
+        return;	
+      }
       else { /* ca[i..j] -> CA_REG_ADDRESS_COMPLEX */
         info->type = CA_REG_ADDRESS_COMPLEX;
         return;
@@ -1227,6 +1231,9 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
   case CA_REG_ADDRESS:
     obj = rb_ca_ref_address(self, &info);
     break;
+  case CA_REG_FLATTEN:
+    obj = rb_ca_refer_new_flatten(self);
+    break;
   case CA_REG_POINT:
     obj = rb_ca_ref_point(self, &info);
     break;
@@ -1311,6 +1318,10 @@ rb_ca_store_method (int argc, VALUE *argv, VALUE self)
   case CA_REG_ADDRESS:
     obj = rb_ca_store_address(self, &info, rval);
     break;
+  case CA_REG_FLATTEN:
+    self = rb_ca_refer_new_flatten(self);
+    obj = rb_ca_store_all(self, rval);
+    break;
   case CA_REG_POINT:
     obj = rb_ca_store_point(self, &info, rval);
     break;
@@ -1584,6 +1595,7 @@ rb_ca_normalize_index (VALUE self, VALUE ridx)
     }
     return rindex;
   case CA_REG_ADDRESS_COMPLEX:
+  case CA_REG_FLATTEN:
     self = rb_ca_refer_new_flatten(self);
     return rb_ca_normalize_index(self, ridx);
   default:
@@ -1779,6 +1791,7 @@ Init_carray_access ()
   rb_define_const(rb_cObject, "CA_REG_NONE",     INT2NUM(CA_REG_NONE));
   rb_define_const(rb_cObject, "CA_REG_ALL",      INT2NUM(CA_REG_ALL));
   rb_define_const(rb_cObject, "CA_REG_ADDRESS",  INT2NUM(CA_REG_ADDRESS));
+  rb_define_const(rb_cObject, "CA_REG_FLATTEN",  INT2NUM(CA_REG_FLATTEN));
   rb_define_const(rb_cObject, "CA_REG_ADDRESS_COMPLEX",
                                                  INT2NUM(CA_REG_ADDRESS_COMPLEX));
   rb_define_const(rb_cObject, "CA_REG_POINT",    INT2NUM(CA_REG_POINT));

data/devel/guess_shape.rb

@@ -0,0 +1,76 @@
+require "carray"
+
+def guess_shape (ary)
+  if ary.class == Array
+    info = {
+      :rank => 0,
+      :dim => [],
+      :stop_rank => 0,
+    }
+    (1..5).each do |rank|
+      info[:rank] = rank
+      guess_shape_rank(ary, info, 1)
+      if info[:stop_rank] != 0
+        return info[:dim]
+      end
+    end
+    raise "too deep array"
+  else
+    return []  ### rank = 0
+  end
+end
+
+# ok　0
+# scalar => 1
+# array invalid length => 2
+
+def guess_shape_rank (ary, info, level)
+  len = info[:dim][level-1]
+  printf "len->#{len}\n"
+  if len 
+    if len != ary.length
+      info[:stop_rank] = level-1
+      return 2
+    end
+  else
+    len = ary.length
+    printf "len: set #{len}\n"
+    info[:dim][level-1] = len
+  end
+  if level == info[:rank]
+    return 0
+  end
+  if level < info[:rank]
+    p ary
+    ary.each do |e|
+      if e.class == Array 
+        retval = guess_shape_rank(e, info, level+1)
+        case retval
+        when 1, 2
+          return retval
+        when 0
+        end
+      else
+        info[:stop_rank] = level
+        info[:dim] = info[:dim][0..level-1]
+        return 1
+      end
+    end
+    return 0
+  end
+  return 3
+end
+
+
+ary = [
+  [[[[3],3],1]],
+  [[2,2]],
+  [[3,3,]]
+]
+#ca = CArray.object(4,3,2,1).seq
+#ca.elem_store([0,0,0,0],[1,2])
+#ary = ca.to_a
+p ary
+p CArray.guess_array_shape(ary)
+p guess_shape(ary)
+p ary.to_ca

data/examples/ex001.rb

@@ -0,0 +1,10 @@
+require "carray"
+
+data = <<HERE_END
+time,temp,humidity
+
+
+HERE_END
+
+ca = CArray.int(3,3).seq!
+

data/examples/test-int.rb

@@ -0,0 +1,13 @@
+require "carray"
+
+a = CArray.double(10).seq(0.1,0.1)
+b = CA_DOUBLE([0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1])
+a1 = (a/0.1)
+b1 = (b/0.1)
+
+p a
+p b
+p a1
+p b1
+p a1.int
+p b1.int

data/lib/carray/autoload/autoload_graphics_zimg.rb

@@ -0,0 +1,3 @@
+class CArray
+  autoload_method "zimg", "carray/graphics/zimg"
+end

data/lib/carray/base/autoload.rb

@@ -61,7 +61,12 @@ module CA
       begin
         Gem::Specification.each do |spec|
           if spec.name =~ /carray/
-            autoload_dirs.push(spec.require_paths.first)
+            spec.require_paths.each do |path|
+              if path !~ /^\//
+                path = File.join(spec.full_gem_path, path)
+              end
+              autoload_dirs.push(path)                
+            end
           end
         end
       rescue Gem::LoadError

data/lib/carray/base/basic.rb

@@ -318,6 +318,18 @@ class CArray
     return reshape(elements).to_ca
   end
 
+  # pulled
+
+  def pulled (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx]
+  end
+  
+  def pull (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx].to_ca
+  end
+
   # reversed
 
   def reversed
@@ -599,7 +611,7 @@ class CArray
 
   #
   # CArray.span(data_type, range[, step])
-  # CArray.span(range[, step]) -> data_type guessed by range.first typ
+  # CArray.span(range[, step]) -> data_type guessed by range.first type
   #
 
   def self.span (*argv)
@@ -608,7 +620,7 @@ class CArray
     else
       type, = *CArray.guess_type_and_bytes(argv.shift, nil)
     end
-    range, step = argv[0], argv[1] || 1
+    range, step = argv[0], argv[1]
     start, stop = range.begin, range.end
     if step == 0
       raise "step should not be 0"
@@ -624,11 +636,9 @@ class CArray
       end
     end
     if type == CA_OBJECT and not step
-      return CA_OBJECT(range.map)
+      return CA_OBJECT(range.to_a)
     else
-#      start = start.to_s.to_r
-#      stop  = stop.to_s.to_r
-#      step  = step.to_s.to_r
+      step ||= 1
       if range.exclude_end?
         n = ((stop - start).abs/step).floor
       else

data/lib/carray/base/inspect.rb

@@ -126,13 +126,11 @@ class CArray::Inspector  # :nodoc:
       lambda{|x| "%i" % x }
     when CA_UINT8, CA_UINT16, CA_UINT32, CA_UINT64
       lambda{|x| "%u" % x }
-    when CA_FLOAT32
-      lambda{|x| "%.5g" % x }
-    when CA_FLOAT64, CA_FLOAT128
-      lambda{|x| "%.8g" % x }
+    when CA_FLOAT32, CA_FLOAT64, CA_FLOAT128
+      lambda{|x| x.inspect }
     when CA_CMPLX64, CA_CMPLX128, CA_CMPLX256
-      lambda{|x| format("%.5g%s%.5gi",
-                        x.real, (x.imag >= 0) ? "+" : "-", x.imag.abs) }
+      lambda{|x| format("%s%s%si",
+                        x.real.inspect, (x.imag >= 0) ? "+" : "-", x.imag.abs.inspect) }
     when CA_FIXLEN
       if @carray.data_class
         if @carray.bytes <= 6

data/lib/carray/base/struct.rb

@@ -303,7 +303,7 @@ class CA::Struct::Builder  # :nodoc:
       else
         data_type, @bytes = CArray.guess_type_and_bytes(@type, @opt[:bytes])
         if data_type == CA_OBJECT
-          raise("CA_OBJECT type can't be a member of struct or union")
+          raise RuntimeError, "CA_OBJECT type can't be a member of struct or union"
         end 
         @byte_length = @bytes
       end

data/lib/carray/graphics/zimg.rb

@@ -0,0 +1,296 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/graphics/zimg.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#  You can redistribute it and/or modify it under the terms of
+#  the Ruby Licence.
+#
+#  Copyright (C) 2005 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
+
+
+=begin
+
+option
+
+  :debug     => (true|false)
+  :output    => filename
+  :complex   => (abs|length|phase|real|imaginary)
+  :colormap  => (red|blue|gray) | "filename" | [r,g,b]
+  :invert    => (true|false)
+  :crange    => [min,max]
+  :nda_color => color
+  :scale     => [x[,y]]
+  :align     => [h,[,v,bcol]]
+  :quality   => quality
+  :interlace => (true|false)
+  :colorbox  => (true|false)
+  :cbox_tics =>   n
+  :cbox_label  => string
+  :cbox_format => string
+  :display   => (true|false) | "program"
+  :legend    => string
+  :label     => [[x1,y1,s1], [x2,y2,s2], ...]
+  :vlabel    => [[x1,y1,s1], [x2,y2,s2], ...]
+  :textfont  => n
+  :textcolor => "xxx"|"xxxxxx"
+  :smooth    => threshold
+  :contors   => [levels,"log",bg,fg] ### Not Implemented
+
+=end
+
+class CArray
+
+  @@zimg_count = 0
+
+  def zimg (option={}) # :nodoc:
+
+    tempfile = "%zimg_#{$$}_#{@@zimg_count}.dat"
+    @@zimg_count += 1
+
+    if self.rank != 2
+      raise "zimg accept only 2-D data"
+    end
+
+    option.each do |k, v|
+      if k.kind_of?(String)
+        option[k.intern] = v
+      end
+    end
+
+    if option[:output]
+      output = option[:output]
+      case output
+      when /.ppm$/
+        outfmt = "--ppm"
+      when /.pgm$/
+        outfmt = "--pgm"
+      when /.jpg$/i, /.jpeg$/i
+        if option[:quality]
+          outfmt = "--jpeg=" + option[:quality].to_s
+        else
+          outfmt = "--jpeg"
+        end
+      else
+        outfmt = ""
+      end
+    else
+      output = "-"
+      outfmt = ""
+    end
+
+    if option[:interlace]
+      interlace = "--interlace"
+    else
+      interlace = ""
+    end
+
+    case self.data_type
+    when CA_UINT8
+      type_spec = "--unsigned-char"
+    when CA_INT8, CA_BOOLEAN
+      type_spec = "--char"
+    when CA_UINT16
+      type_spec = "--unsigned-short"
+    when CA_INT16
+      type_spec = "--short"
+    when CA_UINT32
+      type_spec = "--unsigned-int"
+    when CA_INT32
+      type_spec = "--int"
+    when CA_FLOAT32
+      type_spec = "--float"
+    when CA_FLOAT64
+      type_spec = "--double"
+    when CA_CMPLX64
+      type_spec = "--complex-float=" + ( option[:complex] || "abs" )
+    when CA_CMPLX128
+      type_spec = "--complex-double=" + ( option[:complex] || "abs" )
+    else
+      raise "can't create image for invalid numerical data"
+    end
+
+    case option[:colormap]
+    when "red", "blue", "gray"
+      colormap = "--" + option[:colormap]
+    when String
+      if File.exist?(option[:colormap])
+        colormap = "--colormap=" + option[:colormap]
+      else
+        raise "can't find colomap file"
+      end
+    when Array
+      colormap = "--colormap=" + option[:colormap].join(",")
+    else
+      colormap = ""
+    end
+
+    if option[:crange]
+      crange = "--crange=" + option[:crange].join(',')
+    else
+      crange = ''
+    end
+
+    if option[:nda_color]
+      if option[:fill_value]
+        nda = "--nda=" + [option[:fill_value], option[:nda_color]].join(',')
+      else
+        nda = "--nda=" + ["Infinity", option[:nda_color]].join(',')
+      end
+    else
+      nda = ""
+    end
+
+    if option[:scale]
+      scale = "--scale=" + option[:scale].join(',')
+    else
+      scale = ''
+    end
+
+    if option[:align]
+      if option[:align].last.kind_of?(String)
+        align = "--align=" + option[:align][0..-2].join('x')
+                  "," + option[:align].last
+      else
+        align = "--align=" + option[:align].join('x')
+      end
+    else
+      align = ''
+    end
+
+    if option[:colorbox]
+      if option[:cbox_tics]
+        colorbox = "--colorbox=" + option[:cbox_tics].to_s
+      else
+        colorbox = "--colorbox"
+      end
+    else
+      colorbox = ""
+    end
+
+    if option[:cbox_format]
+      cbox_format = option[:cbox_format]
+    else
+      cbox_format = ""
+    end
+
+    if option[:cbox_label]
+      cbox_label = option[:cbox_label]
+    else
+      cbox_label = ""
+    end
+
+    geom = lambda{|x,y|
+      [ (x > 0 ? "+" : '') + x.to_s, (y > 0 ? '+' :'') + y.to_s].join
+    }
+
+    label = ""
+    if option[:label]
+      option[:label].each do |x, y, s|
+        label << "--label=" + [geom[x, y],s].join(',') + " "
+      end
+    end
+
+    vlabel = ""
+    if option[:vlabel]
+      option[:vlabel].each do |x, y, s|
+        vlabel << "--vlabel=" + [geom[x, y],s].join(',') + " "
+      end
+    end
+
+    if option[:textfont]
+      textfont = "--font=" + option[:textfont].to_s
+    else
+      textfont = ""
+    end
+
+    if option[:textcolor]
+      textcolor = "--textcolor=" + option[:textcolor].to_s
+    else
+      textcolor = ""
+    end
+
+    case option[:smooth]
+    when Numeric
+      smooth = "--smooth=" + option[:smooth].to_s
+    else
+      if option[:smooth]
+        smooth = "--smooth"
+      else
+        smooth = ""
+      end
+    end
+
+    command = [
+               "zimg",
+               "--output=#{output}",
+               outfmt,
+               interlace,
+               type_spec,
+               "--size=" + self.dim.reverse.join(","),
+               scale,
+               align,
+               colormap,
+               option[:invert] ? "--invert" : "",
+               crange,
+               nda,
+               colorbox,
+               cbox_label,
+               cbox_format,
+               label,
+               vlabel,
+               textfont,
+               textcolor,
+               smooth,
+               tempfile
+              ].join(" ")
+
+    if option[:nda_color] and self.has_mask?
+      if option[:fill_value]
+        out = self.unmask(option[:fill_value])
+      else
+        out = self.unmask(nan)
+      end
+    else
+      out = self
+    end
+
+    open(tempfile, "w"){ |io|
+      out.dump_binary(io)
+    }
+
+    if option[:debug]
+      puts command
+    end
+
+    if option[:output]
+      system(command)
+      case option[:display]
+      when String
+        system([option[:display], output].join(" "))
+      else
+        if option[:display]
+          system(["display", output].join(" "))
+        end
+      end
+    else
+      case option[:display]
+      when String
+        system(command + ["|", option[:display], "-"].join(" "))
+      else
+        if option[:display]
+          system(command + ["|", "display -"].join(" "))
+        end
+      end
+    end
+
+  ensure
+    if File.exist?(tempfile)
+      File.unlink(tempfile)
+    end
+  end
+
+end
+