dgaff_ml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGVlMWQyZGZjY2U5MDRlMDllZTBlNTYyZTg4MTg2MmU4NDY0NDlkNw==
-  data.tar.gz: !binary |-
-    MDBhMmRjNTBkOTkxZDZjY2IxMjc5YmM0YmU3NTViYmVhZWI1Y2Q2Mw==
+SHA1:
+  metadata.gz: acb37455b25d865f46bdd47a15ac711115ff4bf7
+  data.tar.gz: e712d337d91b1f4c0c4ee0481272c27e39024a10
 SHA512:
-  metadata.gz: !binary |-
-    MzJkNGMyMGNkN2U0ZWQ2MzUwZjZjOTQxOWM2NzM0ODU0Mjg0MjMzNGZhNjhj
-    YWZkZDczMDc1NWNmM2Q1Yzg0N2EwNzUwMTY3Y2NhMGI1NmExNGFkNDFhMGI3
-    MzBiY2QwYTI0NDIwNDkwM2EyNTg1MzU1MzE3NTA1M2IwODEzN2I=
-  data.tar.gz: !binary |-
-    ZTUxZDE4ZGRmYjQ5YjgxMTAwMTE1MWY4MWM2Y2ZiMTA2M2RmZmMyNGU2Yjlj
-    NGZhYmFkOTZhZTRhNjg0ODk5ZWNjYmI0MDMxOWJjODJkYzI2MWYwOTBiMzQx
-    MWExMTRiN2MzNzNjNTQ0YjE0YWUzZTA4MmRjMTBiOGY5Yzc5MWM=
+  metadata.gz: a3c049ab5551c747e8fb3daf02811d38f0550e712b5c07c04868b8c5b7cc648173ce233022a5bc4887427100088d059b23016de097c569a15809abfa4dd33f10
+  data.tar.gz: a1f90741543c998c16085f5c9ef8aea5326fef9b3076e271940b882adbd2f4c1b644c24ab89fb5b0f712fb999e208761804ed2d6bd241b38c59a9cf271469fb2

data/dgaff_ml.gemspec

@@ -23,4 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rest-client", "~> 2.0.2"
   spec.add_development_dependency "fast-stemmer", "~> 1.0.2"
   spec.add_development_dependency "chronic", "~> 0.10.2"
-end
+end

data/lib/dgaff_ml/model.rb

@@ -9,11 +9,16 @@ class DGaffML
     end
     
     def predict(obs)
-      @client.predict(@dataset_id, translate_obs(obs))
+      predictions = @client.predict(@dataset_id, translate_obs(obs))
+      if self.model["conversion_pipeline"].keys.include?("label")
+        return predictions.collect{|x| self.model["conversion_pipeline"]["label"][x]}
+      else
+        return predictions
+      end
     end
     
     def translate_obs(obs)
-      model_keys = self.model["conversion_pipeline"].keys.sort_by(&:to_i)
+      model_keys = (self.model["conversion_pipeline"].keys-["label"]).sort_by(&:to_i)
       model_classes = model_keys.collect{|k| self.model["col_classes"][k.to_i]}
       translated_rows = []
       obs.each do |row|
@@ -47,7 +52,13 @@ class DGaffML
           end
           detexted << counted
         else
-          detexted << col.collect{|r| r||self.model["conversion_pipeline"][model_keys[i]]["average"]}
+          conversion_pipeline = self.model["conversion_pipeline"][model_keys[i]]
+          replaced = col.collect{|r| r||conversion_pipeline["average"]}
+          dist = conversion_pipeline["max"]-conversion_pipeline["min"]
+          detexted << replaced
+          detexted << replaced.collect{|r| (r-conversion_pipeline["min"]).to_f/dist} if dist > 0
+          detexted << replaced.collect{|r| (r-conversion_pipeline["average"]).to_f/conversion_pipeline["stdev"]} if conversion_pipeline["stdev"] > 0
+          detexted << replaced.collect{|r| r.abs}
         end
       end
       return detexted.transpose

data/lib/dgaff_ml/version.rb

@@ -1,3 +1,3 @@
 module DgaffMl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: dgaff_ml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Devin Gaffney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: fast-stemmer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
 description: Interface for API on machinelearning.devingaffney.com
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Interface for API on machinelearning.devingaffney.com