ai4ruby 1.13 → 1.14

data/lib/ai4r/clusterers/ward_linkage_hierarchical.rb

@@ -13,18 +13,33 @@ module Ai4r
 
       attr_reader :cluster_tree
      
-      def initialize
+      def initialize(depth = nil)
         @cluster_tree = []
+        @depth = depth
+        @merges_so_far = 0
+        super()
+      end
+
+      def build(data_set, number_of_clusters)
+        data_len = data_set.data_items.length
+        @total_merges = data_len - number_of_clusters
         super
+        @cluster_tree << self.clusters
+        @cluster_tree.reverse!
+        return self
       end
 
       protected
 
       def merge_clusters(index_a, index_b, index_clusters)
-        # store current clusters
-        stored_distance_matrix = @distance_matrix.dup
-        @cluster_tree << build_clusters_from_index_clusters(index_clusters)
-        @distance_matrix = stored_distance_matrix
+        # only store if no or above depth
+        if @depth.nil? or @merges_so_far > @total_merges - @depth
+          # store current clusters
+          stored_distance_matrix = @distance_matrix.dup
+          @cluster_tree << build_clusters_from_index_clusters(index_clusters)
+          @distance_matrix = stored_distance_matrix
+        end
+        @merges_so_far += 1
         super
       end
     end

data/test/clusterers/ward_linkage_hierarchical_test.rb

@@ -52,8 +52,28 @@ class Ai4r::Clusterers::WardLinkageHierarchicalTest < Test::Unit::TestCase
   def test_cluster_tree
     clusterer = Ai4r::Clusterers::WardLinkageHierarchical.new
     clusterer.build(DataSet.new(:data_items => @@data), 1)
-
-    assert_equal clusterer.cluster_tree.length, @@data.length - 1
+    assert_equal @@data.length, clusterer.cluster_tree.length
+  end
+    
+  def test_cluster_tree_limit
+    depth = 5
+    clusterer = Ai4r::Clusterers::WardLinkageHierarchical.new(5)
+    clusterer.build(DataSet.new(:data_items => @@data), 1)
+    assert_equal 5, clusterer.cluster_tree.length
+  end
+    
+  def test_cluster_tree_first_length
+    depth = 5
+    clusterer = Ai4r::Clusterers::WardLinkageHierarchical.new(5)
+    clusterer.build(DataSet.new(:data_items => @@data), 1)
+    assert_equal 1, clusterer.cluster_tree.first.length
+  end
+    
+  def test_cluster_tree_last_length
+    depth = 5
+    clusterer = Ai4r::Clusterers::WardLinkageHierarchical.new(5)
+    clusterer.build(DataSet.new(:data_items => @@data), 1)
+    assert_equal 5, clusterer.cluster_tree.last.length
   end
     
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ai4ruby
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 13
-  version: "1.13"
+  - 14
+  version: "1.14"
 platform: ruby
 authors: 
 - Sergio Fierens
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: []
 
 description: