rbbt-dm 1.1.46 → 1.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f70d6a55c5852ffdafd59a3199b41031ee5a5aaa4becc56ee2f7f49be3b5d43
-  data.tar.gz: f5d53ca95b6af4d6c2b63f00bbbfd398e3fa5a6feea15885b00ccd946f3aa765
+  metadata.gz: eefb23100b9c066739e3d7fbeec940d6362d61b093770635f91e33c61d3a44a6
+  data.tar.gz: 4a7d70a7c252ef9a9e3edb4580eb9977186aa502d8e40c53d367a81244a26d2b
 SHA512:
-  metadata.gz: 7cd9928cd7a3e7558e27796f0e8f4c7635caa2331dc3f2d2d904434d9feedf6e3d2085ba301b55c61b87bdee83fbc588c666a99c0d0cc0d5414d1614a964a0a5
-  data.tar.gz: f559bff1acc000be594ad8e91534a4af24acad3ebf80c276b8055af582a91e5137c748acf55267c8001b0c667cc1c6a167ca86a11b34da52ebb796ba8fdd01fe
+  metadata.gz: 3acf95a4b443a7bcf289a8f24dceec824a1d08453ff7cddbb470d608dedd324db5945893ea8c58668ad27d382e5fb1672fd327f207ac380f182be93ddf90b72c
+  data.tar.gz: 6b04078b2458a9c78481a1585ced18a6c5c7a81d1749422be29be510d735a8e8245d8a74fc446ed8895c801acb65ef5b33280e579abf6f8116cd1472d5efbef0

data/lib/rbbt/vector/model.rb

@@ -4,6 +4,20 @@ class VectorModel
   attr_accessor :directory, :model_file, :extract_features, :train_model, :eval_model
   attr_accessor :features, :labels
 
+  def self.R_run(model_file, features, labels, code)
+    TmpFile.with_file do |feature_file|
+      Open.write(feature_file, features.collect{|feats| feats * "\t"} * "\n")
+      Open.write(feature_file + '.class', labels * "\n")
+
+      R.run <<-EOF
+features = read.table("#{ feature_file }", sep ="\\t", stringsAsFactors=FALSE);
+labels = scan("#{ feature_file }.class");
+features = cbind(features, class = labels);
+#{code}
+      EOF
+    end
+  end
+
   def self.R_train(model_file, features, labels, code)
     TmpFile.with_file do |feature_file|
       Open.write(feature_file, features.collect{|feats| feats * "\t"} * "\n")
@@ -72,16 +86,20 @@ cat(paste(label, sep="\\n"));
     when Proc === train_model
       train_model.call(@model_file, @features, @labels)
     when String === train_model
-      SVMModel.R_train(@model_file,  @features, @labels, train_model)
+      VectorModel.R_train(@model_file,  @features, @labels, train_model)
     end
   end
 
+  def run(code)
+    VectorModel.R_run(@model_file,  @features, @labels, code)
+  end
+
   def eval(element)
     case 
     when Proc === eval_model
       eval_model.call(@model_file, extract_features.call(element), false)
     when String === eval_model
-      SVMModel.R_eval(@model_file,  extract_features.call(element), false, eval_model)
+      VectorModel.R_eval(@model_file,  extract_features.call(element), false, eval_model)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-dm
 version: !ruby/object:Gem::Version
-  version: 1.1.46
+  version: 1.1.47
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util