callidus 1.0.67 → 1.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8348b821e13ceed061213ebf3f311f32c52853
-  data.tar.gz: b9231b12ef42ef76f52129149c367d724d4280cf
+  metadata.gz: 64ccfbdf3a87cae055d4adb41fde3f0e3b4401ac
+  data.tar.gz: a63079883594328163839c8f881c1c92f129ae0c
 SHA512:
-  metadata.gz: 46ac0cbdd0e5bf0f50475505a6ed89c60537ac0bfa9879872238ac269e460bebe6347e194c694f044d5aac371add9cfc28dba2f16d5787fec4704c03ed1d6834
-  data.tar.gz: 075e233a7eb2c697aea13d7966a548dcd8d310220d7db2d743d611658020e74c11ee488a15184cb3679799119be5d917af9839ba8355de90d2594a52b5379916
+  metadata.gz: 50a366f39e18b3dab2820f946a26229ede811951790ea093e79a2d842ccd18307d71ca28670a1465f5be80613bbd6e45a9ca56d4be057405a8e3401526f38438
+  data.tar.gz: 3f88ebb2f1b8e2b8ce1c384367f7aece0c45cf274b2ef5a921909aa46fcc46e198d7e2b7cbf71ab06678ee7014127b5277afb8d1473b2ea7936f57e157f08d37

data/lib/callidus.rb

@@ -1,3 +1,4 @@
 require_relative "./src/KNN.rb"
 require_relative "./src/LinearRegression.rb"
-require_relative "./src/Winnow.rb"
+require_relative "./src/Winnow.rb"
+require_relative "./src/ExponentialRegression.rb"

data/lib/src/ExponentialRegression.rb

@@ -0,0 +1,89 @@
+require_relative "../util/Comp"
+
+module Callidus
+    class ExponentialRegression
+        attr_accessor :input
+        attr_accessor :output
+        attr_accessor :predicted_output
+
+        attr_reader :a
+        attr_reader :b
+
+        attr_reader :correlation
+        attr_reader :standard_error
+
+        def initialize(ip = [], op = [])
+            @input = ip
+            @output = op
+
+            @trained = false
+        end
+
+        private def assert_trained(method = "train")
+            if !@trained
+                raise Util::UntrainedError.new("ExponentialRegression")
+            end
+        end
+
+        def formatted
+            assert_trained()
+
+            "f(x) = #{@a}e^#{@b}x"
+        end
+
+        def train
+            mean_x = @input.mean
+            mean_lny = @output.inject(0.0) { |s, n|  s + Math.log(n) } / @output.size
+
+            sum_xx = 0.0
+            sum_xy = 0.0
+            sum_yy = 0.0
+
+            @input.each_index do |i|
+                sum_xx += @input[i] * @input[i]
+                sum_xy += @input[i] * Math.log(@output[i])
+                sum_yy += Math.log(@output[i]) * Math.log(@output[i])
+            end
+
+            sum_xx = (sum_xx / @input.size) - (mean_x * mean_x)
+            sum_xy = (sum_xy / @input.size) - (mean_x * mean_lny)
+            sum_yy = (sum_yy / @output.size) - (mean_lny * mean_lny)
+
+            @b = sum_xy / sum_xx
+            @a = 2.7182818284590452353602 ** (mean_lny - b * mean_x)
+
+            @predicted_output = @input.map { |x| (@a * (2.7182818284590452353602 ** (@b * x))).round(3) }
+
+            @correlation = (sum_xy / (Math.sqrt(sum_xx) * Math.sqrt(sum_yy))).round(3)
+
+            @trained = true
+
+            @a = @a.round(3)
+            @b = @b.round(3)
+
+            self.find_standard_error
+        end
+
+        def find_standard_error
+            assert_trained()
+
+            n = @input.size > @output.size ? @output.size : @input.size
+
+            diffs = []
+
+            n.times do |i|
+                diffs << (@predicted_output[i] - @output[i]) ** 2
+            end
+
+            @standard_error = (Math.sqrt(diffs.sum/(n - 2.0))).round(3)
+
+            self
+        end
+
+        def predict(x)
+            assert_trained()
+
+            @a * (2.7182818284590452353602 ** (@b * x))
+        end
+    end
+end

data/lib/src/KNN.rb

@@ -22,7 +22,7 @@ module Callidus
                 tdiffs.pop(ind)
             end
 
-            return @output[diffs.index(Comp::Arrays.MostFrequent(mins))];
+            @output[diffs.index(Comp::Arrays.MostFrequent(mins))];
         end
     end
 end

data/lib/src/LinearRegression.rb

@@ -91,6 +91,8 @@ module Callidus
         end
 
         def predict(x)
+            assert_trained()
+            
             x * @slope + @y_intercept
         end
     end

data/lib/src/Winnow.rb

@@ -29,7 +29,7 @@ module Callidus
         end
 
         def train(a = @a)
-            if (@input[0] and @input[0].size != @weights.size)
+            if (@input.size > 0 and @input[0] and @input[0].size > 0 and @input[0].size != @weights.size)
                 @weights = Array.new(@input[0].size, @default_weight)
             end
     
@@ -43,7 +43,7 @@ module Callidus
     
             @trained = true
     
-            return self
+            self
         end
 
         def predict(x, options = {})
@@ -58,7 +58,7 @@ module Callidus
                 probability += @weights[i] * x[i] + bias
             end
     
-            return (probability > threshold ? 1 : 0)
+            (probability > threshold ? 1 : 0)
         end
     end
 end

data/lib/util/Comp.rb

@@ -32,6 +32,10 @@ class ::Array
     
         m
     end
+
+    def mean
+        self.sum/self.size.to_f
+    end
 end
 
 module Comp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callidus
 version: !ruby/object:Gem::Version
-  version: 1.0.67
+  version: 1.0.73
 platform: ruby
 authors:
 - Hayden Higginbotham
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/callidus.rb
+- lib/src/ExponentialRegression.rb
 - lib/src/KNN.rb
 - lib/src/LinearRegression.rb
 - lib/src/Winnow.rb
@@ -36,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="