shunkuntype 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa980481aa57d8bae72450249ad33e6fe82b62ba
-  data.tar.gz: 03142adad7500cec3252942be94bc084efc7120e
+  metadata.gz: c5361ad1a9894115d0773dbb8b2929cbe047c7e8
+  data.tar.gz: 421c83828a3cf7c36cb63197d00bb1f3a600aed2
 SHA512:
-  metadata.gz: de1e1914b42d69b735da36af6e0fa6e55322483aa15717c1d5d15ca4bbe7173e7eb1d2e18adfdf325372b64c524a940e0766294ee7f48244e3aad8421379e914
-  data.tar.gz: 3369e8e93244e3780ce67ac56d3deb375bcb28bcb46f6eb68fb10a1959d81790a87b37c420f1d720debb1aff0531507c1b958b17ef8f451d9c2dca79421d9a80
+  metadata.gz: 70b5626b63c53f1feb97044f9e56514a86ba38e4470b22f55a171127a29082d2a9ec3b8870862b7b05179dd40c238ae8acc4fb4304b29c9bf3b18dd1b65c717f
+  data.tar.gz: c93345719cf1b43c51904298eec89b7efbb381115b2044104ef25793e0904cf71400191e94b9d97ca44de82d755fbf94dedcb93cca72b93172a9ee7b9f9fd119

data/lib/shunkuntype/merge.rb

@@ -0,0 +1,52 @@
+require 'time'
+
+def data_merge(file_current, file_server)
+  all_data=[]
+  i,j=0,0
+  while (file_current.length > i) and (file_server.length > j) do
+    line_current,line_server = file_current[i], file_server[j]
+    break if line_current=="\n" or line_server=="\n"
+    time_current=Time.parse(line_current.split(',')[0])
+    time_server=Time.parse(line_server.split(',')[0])
+    if time_current == time_server then
+      all_data << line_current
+      i += 1
+      j += 1
+    elsif time_current < time_server then
+      all_data << line_current
+      i += 1
+    else
+      all_data << line_server
+      j += 1
+    end
+  end
+  while (file_current.length > i)
+    all_data << file_current[i]
+    i += 1
+  end
+  while (file_server.length > j)
+    all_data <<  file_server[j]
+    j += 1
+  end
+  all_data.delete("\n")
+  return all_data.join
+end
+
+if $0 == __FILE__ then
+  file_current = <<'EOS'
+2016-09-23 13:41:36 +0900,STEP-1.txt,60,60
+2016-09-23 13:48:45 +0900,STEP-2.txt,5,60
+2016-09-28 11:41:56 +0900,STEP-2.txt,0,60
+2016-09-28 11:51:46 +0900,STEP-15.txt,29,60
+2016-09-28 12:47:48 +0900,STEP-3.txt,48,60
+2016-09-28 12:50:12 +0900,STEP-1.txt,60,60
+
+EOS
+  file_server = <<'EOS'
+2016-09-23 13:41:36 +0900,STEP-1.txt,60,60
+2016-09-23 13:48:45 +0900,STEP-2.txt,5,60
+2016-09-28 12:48:57 +0900,STEP-4.txt,50,60
+
+EOS
+  print data_merge(file_current.lines, file_server.lines)
+end

data/lib/shunkuntype/version.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'tmpdir'
 
 module Shunkuntype
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   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

@@ -7,6 +7,7 @@ require "shunkuntype/plot"
 require "shunkuntype/mk_summary"
 require "shunkuntype/plot_data"
 require "shunkuntype/db"
+require "shunkuntype/merge"
 require 'systemu'
 
 module Shunkuntype
@@ -58,15 +59,37 @@ module Shunkuntype
     end
 
     def report_submit
+      p 'report submission'
+      data_dir = File.join(ENV['HOME'], '.shunkuntype')
+      FileUtils.cd(data_dir)
       server_info=File.readlines(Shunkuntype::SERVER_FILE)
-      p server_directory=server_info[0].chomp
-      p user_name=server_info[0].split('@')[0]
-      system "scp #{Shunkuntype::TRAIN_FILE} #{server_directory}/#{user_name}_training_data.txt"
-      system "scp #{Shunkuntype::SPEED_FILE} #{server_directory}/#{user_name}_speed_data.txt"
+      p @server_directory=server_info[0].chomp
+      p @user_name=server_info[0].split('@')[0]
+
+      ['training_data.txt','speed_data.txt'].each{|ext|
+        file_merge(ext)
+      }
+    end
+
+    def file_merge(ext_name)
+      file_name=ext_name
+      file_current = File.readlines(file_name)
+      tmp_file = File.open("./tmp_data.txt",'w')
+      sta, out, stderror = systemu "scp #{@server_directory}/#{@user_name}_#{ext_name} ."
+      if stderror.split(":")[2] != " No such file or directory\n" then
+        file_server = File.readlines("#{@user_name}_#{ext_name}")
+        tmp_file.print data_merge(file_current,file_server)
+      else
+        p " No such file or directory in server.\n"
+        tmp_file.print file_current.join
+      end
+      tmp_file.close
+      system "cat tmp_data.txt"
+      system "scp tmp_data.txt #{@server_directory}/#{@user_name}_#{ext_name}"
     end
 
     def data_viewing(file)
-      # opts for MkPlots could be described in file 
+      # opts for MkPlots could be described in file
       # Not coded yet at all!!!
       if file==nil then
         opts = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shunkuntype
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -189,9 +189,9 @@ files:
 - lib/data/trans2.rb
 - lib/data/word.list
 - lib/shunkuntype.rb
-- lib/shunkuntype/#version.rb#
 - lib/shunkuntype/db.rb
 - lib/shunkuntype/finished_check.rb
+- lib/shunkuntype/merge.rb
 - lib/shunkuntype/mk_summary.rb
 - lib/shunkuntype/options.rb
 - lib/shunkuntype/plot.rb

data/lib/shunkuntype/#version.rb#

@@ -1,12 +0,0 @@
-require 'fileutils'
-require 'tmpdir'
-
-module Shunkuntype
-  VERSION = "1.0.3"
-  data_dir = File.join(ENV['HOME'], '.shunkuntype')
-#  SPEED_FILE="./shunkuntype_speed_data.txt"
-  SPEED_FILE=File.join(data_dir,"speed_data.txt")
-#  TRAIN_FILE="./shunkuntype_training_data.txt"
-  TRAIN_FILE=File.join(data_dir,"training_data.txt")
-  SERVER_FILE=File.join(data_dir,"server_data.txt")
-end