nera 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.2
+* 1 major enhancement:
+  * constructor of ParamLayerController now accepts String type simulator name.
+  * constructor of RunLayerController now accepts String type simulator name.
+  * RunLayerController#cancel_jobs returns an array of cancelled job ids.
+  * JobLayerController#cancel_jobs returns an array of cancelled job ids.
+* 2 bug fixes
+  * require statements of NERA::Simulator classes become sooner.
+
 == 0.1.1
 * 1 major enhancement:
 * 2 bug fixes

data/lib/nera/nera_cui.rb

@@ -88,7 +88,7 @@ HEADER
       elsif names[selected] == "exit"
         return :exit
       else
-        @simulator_class = eval(names[selected])
+        @simulator_class = names[selected]
         return :parameter_layer
       end
     end
@@ -98,14 +98,14 @@ 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}")
+        Dialog::message("Specified simulator does not exist #{@path_db_folder}/#{@simulator_class}")
         return :simulator_layer
       end
 
       $stdout.puts <<"HEADER"
 ===============================================
 --- in parameter layer ------------------------
-  #{@path_db_folder} / #{@simulator_class.to_s}
+  #{@path_db_folder} / #{@simulator_class}
 ===============================================
 HEADER
 
@@ -212,14 +212,14 @@ HEADER
 
       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.")
+        Dialog::message("Table #{@path_db_folder}/#{@simulator_class}/#{@parameter_id} is not found.")
         return :parameter_layer
       end
 
       $stdout.puts <<"HEADER"
 ===============================================
 --- in run layer ------------------------------
-  #{@path_db_folder} / #{@simulator_class.to_s} / #{@parameter_id}
+  #{@path_db_folder} / #{@simulator_class} / #{@parameter_id}
 ===============================================
 HEADER
 

data/lib/nera/nera_job_layer_controller.rb

@@ -57,7 +57,7 @@ module NERA
         raise ArgumentError, "each element of job_ids must be an Integer" unless x.is_a?(Integer)
       end
 
-      flag = nil
+      destroyed_jobids = []
       @job_records.transaction {
         job_ids.each do |jid|
           d = @job_records.destroy( jid)
@@ -75,11 +75,12 @@ module NERA
             YAML.dump( run_records.list_all, io)
             io.flush
           end
-          flag = true
+          destroyed_jobids << jid
         end
       }
       dump_in_yaml
-      return flag
+      destroyed_jobids = nil if destroyed_jobids.size == 0
+      return destroyed_jobids
     end
 
     def include_list

data/lib/nera/nera_parameter_layer_controller.rb

@@ -16,15 +16,19 @@ module NERA
     # instance of NERA::ParameterRecords
     @param_records
 
-    def initialize( path_db_folder, sim_class)
+    def initialize( path_db_folder, sim_name)
       raise ArgumentError unless path_db_folder.is_a?(String)
-      unless sim_class.is_a?(Class) and sim_class.superclass == NERA::Simulator
-        raise ArgumentError, "#{sim_class} is not a subclass of NERA::Simulator"
-      end
-      
       @db_folders = NERA::DbFolders.new( path_db_folder)
       sim_records = NERA::SimulatorRecords.new( @db_folders.path_to_simulators_table)
-      @sim_class = sim_class
+      found = sim_records.list.find do |rec|
+        rec[:name] == sim_name.to_s
+      end
+      raise "No such simulator." unless found
+      @sim_class = NERA::Simulator.inherited_simulators.find do |sim|
+        sim.to_s == sim_name.to_s
+      end
+      raise "No such simulator." unless @sim_class
+      
       p_tab_path = @db_folders.path_to_parameters_table( @sim_class)
       @param_records = NERA::ParameterRecords.new( p_tab_path, @sim_class)
     end

data/lib/nera/nera_run_layer_controller.rb

@@ -20,17 +20,25 @@ module NERA
     # instance of NERA::RunRecords
     @run_records
 
-    def initialize( path_db_folder, sim_class, param_id)
+    def initialize( path_db_folder, sim_name, param_id)
       raise ArgumentError unless path_db_folder.is_a?(String)
-      unless sim_class.is_a?(Class) and sim_class.superclass == NERA::Simulator and param_id.is_a?(Integer)
-        raise ArgumentError, "#{sim_class}, #{param_id} are not appropriate instances"
+
+      @db_folders = NERA::DbFolders.new( path_db_folder)
+      sim_records = NERA::SimulatorRecords.new( @db_folders.path_to_simulators_table)
+      found = sim_records.list.find do |rec|
+        rec[:name] == sim_name.to_s
       end
+      raise "No such simulator : #{sim_name.to_s}" unless found
+      sim_class = NERA::Simulator.inherited_simulators.find do |sim|
+        sim.to_s == sim_name.to_s
+      end
+      raise "No such simulator : #{sim_name.to_s}" unless sim_class
       
-      @db_folders = NERA::DbFolders.new( path_db_folder)
       @sim_instance = sim_class.new
       @param_id = param_id
       param_records = NERA::ParameterRecords.new( @db_folders.path_to_parameters_table( sim_class), sim_class)
       found = param_records.find_by_id( @param_id)
+      raise "No such parameter : #{param_id}." unless found
       @sim_instance.class::Parameters.each do |pa|
         key = pa[0]
         if found[key]
@@ -124,6 +132,7 @@ module NERA
       end
       
       job_recs = NERA::JobRecords.new( @db_folders.path_to_jobs_table)
+      destroyed_jobids = []
       job_recs.transaction {
         @run_records.transaction {
           job_ids.each do |jid|
@@ -132,11 +141,13 @@ module NERA
             a = @run_records.destroy_job_id( jid)
             raise "must not happen" unless a
             FileUtils.rm( @db_folders.path_to_job_script(jid) )
+            destroyed_jobids << jid
           end
         }
       }
       dump_in_yaml( job_recs)
-      return true
+      destroyed_jobids = nil if destroyed_jobids.size == 0
+      return destroyed_jobids
     end
 
     def analysis_methods

data/lib/nera/nera_simulator_layer_controller.rb

@@ -35,6 +35,14 @@ module NERA
     def path_to_sim_layer
       @db_folders.path_to_simulator_layer
     end
+
+    def get_class_by_name( sim_name)
+      raise ArgumentError unless sim_name.is_a?(String)
+      found = NERA::Simulator.inherited_simulators.find do |sim|
+        sim.to_s == sim_name
+      end
+      return found
+    end
     
     private
     def register_a_simulator( sim_klass)

data/lib/nera.rb

@@ -22,5 +22,5 @@ require 'nera_simulator_records'
 require 'nera_remote_connector'
 
 module NERA
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/test_nera_job_layer_controller.rb

@@ -56,7 +56,7 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     }
 
     f = @jlc.cancel_jobs( [1,2] )
-    assert(f)
+    assert_equal([1,2], f)
     h, l = @jlc.not_finished_list_in_csv
     assert_equal( 1, l.size)
     assert_equal( 3, l[0].split(',')[0].to_i)
@@ -71,6 +71,9 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
 
     f = @jlc.cancel_jobs( [1000] )
     assert_nil( f)
+
+    f = @jlc.cancel_jobs( [2,3] )
+    assert_equal( [3], f)
   end
 
   def test_include_list

data/test/test_nera_parameter_layer_controller.rb

@@ -11,7 +11,7 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     NERA::DbFolders.create_db( @db_folder)
     @dbf = NERA::DbFolders.new( @db_folder)
     @slc = NERA::SimulatorLayerController.new( @db_folder)
-    @plc = NERA::ParameterLayerController.new( @db_folder, Ising)
+    @plc = NERA::ParameterLayerController.new( @db_folder, "Ising")
   end
 
   def teardown
@@ -29,6 +29,9 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_raise( ArgumentError) {
       x = NERA::ParameterLayerController.new( @dbf, "1")
     }
+    assert_raise( RuntimeError) {
+      x = NERA::ParameterLayerController.new( @db_folder, "Unknown")
+    }
   end
   
   def test_parameters_list_in_csv

data/test/test_nera_run_layer_controller.rb

@@ -11,9 +11,9 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
     NERA::DbFolders.create_db( @db_folder)
     @dbf = NERA::DbFolders.new( @db_folder)
     @slc = NERA::SimulatorLayerController.new( @db_folder)
-    @plc = NERA::ParameterLayerController.new( @db_folder, Ising)
+    @plc = NERA::ParameterLayerController.new( @db_folder, "Ising")
     pid = @plc.create_a_new_parameter_set({:L => 32, :K => 0.01, :tmax => 1})
-    @rlc = NERA::RunLayerController.new( @db_folder, Ising, pid)
+    @rlc = NERA::RunLayerController.new( @db_folder, "Ising", pid)
   end
   
   def teardown
@@ -28,12 +28,18 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_raise( ArgumentError) {
       NERA::RunLayerController.new( Temp,1, 1)
     }
-    assert_raise( ArgumentError) {
+    assert_raise( RuntimeError) {
       x = NERA::RunLayerController.new( @db_folder, 1, "1")
     }
-    assert_raise( ArgumentError) {
+    assert_raise( RuntimeError) {
       x = NERA::RunLayerController.new( @db_folder, "1", 1)
     }
+    assert_raise( RuntimeError) {
+      x = NERA::RunLayerController.new( @db_folder, "Unknown", 1)
+    }
+    assert_raise( RuntimeError) {
+      x = NERA::RunLayerController.new( @db_folder, "Ising", 2)
+    }
   end
 
   def test_path_to_run_layer
@@ -133,7 +139,8 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
   def test_cancel_jobs
     jids = @rlc.create_jobs(3)
     p jids
-    @rlc.cancel_jobs( jids)
+    canceled = @rlc.cancel_jobs( jids)
+    assert_equal( jids, canceled)
     h, l = @rlc.all_runs_list_in_csv
     assert_equal( 0, l.size)
 
@@ -147,8 +154,10 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
 
     # -----------------------------
     jids = @rlc.create_jobs(3)
-    jids.delete(4)
-    @rlc.cancel_jobs( jids)
+    canceled = jids.delete(4)
+    canceled = @rlc.cancel_jobs( jids)
+    assert_equal( [5,6], canceled)
+    assert_nil( @rlc.cancel_jobs( [5,6]) )
     h, l = @rlc.all_runs_list_in_csv
     assert_equal( 1, l.size)
     l = NERA::JobRecords.new( @dbf.path_to_jobs_table).list_all

data/test/test_nera_simulator_layer_controller.rb

@@ -49,6 +49,15 @@ class TC_NERA_SIM_LAYER_CONTROLLER < Test::Unit::TestCase
     p = @slc.path_to_sim_layer
     assert_equal( @db_folder+'/', p)
   end
-  
+
+  def test_get_class_by_name
+    found = @slc.get_class_by_name('Ising')
+    assert_equal( found, Ising)
+    assert_raise(ArgumentError) {
+      found = @slc.get_class_by_name(1)
+    }
+    found = @slc.get_class_by_name('Unknown_simulator')
+    assert_nil(found)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 +09:00
+date: 2009-05-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: This is an application which helps you to manage a database for the Monte Carlo simulations.  For the dtailed usage, see http://nera.rubyforge.com
+description: |-
+  This is an application which helps you to manage a database for the Monte Carlo simulations. 
+  For the dtailed usage, see http://nera.rubyforge.com
 email: 
 - murase@serow.t.u-tokyo.ac.jp
 executables: 
@@ -112,6 +114,8 @@ files:
 - test/test_nera_simulator_records.rb
 has_rdoc: true
 homepage: http://nera.rubyforge.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -133,9 +137,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nera
-rubygems_version: 1.2.0
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: This is an application which helps you to manage a database for the Monte Carlo simulations
 test_files: 
 - test/test_helper.rb