t_learn 0.1.1.4 → 0.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6becf413fe48eb9531615a4f25124b195f2d398
-  data.tar.gz: 574db0c50bbb483001f7e4679c1677c1a9f91990
+  metadata.gz: 8a5ec34f34ed37b9d565989b377f3d73def58395
+  data.tar.gz: 96fb03c78080151b6c3dd171cfbdda4218a3c916
 SHA512:
-  metadata.gz: ea796e2c06c35b66da56160029464d675164767e97f1b5454b63330304e4f9c799a66758fdca5aec5d5c93b90136e4c8e38e8e8e6764706ba4e8c66f899fa80e
-  data.tar.gz: 6978a68150c212043a9c09988a209eca37473040bbe3f534f53ef02dc35874e9a1a795e9f59a93735a58b5a806e983a15c7018558aed1a24c566e81317b5f71f
+  metadata.gz: 110a637a57bb8ecbe136c5b674fdfe77eb9faf4491373f9afc2c66a8d19ef976da93f3acb1c18527813dfeb12fab701a7ea6af35194eb9500211a17406c3f08a
+  data.tar.gz: 0d8ff3858f5e65c3f20f8e54f88a3d4b3bc4a69579212fc1d76f37a00cdde4511861a69c952635dc59aa4e0bbac4f1ae6c3452e5223416b7189a6d608a6ab990

data/lib/t_learn/em.rb

@@ -14,27 +14,36 @@ module TLearn
       @k_num = k_num # ガウス分布の数
       @data_list = data_list
       @dim = @data_list[0].size
-      @data_list = scale(@data_list)
+      # @data_list = scale(@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{Array.new(@dim, rand())}
-      @conv_list = Array.new(@k_num).map{ini_conv()}
+      @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])}
       @pi_list = @k_num.times.map{rand()}
       @gamma = Array.new(@data_list.size).map{Array.new(@k_num, 0)}
     end
 
-    def ini_conv
+    def ini_ave(ave_list)
+      array = []
+      @dim.times {|i|
+        array.push(ave_list[i]*rand())
+      }
+      return array
+    end
+
+    def ini_conv(std_list)
       conv = []
       @dim.times {|i|
-        conv.push(make_array(i))
+        conv.push(make_array(i, std_list[i]))
       }
       return conv
     end
 
-    def make_array(i)
+    def make_array(i, std)
       array = []
       @dim.times {|x|
         if i == x 
-          array.push(1.0)
+          array.push(std**2)
         else
           array.push(0.0)
         end
@@ -188,6 +197,27 @@ module TLearn
       return (f1 * f2)
     end
 
+    def calc_first_ave_std(x)
+      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))}
+
+      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

data/lib/t_learn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t_learn
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.1.1.5
 platform: ruby
 authors:
 - Tcom242242
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,6 @@ files:
 - bin/console
 - bin/setup
 - lib/t_learn.rb
-- lib/t_learn/.em.rb.swp
 - lib/t_learn/em.rb
 - lib/t_learn/feedforward_neural_network.rb
 - lib/t_learn/hop_field_net.rb