multiarray 0.9.0 → 0.10.1

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.9.0'
+PKG_VERSION = '0.10.1'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/multiarray/node.rb

@@ -362,6 +362,10 @@ module Hornetseye
       array_type.size
     end
 
+    def storage_size
+      array_type.storage_size
+    end
+
     def memory
       nil
     end

data/lib/multiarray/operations.rb

@@ -252,6 +252,27 @@ module Hornetseye
       min .. max
     end
 
+    def normalise( range = 0 .. 0xFF )
+      if range.exclude_end?
+        raise "Normalisation does not support ranges with end value " +
+              "excluded (such as #{range})"
+      end
+      lower, upper = min, max
+      if lower.is_a? RGB or upper.is_a? RGB
+        current = [ lower.r, lower.g, lower.b ].min ..
+                  [ upper.r, upper.g, upper.b ].max
+      else
+        current = min .. max
+      end
+      if current.last != current.first
+        factor =
+          ( range.last - range.first ).to_f / ( current.last - current.first )
+        self * factor + ( range.first - current.first * factor )
+      else
+        self + ( range.first - current.first )
+      end
+    end
+
     def fill!( value = typecode.default )
       self[] = value
       self

data/test/tc_sequence.rb

@@ -302,6 +302,11 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal C( 3, 2, 3 ), S[ C( 1, 2, 3 ), C( 3, 2, 1 ) ].max
   end
 
+  def test_normalise
+    assert_equal [ 0.0, 85.0, 255.0 ], S[ 1, 2, 4 ].normalise.to_a
+    assert_equal [ C( 0.0, 85.0, 255.0 ) ], S[ C( 1, 2, 4 ) ].normalise.to_a
+  end
+
   def test_sum
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal 9, t[ 4, 2, 3 ].sum

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 0
-  version: 0.9.0
+  - 10
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2010-10-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency