nmatrix 0.1.0.rc3 → 0.1.0.rc4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc3
+  version: 0.1.0.rc4
 platform: ruby
 authors:
 - John Woods
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,30 +58,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rspec-longrun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,6 @@ files:
 - .travis.yml
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - History.txt
 - LICENSE.txt
 - Manifest.txt
@@ -150,7 +149,7 @@ files:
 - ext/nmatrix/math/getrf.h
 - ext/nmatrix/math/getri.h
 - ext/nmatrix/math/getrs.h
-- ext/nmatrix/math/idamax.h
+- ext/nmatrix/math/imax.h
 - ext/nmatrix/math/inc.h
 - ext/nmatrix/math/laswp.h
 - ext/nmatrix/math/long_dtype.h
@@ -204,7 +203,6 @@ files:
 - lib/nmatrix/math.rb
 - lib/nmatrix/monkeys.rb
 - lib/nmatrix/nmatrix.rb
-- lib/nmatrix/nvector.rb
 - lib/nmatrix/rspec.rb
 - lib/nmatrix/shortcuts.rb
 - lib/nmatrix/version.rb
@@ -238,15 +236,27 @@ homepage: http://sciruby.com
 licenses:
 - BSD 2-clause
 metadata: {}
-post_install_message: "***********************************************************\nWelcome
-  to SciRuby: Tools for Scientific Computing in Ruby!\n\nNMatrix requires a C compiler,
-  and has been tested only\nwith GCC 4.6+. We are happy to accept contributions\nwhich
-  improve the portability of this project.\n\nAlso required is ATLAS. Most Linux distributions
-  and Mac\nversions include ATLAS, but you may wish to compile it\nyourself. The Ubuntu/Debian
-  apt package for ATLAS WILL \nNOT WORK with NMatrix if LAPACK is also installed.\n\nMore
-  explicit instructions for NMatrix and SciRuby should\nbe available on the SciRuby
-  website, sciruby.com, or\nthrough our mailing list (which can be found on our web-\nsite).\n\nThanks
-  for trying out NMatrix! Happy coding!\n\n***********************************************************\n"
+post_install_message: |
+  ***********************************************************
+  Welcome to SciRuby: Tools for Scientific Computing in Ruby!
+
+  NMatrix requires a C compiler, and has been tested only
+  with GCC 4.6+. We are happy to accept contributions
+  which improve the portability of this project.
+
+  Also required is ATLAS. Most Linux distributions and Mac
+  versions include ATLAS, but you may wish to compile it
+  yourself. The Ubuntu/Debian apt package for ATLAS WILL
+  NOT WORK with NMatrix if LAPACK is also installed.
+
+  More explicit instructions for NMatrix and SciRuby should
+  be available on the SciRuby website, sciruby.com, or
+  through our mailing list (which can be found on our web-
+  site).
+
+  Thanks for trying out NMatrix! Happy coding!
+
+  ***********************************************************
 rdoc_options: []
 require_paths:
 - lib

data/Guardfile

@@ -1,6 +0,0 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { "spec" }
-  watch(%r{^ext/nmatrix/(.+)\.(c|cpp|h|rb)$}) { `rake compile | rake spec` }
-  watch('spec/spec_helper.rb')  { "spec" }
-end

data/ext/nmatrix/math/idamax.h

@@ -1,86 +0,0 @@
-/////////////////////////////////////////////////////////////////////
-// = NMatrix
-//
-// A linear algebra library for scientific computation in Ruby.
-// NMatrix is part of SciRuby.
-//
-// NMatrix was originally inspired by and derived from NArray, by
-// Masahiro Tanaka: http://narray.rubyforge.org
-//
-// == Copyright Information
-//
-// SciRuby is Copyright (c) 2010 - 2014, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012 - 2014, John Woods and the Ruby Science Foundation
-//
-// Please see LICENSE.txt for additional copyright notices.
-//
-// == Contributing
-//
-// By contributing source code to SciRuby, you agree to be bound by
-// our Contributor Agreement:
-//
-// * https://github.com/SciRuby/sciruby/wiki/Contributor-Agreement
-//
-// == idamax.h
-//
-// LAPACK idamax function in native C.
-//
-
-#ifndef IDAMAX_H
-#define IDAMAX_H
-
-namespace nm { namespace math {
-
-/*  Purpose */
-/*  ======= */
-
-/*     IDAMAX finds the index of element having max. absolute value. */
-
-/*  Further Details */
-/*  =============== */
-
-/*     jack dongarra, linpack, 3/11/78. */
-/*     modified 3/93 to return if incx .le. 0. */
-/*     modified 12/3/93, array(1) declarations changed to array(*) */
-
-/*  ===================================================================== */
-
-template <typename DType>
-inline int idamax(size_t n, DType *dx, int incx) {
-
-  /* Function Body */
-  if (n < 1 || incx <= 0) return -1;
-  if (n == 1)             return 0;
-
-  DType dmax;
-  size_t imax = 0;
-
-  if (incx == 1) { // if incrementing by 1
-
-    dmax = abs(dx[0]);
-
-    for (size_t i = 1; i < n; ++i) {
-      if (std::abs(dx[i]) > dmax) {
-        imax = i;
-        dmax = std::abs(dx[i]);
-      }
-    }
-
-  } else { // if incrementing by more than 1
-
-    dmax = std::abs(dx[0]);
-
-    for (size_t i = 1, ix = incx; i < n; ++i, ix += incx) {
-      if (std::abs(dx[ix]) > dmax) {
-        imax = i;
-        dmax = std::abs(dx[ix]);
-      }
-    }
-  }
-  return imax;
-} /* idamax_ */
-
-}} // end of namespace nm::math
-
-#endif
-

data/lib/nmatrix/nvector.rb

@@ -1,184 +0,0 @@
-#--
-# = NMatrix
-#
-# A linear algebra library for scientific computation in Ruby.
-# NMatrix is part of SciRuby.
-#
-# NMatrix was originally inspired by and derived from NArray, by
-# Masahiro Tanaka: http://narray.rubyforge.org
-#
-# == Copyright Information
-#
-# SciRuby is Copyright (c) 2010 - 2014, Ruby Science Foundation
-# NMatrix is Copyright (c) 2012 - 2014, John Woods and the Ruby Science Foundation
-#
-# Please see LICENSE.txt for additional copyright notices.
-#
-# == Contributing
-#
-# By contributing source code to SciRuby, you agree to be bound by
-# our Contributor Agreement:
-#
-# * https://github.com/SciRuby/sciruby/wiki/Contributor-Agreement
-#
-# == nmatrix.rb
-#
-# This file defines the NVector class.
-#++
-
-# This is a specific type of NMatrix in which only one dimension is not 1.
-# Although it is stored as a dim-2, n x 1, matrix, it acts as a dim-1 vector
-# of size n. If the @orientation flag is set to :column, it is stored as n x 1
-# instead of 1 x n.
-class NVector < NMatrix
-  #
-  # call-seq:
-  #     new(shape) -> NVector
-  #     new(stype, shape) -> NVector
-  #     new(shape, init) -> NVector
-  #     new(:dense, shape, init) -> NVector
-  #     new(:list, shape, init) -> NVector
-  #     new(shape, init, dtype) -> NVector
-  #     new(stype, shape, init, dtype) -> NVector
-  #     new(stype, shape, dtype) -> NVector
-  #
-  # Creates a new NVector. See also NMatrix#initialize for a more detailed explanation of
-  # the arguments.
-  #
-  # * *Arguments* :
-  #   - +stype+ -> (optional) Storage type of the vector (:list, :dense, :yale). Defaults to :dense.
-  #   - +shape+ -> Shape of the vector. Accepts [n,1], [1,n], or n, where n is a Fixnum.
-  #   - +init+ -> (optional) Yale: capacity; List: default value (0); Dense: initial value or values (uninitialized by default).
-  #   - +dtype+ -> (optional if +init+ provided) Data type stored in the vector. For :dense and :list, can be inferred from +init+.
-  # * *Returns* :
-  #   -
-  #
-  def initialize(*args)
-    stype = args[0].is_a?(Symbol) ? args.shift : :dense
-    shape = args[0].is_a?(Array) ? args.shift  : [1,args.shift]
-
-    if shape.size != 2 || !shape.include?(1) || shape == [1,1]
-      raise(ArgumentError, "shape must be a Fixnum or an Array of positive Fixnums where exactly one value is 1")
-    end
-
-    warn "NVector is deprecated"
-
-    super(stype, shape, *args)
-  end
-
-
-  #
-  # call-seq:
-  #     orientation -> Symbol
-  #
-  # Orientation defaults to row (e.g., [1,3] is a row of length 3). It
-  # may also be column, e.g., for [5,1].
-  #
-  def orientation
-    shape[0] == 1 ? :row : :column
-  end
-
-  # Override NMatrix#each_row and #each_column
-  def each_column(get_by=:reference, &block) #:nodoc:
-    shape[0] == 1 ? self.each(&block) : (yield self)
-  end
-  def each_row(get_by=:reference, &block) #:nodoc:
-    shape[0] == 1 ? (yield self) : self.each(&block)
-  end
-
-
-
-  #
-  # call-seq:
-  #     vector[index] -> element
-  #     vector[range] -> NVector
-  #
-  # Retrieves an element or return a slice.
-  #
-  # Examples:
-  #
-  #   u = NVector.new(3, [10, 20, 30])
-  #   u[0]              # => 10
-  #   u[0] + u[1]       # => 30
-  #   u[0 .. 1].shape   # => [2, 1]
-  #
-  def [](i)
-    shape[0] == 1 ? super(0, i) : super(i, 0)
-  end
-
-  #
-  # call-seq:
-  #     vector[index] = obj -> obj
-  #
-  # Stores +value+ at position +index+.
-  #
-  def []=(i, val)
-    shape[0] == 1 ? super(0, i, val) : super(i, 0, val)
-  end
-
-  #
-  # call-seq:
-  #     dim -> 1
-  #
-  # Returns the dimension of a vector, which is 1.
-  #
-  def dim; 1; end
-
-  #
-  # call-seq:
-  #     size -> Fixnum
-  #
-  # Shorthand for the dominant shape component
-  def size
-    shape[0] > 1 ? shape[0] : shape[1]
-  end
-
-  #
-  # call-seq:
-  #     max -> Numeric
-  #
-  # Return the maximum element.
-  def max
-    max_so_far = self[0]
-    self.each do |x|
-      max_so_far = x if x > max_so_far
-    end
-    max_so_far
-  end
-
-  #
-  # call-seq:
-  #     min -> Numeric
-  #
-  # Return the minimum element.
-  def min
-    min_so_far = self[0]
-    self.each do |x|
-      min_so_far = x if x < min_so_far
-    end
-    min_so_far
-  end
-
-
-  # TODO: Make this actually pretty.
-  def pretty_print(q = nil) #:nodoc:
-    dimen = shape[0] == 1 ? 1 : 0
-
-    arr = (0...shape[dimen]).inject(Array.new){ |a, i| a << self[i] }
-
-    if q.nil?
-      puts "[" + arr.join("\n") + "]"
-    else
-      q.group(1, "", "\n") do
-        q.seplist(arr, lambda { q.text "  " }, :each)  { |v| q.text v.to_s }
-      end
-    end
-  end
-
-  def inspect #:nodoc:
-    original_inspect = super()
-    original_inspect = original_inspect[0...original_inspect.size-1]
-    original_inspect += " orientation:#{self.orientation}>"
-  end
-
-end