Changeset 34106

Timestamp:

06/24/09 01:44:46 (4 years ago)

Author:

winebarrel

Message:

bayon 0.0.4にあわせて類似度を表示するオプションを追加

Location:

lang/ruby/ruby-bayon/trunk

Files:

• README (modified) (1 diff)
• bayon-mswin32.gemspec (modified) (1 diff)
• bayon.gemspec (modified) (1 diff)
• bayon1.9-mswin32.gemspec (modified) (1 diff)
• ext/bayonext.cpp (modified) (6 diffs)
• lib/bayon.rb (modified) (4 diffs)
• package.sh (modified) (1 diff)

lang/ruby/ruby-bayon/trunk/README

@@ -32 +32 @@
       puts labels.join(', ')
     end
+    
+    docs.output_similairty_point = true
+    result = docs.do_clustering
+    
+    result.each do |label_points|
+      puts label_points.map {|label, point|
+        "#{label}(#{point})"
+      }.join(', ')
+    end
 
 == Project Page

lang/ruby/ruby-bayon/trunk/bayon-mswin32.gemspec

@@ -1 +1 @@
 Gem::Specification.new do |spec|
   spec.name              = 'bayon'
-  spec.version           = '0.1.0'
+  spec.version           = '0.1.1'
   spec.platform          = 'mswin32'
   spec.summary           = 'Ruby bindings for bayon.'

lang/ruby/ruby-bayon/trunk/bayon.gemspec

@@ -1 +1 @@
 Gem::Specification.new do |spec|
   spec.name              = 'bayon'
-  spec.version           = '0.1.0'
+  spec.version           = '0.1.1'
   spec.summary           = 'Ruby bindings for bayon.'
   spec.files             = Dir.glob('lib/*.*') + Dir.glob('ext/*.*') + %w(README COPYING)

lang/ruby/ruby-bayon/trunk/bayon1.9-mswin32.gemspec

@@ -1 +1 @@
 Gem::Specification.new do |spec|
   spec.name              = 'bayon1.9'
-  spec.version           = '0.1.0'
+  spec.version           = '0.1.1'
   spec.platform          = 'mswin32'
   spec.summary           = 'Ruby bindings for bayon.'

lang/ruby/ruby-bayon/trunk/ext/bayonext.cpp

@@ -86 +86 @@
   bayon::Analyzer* analyzer_;
 
+  bool output_similairty_point_;
+
   static void free(CBayonAnalyzer *p) {
     if (p->analyzer_) {
@@ -108 +110 @@
     Data_Get_Struct(self, CBayonAnalyzer, p);
     p->analyzer_ = new bayon::Analyzer;
+    p->output_similairty_point_ = false;
 
     return Qnil;
@@ -145 +148 @@
   }
 
+  static VALUE set_output_similairty_point(VALUE self, VALUE v_output) {
+    CBayonAnalyzer *p;
+    bool output = false;
+
+    if (TYPE(v_output) == T_TRUE) {
+      output = true;
+    } else if (TYPE(v_output) == T_FALSE) {
+      output = false;
+    } else {
+      rb_raise(rb_eTypeError, "wrong argument type %s (expected boolean value)");
+    }
+
+    Data_Get_Struct(self, CBayonAnalyzer, p);
+    p->output_similairty_point_ = output;
+
+    return Qnil;
+  }
+
   static VALUE do_clustering(VALUE self, VALUE v_method) {
     CBayonAnalyzer *p;
@@ -157 +178 @@
 
   static VALUE get_next_result(VALUE self) {
+    typedef std::vector< std::pair<bayon::Document *, double> > documents;
     CBayonAnalyzer *p;
     bayon::Cluster cluster;
@@ -163 +185 @@
 
     if(p->analyzer_->get_next_result(cluster)) {
-      const std::vector<bayon::Document *> documents = cluster.documents();
-      VALUE docids = rb_ary_new2(documents.size());
-
-      for(std::vector<bayon::Document *>::const_iterator i = documents.begin(); i != documents.end(); i++) {
-        bayon::Document* doc = *i;
-        rb_ary_push(docids, LONG2NUM(doc->id()));
+      std::vector< std::pair<bayon::Document *, double> > pairs;
+      cluster.sorted_documents(pairs);
+      VALUE docids = rb_ary_new2(pairs.size());
+
+      for(documents::const_iterator i = pairs.begin(); i != pairs.end(); i++) {
+        bayon::Document* doc = i->first;
+        double point = i->second;
+
+        if (p->output_similairty_point_) {
+          VALUE docid_points = rb_ary_new3(2, LONG2NUM(doc->id()), DBL2NUM(point));
+          rb_ary_push(docids, docid_points);
+        } else {
+          rb_ary_push(docids, LONG2NUM(doc->id()));
+        }
       }
 
@@ -186 +216 @@
     rb_define_method(rb_cBayonAnalyzer, "set_cluster_size_limit", __F(&set_cluster_size_limit), 1);
     rb_define_method(rb_cBayonAnalyzer, "set_eval_limit", __F(&set_eval_limit), 1);
+    rb_define_method(rb_cBayonAnalyzer, "set_output_similairty_point", __F(&set_output_similairty_point), 1);
     rb_define_method(rb_cBayonAnalyzer, "do_clustering", __F(&do_clustering), 1);
     rb_define_method(rb_cBayonAnalyzer, "get_next_result", __F(&get_next_result), 0);

lang/ruby/ruby-bayon/trunk/lib/bayon.rb

@@ -7 +7 @@
       @cluster_size_limit = nil
       @eval_limit = nil
+      @output_similairty_point = nil
     end
 
@@ -25 +26 @@
     end
 
+    def output_similairty_point=(output)
+      unless output.instance_of?(TrueClass) or output.instance_of?(FalseClass)
+        raise TypeError, "wrong argument type #{limit.class} (expected boolean value)"
+      end
+
+      @output_similairty_point = output
+    end
+    
     def add_document(label, features)
       unless features.kind_of?(Hash)
@@ -41 +50 @@
       analyzer.set_cluster_size_limit(@cluster_size_limit) if @cluster_size_limit
       analyzer.set_eval_limit(@eval_limit) if @eval_limit
+      analyzer.set_output_similairty_point(@output_similairty_point) if @output_similairty_point
 
       feature_set = []
@@ -60 +70 @@
 
       while (cluster = analyzer.get_next_result)
-        result << cluster.map {|doc_id| @documents[doc_id][0] }
+        if @output_similairty_point
+          result << cluster.map {|doc_id, point| [@documents[doc_id][0], point] }
+        else
+          result << cluster.map {|doc_id| @documents[doc_id][0] }
+        end
       end
 

lang/ruby/ruby-bayon/trunk/package.sh

@@ -1 +1 @@
 #!/bin/sh
-VERSION=0.1.0
+VERSION=0.1.1
 
 rm *.gem *.tar.bz2 2> /dev/null