kmeans-clusterer 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c2552e6a8ee7eddd6d03d8fa8cf7038c0458a11
-  data.tar.gz: 62172e9d841aa4df7b332a4e2cda55bf426bc9b1
+  metadata.gz: 266be0ce63154b6d9dd3928ae7901b42795be4eb
+  data.tar.gz: 4be98d5b084e2d27473ca3bee802b442d2b7690a
 SHA512:
-  metadata.gz: a33d17f4749b00e7ee8a0829e6a402db6eb768bd62f5dcb1e3ed9dcf3020b5ec074b3e5e38a817fb6d4a51ec13b8cf75f189a55b6a3e488738b4dc2828cbb878
-  data.tar.gz: c4a2e27da37141435583d1b09cbf4001f4b2c44a5b2900155e2444f45d9663edf0ccab6d4f80c50d05ad85ce31710a7d4558356bded561bf17199e7333c3e14d
+  metadata.gz: 4afc940658e70c7c0871fe3694d8e220f0048a66191b235ca179695c1366f61ce50b8793d5f107e95cd074110e97903ba3ff36f7116655b9cb047c94193ada6c
+  data.tar.gz: 24a9be6db3a93a5a64c71f6820f62bcc96aa44adbfb35fd7007c882242e82edd4fec9151bc1bf7eaa13cd763f9a9170f382c2ffab6e226f1850d631105871045

data/lib/kmeans-clusterer.rb

@@ -3,6 +3,18 @@ require 'narray'
 class KMeansClusterer
   TYPECODE = { double: NArray::DFLOAT, single: NArray::SFLOAT }
 
+  module Utils
+    def self.ensure_matrix x, typecode = nil
+      if x.is_a?(NMatrix)
+        x
+      elsif defined?(GSL::Matrix) && x.is_a?(GSL::Matrix)
+        x.to_nm
+      else
+        NMatrix.cast(x, typecode)
+      end
+    end
+  end
+
   module Scaler
     def self.mean data
       data.mean(1)
@@ -111,9 +123,7 @@ class KMeansClusterer
     opts[:k] = k
     opts[:typecode] = TYPECODE[opts[:float_precision]]
 
-    unless data.is_a?(NMatrix)
-      data = NMatrix.cast data, opts[:typecode]
-    end
+    data = Utils.ensure_matrix data, opts[:typecode]
 
     if opts[:scale_data]
       data, mean, std = Scaler.scale(data, nil, nil, opts[:typecode])
@@ -227,7 +237,7 @@ class KMeansClusterer
   end
 
   def predict data
-    data = NMatrix.cast(data, @typecode)
+    data = Utils.ensure_matrix data, @typecode
     data, _m, _s = Scaler.scale(data, @mean, @std, @typecode) if @scale_data
     distances = Distance.euclidean(@centroids, data)
     data.shape[1].times.map do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kmeans-clusterer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Geoff Buesing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray