kmeans-clusterer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf47337db7688eba2c31a5117e2f8c071415759a
-  data.tar.gz: 844c11b63adf3d1e5a554bebcdbde8f251c45d96
+  metadata.gz: ef3362502d8b947a79154f0c38f00941399f3192
+  data.tar.gz: 28d240da6a683201cf5f36c13cac2df5c21c31d8
 SHA512:
-  metadata.gz: 78750f92bd336135d5118c061dea3e6d56cce8500642f18aa8b4dd0c5dd2953eda2c47691348685ff591d5c33b795aff93c52fd6869d53701cc3c46b661b9eee
-  data.tar.gz: 70470a45c59ad789a08f3f73a189de3958e6202b4c4fc5459eae967d2cd3ea4653ac20fc1dc2f343fe795829307f845680975fbaeeb35e5b62335ffc3006fd76
+  metadata.gz: 6a2ee8ee21cd05b6ad0cc16e6db453fdd98bbba71506160b8396d5deff844a3ef7319e20895da191d7bd2562c69c407ee491fa4371c796acc6f2a8082b2ee171
+  data.tar.gz: 98ccfaeb50eb586145853d5da8bffa8b72447c6621431a9663493aaa67867119d8242837ad365cdc6e64e1fb8f3ea5c3b46b5e76d1af577bb2f5effe5465dd3a

data/lib/kmeans-clusterer.rb

@@ -15,11 +15,11 @@ class KMeansClusterer
     end
 
     def self.scale data, mean = nil, std = nil, typecode = nil
-      data = NArray.cast(data, typecode)
+      data = NArray.ref(data)
       mean ||= self.mean(data)
       std ||= self.std(data)
       data = (data - mean) / std
-      [data, mean, std]
+      [NMatrix.ref(data), mean, std]
     end
   end
 
@@ -77,13 +77,15 @@ class KMeansClusterer
     opts[:k] = k
     opts[:typecode] = TYPECODE[opts[:float_precision]]
 
+    data = NMatrix.cast data, opts[:typecode]
+
     if opts[:scale_data]
       data, mean, std = Scaler.scale(data, nil, nil, opts[:typecode])
       opts[:mean] = mean
       opts[:std] = std
     end
 
-    opts[:points_matrix] = NMatrix.cast(data, opts[:typecode])
+    opts[:points_matrix] = data
     opts[:row_norms] = opts[:points_matrix].map {|v| v**2}.sum(0)
 
     bestrun = nil
@@ -144,7 +146,7 @@ class KMeansClusterer
       updated_centroids = []
 
       @k.times do |i|
-        centroid = NArray.cast(@centroids[true, i].flatten, @typecode)
+        centroid = NArray.ref(@centroids[true, i].flatten)
         point_ids = @cluster_point_ids[i]
 
         if point_ids.empty?
@@ -179,8 +181,8 @@ class KMeansClusterer
   end
 
   def predict data
-    data, _m, _s = Scaler.scale(data, @mean, @std, @typecode) if @scale_data
     data = NMatrix.cast(data, @typecode)
+    data, _m, _s = Scaler.scale(data, @mean, @std, @typecode) if @scale_data
     distances = distance(@centroids, data, nil)
     data.shape[1].times.map do |i|
       distances[i, true].sort_index[0] # index of closest cluster
@@ -220,6 +222,10 @@ class KMeansClusterer
 
   alias_method :silhouette_score, :silhouette
 
+  def inspect
+    %{#<#{self.class.name} k:#{@k} iterations:#{@iterations} error:#{@error} runtime:#{@runtime}>}
+  end
+
   private
     def wrap_point point
       return point if point.is_a?(Point)
@@ -289,14 +295,14 @@ class KMeansClusterer
 
     def set_points
       @points = @points_count.times.map do |i|
-        data = NArray.cast @points_matrix[true, i].flatten, @typecode
+        data = NArray.ref @points_matrix[true, i].flatten
         Point.new(i, data, @labels[i])
       end
     end
 
     def set_clusters
       @clusters = @k.times.map do |i|
-        centroid = NArray.cast @centroids[true, i].flatten, @typecode
+        centroid = NArray.ref @centroids[true, i].flatten
         c = Cluster.new i, Point.new(-i, centroid)
         @cluster_point_ids[i].each do |p|
           c << @points[p]
@@ -322,17 +328,17 @@ class KMeansClusterer
     end
 
     def get_point i
-      NArray.cast @points_matrix[true, i].flatten, @typecode
+      NArray.ref @points_matrix[true, i].flatten
     end
 
     def get_centroid i
-      NArray.cast(@centroids[true, i].flatten, @typecode)
+      NArray.ref(@centroids[true, i].flatten)
     end
 
     def get_points_for_centroid i
       point_ids = @cluster_point_ids[i]
       points = @points_matrix[true, point_ids]
-      points.empty? ? NArray.sfloat(0) : NArray.cast(points, @typecode)
+      points.empty? ? NArray.sfloat(0) : NArray.ref(points)
     end
 
     def distance x, y, yy = @row_norms

metadata

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