jubatus 0.4.1 → 0.5.0

data/lib/jubatus/graph/types.rb

@@ -1,123 +1,184 @@
-# This file is auto-generated from graph.idl
+# This file is auto-generated from graph.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
-
-class String
-  def to_tuple
-    self
-  end
-end
-
-class Hash
-  def to_tuple
-    self
-  end
-end
+require 'jubatus/common'
 
 module Jubatus
 module Graph
 
 class Node
+  include Jubatus::Common
+  TYPE = TTuple.new(TMap.new(TString.new, TString.new), TList.new(TInt.new(
+      false, 8)), TList.new(TInt.new(false, 8)))
+
   def initialize(property, in_edges, out_edges)
-     @property = property 
-     @in_edges = in_edges 
-     @out_edges = out_edges 
+    @property = property
+    @in_edges = in_edges
+    @out_edges = out_edges
+  end
+
+  def to_msgpack(out = '')
+    t = [@property, @in_edges, @out_edges]
+    return TYPE.to_msgpack(t)
+  end
+
+  def Node.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    Node.new(*val)
+  end
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("node")
+    gen.add("property", @property)
+    gen.add("in_edges", @in_edges)
+    gen.add("out_edges", @out_edges)
+    gen.close()
+    return gen.to_s
   end
-  def to_tuple    
-    [@property.each_with_object({}) {|(k,v),h| h[k] = v},
-     @in_edges.map {|x| x},
-     @out_edges.map {|x| x}]
+
+  attr_reader :property, :in_edges, :out_edges
+
+end
+
+class Query
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TString.new)
+
+  def initialize(from_id, to_id)
+    @from_id = from_id
+    @to_id = to_id
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@from_id, @to_id]
+    return TYPE.to_msgpack(t)
   end
-  def Node.from_tuple(tuple)
-    Node.new(
-      tuple[0].each_with_object({}) {|(k,v),h| h[k] = v },
-      tuple[1].map { |x| x },
-      tuple[2].map { |x| x }
-    )
+
+  def Query.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    Query.new(*val)
+  end
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("query")
+    gen.add("from_id", @from_id)
+    gen.add("to_id", @to_id)
+    gen.close()
+    return gen.to_s
   end
-  attr_reader :property
-  attr_accessor :in_edges, :out_edges
+
+  attr_reader :from_id, :to_id
+
 end
 
-class Preset_query
+class PresetQuery
+  include Jubatus::Common
+  TYPE = TTuple.new(TList.new(TUserDef.new(Query)), TList.new(TUserDef.new(
+      Query)))
+
   def initialize(edge_query, node_query)
-     @edge_query = edge_query 
-     @node_query = node_query 
-  end
-  def to_tuple    
-    [@edge_query.map {|x|  [x[0], x[1], ] },
-     @node_query.map {|x|  [x[0], x[1], ] }]
+    @edge_query = edge_query
+    @node_query = node_query
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@edge_query, @node_query]
+    return TYPE.to_msgpack(t)
   end
-  def Preset_query.from_tuple(tuple)
-    Preset_query.new(
-      tuple[0].map { |x|  [x[0] , x[1] ]  },
-      tuple[1].map { |x|  [x[0] , x[1] ]  }
-    )
+
+  def PresetQuery.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    PresetQuery.new(*val)
   end
-  attr_accessor :edge_query, :node_query
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("preset_query")
+    gen.add("edge_query", @edge_query)
+    gen.add("node_query", @node_query)
+    gen.close()
+    return gen.to_s
+  end
+
+  attr_reader :edge_query, :node_query
+
 end
 
 class Edge
+  include Jubatus::Common
+  TYPE = TTuple.new(TMap.new(TString.new, TString.new), TString.new,
+      TString.new)
+
   def initialize(property, source, target)
-     @property = property 
-     @source = source 
-     @target = target 
-  end
-  def to_tuple    
-    [@property.each_with_object({}) {|(k,v),h| h[k] = v},
-     @source,
-     @target]
+    @property = property
+    @source = source
+    @target = target
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@property, @source, @target]
+    return TYPE.to_msgpack(t)
   end
-  def Edge.from_tuple(tuple)
-    Edge.new(
-      tuple[0].each_with_object({}) {|(k,v),h| h[k] = v },
-      tuple[1],
-      tuple[2]
-    )
+
+  def Edge.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    Edge.new(*val)
+  end
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("edge")
+    gen.add("property", @property)
+    gen.add("source", @source)
+    gen.add("target", @target)
+    gen.close()
+    return gen.to_s
   end
-  attr_reader :property
-  attr_accessor :source, :target
+
+  attr_reader :property, :source, :target
+
 end
 
-class Shortest_path_query
+class ShortestPathQuery
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TString.new, TInt.new(false, 4), TUserDef.new(
+      PresetQuery))
+
   def initialize(source, target, max_hop, query)
-     @source = source 
-     @target = target 
-     @max_hop = max_hop 
-     @query = query 
-  end
-  def to_tuple    
-    [@source,
-     @target,
-     @max_hop,
-     @query.to_tuple]
+    @source = source
+    @target = target
+    @max_hop = max_hop
+    @query = query
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
-  end
-  def Shortest_path_query.from_tuple(tuple)
-    Shortest_path_query.new(
-      tuple[0],
-      tuple[1],
-      tuple[2],
-      Preset_query.from_tuple(tuple[3])
-    )
-  end
-  attr_reader :query
-  attr_accessor :source, :target, :max_hop
-end
+    t = [@source, @target, @max_hop, @query]
+    return TYPE.to_msgpack(t)
+  end
+
+  def ShortestPathQuery.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    ShortestPathQuery.new(*val)
+  end
+
+  def to_s
+    gen = Jubatus::Common::MessageStringGenerator.new
+    gen.open("shortest_path_query")
+    gen.add("source", @source)
+    gen.add("target", @target)
+    gen.add("max_hop", @max_hop)
+    gen.add("query", @query)
+    gen.close()
+    return gen.to_s
+  end
+
+  attr_reader :source, :target, :max_hop, :query
 
-end
 end
 
+end  # Graph
+end  # Jubatus

data/lib/jubatus/nearest_neighbor/client.rb

@@ -0,0 +1,53 @@
+# This file is auto-generated from nearest_neighbor.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 NearestNeighbor
+module Client
+
+class NearestNeighbor < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
+  end
+
+  def clear
+    @jubatus_client.call("clear", [], TBool.new, [])
+  end
+
+  def set_row(id, d)
+    @jubatus_client.call("set_row", [id, d], TBool.new, [TString.new,
+        TDatum.new])
+  end
+
+  def neighbor_row_from_id(id, size)
+    @jubatus_client.call("neighbor_row_from_id", [id, size], TList.new(
+        TUserDef.new(IdWithScore)), [TString.new, TInt.new(false, 4)])
+  end
+
+  def neighbor_row_from_data(query, size)
+    @jubatus_client.call("neighbor_row_from_data", [query, size], TList.new(
+        TUserDef.new(IdWithScore)), [TDatum.new, TInt.new(false, 4)])
+  end
+
+  def similar_row_from_id(id, ret_num)
+    @jubatus_client.call("similar_row_from_id", [id, ret_num], TList.new(
+        TUserDef.new(IdWithScore)), [TString.new, TInt.new(true, 4)])
+  end
+
+  def similar_row_from_data(query, ret_num)
+    @jubatus_client.call("similar_row_from_data", [query, ret_num], TList.new(
+        TUserDef.new(IdWithScore)), [TDatum.new, TInt.new(true, 4)])
+  end
+end
+
+end  # Client
+end  # NearestNeighbor
+
+end  # Jubatus

data/lib/jubatus/nearest_neighbor/types.rb

@@ -0,0 +1,44 @@
+# This file is auto-generated from nearest_neighbor.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 NearestNeighbor
+
+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 = '')
+    t = [@id, @score]
+    return TYPE.to_msgpack(t)
+  end
+
+  def IdWithScore.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    IdWithScore.new(*val)
+  end
+
+  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_reader :id, :score
+
+end
+
+end  # NearestNeighbor
+end  # Jubatus

data/lib/jubatus/recommender/client.rb

@@ -1,68 +1,74 @@
-# This file is auto-generated from recommender.idl
+# This file is auto-generated from recommender.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 Recommender
 module Client
 
-class Recommender
-  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)
-  end
-  def update_row(name, id, row)
-    @cli.call(:update_row, name, id, row)
-  end
-  def clear(name)
-    @cli.call(:clear, name)
+class Recommender < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
   end
-  def complete_row_from_id(name, id)
-    Datum.from_tuple(@cli.call(:complete_row_from_id, name, id))
+
+  def clear_row(id)
+    @jubatus_client.call("clear_row", [id], TBool.new, [TString.new])
   end
-  def complete_row_from_datum(name, row)
-    Datum.from_tuple(@cli.call(:complete_row_from_datum, name, row))
+
+  def update_row(id, row)
+    @jubatus_client.call("update_row", [id, row], TBool.new, [TString.new,
+        TDatum.new])
   end
-  def similar_row_from_id(name, id, size)
-    Similar_result.from_tuple(@cli.call(:similar_row_from_id, name, id, size))
+
+  def clear
+    @jubatus_client.call("clear", [], TBool.new, [])
   end
-  def similar_row_from_datum(name, row, size)
-    Similar_result.from_tuple(@cli.call(:similar_row_from_datum, name, row, size))
+
+  def complete_row_from_id(id)
+    @jubatus_client.call("complete_row_from_id", [id], TDatum.new,
+        [TString.new])
   end
-  def decode_row(name, id)
-    Datum.from_tuple(@cli.call(:decode_row, name, id))
+
+  def complete_row_from_datum(row)
+    @jubatus_client.call("complete_row_from_datum", [row], TDatum.new,
+        [TDatum.new])
   end
-  def get_all_rows(name)
-    @cli.call(:get_all_rows, name)
+
+  def similar_row_from_id(id, size)
+    @jubatus_client.call("similar_row_from_id", [id, size], TList.new(
+        TUserDef.new(IdWithScore)), [TString.new, TInt.new(false, 4)])
   end
-  def calc_similarity(name, lhs, rhs)
-    @cli.call(:calc_similarity, name, lhs, rhs)
+
+  def similar_row_from_datum(row, size)
+    @jubatus_client.call("similar_row_from_datum", [row, size], TList.new(
+        TUserDef.new(IdWithScore)), [TDatum.new, TInt.new(false, 4)])
   end
-  def calc_l2norm(name, row)
-    @cli.call(:calc_l2norm, name, row)
+
+  def decode_row(id)
+    @jubatus_client.call("decode_row", [id], TDatum.new, [TString.new])
   end
-  def save(name, id)
-    @cli.call(:save, name, id)
+
+  def get_all_rows
+    @jubatus_client.call("get_all_rows", [], TList.new(TString.new), [])
   end
-  def load(name, id)
-    @cli.call(:load, name, id)
+
+  def calc_similarity(lhs, rhs)
+    @jubatus_client.call("calc_similarity", [lhs, rhs], TFloat.new, [TDatum.new,
+        TDatum.new])
   end
-  def get_status(name)
-    @cli.call(:get_status, name)
+
+  def calc_l2norm(row)
+    @jubatus_client.call("calc_l2norm", [row], TFloat.new, [TDatum.new])
   end
 end
 
-end
-end
-end
+end  # Client
+end  # Recommender
+
+end  # Jubatus

data/lib/jubatus/recommender/types.rb

@@ -1,41 +1,44 @@
-# This file is auto-generated from recommender.idl
+# This file is auto-generated from recommender.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 Recommender
 
-class Similar_result
-  def Similar_result.from_tuple(tuple)
-    tuple.map { |x|  [x[0] , x[1] ]  }
-  end
-  def to_tuple(o)
-    o
-  end
-end
+class IdWithScore
+  include Jubatus::Common
+  TYPE = TTuple.new(TString.new, TFloat.new)
 
-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], ] }]
+  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 Datum.from_tuple(tuple)
-    Datum.new(
-      tuple[0].map { |x|  [x[0] , x[1] ]  },
-      tuple[1].map { |x|  [x[0] , x[1] ]  }
-    )
+
+  def IdWithScore.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    IdWithScore.new(*val)
   end
-  attr_accessor :string_values, :num_values
-end
 
-end
+  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_reader :id, :score
+
 end
 
+end  # Recommender
+end  # Jubatus

data/lib/jubatus/regression/client.rb

@@ -1,44 +1,38 @@
-# This file is auto-generated from regression.idl
+# This file is auto-generated from regression.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 Regression
 module Client
 
-class Regression
-  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, train_data)
-    @cli.call(:train, name, train_data)
+class Regression < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
   end
-  def estimate(name, estimate_data)
-    @cli.call(:estimate, name, estimate_data)
-  end
-  def clear(name)
-    @cli.call(:clear, name)
-  end
-  def save(name, id)
-    @cli.call(:save, name, id)
+
+  def train(train_data)
+    @jubatus_client.call("train", [train_data], TInt.new(true, 4), [TList.new(
+        TUserDef.new(ScoredDatum))])
   end
-  def load(name, id)
-    @cli.call(:load, name, id)
+
+  def estimate(estimate_data)
+    @jubatus_client.call("estimate", [estimate_data], TList.new(TFloat.new),
+        [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  # Regression
+
+end  # Jubatus

data/lib/jubatus/regression/types.rb

@@ -1,32 +1,44 @@
-# This file is auto-generated from regression.idl
+# This file is auto-generated from regression.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 Regression
 
-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 ScoredDatum
+  include Jubatus::Common
+  TYPE = TTuple.new(TFloat.new, TDatum.new)
+
+  def initialize(score, data)
+    @score = score
+    @data = data
   end
+
   def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
+    t = [@score, @data]
+    return TYPE.to_msgpack(t)
+  end
+
+  def ScoredDatum.from_msgpack(m)
+    val = TYPE.from_msgpack(m)
+    ScoredDatum.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("scored_datum")
+    gen.add("score", @score)
+    gen.add("data", @data)
+    gen.close()
+    return gen.to_s
   end
-  attr_accessor :string_values, :num_values
-end
 
-end
+  attr_reader :score, :data
+
 end
 
+end  # Regression
+end  # Jubatus