jubatus 0.1.0 → 0.4.0

data/lib/jubatus/graph/types.rb

@@ -1,25 +1,4 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//graph.idl
+# This file is auto-generated from jubatus-generate/src/server/graph.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
@@ -38,38 +17,30 @@ class Hash
 end
 
 module Jubatus
+module Graph
 
-class Property
-  def Property.from_tuple(tuple)
-    tuple.each_with_object({}) {|(k,v),h| h[k] = v }
-  end
-  def to_tuple(o)
-    o
-  end
-end
-
-class Node_info
-  def initialize(p, in_edges, out_edges)
-     @p = p 
+class Node
+  def initialize(property, in_edges, out_edges)
+     @property = property 
      @in_edges = in_edges 
      @out_edges = out_edges 
   end
   def to_tuple    
-    [@p.to_tuple,
+    [@property.each_with_object({}) {|(k,v),h| h[k] = v},
      @in_edges.map {|x| x},
      @out_edges.map {|x| x}]
   end
   def to_msgpack(out = '')
     to_tuple.to_msgpack(out)
   end
-  def Node_info.from_tuple(tuple)
-    Node_info.new(
-      Property.from_tuple(tuple[0]),
+  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 }
     )
   end
-  attr_reader :p
+  attr_reader :property
   attr_accessor :in_edges, :out_edges
 end
 
@@ -94,58 +65,59 @@ class Preset_query
   attr_accessor :edge_query, :node_query
 end
 
-class Edge_info
-  def initialize(p, src, tgt)
-     @p = p 
-     @src = src 
-     @tgt = tgt 
+class Edge
+  def initialize(property, source, target)
+     @property = property 
+     @source = source 
+     @target = target 
   end
   def to_tuple    
-    [@p.to_tuple,
-     @src,
-     @tgt]
+    [@property.each_with_object({}) {|(k,v),h| h[k] = v},
+     @source,
+     @target]
   end
   def to_msgpack(out = '')
     to_tuple.to_msgpack(out)
   end
-  def Edge_info.from_tuple(tuple)
-    Edge_info.new(
-      Property.from_tuple(tuple[0]),
+  def Edge.from_tuple(tuple)
+    Edge.new(
+      tuple[0].each_with_object({}) {|(k,v),h| h[k] = v },
       tuple[1],
       tuple[2]
     )
   end
-  attr_reader :p
-  attr_accessor :src, :tgt
+  attr_reader :property
+  attr_accessor :source, :target
 end
 
-class Shortest_path_req
-  def initialize(src, tgt, max_hop, q)
-     @src = src 
-     @tgt = tgt 
+class Shortest_path_query
+  def initialize(source, target, max_hop, query)
+     @source = source 
+     @target = target 
      @max_hop = max_hop 
-     @q = q 
+     @query = query 
   end
   def to_tuple    
-    [@src,
-     @tgt,
+    [@source,
+     @target,
      @max_hop,
-     @q.to_tuple]
+     @query.to_tuple]
   end
   def to_msgpack(out = '')
     to_tuple.to_msgpack(out)
   end
-  def Shortest_path_req.from_tuple(tuple)
-    Shortest_path_req.new(
+  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 :q
-  attr_accessor :src, :tgt, :max_hop
+  attr_reader :query
+  attr_accessor :source, :target, :max_hop
 end
 
 end
+end
 

data/lib/jubatus/recommender/client.rb

@@ -1,25 +1,4 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//recommender.idl
+# This file is auto-generated from jubatus-generate/src/server/recommender.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
@@ -27,23 +6,21 @@ require 'msgpack/rpc'
 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 set_config(name, c)
-    @cli.call(:set_config, name, c)
-  end
   def get_config(name)
-    Config_data.from_tuple(@cli.call(: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, d)
-    @cli.call(:update_row, name, id, d)
+  def update_row(name, id, row)
+    @cli.call(:update_row, name, id, row)
   end
   def clear(name)
     @cli.call(:clear, name)
@@ -51,14 +28,14 @@ class Recommender
   def complete_row_from_id(name, id)
     Datum.from_tuple(@cli.call(:complete_row_from_id, name, id))
   end
-  def complete_row_from_data(name, d)
-    Datum.from_tuple(@cli.call(:complete_row_from_data, name, d))
+  def complete_row_from_datum(name, row)
+    Datum.from_tuple(@cli.call(:complete_row_from_datum, name, row))
   end
   def similar_row_from_id(name, id, size)
     Similar_result.from_tuple(@cli.call(:similar_row_from_id, name, id, size))
   end
-  def similar_row_from_data(name, data, size)
-    Similar_result.from_tuple(@cli.call(:similar_row_from_data, name, data, size))
+  def similar_row_from_datum(name, row, size)
+    Similar_result.from_tuple(@cli.call(:similar_row_from_datum, name, row, size))
   end
   def decode_row(name, id)
     Datum.from_tuple(@cli.call(:decode_row, name, id))
@@ -66,11 +43,11 @@ class Recommender
   def get_all_rows(name)
     @cli.call(:get_all_rows, name)
   end
-  def similarity(name, lhs, rhs)
-    @cli.call(:similarity, name, lhs, rhs)
+  def calc_similarity(name, lhs, rhs)
+    @cli.call(:calc_similarity, name, lhs, rhs)
   end
-  def l2norm(name, d)
-    @cli.call(:l2norm, name, d)
+  def calc_l2norm(name, row)
+    @cli.call(:calc_l2norm, name, row)
   end
   def save(name, id)
     @cli.call(:save, name, id)
@@ -85,3 +62,4 @@ end
 
 end
 end
+end

data/lib/jubatus/recommender/types.rb

@@ -1,30 +1,10 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//recommender.idl
+# This file is auto-generated from jubatus-generate/src/server/recommender.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
 module Jubatus
+module Recommender
 
 class Similar_result
   def Similar_result.from_tuple(tuple)
@@ -35,27 +15,6 @@ class Similar_result
   end
 end
 
-class Config_data
-  def initialize(method, converter)
-     @method = method 
-     @converter = converter 
-  end
-  def to_tuple    
-    [@method,
-     @converter]
-  end
-  def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
-  end
-  def Config_data.from_tuple(tuple)
-    Config_data.new(
-      tuple[0],
-      tuple[1]
-    )
-  end
-  attr_accessor :method, :converter
-end
-
 class Datum
   def initialize(string_values, num_values)
      @string_values = string_values 
@@ -78,4 +37,5 @@ class Datum
 end
 
 end
+end
 

data/lib/jubatus/regression/client.rb

@@ -1,25 +1,4 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//regression.idl
+# This file is auto-generated from jubatus-generate/src/server/regression.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
@@ -27,17 +6,15 @@ require 'msgpack/rpc'
 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 set_config(name, c)
-    @cli.call(:set_config, name, c)
-  end
   def get_config(name)
-    Config_data.from_tuple(@cli.call(:get_config, name))
+    @cli.call(:get_config, name)
   end
   def train(name, train_data)
     @cli.call(:train, name, train_data)
@@ -45,11 +22,11 @@ class Regression
   def estimate(name, estimate_data)
     @cli.call(:estimate, name, estimate_data)
   end
-  def save(name, arg1)
-    @cli.call(:save, name, arg1)
+  def save(name, id)
+    @cli.call(:save, name, id)
   end
-  def load(name, arg1)
-    @cli.call(:load, name, arg1)
+  def load(name, id)
+    @cli.call(:load, name, id)
   end
   def get_status(name)
     @cli.call(:get_status, name)
@@ -58,3 +35,4 @@ end
 
 end
 end
+end

data/lib/jubatus/regression/types.rb

@@ -1,60 +1,10 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//regression.idl
+# This file is auto-generated from jubatus-generate/src/server/regression.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
 module Jubatus
-
-class Param_t
-  def Param_t.from_tuple(tuple)
-    tuple.each_with_object({}) {|(k,v),h| h[k] = v }
-  end
-  def to_tuple(o)
-    o
-  end
-end
-
-class Config_data
-  def initialize(method, config)
-     @method = method 
-     @config = config 
-  end
-  def to_tuple    
-    [@method,
-     @config]
-  end
-  def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
-  end
-  def Config_data.from_tuple(tuple)
-    Config_data.new(
-      tuple[0],
-      tuple[1]
-    )
-  end
-  attr_accessor :method, :config
-end
+module Regression
 
 class Datum
   def initialize(string_values, num_values)
@@ -78,4 +28,5 @@ class Datum
 end
 
 end
+end