carray 1.2.0 → 1.3.0

data/ext/calculus/carray_interp.c

@@ -15,9 +15,9 @@
 #include <math.h>
 
 static int
-find_index (int n, double *y, double yy, int *major, double *frac)
+find_index (ca_size_t n, double *y, double yy, ca_size_t *major, double *frac)
 {
-  int   a, b, c, x1;
+  ca_size_t  a, b, c, x1;
   double ya, yb, yc;
   double y1, y2;
 
@@ -33,7 +33,7 @@ find_index (int n, double *y, double yy, int *major, double *frac)
 
   /* check for equally spaced scale */
 
-  a = (int)((yy-y[0])/(y[n-1]-y[0])*(n-1));
+  a = (ca_size_t)((yy-y[0])/(y[n-1]-y[0])*(n-1));
 
   if ( a >= 0 && a < n-1 ) {
     if ( (y[a] - yy) * (y[a+1] - yy) <= 0 ) {
@@ -118,7 +118,7 @@ find_index (int n, double *y, double yy, int *major, double *frac)
 */
 
 static int
-linear_interp_loop (CArray *ca, int *major, double *frac,
+linear_interp_loop (CArray *ca, ca_size_t *major, double *frac,
                     int level, int32_t *idx, double wt, double *valp)
 {
   double tmp;
@@ -154,9 +154,9 @@ linear_interp_loop (CArray *ca, int *major, double *frac,
 }
 
 static double
-linear_interp (CArray *ca, int *major, double *frac)
+linear_interp (CArray *ca, ca_size_t *major, double *frac)
 {
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   double value = 0;
   linear_interp_loop(ca, major, frac, 0, idx, 1, &value);
   return value;
@@ -171,12 +171,12 @@ If value[n] is NaN, the interpolation will be made for each index of the dimensi
 static int
 ca_interpolate_loop (CArray *ca, double **scale,
                      CArray **value,
-                     int *major, double *frac,
+                     ca_size_t *major, double *frac,
                      int level, double **dstp)
 {
   double val, frc;
-  int maj;
-  int i;
+  ca_size_t maj;
+  ca_size_t i;
   if ( level == ca->rank-1 ) {
     if ( ! value[level] ) {
       for (i=0; i<ca->dim[level]; i++) {
@@ -221,7 +221,7 @@ ca_interpolate_loop (CArray *ca, double **scale,
 int
 ca_interpolate (CArray *ca, double **scale, CArray **value, double *outp)
 {
-  int major[CA_RANK_MAX];
+  ca_size_t major[CA_RANK_MAX];
   double frac[CA_RANK_MAX];
   int status;
 
@@ -239,7 +239,8 @@ rb_ca_interpolate_bilinear (int argc, VALUE *argv, volatile VALUE self)
   double *scales[CA_RANK_MAX];
   CArray *values[CA_RANK_MAX];
   CArray *scales_ca[CA_RANK_MAX];
-  int32_t out_rank, out_dim[CA_RANK_MAX];
+  int8_t out_rank;
+  ca_size_t out_dim[CA_RANK_MAX];
   int i;
 
   rb_scan_args(argc, argv, "2", &vscales, &vvalues);

data/ext/fortio/lib/fortio/fortran_sequential.rb

@@ -114,7 +114,7 @@ class FortranSequential
         case fmt = fmts.shift
         when String
           list = []
-          specs = fmt.scan(/(?:\d+)(?:a\[\d+\]|\w)/)
+          specs = fmt.scan(/(?:\d+|)(?:a\[\d+\]|\w)/)
           while not specs.empty?
             case specs.shift
             when /(\d+)?a\[(\d+)\]/
@@ -196,7 +196,7 @@ class FortranSequential
         end
         case fmt
         when String
-          specs = fmt.scan(/(?:\d+)(?:a\[\d+\]|\w)/)
+          specs = fmt.scan(/(?:\d+|)(?:a\[\d+\]|\w)/)
           while not specs.empty?
             case specs.shift
             when /(\d+)?a\[(\d+)\]/

data/ext/fortio/ruby_fortio.c

@@ -36,7 +36,7 @@ rb_ff_read_F (VALUE mod, VALUE vbuffer, VALUE vscale, VALUE vlength, VALUE vprec
 {
   double val;
   int status;
-  status = read_F(StringValuePtr(vbuffer), RSTRING_LEN(vbuffer),
+  status = read_F(StringValuePtr(vbuffer), (int) RSTRING_LEN(vbuffer),
                   NUM2INT(vscale), NUM2INT(vlength), NUM2INT(vprec), &val);
   if ( ! status ) {
     rb_raise(rb_eRuntimeError, "invalid string for F descriptor");

data/ext/imagemap/carray_imagemap.c

@@ -37,9 +37,9 @@ static void
 draw_linex (CArray *ca, float x0, float y0, float x1, float y1, char *ptr)
 {
   float x, y;
-  int ix, iy;
-  int dim0 = ca->dim[0];
-  int dim1 = ca->dim[1];
+  ca_size_t ix, iy;
+  ca_size_t dim0 = ca->dim[0];
+  ca_size_t dim1 = ca->dim[1];
   float a = (y1-y0)/(x1-x0);
   for (x=x0; x<x1; x+=1) {
     y = a*(x-x0)+y0;
@@ -56,9 +56,9 @@ static void
 draw_liney (CArray *ca, float x0, float y0, float x1, float y1, char *ptr)
 {
   float x, y;
-  int ix, iy;
-  int dim0 = ca->dim[0];
-  int dim1 = ca->dim[1];
+  ca_size_t ix, iy;
+  ca_size_t dim0 = ca->dim[0];
+  ca_size_t dim1 = ca->dim[1];
   float a = (x1-x0)/(y1-y0);
   for (y=y0; y<y1; y+=1) {
     x = a*(y-y0)+x0;
@@ -136,8 +136,8 @@ fill_rect (CArray *image, float x[4], float y[4], char *ptr)
   CArray *mask;
   float xmin, xmax, ymin, ymax;
   float gx[4], gy[4];
-  int32_t dim[2];
-  int32_t i, j, ixmin, iymin, ixmax, iymax;
+  ca_size_t dim[2];
+  ca_size_t i, j, ixmin, iymin, ixmax, iymax;
   char  one = 1;
 
   xmin = x[0];
@@ -162,11 +162,11 @@ fill_rect (CArray *image, float x[4], float y[4], char *ptr)
     }
   }
 
-  ixmin = (int32_t) floor(xmin);
-  iymin = (int32_t) floor(ymin);
+  ixmin = (ca_size_t) floor(xmin);
+  iymin = (ca_size_t) floor(ymin);
 
-  ixmax = (int32_t) ceil(xmax) + 1;
-  iymax = (int32_t) ceil(ymax) + 1;
+  ixmax = (ca_size_t) ceil(xmax) + 1;
+  iymax = (ca_size_t) ceil(ymax) + 1;
 
   dim[0] = ixmax - ixmin + 1;
   dim[1] = iymax - iymin + 1;
@@ -240,7 +240,7 @@ rb_im_fill_rect (VALUE self,
 }
 
 void
-draw_hline_gradation (CArray *image, int iy, 
+draw_hline_gradation (CArray *image, ca_size_t iy, 
           float x0, float x1, float z0, float z1);
 
 static VALUE
@@ -251,7 +251,7 @@ rb_img_draw_hline_gradation (VALUE self, VALUE viy,
 
   Data_Get_Struct(self, CArray, image);
 
-  draw_hline_gradation(image, NUM2INT(viy),
+  draw_hline_gradation(image, NUM2SIZE(viy),
            NUM2DBL(vx0), NUM2DBL(vx1), NUM2DBL(vz0), NUM2DBL(vz1));
 
   return Qnil;

data/ext/narray/ca_wrap_narray.c

@@ -123,7 +123,7 @@ rb_cary_na_ref_new_i (int argc, VALUE *argv, VALUE self, VALUE klass)
 {
   CArray *orig;
   struct NARRAY *ary;
-  int i;
+  int8_t i;
 
   Data_Get_Struct(self, CArray, orig);
 
@@ -147,20 +147,20 @@ rb_cary_na_ref_new_i (int argc, VALUE *argv, VALUE self, VALUE klass)
     ary->rank = orig->rank;
     ary->shape = ALLOC_N(int, ary->rank);
     for (i=0; i<ary->rank; i++) {
-      ary->shape[i] = orig->dim[ary->rank-1-i];
+      ary->shape[i] = (int) orig->dim[ary->rank-1-i];
     }
-    ary->total = orig->elements;
+    ary->total = (int) orig->elements;
     ary->ptr   = orig->ptr;
   }
   else {
-    int32_t elements = 1;
+    ca_size_t elements = 1;
     ary->rank = argc;
     ary->shape = ALLOC_N(int, ary->rank);
     for (i=0; i<ary->rank; i++) {
       ary->shape[i] = NUM2INT(argv[i]);
       elements *= ary->shape[i];
     }
-    ary->total = elements;
+    ary->total = (int) elements;
     ary->ptr   = orig->ptr;
     if ( elements != orig->elements ) {
       free(ary->shape);
@@ -221,7 +221,14 @@ rb_cary_to_na_bang_i (VALUE self, VALUE klass)
     obj = na_make_empty(type, klass);
   }
   else {
-    obj = na_make_object(type, ca->rank, (int *) ca->dim, klass);
+    int shape[127];
+    int i;
+
+    for (i=0; i<ca->rank; i++) {
+      shape[i] = (int) ca->dim[ca->rank-i-1];
+    }
+
+    obj = na_make_object(type, ca->rank, shape, klass);
     GetNArray(obj, na);
 
     fary = rb_ca_farray(self);
@@ -281,13 +288,15 @@ rb_cary_to_na_i (VALUE self, VALUE klass)
     obj = na_make_empty(type, klass);
   }
   else {
-    obj = na_make_object(type, ca->rank, (int *) ca->dim, klass);
-    GetNArray(obj, na);
-
+    int shape[127];
+    
     for (i=0; i<ca->rank; i++) {
-      na->shape[i] = ca->dim[ca->rank-i-1];
+      shape[i] = (int) ca->dim[ca->rank-i-1];
     }
 
+    obj = na_make_object(type, ca->rank, shape, klass);
+    GetNArray(obj, na);
+
     ca_copy_data(ca, na->ptr);
   }
 
@@ -337,7 +346,7 @@ rb_na_ca_ref_new (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE obj;
   struct NARRAY *na;
-  int32_t dim[CA_RANK_MAX];
+  ca_size_t dim[CA_RANK_MAX];
   int8_t data_type;
   int i;
 
@@ -346,7 +355,7 @@ rb_na_ca_ref_new (int argc, VALUE *argv, VALUE self)
   data_type = na_typecode_to_ca_data_type(na->type);
 
   if ( na->total == 0 ) {
-    int32_t zero = 0;
+    ca_size_t zero = 0;
     obj = rb_carray_wrap_ptr(data_type, 1, &zero, 0, NULL,
                              &EMPTY_ARRAY_PTR, self); /* avoid ca->ptr == NULL */
   }
@@ -387,16 +396,16 @@ rb_na_to_ca (VALUE self)
   volatile VALUE obj;
   CArray *ca;
   struct NARRAY *na;
-  int32_t dim[CA_RANK_MAX];
-  int32_t data_type;
-  int32_t i;
+  ca_size_t dim[CA_RANK_MAX];
+  ca_size_t data_type;
+  ca_size_t i;
 
   GetNArray(self, na);
 
   data_type = na_typecode_to_ca_data_type(na->type);
 
   if ( na->total == 0 ) {
-    int32_t zero = 0;
+    ca_size_t zero = 0;
     obj = rb_carray_new(data_type, 1, &zero, 0, NULL);
   }
   else {
@@ -430,16 +439,16 @@ rb_na_to_ca_bang (VALUE self)
   volatile VALUE obj, fary;
   CArray *ca;
   struct NARRAY *na;
-  int32_t dim[CA_RANK_MAX];
-  int32_t data_type;
-  int32_t i;
+  ca_size_t dim[CA_RANK_MAX];
+  ca_size_t data_type;
+  ca_size_t i;
 
   GetNArray(self, na);
 
   data_type = na_typecode_to_ca_data_type(na->type);
 
   if ( na->total == 0 ) {
-    int32_t zero = 0;
+    ca_size_t zero = 0;
     obj = rb_carray_new(data_type, 1, &zero, 0, NULL);
   }
   else {
@@ -449,7 +458,7 @@ rb_na_to_ca_bang (VALUE self)
       dim[i] = na->shape[na->rank-i-1];
     }
 
-    obj = rb_carray_new(data_type, na->rank, na->shape, 0, NULL);
+    obj = rb_carray_new(data_type, na->rank, dim, 0, NULL);
     fary = rb_ca_farray(obj);
     Data_Get_Struct(fary, CArray, ca);
 

data/extconf.rb

@@ -68,6 +68,8 @@ end
 
 $CFLAGS += " -Wall -O2"
 # $CFLAGS += " -m128bit-long-double"  ### gcc only
+# $CFLAGS += " -Wno-absolute-value"
+# $LDFLAGS += " -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
 
 # --- check data types
 
@@ -118,6 +120,9 @@ else
 	have_type("long long", header)
 	have_type("float", header)
 	have_type("double", header)
+  if have_type("long double", header)
+    check_sizeof("long double")
+  end
   if have_header("complex.h")
     complex_h = "complex.h"
     have_type("float complex",  complex_h)

data/lib/carray/base/basic.rb

@@ -20,7 +20,7 @@ end
 
 class Array                          # :nodoc:
   def +@
-    return CA_INT32(self)
+    return CA_SIZE(self)
   end
   def to_ca
     return CA_OBJECT(self)
@@ -29,7 +29,7 @@ end
 
 class Range                          # :nodoc: 
   def +@
-    return CA_INT32(self)    
+    return CA_SIZE(self)    
   end
   def to_ca
     return CA_OBJECT(self)
@@ -149,6 +149,7 @@ end
  "CA_DOUBLE",
  "CA_COMPLEX",
  "CA_DCOMPLEX",
+ "CA_SIZE",
 ].each do |name|
   eval %{
     def #{name} (*val)
@@ -920,7 +921,7 @@ class CArray
   def self.join (*argv)
     # get options
     case argv.first
-    when Fixnum, Symbol, String
+    when Integer, Symbol, String
       type, = *CArray.guess_type_and_bytes(argv.shift, 0)
     else
       type = argv.flatten.first.data_type

data/lib/carray/base/serialize.rb

@@ -53,11 +53,11 @@ class CArray::Serializer   # :nodoc:
     char_p    :data_type_name, :bytes=>8
     char_p    :endian,         :bytes=>4
     int32     :data_type
-    int32     :bytes
+    int64     :bytes
     int32     :rank
-    int32     :elements
+    int64     :elements
     int32     :has_mask
-    array     :dim,            :type => CArray.int32(CA_RANK_MAX)
+    array     :dim,            :type => CArray.int64(CA_RANK_MAX)
     int32     :has_attr
   }
 

data/lib/carray/graphics/gnuplot.rb

@@ -511,13 +511,13 @@ class CA::Gnuplot # :nodoc:
     list = list.clone
     conf = []
     while not list.empty? and
-          ( list.last.is_a?(Fixnum) or
+          ( list.last.is_a?(Integer) or
             list.last.is_a?(Symbol) or
             list.last.is_a?(String) or
             list.last.nil? )
       conf.unshift(list.pop)
     end
-    if conf.last.is_a?(Fixnum)
+    if conf.last.is_a?(Integer)
       idx = conf.pop
       case idx
       when 1,2
@@ -1920,17 +1920,21 @@ __EOD__
       end
 
       lines = text.split("\n").map{|line| line.strip }
-
-      model   = "RGB"
+      
+      model   = "HSV"
       entries = []
       lines.each do |line|
         case line
-        when /\A\#\s*COLOR_MODEL\s*=\s*\+(.+)\s*\Z/
+        when /\A\#\s*COLOR_MODEL\s*=\s*(.+)\s*\Z/
           model = $1.upcase
         when /\A\Z/, /\A#/, /\A([FBN])\s*(.*)\Z/
           next
         else
-          entries.push(line.split(/\s+/)[0,8].map{|x| x.to_f})
+          list = line.split(/\s+/)
+          list[1] = list[1].split(/\-/)
+          list[3] = list[3].split(/\-/)
+          list = list.flatten.map{|x| x.to_f}
+          entries.push(list)
         end
       end
 
@@ -1946,7 +1950,6 @@ __EOD__
         color[level, nil] = entry[5, 3]
         level += 1
       end
-
       if model =~ /HSV/
         color[nil, 0] /= 360
       else

data/lib/carray/io/csv.rb

@@ -381,14 +381,15 @@ module CA
 
   class CSVWriter      # :nodoc:
 
-    def initialize (sep=",", rs=$/, &block)
+    def initialize (sep=",", rs=$/, fill="", &block)
       @block = block
       @sep   = sep
       @rs    = rs
+      @fill  = fill
     end
 
     def write_io (table, io)
-      return Processor.new(table, io, @sep, @rs, &@block).run
+      return Processor.new(table, io, @sep, @rs, @fill, &@block).run
     end
 
     def write_string (table, string) 
@@ -404,10 +405,11 @@ module CA
 
     class Processor   # :nodoc:
 
-      def initialize (table, io, sep, rs, &block)
+      def initialize (table, io, sep, rs, fill, &block)
         @io       = io
         @sep      = sep
         @rs       = rs
+        @fill     = fill
         @block    = block || proc { body }
         if table.has_data_class?
           @names = table.members
@@ -426,6 +428,9 @@ module CA
             @table = table.object  ### convert to CA_OBJECT
           end
         end
+        if @table.has_mask?
+          @table.unmask(@fill)
+        end
         @regexp_simple = /#{@sep}/o
       end
 
@@ -532,15 +537,15 @@ class CArray
     end
   end
 
-  def save_csv (file, option = {}, rs: $/, sep: ",", mode: "w", &block)
-    option = {:sep=>sep, :rs=>rs, :mode=>mode}.update(option)
-    writer = CA::CSVWriter.new(option[:sep], option[:rs], &block)
+  def save_csv (file, option = {}, rs: $/, sep: ",", fill: "", mode: "w", &block)
+    option = {:sep=>sep, :rs=>rs, :fill=>fill, :mode=>mode}.update(option)
+    writer = CA::CSVWriter.new(option[:sep], option[:rs], option[:fill], &block)
     return writer.write_file(self, file, option[:mode])
   end
 
-  def to_csv (io="", option ={}, rs: $/, sep: ",", &block)
-    option = {:sep=>sep, :rs=>rs}.update(option)
-    writer = CA::CSVWriter.new(option[:sep], option[:rs], &block)
+  def to_csv (io="", option ={}, rs: $/, sep: ",", fill: "", &block)
+    option = {:sep=>sep, :rs=>rs, :fill=>fill}.update(option)
+    writer = CA::CSVWriter.new(option[:sep], option[:rs], option[:fill], &block)
     case io
     when IO, StringIO
       return writer.write_io(self, io)