carray 1.4.0 → 1.5.1

data/lib/carray/{base/inspect.rb → inspect.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/inspect.rb
+#  carray/inspect.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -17,14 +17,14 @@ class CArray::Inspector  # :nodoc:
   end
 
   def inspect_string
-    if @carray.rank == 0
-      raise "can't inspect CArray of rank == 0"
+    if @carray.ndim == 0
+      raise "can't inspect CArray of ndim == 0"
     end
     formatter  = get_formatter()
     class_name = get_class_name()
     type_name  = get_type_name()
     shape      = get_shape()
-    data_spec  = get_data_spec(0, Array.new(@carray.rank){0}, formatter)
+    data_spec  = get_data_spec(0, Array.new(@carray.ndim){0}, formatter)
     info_list  = get_info_list()
     output = ["<",
               format("%s.%s(%s)", class_name, type_name, shape.join(",")),
@@ -152,9 +152,9 @@ class CArray::Inspector  # :nodoc:
 
   def get_data_spec (level, idx, formatter)
     io = "[ "
-    rank = @carray.rank
+    ndim = @carray.ndim
     dim  = @carray.dim
-    if level == rank - 1
+    if level == ndim - 1
       over = false
       dim[level].times do |i|
         idx[level] = i

data/lib/carray/io/imagemagick.rb

@@ -121,7 +121,7 @@ class CArray
 
   def magick_guess_image_type
     image_type = nil
-    case rank
+    case ndim
     when 2
       if fixlen?
         case bytes

data/lib/carray/{base/iterator.rb → iterator.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/iterator.rb
+#  carray/iterator.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -318,7 +318,7 @@ class CAClassIterator < CAIterator # :nodoc:
     @classifier = classifier || @reference.uniq.sort
     @null = CArray.new(@reference.data_type,[0])
     @table = {}
-    @rank = 1
+    @ndim = 1
     @dim  = [0]
     if @classifier.all_masked? or @classifier.size == 0
       @dim  = [0]
@@ -343,7 +343,7 @@ class CAClassIterator < CAIterator # :nodoc:
     return self
   end
   
-  def ranking (&block)
+  def ndiming (&block)
     block ||= lambda {|a| a.size }
     values = self.to_a.map{|v| block[v] }.to_ca
     addrs  = values.sort_addr.reverse

data/lib/carray/mask.rb

@@ -0,0 +1,91 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/mask.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
+#
+# ----------------------------------------------------------------------------
+
+class CArray
+  
+  # mask
+  
+  #
+  # Returns the number of masked elements.
+  #
+
+  def count_masked (*axis)
+    if has_mask?  
+      return mask.int64.accumulate(*axis)
+    else
+      if axis.empty?
+        return 0
+      else
+        spec = shape.map{:i}
+        axis.each do |k|
+          spec[k] = nil
+        end
+        return self[*spec].ca.template(:int64) { 0 }
+      end
+    end
+  end
+
+  #
+  # Returns the number of not-masked elements.
+  #
+  def count_not_masked (*axis)
+    if has_mask?
+      return mask.not.int64.accumulate(*axis)
+    else
+      if axis.empty?
+        return elements
+      else
+        spec = shape.map {:i}
+        axis.each do |k|
+          spec[k] = nil
+        end
+        it = self[*spec].ca
+        count = self.elements/it.elements
+        return it.template(:int64) { count }
+      end
+    end
+  end
+
+  def maskout! (*argv)
+    case argv.size
+    when 1
+      val = argv.first
+      case val
+      when CArray, Symbol
+        self[val] = UNDEF
+      else
+        self[:eq, val] = UNDEF
+      end
+    else
+      self[*argv] = UNDEF          
+    end
+    return self
+  end
+
+  def maskout (*argv)
+    obj = self.to_ca
+    case argv.size
+    when 1
+      val = argv.first
+      case val
+      when CArray, Symbol
+        obj[val] = UNDEF
+      else
+        obj[:eq, val] = UNDEF
+      end
+    else
+      obj[*argv] = UNDEF      
+    end
+    return obj
+  end
+  
+end

data/lib/carray/{base/math.rb → math.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/math.rb
+#  carray/math.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -226,7 +226,7 @@ class CArray
 
   def anomaly (*argv)
     opt = argv.last.is_a?(Hash) ? argv.pop : {}
-    idxs = Array.new(self.rank) { |i| argv.include?(i) ? :* : nil }
+    idxs = Array.new(self.ndim) { |i| argv.include?(i) ? :* : nil }
     if mn = opt[:mean]
       return self - mn[*idxs]
     else
@@ -260,7 +260,7 @@ class CArray
         return (c[(n-1)/2] + c[n/2])/2.0
       end
     else
-      raise "CArray#median is not implemented for multiple ranks"
+      raise "CArray#median is not implemented for multiple ndims"
     end
 
   end
@@ -285,27 +285,23 @@ class CArray
     end
     out = []
     begin
-    pers.each do |per|
-      if per == 100
-        out << ca[n-1]
-      elsif per >= 0 and per < 100
-        if n > 1
-          f = (n-1)*per/100.0
-          k = f.floor
-          r = f - k
-          out << (1-r)*ca[k] + r*ca[k+1]
+      pers.each do |per|
+        if per == 100
+          out << ca[n-1]
+        elsif per >= 0 and per < 100
+          if n > 1
+            f = (n-1)*per/100.0
+            k = f.floor
+            r = f - k
+            out << (1-r)*ca[k] + r*ca[k+1]
+          else
+            out << ca[0]
+          end
         else
-          out << ca[0]
+          out << CA_NAN
         end
-      else
-        out << CA_NAN
       end
     end
-  rescue
-    p self[:is_not_masked]
-    p n
-    raise
-  end
     return out
   end
   
@@ -373,31 +369,5 @@ class CArray
 
 end
 
-class CArray
-
-  def self.summation (*dim)
-    out = nil
-    first = true
-    CArray.each_index(*dim) { |*idx|
-      if first
-        out = yield(*idx)
-        first = false
-      else  
-        out += yield(*idx)
-      end
-    }
-    return out
-  end
-  
-  def by (other)
-    case other
-    when CArray
-      return (self[nil][nil,:*]*other[nil][:*,nil]).reshape(*(dim+other.dim))
-    else
-      return self * other
-    end
-  end
-  
-end
 
 

data/lib/carray/math/histogram.rb

@@ -49,7 +49,7 @@ class CAHistogram < CArray
       raise "scales should be an array of scales"
     end
 
-    rank = scales.size
+    ndim = scales.size
     @scales = scales.clone
     @scales.map! { |s| CArray.wrap_readonly(s, CA_DOUBLE) }
     
@@ -60,10 +60,10 @@ class CAHistogram < CArray
         raise "invalid length of offset in option"
       end
     else
-      @offsets = Array.new(rank) { 0 }
+      @offsets = Array.new(ndim) { 0 }
     end
 
-    dim = Array.new(rank) { |i| 
+    dim = Array.new(ndim) { |i| 
       case @offsets[i]
       when 0
         @scales[i].size
@@ -76,12 +76,12 @@ class CAHistogram < CArray
     
     super(data_type, dim, &block)
 
-    @mid_points = Array.new(rank) { |i|
+    @mid_points = Array.new(ndim) { |i|
       x = (@scales[i] + @scales[i].shifted(-1))/2
       x[0..-2].to_ca
     }
 
-    @inner = self[*Array.new(rank) { |i| @offsets[i]..-2 }]
+    @inner = self[*Array.new(ndim) { |i| @offsets[i]..-2 }]
 
   end
 
@@ -91,7 +91,7 @@ class CAHistogram < CArray
   alias midpoints mid_points
 
   def increment (*values)
-    idx = Array.new(rank) {|i|
+    idx = Array.new(ndim) {|i|
       vi = CArray.wrap_readonly(values[i], CA_DOUBLE)
       @scales[i].bin(vi, @include_upper, @include_lowest, @offsets[i]).to_ca
     }
@@ -103,7 +103,7 @@ class CAHistogram < CArray
     val = CArray.wrap_readonly(values.pop, self.data_type)
     sel = val.ne(0)
     val = val[sel].to_ca
-    idx = Array.new(rank) {|i|
+    idx = Array.new(ndim) {|i|
       vi = CArray.wrap_readonly(values[i], CA_DOUBLE)[sel]
       @scales[i].bin(vi, @include_upper, @include_lowest, @offsets[i]).to_ca
     }

data/lib/carray/mkmf.rb

@@ -18,6 +18,13 @@ def have_carray
   rescue LoadError
     abort "Ruby/CArray is not installed"
   end
+  $LOAD_PATH.each do |path|
+    if File.exist? File.join(path, 'carray.h')
+      dir_config("carray", path, path)      
+      break
+    end
+  end
+=begin  
   dir_config("carray", $sitearchdir, $sitearchdir)
   if defined? Gem
     if Gem::VERSION >= "1.7.0"
@@ -34,6 +41,7 @@ def have_carray
       end
     end
   end
+=end
   status = true
   status &= have_header("carray.h")
   if /cygwin|mingw/ =~ RUBY_PLATFORM

data/lib/carray/object/ca_obj_pack.rb

@@ -22,9 +22,9 @@ class CAPack < CAObject # :nodoc:
 
   def initialize (list, options={})
     @list   = list
-    @rank   = options[:rank]
-    unless @rank
-      @rank = list.map{|m| m.rank}.min
+    @ndim   = options[:ndim]
+    unless @ndim
+      @ndim = list.map{|m| m.ndim}.min
     end
     @names  = options[:names] || [nil]*@list.size
     @dim    = guess_dim(list)
@@ -55,10 +55,10 @@ class CAPack < CAObject # :nodoc:
     list.each do |mem|
       case mem
       when CArray
-        if mem.rank < @rank
-          raise "mem.rank < @rank"
+        if mem.ndim < @ndim
+          raise "mem.ndim < @ndim"
         else
-          newdim = mem.dim[0, @rank]
+          newdim = mem.dim[0, @ndim]
         end
         if dim
           unless dim == newdim
@@ -78,10 +78,10 @@ class CAPack < CAObject # :nodoc:
         name = @names[i]
         case mem
         when CArray
-          if mem.rank == @rank
+          if mem.ndim == @ndim
             s.member mem.data_type, name, :bytes=>mem.bytes ### anonymous member
           else
-            dummy = Array.new(@rank){0} + [false]
+            dummy = Array.new(@ndim){0} + [false]
             s.member mem[*dummy].to_ca, name                ### anonymous member
           end
         else

data/lib/carray/obsolete.rb

@@ -0,0 +1,272 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/obsolete.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
+#
+# ----------------------------------------------------------------------------
+
+module CA
+  TableMethods = CArray::TableMethods
+end
+
+class CArray
+  
+  ### obsolete methods
+
+  def extend_as_table (column_names)
+    warn "CArray#extend_as_table will be obsolete"
+    self.extend CArray::TableMethods
+    self.column_names = column_names
+    self
+  end
+
+  # pulled
+
+  def pulled (*args)
+    warn "CArray#pulled will be obsolete"
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx]
+  end
+  
+  def pull (*args)
+    warn "CArray#pull will be obsolete"
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx].to_ca
+  end
+
+  # Returns the array eliminated all the duplicated elements.
+  def duplicated_values
+    warn "CArray#duplicated_values will be obsolete"
+    if uniq.size == size
+      return []
+    else
+      hash = {}
+      list = []
+      each_with_addr do |v, addr|
+        if v == UNDEF
+          next
+        elsif hash[v]
+          list << [v, addr, hash[v]]
+          hash[v] += 1
+        else
+          hash[v] = 0
+        end
+      end
+      return list
+    end
+  end
+
+  def self.summation (*dim)
+    warn "CArray.summation will be obsolete"
+    out = nil
+    first = true
+    CArray.each_index(*dim) { |*idx|
+      if first
+        out = yield(*idx)
+        first = false
+      else
+        out += yield(*idx)
+      end
+    }
+    return out
+  end
+  
+  def by (other)
+    warn "CArray#by will be obsolete"
+    case other
+    when CArray
+      return (self[nil][nil,:*]*other[nil][:*,nil]).reshape(*(dim+other.dim))
+    else
+      return self * other
+    end
+  end
+
+  def save_binary (filename, opt={})    # :nodoc: 
+    warn "CArray#save_binary will be obsolete, use CArray.save"
+    open(filename, "w") { |io|
+      return Serializer.new(io).save(self, opt)
+    }
+  end
+
+  def self.load_binary (filename, opt={})     # :nodoc: 
+    warn "CArray.load_binary will be obsolete, use CArray.load"
+    open(filename) { |io|
+      return Serializer.new(io).load(opt)
+    }
+  end
+
+  def save_binary_io (io, opt={})        # :nodoc:
+    warn "CArray#save_binary_io will be obsolete, use CArray.save"
+    return Serializer.new(io).save(self, opt) 
+  end
+
+  def self.load_binary_io (io, opt={})   # :nodoc:
+    warn "CArray#load_binary_io will be obsolete, use CArray.load"
+    return Serializer.new(io).load(opt)   
+  end 
+
+  def to_binary (io="", opt={})          # :nodoc:
+    warn "CArray#to_binary will be obsolete, use CArray.dump"
+    Serializer.new(io).save(self, opt) 
+    return io
+  end
+
+  def self.from_binary (io, opt={})      # :nodoc:
+    warn "CArray.from_binary will be obsolete, use CArray.load"
+    return Serializer.new(io).load(opt)   
+  end 
+
+  def replace_value (from, to)
+    warn "CArray#replace_value will be obsolete"
+    self[:eq, from] = to
+    return self
+  end
+  
+  def asign (*idx)
+    warn "CArray#asign will be obsolete"
+    self[*idx] = yield
+    return self
+  end
+  
+  def fa                               # :nodoc:
+    warn "CArray#fa will be obsolete, use CArray#t"
+    return self.t
+  end
+
+  def block_iterator (*argv)           # :nodoc:
+    warn "CArray#block_iterator will be obsolete, use CArray#blocks"
+    return blocks(*argv)
+  end
+
+  def window_iterator (*argv)          # :nodoc:
+    warn "CArray#window_iterator will be obsolete, use CArray#windows"
+    return windows(*argv)
+  end
+
+  def rotated (*argv)                  # :nodoc:
+    warn "CArray#rotated will be obsolete, use CArray#rolled"
+    argv.push({:roll => Array.new(ndim){1} })
+    return shifted(*argv)
+  end
+
+  def rotate! (*argv)                  # :nodoc:
+    warn "CArray#rotate! will be obsolete, use CArray#roll!"
+    self[] = self.rolled(*argv)
+    return self
+  end
+
+  def rotate (*argv)                   # :nodoc:
+    warn "CArray#rotate will be obsolete, use CArray#roll"
+    return self.rolled(*argv).to_ca
+  end
+
+  def select (&block)                  # :nodoc:
+    warn "CArray#select will be obsolete"
+    case block.arity
+    when 1
+      return self[*yield(self)]
+    when -1, 0
+      return self[*instance_exec(&block)]
+    else
+      raise
+    end
+  end
+
+  def transform (type, dim, opt = {}) # :nodoc:
+    warn("CArray#transform will be obsolete")
+    return refer(type, dim, opt).to_ca
+  end
+  
+  def classify (klass, outlier = nil)  # :nodoc:
+    warn "CArray#classify will be obsolete"
+    b = CArray.int32(*dim)
+    f = CArray.boolean(*dim) { 1 }
+    attach {
+      (klass.elements-1).times do |i|
+        r = f.and(self < klass[i+1])
+        b[r] = i
+        f[r] = 0
+      end
+      if outlier
+        b[self < klass[0]] = outlier
+        b[f] = outlier
+      else
+        b[self < klass[0]] = -1
+        b[f] = klass.elements-1
+      end
+    }
+    return b
+  end
+
+
+
+end
+
+=begin
+
+class Numeric
+  
+  [
+    :boolean,
+    :int8,
+    :uint8,
+    :int16,
+    :uint16,
+    :int32,
+    :uint32,
+    :int64,
+    :uint64,
+    :float32,
+    :float64,
+    :float128,
+    :cmplx64,
+    :cmplx128,
+    :cmplx256,
+    :byte,
+    :short,
+    :int,
+    :float,
+    :double,
+    :complex,
+    :dcomplex,
+    :object
+  ].each do |name|
+    class_eval %{
+      def #{name} ()
+        warn "Numeric##{name} will be obsolete"
+        CScalar.new(#{name.inspect}) {self}
+      end
+    }
+  end
+
+end
+
+class CArray
+  def histogram (klass)
+    c = CArray.int32(klass.elements-1)
+    f = CArray.boolean(*dim) { 1 }
+    attach {
+      k = 0
+      r = f.and(self < klass[0])
+      f[r] = 0
+      (klass.elements-1).times do |i|
+        r = f.and(self < klass[i+1])
+        c[k] = r.count_true
+        f[r] = 0
+        k+=1
+      end
+    }
+    return c
+  end
+
+  def self.load_from_file (filename, data_type, dim, opt={}) # :nodoc:
+    raise "Sorry, CArray.load_from_file is depleted"
+  end
+
+end
+=end