shunkuntype 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9b732dc82cc5aa2ddf7736e55af3453cd3bafd2
-  data.tar.gz: 7def80b6697fcec4ab2fce2d14c27afe6ddcb3f2
+  metadata.gz: 8116daf8b4491b03eae9efc00a2293e7d1779ef7
+  data.tar.gz: 05516f095e981543e05e2ddd08a1983de4e789d8
 SHA512:
-  metadata.gz: 65af830217d92b322e78cc518457a77daaf884769d1d4a8b3a795f8cf0b6754d1797839cf4f232cf5c6ea019b935e599fcf9a3d3a30baa82bad019d3e1ea3501
-  data.tar.gz: bb18ccd9b3f008e48ddfa5ee0b0339a2f44e1b1adcc01b1d256a35e0f107049a93f36d996198ec2cc6d4ca6310997eddf6cbbfea96bf93942dc8f7d577e7acc6
+  metadata.gz: 8deff29282144e6fcfd6144b88dff256d1cf28f93c69539edbcd2863838b8aa1b8e36442fce0922b1f5d9e7be5363d49f4ef3f8d396a751ce5d4544fb0069aa4
+  data.tar.gz: 0c04fcec5327b3b6068915a00ef93932e99e21390670c010f838a30334e64ffe17c282c5841f8898da845b7e91142e081cf162f5ea4d45d15bbf78eaaa139979

data/lib/shunkuntype/finished_check.rb

@@ -9,7 +9,18 @@ class FinishCheck
           ['lo.    30,31,32,33,34', 30,31,32,33,34],
           ['aqz    35,36,37,38,39', 35,36,37,38,39],
           [';p  40,41,42,43,44,45',40,41,42,43,44,45],
-          ['consol 46,47,48,49,50', 46,47,48,49,50]
+          ['consol 46,47,48,49,50', 46,47,48,49,50],
+          ['ex01   51,52,53,54,55', 51,52,53,54,55],
+          ['ex02   56,57,58,59,60', 56,57,58,59,60],
+          ['ex03   61,62,63,64,65', 61,62,63,64,65],
+          ['ex04   66,67,68,69,70', 66,67,68,69,70],
+          ['ex05   71,72,73,74,75', 71,72,73,74,75],
+          ['ex06   76,77,78,79,80', 76,77,78,79,80],
+          ['ex07   81,82,83,84,85', 81,82,83,84,85],
+          ['ex08   86,87,88,89,90', 86,87,88,89,90],
+          ['ex09   91,92,93,94,95', 91,92,93,94,95],
+          ['ex10   96,97'         , 96,97]
+
          ]]
   def initialize
     finish = [[],[]]

data/lib/shunkuntype/mk_summary.rb

@@ -23,6 +23,7 @@ class MkSummary
       p name
       speed_file="#{name}_speed_data.txt"
       if files.include?(speed_file)
+        p speed_file
         file = File.readlines(File.join($mem_dir,speed_file))
         init= (file[0]!=nil ? file[0].split(",")[2].to_f : 0.0 )
         cur = (file[-1]!=nil ? file[-1].split(",")[2].to_f : 0.0 )
@@ -30,6 +31,7 @@ class MkSummary
       end
       training_file="#{name}_training_data.txt"
       if files.include?(training_file)
+        p training_file
         file = File.readlines(File.join($mem_dir,training_file))
         work_time = file.inject(0){|sum,line|
           sec=line.split(',')[3].to_i

data/lib/shunkuntype/plot_data.rb

@@ -29,12 +29,16 @@ class PlotData
   end
 
   def read_general_data(file, x_col, y_col)
-    File.open(file,'r'){|file|
-      while line=file.gets do
-        tmp=line.chomp.split(',')
-        @data << [tmp[x_col],tmp[y_col]]
-      end
-    }
+    begin
+      File.open(file,'r'){|file|
+        while line=file.gets do
+          tmp=line.chomp.split(',')
+          @data << [tmp[x_col],tmp[y_col]]
+        end
+      }
+    rescue => e
+      p e
+    end
   end
 # @!endgroup
 
@@ -82,16 +86,15 @@ class MkPlots
     @opts = opts
     mk_mem_names()
     work_all()
-#    FileUtils.mv('res.png', './work.png')
     speed_all()
-#    FileUtils.mv('res.png', './speed.png')
   end
 
   def work_all
-    all_data= @mem_names.inject([]){|all,name| all << work_view(name) }
+    all_data= @mem_names.inject([]){|all,name|
+      all << work_view(name)
+    }
     text="Work minutes [min]"
     plot(all_data,text)
-#    plot(all_data,text,opts={:png=>true})
   end
 
   def speed_all
@@ -100,11 +103,10 @@ class MkPlots
     text="Typing speed [sec/20 words]"
 
     plot(all_data,text)
-#    plot(all_data,text,opts={:png=>true})
   end
 
   def speed_view(name)
-    p name1 = "#{@source_dir}/#{name}_speed_data.txt"
+    name1 = "#{@source_dir}/#{name}_speed_data.txt"
     data0 = PlotData.new(name1, 0, 2, name)
     start=Time.parse(Time.now.to_s)
     x_func = proc{|x| ((Time.parse(x)-start)/3600/24) }

data/lib/shunkuntype/version.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'tmpdir'
 
 module Shunkuntype
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
   data_dir = File.join(ENV['HOME'], '.shunkuntype')
 #  SPEED_FILE="./shunkuntype_speed_data.txt"
   SPEED_FILE=File.join(data_dir,"speed_data.txt")

data/lib/shunkuntype.rb

@@ -103,11 +103,11 @@ module Shunkuntype
       server_info=File.readlines(Shunkuntype::SERVER_FILE)
       p server_directory=server_info[0].chomp
       Dir.mktmpdir('shunkun'){|tmp_dir|
+#      ['tmp_dir'].each{|tmp_dir|
         p tmp_dir
         FileUtils.mkdir_p(File.join(tmp_dir,'mem_data'))
         system "scp -r #{server_directory}/* #{tmp_dir}/mem_data"
-        # write data to file
-        table = MkSummary.new(tmp_dir)
+        table = MkSummary.new(tmp_dir)         # read data from files
         MkPlots.new(tmp_dir,opts)
         File.open('./tmp.html','a'){|f|
           f.write("<html>\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shunkuntype
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu