jubatus 0.4.1 → 0.5.0

data/{test → integration_test}/jubatus_test/regression/test.rb

@@ -5,7 +5,6 @@ require 'test/unit'
 require 'json'
 
 require 'jubatus/regression/client'
-require 'jubatus/regression/types'
 require 'jubatus_test/test_util'
 
 class RegressionTest < Test::Unit::TestCase
@@ -34,7 +33,7 @@ class RegressionTest < Test::Unit::TestCase
 
     TestUtil.write_file("config_regression.json", @config.to_json)
     @srv = TestUtil.fork_process("regression", PORT, "config_regression.json")
-    @cli = Jubatus::Regression::Client::Regression.new(HOST, PORT)
+    @cli = Jubatus::Regression::Client::Regression.new(HOST, PORT, "name")
   end
 
   def teardown
@@ -46,38 +45,34 @@ class RegressionTest < Test::Unit::TestCase
   end
 
   def test_get_config
-    config = @cli.get_config("name")
+    config = @cli.get_config
     assert_equal(JSON.parse(config), @config)
   end
 
   def test_train
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Regression::Datum.new(string_values, num_values)
+    d = Jubatus::Common::Datum.new("skey1" => "val1", "skey2" => "val2", "nkey1" => 1.0, "nkey2" => 2.0)
     data = [[1.0, d]]
-    assert_equal(@cli.train("name", data), 1)
+    assert_equal(@cli.train(data), 1)
   end
 
   def test_estimate
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Regression::Datum.new(string_values, num_values)
+    d = Jubatus::Common::Datum.new("skey1" => "val1", "skey2" => "val2", "nkey1" => 1.0, "nkey2" => 2.0)
     data = [d]
-    result = @cli.estimate("name", data)
+    result = @cli.estimate(data)
   end
 
   def test_save
-    assert_equal(@cli.save("name", "regression.save_test.model"), true)
+    assert_equal(@cli.save("regression.save_test.model"), true)
   end
 
   def test_load
     model_name = "regression.load_test.model"
-    @cli.save("name", model_name)
-    assert_equal(@cli.load("name", model_name), true)
+    @cli.save(model_name)
+    assert_equal(@cli.load(model_name), true)
   end
 
   def test_get_status
-    @cli.get_status("name")
+    @cli.get_status
   end
 
 end

data/integration_test/jubatus_test/stat/test.rb

@@ -0,0 +1,108 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+
+require 'json'
+
+require 'jubatus/stat/client'
+require 'jubatus_test/test_util'
+
+class StatTest < Test::Unit::TestCase
+  HOST = "127.0.0.1"
+  PORT = 23004
+  TIMEOUT = 10
+
+  def setup
+    @config = {
+        "window_size" => 10
+    }
+
+    TestUtil.write_file("config_stat.json", @config.to_json)
+    @srv = TestUtil.fork_process("stat", PORT, "config_stat.json")
+    @cli = Jubatus::Stat::Client::Stat.new(HOST, PORT, "name")
+
+  end
+
+  def teardown
+    TestUtil.kill_process(@srv)
+  end
+
+  def test_get_client
+    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
+  end
+
+  def test_get_config
+    config = @cli.get_config
+    assert_equal(JSON.parse(config), @config)
+  end
+
+  def test_stddev
+    @cli.push("stddev", 1.0)
+    @cli.push("stddev", 2.0)
+    @cli.push("stddev", 3.0)
+    @cli.push("stddev", 4.0)
+    @cli.push("stddev", 5.0)
+    assert_equal(@cli.stddev("stddev"), Math::sqrt(2.0))
+  end
+
+  def test_sum
+    @cli.push("sum", 1.0)
+    @cli.push("sum", 2.0)
+    @cli.push("sum", 3.0)
+    @cli.push("sum", 4.0)
+    @cli.push("sum", 5.0)
+    assert_equal(@cli.sum("sum"), 15.0)
+  end
+
+  def test_max
+    @cli.push("max", 1.0)
+    @cli.push("max", 2.0)
+    @cli.push("max", 3.0)
+    @cli.push("max", 4.0)
+    @cli.push("max", 5.0)
+    assert_equal(@cli.max("max"), 5.0)
+  end
+
+  def test_min
+    @cli.push("min", 1.0)
+    @cli.push("min", 2.0)
+    @cli.push("min", 3.0)
+    @cli.push("min", 4.0)
+    @cli.push("min", 5.0)
+    assert_equal(@cli.min("min"), 1.0)
+  end
+
+  def test_entropy
+    @cli.push("entropy", 1.0)
+    @cli.push("entropy", 2.0)
+    @cli.push("entropy", 3.0)
+    @cli.push("entropy", 4.0)
+    @cli.push("entropy", 5.0)
+    assert_equal(@cli.entropy("entropy"), 0.0)
+  end
+
+  def test_moment
+    @cli.push("moment", 1.0)
+    @cli.push("moment", 2.0)
+    @cli.push("moment", 3.0)
+    @cli.push("moment", 4.0)
+    @cli.push("moment", 5.0)
+    assert_equal(@cli.moment("moment", 3, 0.0), 45.0)
+  end
+
+  def test_save
+    assert_equal(@cli.save("stat.save_test.model"), true)
+  end
+
+  def test_load
+    model_name = "stat.load_test.model"
+    @cli.save(model_name)
+    assert_equal(@cli.load(model_name), true)
+  end
+
+  def test_get_status
+    @cli.get_status
+  end
+
+end
+

data/{test → integration_test}/jubatus_test/test_util.rb

@@ -26,6 +26,7 @@ class TestUtil
         child = Process.fork()
         if child.nil? then
             begin
+                STDERR.reopen File.open('/dev/null', 'w')
                 exec(cmd, cmd, "--rpc-port", port.to_s, "--configpath", config, "--thread", "100", "--datadir", ".")
             rescue
                 puts $!

data/jubatus.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.has_rdoc    = false
   gem.license     = "MIT"
 
-  files = `git ls-files`.split("\n")
+  files = `git ls-files`.split("\n") + Dir.glob("lib/jubatus/**/*.rb")
   excludes = ["patch/*", "generate.sh"]
 
   gem.files       = files.reject { |f| excludes.any? { |e| File.fnmatch(e, f) } }

data/lib/jubatus/anomaly/client.rb

@@ -1,53 +1,54 @@
-# This file is auto-generated from anomaly.idl
+# This file is auto-generated from anomaly.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
 require File.join(File.dirname(__FILE__), 'types')
 
 module Jubatus
+
 module Anomaly
 module Client
 
-class Anomaly
-  def initialize(host, port)
-    @cli = MessagePack::RPC::Client.new(host, port)
-  end
-  def get_client
-    @cli
-  end
-  def get_config(name)
-    @cli.call(:get_config, name)
-  end
-  def clear_row(name, id)
-    @cli.call(:clear_row, name, id)
+class Anomaly < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
   end
-  def add(name, row)
-    @cli.call(:add, name, row)
-  end
-  def update(name, id, row)
-    @cli.call(:update, name, id, row)
+
+  def clear_row(id)
+    @jubatus_client.call("clear_row", [id], TBool.new, [TString.new])
   end
-  def clear(name)
-    @cli.call(:clear, name)
+
+  def add(row)
+    @jubatus_client.call("add", [row], TUserDef.new(IdWithScore), [TDatum.new])
   end
-  def calc_score(name, row)
-    @cli.call(:calc_score, name, row)
+
+  def update(id, row)
+    @jubatus_client.call("update", [id, row], TFloat.new, [TString.new,
+        TDatum.new])
   end
-  def get_all_rows(name)
-    @cli.call(:get_all_rows, name)
+
+  def overwrite(id, row)
+    @jubatus_client.call("overwrite", [id, row], TFloat.new, [TString.new,
+        TDatum.new])
   end
-  def save(name, id)
-    @cli.call(:save, name, id)
+
+  def clear
+    @jubatus_client.call("clear", [], TBool.new, [])
   end
-  def load(name, id)
-    @cli.call(:load, name, id)
+
+  def calc_score(row)
+    @jubatus_client.call("calc_score", [row], TFloat.new, [TDatum.new])
   end
-  def get_status(name)
-    @cli.call(:get_status, name)
+
+  def get_all_rows
+    @jubatus_client.call("get_all_rows", [], TList.new(TString.new), [])
   end
 end
 
-end
-end
-end
+end  # Client
+end  # Anomaly
+
+end  # Jubatus

data/lib/jubatus/anomaly/types.rb

@@ -1,32 +1,44 @@
-# This file is auto-generated from anomaly.idl
+# This file is auto-generated from anomaly.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
+
 module Jubatus
 module Anomaly
 
-class Datum
-  def initialize(string_values, num_values)
-     @string_values = string_values 
-     @num_values = num_values 
-  end
-  def to_tuple    
-    [@string_values.map {|x|  [x[0], x[1], ] },
-     @num_values.map {|x|  [x[0], x[1], ] }]
+class IdWithScore
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TFloat.new)
+
+  def initialize(id, score)
+    @id = id
+    @score = score
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@id, @score]
+    return TYPE.to_msgpack(t)
+  end
+
+  def IdWithScore.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    IdWithScore.new(*val)
   end
-  def Datum.from_tuple(tuple)
-    Datum.new(
-      tuple[0].map { |x|  [x[0] , x[1] ]  },
-      tuple[1].map { |x|  [x[0] , x[1] ]  }
-    )
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("id_with_score")
+    gen.add("id", @id)
+    gen.add("score", @score)
+    gen.close()
+    return gen.to_s
   end
-  attr_accessor :string_values, :num_values
-end
 
-end
+  attr_reader :id, :score
+
 end
 
+end  # Anomaly
+end  # Jubatus

data/lib/jubatus/classifier/client.rb

@@ -1,44 +1,38 @@
-# This file is auto-generated from classifier.idl
+# This file is auto-generated from classifier.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
 require File.join(File.dirname(__FILE__), 'types')
 
 module Jubatus
+
 module Classifier
 module Client
 
-class Classifier
-  def initialize(host, port)
-    @cli = MessagePack::RPC::Client.new(host, port)
-  end
-  def get_client
-    @cli
-  end
-  def get_config(name)
-    @cli.call(:get_config, name)
-  end
-  def train(name, data)
-    @cli.call(:train, name, data)
+class Classifier < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
   end
-  def classify(name, data)
-    @cli.call(:classify, name, data)
-  end
-  def clear(name)
-    @cli.call(:clear, name)
-  end
-  def save(name, id)
-    @cli.call(:save, name, id)
+
+  def train(data)
+    @jubatus_client.call("train", [data], TInt.new(true, 4), [TList.new(
+        TUserDef.new(LabeledDatum))])
   end
-  def load(name, id)
-    @cli.call(:load, name, id)
+
+  def classify(data)
+    @jubatus_client.call("classify", [data], TList.new(TList.new(TUserDef.new(
+        EstimateResult))), [TList.new(TDatum.new)])
   end
-  def get_status(name)
-    @cli.call(:get_status, name)
+
+  def clear
+    @jubatus_client.call("clear", [], TBool.new, [])
   end
 end
 
-end
-end
-end
+end  # Client
+end  # Classifier
+
+end  # Jubatus

data/lib/jubatus/classifier/types.rb

@@ -1,53 +1,76 @@
-# This file is auto-generated from classifier.idl
+# This file is auto-generated from classifier.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
+
 module Jubatus
 module Classifier
 
-class Datum
-  def initialize(string_values, num_values)
-     @string_values = string_values 
-     @num_values = num_values 
-  end
-  def to_tuple    
-    [@string_values.map {|x|  [x[0], x[1], ] },
-     @num_values.map {|x|  [x[0], x[1], ] }]
+class EstimateResult
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TFloat.new)
+
+  def initialize(label, score)
+    @label = label
+    @score = score
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@label, @score]
+    return TYPE.to_msgpack(t)
   end
-  def Datum.from_tuple(tuple)
-    Datum.new(
-      tuple[0].map { |x|  [x[0] , x[1] ]  },
-      tuple[1].map { |x|  [x[0] , x[1] ]  }
-    )
+
+  def EstimateResult.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    EstimateResult.new(*val)
   end
-  attr_accessor :string_values, :num_values
-end
 
-class Estimate_result
-  def initialize(label, score)
-     @label = label 
-     @score = score 
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("estimate_result")
+    gen.add("label", @label)
+    gen.add("score", @score)
+    gen.close()
+    return gen.to_s
   end
-  def to_tuple    
-    [@label,
-     @score]
+
+  attr_reader :label, :score
+
+end
+
+class LabeledDatum
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TDatum.new)
+
+  def initialize(label, data)
+    @label = label
+    @data = data
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@label, @data]
+    return TYPE.to_msgpack(t)
+  end
+
+  def LabeledDatum.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    LabeledDatum.new(*val)
   end
-  def Estimate_result.from_tuple(tuple)
-    Estimate_result.new(
-      tuple[0],
-      tuple[1]
-    )
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("labeled_datum")
+    gen.add("label", @label)
+    gen.add("data", @data)
+    gen.close()
+    return gen.to_s
   end
-  attr_accessor :label, :score
-end
 
-end
+  attr_reader :label, :data
+
 end
 
+end  # Classifier
+end  # Jubatus

data/lib/jubatus/clustering/client.rb

@@ -0,0 +1,51 @@
+# This file is auto-generated from clustering.idl(0.4.5-350-g9c67807) with jenerator version 0.4.5-418-gd2d5f04/develop
+# *** DO NOT EDIT ***
+
+require 'rubygems'
+require 'msgpack/rpc'
+require 'jubatus/common'
+require File.join(File.dirname(__FILE__), 'types')
+
+module Jubatus
+
+module Clustering
+module Client
+
+class Clustering < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
+  end
+
+  def push(points)
+    @jubatus_client.call("push", [points], TBool.new, [TList.new(TDatum.new)])
+  end
+
+  def get_revision
+    @jubatus_client.call("get_revision", [], TInt.new(false, 4), [])
+  end
+
+  def get_core_members
+    @jubatus_client.call("get_core_members", [], TList.new(TList.new(
+        TUserDef.new(WeightedDatum))), [])
+  end
+
+  def get_k_center
+    @jubatus_client.call("get_k_center", [], TList.new(TDatum.new), [])
+  end
+
+  def get_nearest_center(point)
+    @jubatus_client.call("get_nearest_center", [point], TDatum.new,
+        [TDatum.new])
+  end
+
+  def get_nearest_members(point)
+    @jubatus_client.call("get_nearest_members", [point], TList.new(TUserDef.new(
+        WeightedDatum)), [TDatum.new])
+  end
+end
+
+end  # Client
+end  # Clustering
+
+end  # Jubatus

data/lib/jubatus/clustering/types.rb

@@ -0,0 +1,44 @@
+# This file is auto-generated from clustering.idl(0.4.5-350-g9c67807) with jenerator version 0.4.5-418-gd2d5f04/develop
+# *** DO NOT EDIT ***
+
+require 'rubygems'
+require 'msgpack/rpc'
+require 'jubatus/common'
+
+module Jubatus
+module Clustering
+
+class WeightedDatum
+  include Jubatus::Common
+  TYPE = TTuple.new(TFloat.new, TDatum.new)
+
+  def initialize(weight, point)
+    @weight = weight
+    @point = point
+  end
+
+  def to_msgpack(out = '')
+    t = [@weight, @point]
+    return TYPE.to_msgpack(t)
+  end
+
+  def WeightedDatum.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    WeightedDatum.new(*val)
+  end
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("weighted_datum")
+    gen.add("weight", @weight)
+    gen.add("point", @point)
+    gen.close()
+    return gen.to_s
+  end
+
+  attr_reader :weight, :point
+
+end
+
+end  # Clustering
+end  # Jubatus