kmeans-clusterer 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e426d9d9009e4ea9fc432f08b8390f8bb69bc6
-  data.tar.gz: 8cd3c31df1d33de334c63db296fe2d40f4c56eac
+  metadata.gz: 2f196c59682129e44c96683048f0038bbff969e8
+  data.tar.gz: 59c7aead159e0c8ccbf216b10289022876f4d315
 SHA512:
-  metadata.gz: ffeb5fd9e2167411314674110cb618d5de43460fd32d01572bd400e7905fd7f94052624fa013c3d1309b08c10d5f1afc92b24e87ff9f4eb302c25639f53f3e32
-  data.tar.gz: a4e10c472ec5fc84b4a1444da6fadf5c246310a2aef0f701d58af7cd62231a9aac53fff0c3200ed48badfab5b35b117a9ac8be23aa986cfaa3636a37686fcf12
+  metadata.gz: 62c9ed6a7109e4034eb0907bd8fc1e862a79d902914a2658ff8959889352edc634b24be63f7fd4372ac144aaa200515f7a12a99de54f0c6dc4fa57008d7e8a91
+  data.tar.gz: 95fc7bdd5f57aadf8b64656f5bf6f9affb09a5f7d30f44a5bc3ddfb590ae8229348aca04c11c64ee381066b0ce76d2f415b3df2eb095848f9aa46fead6e7ddd6

data/lib/kmeans-clusterer.rb

@@ -13,6 +13,10 @@ class KMeansClusterer
         NMatrix.cast(x, typecode)
       end
     end
+
+    def self.ensure_narray x, typecode = nil
+      x.is_a?(NArray) ? x : NArray.cast(x, typecode)
+    end
   end
 
   module Scaler
@@ -121,12 +125,12 @@ class KMeansClusterer
     opts = DEFAULT_OPTS.merge(opts)
 
     opts[:k] = k
-    opts[:typecode] = TYPECODE[opts[:float_precision]]
+    typecode = TYPECODE[opts[:float_precision]]
 
-    data = Utils.ensure_matrix data, opts[:typecode]
+    data = Utils.ensure_matrix data, typecode
 
     if opts[:scale_data]
-      data, mean, std = Scaler.scale(data, nil, nil, opts[:typecode])
+      data, mean, std = Scaler.scale(data, nil, nil, typecode)
       opts[:mean] = mean
       opts[:std] = std
     end
@@ -162,11 +166,11 @@ class KMeansClusterer
     @row_norms = opts[:row_norms]
 
     @data = opts[:data]
-    @points_count = @data.shape[1] if @data
-    @mean = opts[:mean]
-    @std = opts[:std]
+    @points_count = @data ? @data.shape[1] : 0
+    @mean = Utils.ensure_narray(opts[:mean]) if opts[:mean]
+    @std = Utils.ensure_narray(opts[:std]) if opts[:std]
     @scale_data = opts[:scale_data]
-    @typecode = opts[:typecode]
+    @typecode = TYPECODE[opts[:float_precision] || :double]
     @max_iter = opts[:max_iter]
 
     init_centroids

metadata

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