nera 0.0.2 → 0.0.3

data/bin/nera_addsim

@@ -18,13 +18,23 @@ parser = OptionParser.new do |opts|
   opts.parse!(ARGV)
 end
 
-unless ARGV.size == 1
-  raise "\n\nUsage:\n nera_addsim 'nera_db_folder'"
+unless ARGV.size < 2
+  raise "\n\nUsage:\n nera_addsim 'nera_db_folder' or nera_addsim"
 end
-folder_path = ARGV[0]+'/Simulator_classes/'
-unless FileTest.directory?( folder_path)
-  raise "Folder #{folder_path} does not exist."
+
+folder_path = ""
+if ARGV.size == 0
+  unless FileTest.exists?("Jobs") and FileTest.exists?("Tables") and  FileTest.exists?("simulators.yml")
+    raise "\n\nCurrent directory is not a valid database.\nThis command performs in your database directory.\n\n"
+  end
+  folder_path = '.'
+else 
+  folder_path = ARGV[0]
+end
+
+unless FileTest.directory?( folder_path + '/Simulator_classes/')
+  raise "Folder #{folder_path}/Simulator_classes does not exist."
 end
 
 require File.expand_path(File.dirname(__FILE__) + "/../lib/nera_addsim/make_simulator")
-NERA::CUI_Simulator_Adder.new(ARGV[0])
+NERA::CUI_Simulator_Adder.new(folder_path)

data/lib/nera/nera_cui.rb

@@ -95,6 +95,13 @@ HEADER
 
     # --- selection of a parameter set
     def param_layer_action
+
+      plc = NERA::ParameterLayerController.new( @path_db_folder, @simulator_class)
+      unless plc
+        Dialog::message("Specified simulator does not exist #{@path_db_folder}/#{@simulator_class.to_s}")
+        return :simulator_layer
+      end
+
       $stdout.puts <<"HEADER"
 ===============================================
 --- in parameter layer ------------------------
@@ -102,12 +109,6 @@ HEADER
 ===============================================
 HEADER
 
-      plc = NERA::ParameterLayerController.new( @path_db_folder, @simulator_class)
-      unless plc
-        Dialog::message("Specified simulator does not exist #{@path_db_folder}/#{@simulator_class.to_s}")
-        return :simulator_layer
-      end
-      
       header,list = plc.parameters_list_in_csv
       list.unshift( "Menu")
       selected = 0
@@ -208,6 +209,13 @@ HEADER
     
     # --- action at run layer
     def run_layer_action
+
+      rlc = NERA::RunLayerController.new( @path_db_folder, @simulator_class, @parameter_id)
+      unless rlc
+        Dialog::message("Table #{@path_db_folder}/#{@simulator_class.to_s}/#{@parameter_id} is not found.")
+        return :parameter_layer
+      end
+
       $stdout.puts <<"HEADER"
 ===============================================
 --- in run layer ------------------------------
@@ -223,12 +231,6 @@ HEADER
                      "Cancel jobs",
                      "Analyze data",
                      "Exit"]
-      rlc = NERA::RunLayerController.new( @path_db_folder, @simulator_class, @parameter_id)
-      unless rlc
-        Dialog::message("Table #{@path_db_folder}/#{@simulator_class.to_s}/#{@parameter_id} is not found.")
-        return :parameter_layer
-      end
-
       selected = 0
       Dir.chdir( rlc.path_to_run_layer) {
         selected = Dialog::select_one_or_return_string( action_list, "Select one")

data/lib/nera.rb

@@ -21,5 +21,5 @@ require 'nera_simulator_layer_controller'
 require 'nera_simulator_records'
 
 module NERA
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/nera_addsim/make_simulator.rb

@@ -7,6 +7,7 @@ module NERA
     def script_body(sim_info)
       params=[]
       sim_info[:params].each do | param |
+        next if param[0] == "seed"
         params << " [#{param[0]},#{param[1]},#{param[2]}]" 
       end
       params_str =  params.join(",\n\t\t") 
@@ -32,13 +33,16 @@ BODY
       while true
         $stdout.puts
         $stdout.puts "+++Input parameter name+++"
+        $stdout.puts " If you need a seed of random number, please just input \"seed\""
         name = Readline.readline(">").chomp.strip
         break if name =~ /^[a-z]/ or name =~ /^[A-Z]/
         $stdout.puts "Input is not valid"
         $stdout.puts 
         $stdout.puts "Input the simulator name again."
       end
-      array << ":#{name}"
+      return ["seed",nil,nil] if name == "seed"
+      #array << ":#{name}"
+      array << name.to_sym.inspect
       $stdout.puts
       num = Dialog.select_one(type, "++Select parameter type+++")
       array << type[num]
@@ -53,6 +57,8 @@ BODY
         end
         if type[num] == Integer or type[num] == Float
           if /[-+]?(?:[0-9]+(\.[0-9]*)?|(\.[0-9]+))([eE][-+]?[0-9]+)?/ =~ default
+            default = "#{default.to_i}" if type[num] == Integer
+            default = "#{default.to_f}" if type[num] == Float
             break
           end
         else
@@ -84,11 +90,16 @@ BODY
         
         case num
         when 0
+          if param[0] == "seed"
+            return ["seed",nil,nil]
+          end
           if param[1] == Integer or param[1] == Float
             unless /[-+]?(?:[0-9]+(\.[0-9]*)?|(\.[0-9]+))([eE][-+]?[0-9]+)?/ =~ param[2]
               $stdout.puts "! Default value must be #{param[1]}"
               next
             end
+            param[2] = "#{param[2].to_i}" if param[1] == Integer
+            param[2] = "#{param[2].to_f}" if param[1] == Float
           end
           return param
         when 1
@@ -96,12 +107,14 @@ BODY
           while true
             $stdout.puts
             $stdout.puts "+++Input parameter name+++"
+            $stdout.puts " If you need a seed of random number, please just input \"seed\""
             name = Readline.readline(">").chomp.strip
             break if name =~ /^[a-z]/ or name =~ /^[A-Z]/
             $stdout.puts "Input is not valid"
             $stdout.puts 
             $stdout.puts "Input the simulator name again."
           end
+          return ["seed",nil,nil] if name == "seed"
           param[0] = ":#{name}"
         when 2
           $stdout.puts
@@ -115,7 +128,8 @@ BODY
             # p param[1]
             if param[1] == Integer or param[1] == Float
               if /[-+]?(?:[0-9]+(\.[0-9]*)?|(\.[0-9]+))([eE][-+]?[0-9]+)?/ =~ default
-                param[2] = default
+                param[2] = "#{default.to_i}" if param[1] == Integer
+                param[2] = "#{default.to_f}" if param[1] == Float
                 break
               end
             else 
@@ -173,7 +187,7 @@ BODY
           return nil
         end
         
-        $stdout.print "Would you create a new simulator \"#{name}\" ?(y/n): "
+        $stdout.print "Will you create a new simulator \"#{name}\" ?(y/n): "
         if Readline.readline("").chomp.strip == "y"
           sim_info[:name]=name
           break
@@ -194,17 +208,17 @@ BODY
           path_file = Readline.readline("> ~/").chomp.strip
           unless File.file?(home+path_file)
             $stdout.puts "File \"~/#{path_file}\" is not found."
-            $stdout.print "Would you abort this registration\" ?(y/n): "
+            $stdout.print "Will you abort this registration\" ?(y/n): "
             return nil if Readline.readline("").chomp.strip == "y"
           else
             if (File.stat(home+path_file).mode & 2**6 ) != 2**6
               $stdout.puts "File ~/#{path_file} is not executable."
-              $stdout.print "Would you abort this registration\" ?(y/n): "
+              $stdout.print "Will you abort this registration\" ?(y/n): "
               return nil if Readline.readline("").chomp.strip == "y"
             end
           end
           
-          $stdout.print "Would you use \"~/#{path_file}\" ?(y/n): "
+          $stdout.print "Will you use \"~/#{path_file}\" ?(y/n): "
           if Readline.readline("").chomp.strip == "y"
             sim_info[:path]="~/"+path_file
             break
@@ -229,25 +243,33 @@ BODY
         $stdout.puts "Execute command :"
         params_str = ""
         params.each do | name, type, default |
-          params_str += " (#{name.sub(':','')})"
+          if name == "seed"
+            params_str += " (seed)"
+          else
+            params_str += " (#{name.sub(':','')})"
+          end
+        
         end
-        exec = "#{path}#{params_str} (seed)"
+        exec = "#{path}#{params_str}"
         $stdout.puts "  $ #{exec}"
         $stdout.puts "------------------------------"
         menu =["add"]
         params.each do | name, type, default |
-          menu += ["#{name.sub(':','')} : #{type} (default #{default})"]
+          if name == "seed"
+            menu += ["seed"]
+          else
+            menu += ["#{name.sub(':','')} : #{type} (default #{default})"]
+          end
         end
         menu += ["exit"]
         num = Dialog.select_one(menu)
-        # p menu[num]
         case menu[num]
         when "add"
           params << add_param()
           next
         when "exit"
           if params.length==0
-            $stdout.print "Any parameters don't exist. Would you continue this registration?(y/n): "
+            $stdout.print "Any parameters don't exist. Will you continue this registration?(y/n): "
             next if Readline.readline("").chomp.strip != "y"
           end
           break
@@ -280,9 +302,7 @@ BODY
         $stdout.puts "     No parameter"
       else
         index = 1
-        cmd = []
         sim_info[:params].each do |name, type, default|
-          cmd << name.sub(':','')
           $stdout.puts "     #{index}-> #{name.sub(':','')} : #{type} (default #{default}) "
           index += 1
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 +09:00
+date: 2009-03-30 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency