mdarray 0.5.3-java → 0.5.4-java

data/lib/mdarray.rb

@@ -66,7 +66,8 @@ require_relative 'env'
 class MDArray
   include_package "ucar.ma2"
   include Enumerable
-  
+
+  attr_reader :id                        # an array identifier
   attr_reader :type
   attr_reader :nc_array
   attr_reader :local_index               # internal helper index for this array
@@ -79,6 +80,13 @@ class MDArray
   
   @numerical = ["numeric", "byte", "short", "int", "long", "float", "double"]
   @non_numerical = ["boolean", "char", "string", "sequence"]
+  @characters = ('a'..'z').to_a + ('A'..'Z').to_a
+
+=begin
+  @characters = ('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a
+  @characters = ('A'..'F').to_a + (0..9).to_a
+  @characters = (32..126).to_a.pack('U*').chars.to_a
+=end
 
   class << self
     
@@ -90,7 +98,8 @@ class MDArray
     attr_accessor :unary_operator
     attr_accessor :previous_binary_operator
     attr_accessor :previous_unary_operator
-        
+    attr_reader :characters
+
   end
   
   MDArray.function_map = Map.new
@@ -104,7 +113,8 @@ class MDArray
   #------------------------------------------------------------------------------------
 
   def initialize(type, storage, section = false)
-
+    
+    @id = (0..8).map{MDArray.characters.sample}.join
     @type = type
     @nc_array = storage
     @local_index = Counter.new(self)
@@ -416,6 +426,44 @@ class MDArray
 
   end
   
+  #------------------------------------------------------------------------------------
+  #
+  #------------------------------------------------------------------------------------
+
+  private
+
+  #------------------------------------------------------------------------------------
+  #
+  #------------------------------------------------------------------------------------
+
+  def self.get_ncarray_type(nc_array)
+
+    if (nc_array.is_a? ArrayDouble)
+      "double"
+    elsif (nc_array.is_a? ArrayFloat)
+      "float"
+    elsif (nc_array.is_a? ArrayLong)
+      "long"
+    elsif (nc_array.is_a? ArrayInt)
+      "int"
+    elsif (nc_array.is_a? ArrayShort)
+      "short"
+    elsif (nc_array.is_a? ArrayByte)
+      "byte"
+    elsif (nc_array.is_a? ArrayChar)
+      "char"
+    elsif (nc_array.is_a? ArrayString)
+      "string"
+    elsif (nc_array.is_a? ArrayBoolean)
+      "boolean"
+    elsif (nc_array.is_a? ArrayObject)
+      "object"
+    else
+      raise "Unknow type for #{nc_array}"
+    end
+    
+  end
+
 end
 
 require_relative 'mdarray/proc_util'
@@ -434,4 +482,7 @@ require_relative 'mdarray/counter'
 require_relative 'mdarray/ruby_stats'
 require_relative 'mdarray/lazy_mdarray'
 require_relative 'mdarray/csv'
+require_relative 'mdarray/section'
+
 require_relative 'colt/colt'
+require_relative 'netcdf/netcdf'

data/lib/mdarray/access.rb

@@ -70,6 +70,14 @@ class MDArray
     @local_index.get(index)
   end
 
+  #---------------------------------------------------------------------------------------
+  # Sets a value for a scalar D0 array
+  #---------------------------------------------------------------------------------------
+
+  def get_scalar
+    @local_index.get_scalar
+  end
+
   #------------------------------------------------------------------------------------
   # 
   #------------------------------------------------------------------------------------
@@ -121,6 +129,14 @@ class MDArray
     @local_index.set(index, value)
   end
 
+  #---------------------------------------------------------------------------------------
+  # Sets a value for a scalar D0 array
+  #---------------------------------------------------------------------------------------
+
+  def set_scalar(value)
+    @local_index.set_scalar(value)
+  end
+
   #---------------------------------------------------------------------------------------
   #
   #---------------------------------------------------------------------------------------

data/lib/mdarray/counter.rb

@@ -178,6 +178,14 @@ class MDArray
       get_at_counter
     end
 
+    #---------------------------------------------------------------------------------------
+    #
+    #---------------------------------------------------------------------------------------
+
+    def get_scalar
+      @mdarray.nc_array.get
+    end
+
     #------------------------------------------------------------------------------------
     # Gets the element at the given counter.  Assumes that the counter is of the proper
     # shape. Also, counter should be an int java array
@@ -217,6 +225,14 @@ class MDArray
       set_at_counter(value)
     end
 
+    #---------------------------------------------------------------------------------------
+    #
+    #---------------------------------------------------------------------------------------
+
+    def set_scalar(value)
+      @mdarray.nc_array.set(value)
+    end
+
     #------------------------------------------------------------------------------------
     # Sets value of current counter.  Can be done fast, as the current counter is always
     # in its basic shape.

data/lib/mdarray/creation.rb

@@ -91,16 +91,28 @@ class MDArray
   #
   #------------------------------------------------------------------------------------
 
+  def self.from_jstorage(type, shape, jstorage, section = false)
+
+    dtype = DataType.valueOf(type.upcase)
+    jshape = shape.to_java :int
+    nc_array = Java::UcarMa2.Array.factory(dtype, jshape, jstorage)
+    klass = Object.const_get("#{type.capitalize}MDArray")
+    return klass.new(type, nc_array, section)
+
+  end
 
   #------------------------------------------------------------------------------------
   #
   #------------------------------------------------------------------------------------
 
   def self.build_from_nc_array(type, nc_array, section = false)
+    if (!type)
+      type = MDArray.get_ncarray_type(nc_array)
+    end
     klass = Object.const_get("#{type.capitalize}MDArray")
     return klass.new(type, nc_array, section)
   end
-
+  
   #------------------------------------------------------------------------------------
   # Builds a boolean mdarray
   # @param shape [Array] the shape of the mdarray as a ruby array

data/lib/mdarray/lazy_mdarray.rb

@@ -175,12 +175,16 @@ class LazyMDArray < ByteMDArray
   end
 
   #---------------------------------------------------------------------------------------
-  # Validates the expression checking if it can be performed: all dimensions need to be
-  # compatible
+  #
   #---------------------------------------------------------------------------------------
 
   protected
 
+  #---------------------------------------------------------------------------------------
+  # Validates the expression checking if it can be performed: all dimensions need to be
+  # compatible
+  #---------------------------------------------------------------------------------------
+
   def validate_fast(*args)
 
     # test_janino_function

data/lib/mdarray/lazy_operators.rb

@@ -26,6 +26,8 @@
 
 class LazyBinaryOperator < BinaryOperator
 
+  attr_reader :exp      # expression in string format
+
   #---------------------------------------------------------------------------------------
   #
   #---------------------------------------------------------------------------------------
@@ -35,6 +37,7 @@ class LazyBinaryOperator < BinaryOperator
     @op1 = args.shift
     @op2 = args.shift
     @other_args = args
+    @exp = ""
 
   end
 
@@ -52,11 +55,16 @@ class LazyBinaryOperator < BinaryOperator
     if (@op1.is_a? LazyMDArray)
       lazy.push(@op2)
       lazy.push(self)
+      # @exp << "(" << @op1.exp << name << @op2.id << ")"
     else
       lazy = LazyMDArray.new
       lazy.push(@op1)
       lazy.push(@op2)
       lazy.push(self)
+      # p @op1.id
+      # p @op2.id
+      # p @name
+      # @exp << "(" << @op1.id << name << @op2.id << ")"
     end
 
     return lazy

data/lib/mdarray/printing.rb

@@ -77,8 +77,17 @@ class MDArray
   #------------------------------------------------------------------------------------
 
   def print
-    (rank == 1)? print1d : printnd
+
+    case rank
+    when 0
+      print0d
+    when 1
+      print1d
+    else
+      printnd
+    end
     Kernel.print "\n"
+
   end
 
   #------------------------------------------------------------------------------------
@@ -125,6 +134,14 @@ class MDArray
     
   end
 
+  #------------------------------------------------------------------------------------
+  # 
+  #------------------------------------------------------------------------------------
+
+  def print0d
+    Kernel.print(@nc_array.get())
+  end
+
   #------------------------------------------------------------------------------------
   # 
   #------------------------------------------------------------------------------------
@@ -158,8 +175,6 @@ class MDArray
       end
     end
 
-    p "axes: #{axes}, slice: #{slice}, sizes: #{sizes}"
-
     counter.each_along_axes(axes) do |ct, axis|
       section(ct, sizes)
     end

data/lib/mdarray/section.rb

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+
+##########################################################################################
+# Copyright © 2013 Rodrigo Botafogo. All Rights Reserved. Permission to use, copy, modify, 
+# and distribute this software and its documentation, without fee and without a signed 
+# licensing agreement, is hereby granted, provided that the above copyright notice, this 
+# paragraph and the following two paragraphs appear in all copies, modifications, and 
+# distributions.
+#
+# IN NO EVENT SHALL RODRIGO BOTAFOGO BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, 
+# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF 
+# THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF RODRIGO BOTAFOGO HAS BEEN ADVISED OF THE 
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# RODRIGO BOTAFOGO SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
+# SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". 
+# RODRIGO BOTAFOGO HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, 
+# OR MODIFICATIONS.
+##########################################################################################
+
+class MDArray
+
+  class Section
+    include_package "ucar.ma2"
+
+    attr_reader :netcdf_elmt
+
+    #-------------------------------------------------------------------------------------
+    #
+    #-------------------------------------------------------------------------------------
+
+    def initialize(netcdf_section)
+      @netcdf_elmt = netcdf_section
+    end
+
+    #-------------------------------------------------------------------------------------
+    # Builds a section by passing the proper section definition. The following itens can
+    # be part of the section definition
+    # shape
+    # origin
+    # size
+    # stride
+    # range
+    # section
+    # spec
+    #-------------------------------------------------------------------------------------
+
+    def self.build(*args)
+
+      opts = Map.options(args)
+
+      shape = opts.getopt(:shape)
+      origin = opts.getopt(:origin)
+      size = opts.getopt(:size)
+      stride = opts.getopt(:stride)
+      range = opts.getopt(:range)
+      section = opts.getopt(:section)
+      spec = opts.getopt(:spec)
+
+      if (spec)
+        new(Java::UcarMa2::Section.new(spec))
+      elsif (shape)
+        if (origin)
+          new(Java::UcarMa2::Section.new(origin.to_java(:int), shape.to_java(:int)))
+        else
+          new(Java::UcarMa2::Section.new(shape.to_java(:int)))
+        end
+      elsif (origin)
+        if (!size || !stride)
+          raise "Invalid section definition, size and stride are required"
+        end
+        new(Java::UcarMa2::Section.new(origin.to_java(:int), size.to_java(:int), 
+                                       stride.to_java(:int)))
+      elsif (range)
+        new(Java::UcarMa2::Section.new(range))
+      end
+
+    end
+
+    #-------------------------------------------------------------------------------------
+    #
+    #-------------------------------------------------------------------------------------
+
+    def print
+      p @netcdf_elmt.toString()
+    end
+
+    #-------------------------------------------------------------------------------------
+    #
+    #-------------------------------------------------------------------------------------
+
+    def to_s
+      @netcdf_elmt.toString()
+    end
+
+  end
+
+end
+
+

data/lib/netcdf/attribute.rb

@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+##########################################################################################
+# Copyright © 2013 Rodrigo Botafogo. All Rights Reserved. Permission to use, copy, modify, 
+# and distribute this software and its documentation, without fee and without a signed 
+# licensing agreement, is hereby granted, provided that the above copyright notice, this 
+# paragraph and the following two paragraphs appear in all copies, modifications, and 
+# distributions.
+#
+# IN NO EVENT SHALL RODRIGO BOTAFOGO BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, 
+# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF 
+# THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF RODRIGO BOTAFOGO HAS BEEN ADVISED OF THE 
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# RODRIGO BOTAFOGO SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
+# SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". 
+# RODRIGO BOTAFOGO HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, 
+# OR MODIFICATIONS.
+##########################################################################################
+
+#=========================================================================================
+#
+#=========================================================================================
+
+class NetCDF
+
+  #=======================================================================================
+  # An Attribute has a name and a value, used for associating arbitrary metadata with 
+  # a Variable or a Group. The value can be a one dimensional array of Strings or 
+  # numeric values.
+  # Attributes are immutable.
+  #=======================================================================================
+
+  class Attribute < CDMNode
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def data_type
+      @netcdf_elmt.getDataType().toString()
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def length
+      @netcdf_elmt.getLength()
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def numeric_value(index = 0)
+      @netcdf_elmt.getNumericValue(index)
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def string_value(index = 0)
+      @netcdf_elmt.getStringValue(index)
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def value(index = 0)
+      @netcdf_elmt.getValue(index)
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def array?
+      @netcdf_elmt.isArray()
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def string?
+      @netcdf_elmt.isString()
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def unsigned?
+      @netcdf_elmt.isUnsigned()
+    end
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def to_string(strict = false)
+      @netcdf_elmt.toString(strict)
+    end
+
+    #------------------------------------------------------------------------------------
+    # Needs to be correctly rubyfied
+    #------------------------------------------------------------------------------------
+
+    def write_cdl(formater, strict = false)
+      @netcdf_elmt.write_cdl(formater, strict)
+    end
+
+  end # Attribute
+
+  #=======================================================================================
+  #
+  #=======================================================================================
+
+  class AttributeWriter < Attribute
+
+    #------------------------------------------------------------------------------------
+    #
+    #------------------------------------------------------------------------------------
+
+    def self.build(name, val, type = "int")
+
+      type = type.to_sym
+      value = val
+      if (val.is_a? Numeric)
+        value = val.to_java(type)
+      elsif (val.is_a? Array)
+        value = Array.new
+        val.each do |elmt|
+          if (elmt.is_a? Numeric)
+            value << elmt.to_java(type)
+          else
+            value << elmt
+          end
+        end
+      end
+
+      NetCDF::Attribute.new(Java::UcarNc2::Attribute.new(name, value))
+
+    end
+
+  end # AttributeWriter
+
+end
+
+