t_learn 0.1.1.5 → 0.1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5ec34f34ed37b9d565989b377f3d73def58395
-  data.tar.gz: 96fb03c78080151b6c3dd171cfbdda4218a3c916
+  metadata.gz: 498f21fc8a9db10db42ac7cad564f372eb5e9b0c
+  data.tar.gz: 9b1c1a70545014cc35dde9191660cdb502948e1c
 SHA512:
-  metadata.gz: 110a637a57bb8ecbe136c5b674fdfe77eb9faf4491373f9afc2c66a8d19ef976da93f3acb1c18527813dfeb12fab701a7ea6af35194eb9500211a17406c3f08a
-  data.tar.gz: 0d8ff3858f5e65c3f20f8e54f88a3d4b3bc4a69579212fc1d76f37a00cdde4511861a69c952635dc59aa4e0bbac4f1ae6c3452e5223416b7189a6d608a6ab990
+  metadata.gz: 6d91f5751e8fda7d1d99e513dab12bd281b572b8beaf6f2eef99c78418a50583ed39a27538925aeaa90062c45adb7361e94b03756aa76002d5f519bd681bf227
+  data.tar.gz: 947dc97fdd84c07bf3f395f339b16f93a72719a66ed47203f092843871500ebf0dbc11b5ddf1c5569cb999568dead4f6b6422dd9126689f5ca6446f81e6d2ae0

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 
 group :development, :test do
   gem 'pry-rails'
-  gem 'matrix'
 end

data/README.md

@@ -90,7 +90,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/t_learn. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Tcom242242/t_learn. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/t_learn/em.rb

@@ -4,6 +4,7 @@
 require "yaml"
 require "json"
 require "pry"
+require "matrix"
 
 module TLearn
 
@@ -11,11 +12,11 @@ module TLearn
     attr_accessor :mu_list, :conv_list, :pi_list, :log_likelihood, :k_num,:data_list, :real_data_list
 
     def init(data_list, k_num)
-      @k_num = k_num # ガウス分布の数
+      @k_num = k_num 
       @data_list = data_list
       @dim = @data_list[0].size
       # @data_list = scale(@data_list)
-      data_ave_std =calc_first_ave_std(@data_list)
+      data_ave_std = calc_first_ave_std(@data_list)
       @real_data_list = Marshal.load(Marshal.dump(@data_list))
       @mu_list = Array.new(@k_num).map{ini_ave(data_ave_std[:ave_list])}
       @conv_list = Array.new(@k_num).map{ini_conv(data_ave_std[:std_list])}
@@ -51,8 +52,9 @@ module TLearn
       return array
     end
 
-    def create_log(cycle)
+    def create_log(cycle, likelihood)
       log = {:cycle => cycle, 
+             :likelihood => likelihood,
              :mu => @mu_list.clone, 
              :conv => @conv_list.clone, 
              :pi_list => @pi_list.clone}
@@ -72,7 +74,7 @@ module TLearn
         diff = (likelihood - last_likelihood).abs
         last_likelihood = likelihood
         puts "likelihood: #{likelihood}"
-        result.push(create_log(cycle))
+        result.push(create_log(cycle, likelihood))
         cycle += 1
         break if diff < 0.000001
       end
@@ -120,7 +122,6 @@ module TLearn
       return mu
     end
 
-    
     def calc_conv(k, nk)
       conv = Array.new(@dim).map{Array.new(@dim, 0)}
       @dim.times{|i|
@@ -130,7 +131,11 @@ module TLearn
           } 
         }
       }
-      conv = conv.map{|arr| arr.map{|v| v/nk}}
+      conv = conv.map{|arr| 
+        arr.map{|v| 
+          (v/nk) != 0.0 ? (v/nk) : 0.1
+        }
+      }
       return conv
     end
 
@@ -146,23 +151,6 @@ module TLearn
       return log_likelihood
     end 
 
-
-    #
-    # === 混合正規分布を生成する
-    #
-    def gaussian_mix()
-      r1_x = normal_rand()
-      r1_y = normal_rand()
-      r2_x = normal_rand(10.0, 50.0)
-      r2_y = normal_rand(10.0, 50.0)
-
-      if (rand() < 0.15)
-        return [r1_x, r1_y]
-      else
-        return [r2_x, r2_y]
-      end
-    end
-
     #
     # === gauusian distribution 
     #
@@ -175,24 +163,20 @@ module TLearn
         f2 = Math.exp(-(((x-mu)**2)/((2.0*sigma))))
         return f1 * f2
       else
-        return gauusian2dim(x, mu, sigma)
+        return gauusian_over_2dim(x, mu, sigma)
       end
     end
 
 
     #
-    # === gauusian distribution .2 dim version
+    # === gauusian distribution over 2 dim version
     #
-    def gauusian2dim(x, mu, conv)
+    def gauusian_over_2dim(x, mu, conv)
       x = Matrix[x]
       mu = Matrix[mu]
       conv = Matrix[*conv]
-      begin
-        f1 = 1.0/(2.0 * Math::PI * ( conv.det**(0.5) ))
-        f2 = Math.exp((-1.0/2.0)*((x-mu) * conv.inverse * (x-mu).transpose)[0, 0])
-      rescue
-        binding.pry ;
-      end
+      f1 = 1.0/(((2.0 * Math::PI)**(@dim/2.0)) * ( conv.det**(0.5) ))
+      f2 = Math.exp((-1.0/2.0)*((x-mu) * conv.inverse * (x-mu).transpose)[0, 0])
 
       return (f1 * f2)
     end
@@ -203,7 +187,7 @@ module TLearn
       std_list = []
       x.each{|vec| 
         vec.each_with_index{|data, i|
-          sum_each_vec[i] = (sum_each_vec[i] == nil) ? data : sum_each_vec[i]+data
+          sum_each_vec[i] = (sum_each_vec[i] == nil) ? data : sum_each_vec[i] + data
         }
       }
       x[0].size.times{|i| ave_list.push(sum_each_vec[i]/x.size)}
@@ -214,53 +198,47 @@ module TLearn
           sum_each_vec[i] = (sum_each_vec[i] == nil) ? (ave_list[i]-data)**2 : (sum_each_vec[i]+(ave_list[i]-data)**2)
         }
       }
-      x[0].size.times{|i| std_list.push(Math.sqrt(sum_each_vec[i]/x.size))}
+      x[0].size.times{|i| 
+        std = Math.sqrt(sum_each_vec[i]/x.size)
+        std = 0.1 if std == 0.0 
+        std_list.push(std)
+      }
 
       return {:ave_list => ave_list, :std_list => std_list}
     end
 
+
     def scale(x)
-      if x[0].instance_of?(Array)  # check whether x's factor is 1dim or over 2dim
-        sum_each_vec = []
-        ave_list = []
-        std_list = []
-        x.each{|vec| 
-          vec.each_with_index{|data, i|
-            sum_each_vec[i] = (sum_each_vec[i] == nil) ? data : sum_each_vec[i]+data
-          }
-        }
-        x[0].size.times{|i|
-          ave_list.push(sum_each_vec[i]/x.size)
+      sum_each_vec = []
+      ave_list = []
+      std_list = []
+      x.each{|vec| 
+        vec.each_with_index{|data, i|
+          sum_each_vec[i] = (sum_each_vec[i] == nil) ? data : sum_each_vec[i]+data
         }
+      }
+      x[0].size.times{|i|
+        ave_list.push(sum_each_vec[i]/x.size)
+      }
 
-        sum_each_vec = []
-        x.each{|vec| 
-          vec.each_with_index{|data, i|
-            sum_each_vec[i] = (sum_each_vec[i] == nil) ? (ave_list[i]-data)**2 : (sum_each_vec[i]+(ave_list[i]-data)**2)
-          }
-        }
-        x[0].size.times{|i|
-          std_list.push(Math.sqrt(sum_each_vec[i]/x.size))
+      sum_each_vec = []
+      x.each{|vec| 
+        vec.each_with_index{|data, i|
+          sum_each_vec[i] = (sum_each_vec[i] == nil) ? (ave_list[i]-data)**2 : (sum_each_vec[i]+(ave_list[i]-data)**2)
         }
+      }
+      x[0].size.times{|i|
+        std_list.push(Math.sqrt(sum_each_vec[i]/x.size))
+      }
 
-        scaled_x = []
-        x.each_with_index{|vec, i| 
-          scaled_x[i] ||= []
-          vec.each_with_index{|data, j|
-            scaled_x[i][j] ||= (data-ave_list[j])/std_list[j]
-          }
+      scaled_x = []
+      x.each_with_index{|vec, i| 
+        scaled_x[i] ||= []
+        vec.each_with_index{|data, j|
+          scaled_x[i][j] ||= (data-ave_list[j])/std_list[j]
         }
-        return scaled_x
-      else  # if 1dim
-        mu = x.each.inject(0.0){|sum, data| sum+=data}/x.size
-        var = (x.each.inject(0.0){|sum, data| sum+=(data-mu)**2}/x.size) 
-        std = Math.sqrt(var)
-        scaled_x = []
-        x.each{|sum,data| 
-          scaled_x.push((mu-data)/std)
-        } 
-        return scaled_x
-      end
+      }
+      return scaled_x
     end
   end
 end

data/lib/t_learn/version.rb

@@ -1,3 +1,3 @@
 module TLearn
-  VERSION = "0.1.1.5"
+  VERSION = "0.1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t_learn
 version: !ruby/object:Gem::Version
-  version: 0.1.1.5
+  version: 0.1.1.6
 platform: ruby
 authors:
 - Tcom242242
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rake_tasks~"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md

data/.rake_tasks~

@@ -1,7 +0,0 @@
-build
-clean
-clobber
-install
-install:local
-release[remote]
-spec