carray 1.3.5 → 1.5.2

data/{carray_utils.c → ext/carray_utils.c}

@@ -3,10 +3,8 @@
   carray_utils.c
 
   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
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -422,6 +420,11 @@ ca_bounds_normalize_index (int8_t bounds, ca_size_t size0, ca_size_t k)
   }
 }
 
+/* @private
+@overload scan_float (str, fill_value=nil)
+
+*/
+
 static VALUE
 rb_ca_s_scan_float (int argc, VALUE *argv, VALUE self)
 {
@@ -447,6 +450,11 @@ rb_ca_s_scan_float (int argc, VALUE *argv, VALUE self)
   }
 }
 
+/* @private
+@overload scan_int (str, fill_value=nil)
+
+*/
+
 static VALUE
 rb_ca_s_scan_int (int argc, VALUE *argv, VALUE self)
 {
@@ -564,7 +572,7 @@ rb_ca_guess_type_and_bytes (VALUE rtype, VALUE rbytes,
   }
 }
 
-/* rdoc:
+/* @private
   def CArray.guess_type_and_bytes (type, bytes=0)
   end
 */

data/{extconf.rb → ext/extconf.rb}

@@ -189,11 +189,6 @@ if ( not File.exist?("carray_stat_proc.c") ) or
   system("ruby carray_stat_proc.rb > carray_stat_proc.c")
 end
 
-puts "creating rdoc_ext.rb"
-system %{
-  ruby utils/extract_rdoc.rb > rdoc_ext.rb
-}
-
 # --- create Makefile
 
 create_makefile("carray_ext")
@@ -224,7 +219,7 @@ carray_stat_proc.c: carray_stat_proc.rb
 carray_math.c: carray_math.rb
 	${RUBY} carray_math.rb
 
-rdoc:
+yard:
 	sh utils/create_rdoc.sh
 
 clean-generated:

data/{mkmath.rb → ext/mkmath.rb}

@@ -289,7 +289,12 @@ ca_binop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_binop(self, other, ca_binop_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_binop(self, other, ca_binop_#{name}); 
+}
 static VALUE rb_ca_#{name}_bang (VALUE self, VALUE other)
 { return rb_ca_call_binop_bang(self, other, ca_binop_#{name}); }
   }
@@ -300,7 +305,7 @@ static VALUE rb_ca_#{name}_bang (VALUE self, VALUE other)
 }
   end
   METHODS     << %{
-  rb_define_method(rb_cCArray, "#{op}!", rb_ca_#{name}_bang, 1);
+  rb_define_method(rb_cCArray, "#{name}!", rb_ca_#{name}_bang, 1);
 }
 
 end
@@ -529,7 +534,12 @@ ca_bincmp_#{name}_#{type} (ca_size_t n, boolean8_t *m,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_bincmp(self, other, ca_bincmp_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_bincmp(self, other, ca_bincmp_#{name});
+}
   }
   DEFINITIONS << io.string
   if op

data/{ruby_carray.c → ext/ruby_carray.c}

@@ -3,10 +3,8 @@
   ruby_carray.c
 
   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
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -24,6 +22,7 @@ void Init_numeric_float_function ();
 void Init_carray_core ();
 void Init_carray_undef ();
 void Init_carray_class ();
+void Init_carray_data_type ();
 void Init_carray_test ();
 void Init_carray_attribute ();
 void Init_carray_loop ();
@@ -34,7 +33,6 @@ void Init_carray_iterator ();
 void Init_carray_operator ();
 void Init_carray_numeric ();
 void Init_carray_math ();
-void Init_carray_random ();
 void Init_carray_utils ();
 void Init_carray_order ();
 void Init_carray_sort_addr ();
@@ -70,6 +68,9 @@ void Init_ca_iter_dimension ();
 void Init_ca_iter_block ();
 void Init_ca_iter_window ();
 
+void Init_carray_mathfunc ();
+
+
 void
 Init_carray_ext ()
 {
@@ -94,7 +95,7 @@ Init_carray_ext ()
   rb_eCADataTypeError =
     rb_define_class_under(rb_cCArray, "DataTypeError", rb_eStandardError);
 
-  /* rdoc:
+  /* yard:
      class CArray::DataTypeError # :nodoc:
      end
   */
@@ -108,7 +109,7 @@ Init_carray_ext ()
 
   /* -- version -- */
 
-  /* rdoc: 
+  /* yard: 
     class CArray
       VERSION = nil         # :nodoc:
       VERSION_CODE = nil    # :nodoc:
@@ -119,11 +120,17 @@ Init_carray_ext ()
     end
   */
   
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION", rb_str_new2(CA_VERSION));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_CODE", INT2NUM(CA_VERSION_CODE));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_MAJOR", INT2NUM(CA_VERSION_MAJOR));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_MINOR", INT2NUM(CA_VERSION_MINOR));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_TEENY", INT2NUM(CA_VERSION_TEENY));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_DATE", rb_str_new2(CA_VERSION_DATE));
 
   /* -- system -- */
@@ -132,8 +139,10 @@ Init_carray_ext ()
   rb_define_const(rb_cObject, "CA_NIL", CA_NIL);
 
 #ifdef HAVE_COMPLEX_H
+  /* @private */
   rb_define_const(rb_cCArray, "HAVE_COMPLEX", Qtrue);
 #else
+  /* @private */
   rb_define_const(rb_cCArray, "HAVE_COMPLEX", Qfalse);
 #endif
 
@@ -166,7 +175,6 @@ Init_carray_ext ()
   rb_define_const(rb_cObject, "CA_DCOMPLEX",    INT2NUM(CA_DCOMPLEX));
   rb_define_const(rb_cObject, "CA_SIZE",        INT2NUM(CA_SIZE));
 
-
   rb_define_const(rb_cObject, "CA_ALIGN_VOIDP",    INT2NUM(CA_ALIGN_VOIDP));
   rb_define_const(rb_cObject, "CA_ALIGN_FIXLEN",   INT2NUM(CA_ALIGN_INT8));
   rb_define_const(rb_cObject, "CA_ALIGN_BOOLEAN",  INT2NUM(CA_ALIGN_INT8));
@@ -193,6 +201,7 @@ Init_carray_ext ()
   Init_numeric_float_function();
 
   Init_carray_class();
+  Init_carray_data_type();
   Init_carray_test();
   Init_carray_attribute();
   Init_carray_undef();
@@ -203,7 +212,6 @@ Init_carray_ext ()
   Init_carray_operator();
   Init_carray_math();      /* order of math, numeric should not be changed */
   Init_carray_numeric();   /* order of math, numeric should not be changed */
-  Init_carray_random();
   Init_carray_order();
   Init_carray_sort_addr();  
   Init_carray_stat();
@@ -240,5 +248,9 @@ Init_carray_ext ()
   Init_ca_iter_dimension();
   Init_ca_iter_block();
   Init_ca_iter_window();
+
+  Init_carray_mathfunc();
+
+
 }
 

data/{ruby_ccomplex.c → ext/ruby_ccomplex.c}

@@ -3,10 +3,8 @@
   ruby_ccomplex.c
 
   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
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 

data/{ruby_float_func.c → ext/ruby_float_func.c}

@@ -3,10 +3,8 @@
   ruby_numeric.c
 
   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
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 

data/ext/version.h

@@ -0,0 +1,16 @@
+/* ---------------------------------------------------------------------------
+
+  version.h
+
+  This file is part of Ruby/CArray extension library.
+
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
+
+---------------------------------------------------------------------------- */
+
+#define CA_VERSION "1.5.2"
+#define CA_VERSION_CODE 152
+#define CA_VERSION_MAJOR 1
+#define CA_VERSION_MINOR 5
+#define CA_VERSION_TEENY 2
+#define CA_VERSION_DATE "2020/07/22"

data/lib/carray.rb

@@ -14,15 +14,59 @@ major = RbConfig::CONFIG['MAJOR'].to_i
 minor = RbConfig::CONFIG['MINOR'].to_i
 teeny = RbConfig::CONFIG['TEENY'].to_i
 ruby_version_code = major * 100 + minor * 10 + teeny
+
 if ruby_version_code < 190
   require 'complex'
 end
 
+# main 
+
 require 'carray_ext'
-require 'carray/base/basic'
-require 'carray/base/math'
-require 'carray/base/iterator'
-require 'carray/base/struct'
-require 'carray/base/inspect'
-require 'carray/base/autoload'
-require 'carray/base/obsolete'
+
+require 'carray/inspect'
+require 'carray/basic'
+require 'carray/construct'
+require 'carray/mask'
+require 'carray/compose'
+require 'carray/transform'
+require 'carray/convert'
+require 'carray/testing'
+require 'carray/ordering'
+require 'carray/broadcast'
+
+require 'carray/math'
+require 'carray/iterator'
+require 'carray/struct'
+require 'carray/table'
+require 'carray/string'
+
+# obsolete methods
+
+require 'carray/obsolete'
+
+# autoload
+
+unless $CARRAY_NO_AUTOLOAD 
+  
+  require 'carray/autoload'
+  require 'carray/autoload/autoload_base'
+  require 'carray/autoload/autoload_io_imagemagick'
+  require 'carray/autoload/autoload_math_histogram'
+  require 'carray/autoload/autoload_math_recurrence'
+  require 'carray/autoload/autoload_object_iterator'
+  require 'carray/autoload/autoload_object_link'
+  require 'carray/autoload/autoload_object_pack'
+
+  require 'carray/autoload/autoload_gem_random'
+  require 'carray/autoload/autoload_gem_gnuplot'
+  require 'carray/autoload/autoload_gem_narray'
+  require 'carray/autoload/autoload_gem_numo_narray'
+  require 'carray/autoload/autoload_gem_io_csv'
+  require 'carray/autoload/autoload_gem_io_sqlite3'
+  require 'carray/autoload/autoload_gem_rmagick'
+  require 'carray/autoload/autoload_gem_cairo'
+  require 'carray/autoload/autoload_gem_opencv'
+  require 'carray/autoload/autoload_gem_ffi'
+
+  undef autoload_method
+end

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

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/autoload.rb
+#  carray/autoload.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -13,7 +13,11 @@
 def autoload_method (method, library)
   eval %{
     def #{method} (*argv, &block)
-      require "#{library}"
+      begin
+        require "#{library}"
+      rescue LoadError
+        raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+      end
       #{method}(*argv, &block)
     end
   }
@@ -23,7 +27,11 @@ class Class
   def autoload_method (method, library)
     class_eval %{
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -34,7 +42,11 @@ class Module
   def autoload_method (method, library)
     class_eval %{
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -46,7 +58,11 @@ class Module
     class_eval %{
       module_function
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -87,6 +103,33 @@ module CA
 
 end
 
+__END__
+names = {"carray" => true}
+Gem.path.each do |path|
+  gems = File.join(path, "gems")
+  if File.directory?(gems)
+    Dir.chdir(gems) {
+      Dir["carray-*"].sort.reverse.each do |dir|
+        name = dir.sub(/\-\d+\.\d+\.\d+\z/, '')
+        next if names[name]
+        lib = File.join(dir, "lib")
+        if File.directory?(lib)
+          Dir.chdir(lib) {
+            Dir["carray/autoload/autoload_*"].each do |loader|
+              begin
+                load File.expand_path(File.join(gems, dir, lib, loader.sub(/\.rb\z/, "")))
+              rescue LoadError
+              end
+            end
+          }
+        end
+        names[name] = true
+      end
+    }
+  end
+end
+
+__END__
 CA.each_load_path("carray/autoload") {
   Dir["autoload_*.rb"].each do |basename|
     if basename =~ /\A(autoload_.+)\.rb\Z/
@@ -98,4 +141,3 @@ CA.each_load_path("carray/autoload") {
   end
 }
 
-undef autoload_method

data/lib/carray/autoload/autoload_base.rb

@@ -1,5 +1,5 @@
 class CArray
-  serialize_rb = "carray/base/serialize"
+  serialize_rb = "carray/serialize"
   autoload :Serializer, serialize_rb
   autoload_method "self.save", serialize_rb
   autoload_method "self.load", serialize_rb
@@ -17,7 +17,3 @@ end
 class Rational < Numeric
   include FloatFunction
 end
-
-module CA
-  autoload :NumPy, "carray/base/numpysh.rb"
-end

data/lib/carray/autoload/autoload_gem_cairo.rb

@@ -0,0 +1,9 @@
+
+module Cairo
+  class Surface
+  end
+  class ImageSurface < Surface
+    autoload_method "self.new_from_ca", "carray-cairo"
+    autoload_method "ca", "carray-cairo"
+  end
+end