mdarray 0.4.2-java → 0.4.3-java

data/README.md

@@ -19,4 +19,25 @@ second dimension has a length of 3.
 [[ 1., 0., 0.],
  [ 0., 1., 2.]]
 
+
+* MDArray Properties
+  + Easy calculation for large numerical multi dimensional arrays;
+  + Basic types are: boolean, byte, short, int, long, float, double, string, structure;
+  + Based on JRuby, which allows importing Java libraries.  Version 0.4.0 only imports Java-NetCDF;
+  + Operator: +,-,*,/,%,**, >, >=, etc.
+  + Functions: abs, ceil, floor, truncate, is_zero, square, cube, fourth;
+  + Binary Operators: &, |, ^, ~ (binary_ones_complement), <<, >>;
+  + Ruby Math functions: acos, acosh, asin, asinh, atan, atan2, atanh, cbrt, cos, erf, exp, gamma, 
+      hypot, ldexp, log, log10, log2, sin, sinh, sqrt, tan, tanh, neg;
+  + Boolean operations on boolean arrays: and, or, not;
+  + Simple statistics: sum, min, max, mean, weighted_mean;
+  + Easy manipulation of arrays: reshape, reduce dimension, permute, section, slice, etc.
+
+
 MDArray wiki can be found at: https://github.com/rbotafogo/mdarray/wiki
+
+HISTORY
+=======
+
+19/04/2013: Version 0.4.3: Fixes a simple (but fatal bug).  No new features
+17/04/2013: Version 0.4.2: Adds simple statistics and boolean operators

data/lib/env.rb

@@ -1,11 +1,7 @@
-# Add path to CLASSPATH
+require 'java'
 
-def add_path(path)
-
-  $CLASSPATH << `cygpath -p -m #{path}`.tr("\n", "")
+$CLASSPATH << "#{File.dirname(__FILE__)}/../vendor/"
 
+Dir["#{File.dirname(__FILE__)}/../vendor/*.jar"].each do |jar|
+   require jar
 end
-
-add_path("../vendor/netcdfAll-4.3.16.jar")
-add_path(":../vendor/parallelcolt-0.9.4.jar")
-add_path(":../target/mdarray_helper.jar")

data/test/test_boolean.rb

@@ -4,8 +4,6 @@ require 'shoulda'
 
 require 'mdarray'
 
-require_relative 'env'
-
 class MDArrayTest < Test::Unit::TestCase
 
   context "Arithmetic Tests" do

data/test/test_complete.rb

@@ -21,12 +21,10 @@
 
 require 'simplecov'
 
-#require_relative 'env'
-
 #=begin
 SimpleCov.start do
   @filters = []
-  add_group "MDArray", "F:/rbotafogo/cygwin/home/zxb3/Desenv/MDArray/lib"
+  add_group "MDArray", "mdarray-0.4.2-java/lib"
 end
 #=end
 

data/test/test_printing.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require "test/unit"
 require 'shoulda'
 
-require 'env'
 require 'mdarray'
 
 class MDArrayTest < Test::Unit::TestCase

data/test/test_speed.rb

@@ -3,7 +3,6 @@ require "test/unit"
 require 'shoulda'
 require 'jruby/profiler'
 
-require 'env'
 require 'benchmark'
 
 require 'mdarray'

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "mdarray"
-$version="0.4.2"
+$version="0.4.3"

metadata

@@ -2,14 +2,14 @@
 name: mdarray
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.4.2
+  version: 0.4.3
 platform: java
 authors:
 - Rodrigo Botafogo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -105,7 +105,6 @@ files:
 - lib/mdarray/ruby_stats.rb
 - lib/mdarray/views.rb
 - test/arithmetic_casting.rb
-- test/env.rb
 - test/test_access.rb
 - test/test_boolean.rb
 - test/test_comparison.rb
@@ -113,7 +112,6 @@ files:
 - test/test_counter.rb
 - test/test_creation.rb
 - test/test_error.rb
-- test/test_lazy.rb
 - test/test_operator.rb
 - test/test_printing.rb
 - test/test_shape.rb
@@ -153,7 +151,6 @@ specification_version: 3
 summary: Multi dimensional array similar to narray and numpy.
 test_files:
 - test/arithmetic_casting.rb
-- test/env.rb
 - test/test_access.rb
 - test/test_boolean.rb
 - test/test_comparison.rb
@@ -161,7 +158,6 @@ test_files:
 - test/test_counter.rb
 - test/test_creation.rb
 - test/test_error.rb
-- test/test_lazy.rb
 - test/test_operator.rb
 - test/test_printing.rb
 - test/test_shape.rb

data/test/env.rb

@@ -1,50 +0,0 @@
-require 'rbconfig'
-
-# Config::CONFIG['host_os'] # returns mswin32 on Windows, for example
-# p Config::CONFIG
-
-# Fix environment variable for MultiCell
-# Prepare environment to work inside Cygwin
-
-# Return the cygpath of a path
-def cygpath(path)
-  `cygpath -p -m #{path}`.tr("\n", "")
-end
-
-# Add path to load path
-def mklib(path, home_path = true)
-
-  if (home_path)
-    lib = path + "/lib"
-  else
-    lib = path
-  end
-
-  $LOAD_PATH << `cygpath -p -m #{lib}`.tr("\n", "")
-
-end
-
-# Home directory for MDArray
-$MDARRAY_HOME_DIR = "/home/zxb3/Desenv/MDArray"
-mklib($MDARRAY_HOME_DIR)
-
-# Home directory for MultiCell
-$MC_HOME_DIR = "/home/zxb3/Desenv/MultiCell"
-mklib($MC_HOME_DIR)
-
-# Home directory for NcInterface
-$NCI_HOME_DIR = "/home/zxb3/Desenv/NcInterface"
-mklib($NCI_HOME_DIR)
-
-# Home directory for BM&F Bovespa files
-$BMF_BOVESPA_DIR = "/home/zxb3/Investimentos/SeriesHistoricas/BMF_BOVESPA/"
-
-# Home directory for results
-$RESULT_HOME_DIR = $MC_HOME_DIR + "/results/"
-
-=begin
-# Build Jruby classpath from environment classpath
-ENV['WCLASSPATH'].split(';').each do |path|
-  $CLASSPATH << cygpath(path)
-end
-=end

data/test/test_lazy.rb

@@ -1,52 +0,0 @@
-require 'rubygems'
-require "test/unit"
-require 'shoulda'
-
-require 'env'
-require 'mdarray'
-
-class MDArrayTest < Test::Unit::TestCase
-
-  context "Arithmetic Tests" do
-
-    setup do
-
-      # create a = [20 30 40 50]
-      @a = MDArray.arange(20, 60, 10)
-      # create b = [0 1 2 3]
-      @b = MDArray.arange(4)
-      # create c = [1.87 5.34 7.18 8.84]
-      @c = MDArray.double([4], [1.87, 5.34, 7.18, 8.84])
-      # create d = [[1 2] [3 4]]
-      @d = MDArray.int([2, 2], [1, 2, 3, 4])
-      # creates an array from a function (actually a block).  The name fromfunction
-      # is preserved to maintain API compatibility with NumPy (is it necessary?)
-      @e = MDArray.fromfunction("double", [4, 5, 6]) do |x, y, z|
-        3.21 * (x + y + z)
-      end
-      @f = MDArray.fromfunction("double", [4, 5, 6]) do |x, y, z|
-        9.57 * x + y + z
-      end
-      @g = MDArray.byte([1], [60])
-      @h = MDArray.byte([1], [13])
-      @i = MDArray.double([4], [2.0, 6.0, 5.0, 9.0])
-            
-    end # setup
-
-    #-------------------------------------------------------------------------------------
-    #
-    #-------------------------------------------------------------------------------------
-
-    should "do basic lazy operations" do
-
-      op = @a.add_(@b)
-      p op
-      p op.type
-      op.exec(3)
-
-    end
-
-  end
-
-end
-