nera 0.5.2 → 0.6.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.0
+* 1 major enhancement:
+  * Implemented a new API functions.
+  * an API function is renamed. 
+* 2 bug fixes:
+
 == 0.5.2
 * 1 major enhancement:
 * 2 bug fixes:

data/lib/nera/nera_cui.rb

@@ -180,7 +180,7 @@ HEADER
       when "return to simulator layer"
         return :simulator_layer
       when "create a new parameter set"
-        plist = plc.list_of_parameters( @parameter_id)
+        plist = plc.get_parameter( @parameter_id)
         new_param_hash = Dialog::set_multiple_values( plist, "Input the new parameter set")
         f = plc.create_a_new_parameter_set( new_param_hash)
         if f

data/lib/nera/nera_job_layer_controller.rb

@@ -30,6 +30,10 @@ module NERA
       return @db_folders.path_to_job_layer
     end
 
+    def not_finished_list
+      @job_records.list_all
+    end
+
     def not_finished_list_in_csv
       list = @job_records.list_all
       header = @job_records.keys.dup

data/lib/nera/nera_parameter_layer_controller.rb

@@ -58,6 +58,10 @@ module NERA
     end
     
     public
+    def parameters_list
+      @param_records.list_all
+    end
+    
     def parameters_list_in_csv
       l_active = @param_records.list_active
       header = @param_records.keys.dup
@@ -108,7 +112,7 @@ module NERA
       return found_ids
     end
 
-    def list_of_parameters( param_id = nil)
+    def get_parameter( param_id = nil)
       param_list = []
       @sim_class::Parameters.each do |elem| param_list << elem.dup end
       if param_id
@@ -119,6 +123,7 @@ module NERA
       end
       return param_list
     end
+    alias :list_of_parameters :get_parameter
 
     def path_to_param_layer
       return  @db_folders.path_to_parameter_layer( @sim_class)

data/lib/nera/nera_parameter_records.rb

@@ -153,6 +153,42 @@ module NERA
       @db.find_by_id( id)
     end
 
+    # method to find similar parameter sets.
+    # argument ( parameter_id to compare, parameter name)
+    # return the array having arrays of [ found_id, values of the parameter].
+    # example:
+    #   param_recs.find_similar_parameter_sets( 3, :L)
+    #      # => [ [1,18],[2,22],[10,128] ]
+    # For this case, param_id 1,2,3,10 have the same parameters except for :L.
+    # :L for param_id 1, 2, 10 are 18, 22, and 128, respectively.
+    #
+    # If the parameter set specified by the first argument <param_id> is not found,
+    # nil is returned.
+    #
+    # If the simulator does not have the parameter specified by the second argument <param>,
+    # nil is returned.
+    #
+    # If a similar parameter is not found, [] is returned.
+    def find_similar_parameter_sets( param_id, param_key)
+      return nil unless @sim_class::Parameters.any? do |prm| prm[0] == param_key end
+      found = find_by_id( param_id.to_i)
+      return nil unless found
+      match = {}
+      @sim_class::Parameters.each do |prm|
+        next if prm[0] == param_key
+        match[ prm[0] ] = prm[2]
+        match[ prm[0] ] = found[ prm[0] ] if found.has_key?( prm[0] )
+      end
+      list = @db.find_all do |r|
+        next if r[:id] == param_id
+        match.all? do |k, val| r[k] == val end
+      end
+      
+      a = list.to_a.map do |rec| [ rec[:id], rec[param_key] ] end
+      sorted = a.sort_by do |elem| elem[1] end
+      return sorted
+    end
+
     def update_to_state_active( id)
       raise ArgumentError unless id.is_a?(Integer)
       found = @db.find_by_id( id)

data/lib/nera/nera_run_layer_controller.rb

@@ -61,6 +61,10 @@ module NERA
     def path_to_run_layer
       return @db_folders.path_to_run_layer( @sim_instance.class, @param_id)
     end
+
+    def all_runs_list
+      return @run_records.list_all
+    end
     
     def all_runs_list_in_csv
       list = @run_records.list_all
@@ -170,6 +174,10 @@ module NERA
       return destroyed_jobids
     end
 
+    def find_similar_parameter_sets(parameter_key)
+      @param_records.find_similar_parameter_sets( @param_id, parameter_key) 
+    end
+
     def analysis_methods
       found = @sim_instance.public_methods.find_all do |meth|
         meth =~ /^analyze_/

data/lib/nera.rb

@@ -22,5 +22,5 @@ require 'nera_simulator_records'
 require 'nera_remote_connector'
 
 module NERA
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

data/test/test_nera_job_layer_controller.rb

@@ -32,6 +32,55 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
   def test_path_to_job_layer
     assert_equal( @dbf.path_to_job_layer, @jlc.path_to_job_layer)
   end
+
+  def test_not_finished_list
+    l = @jlc.not_finished_list
+    assert_equal( 3, l.size)
+    assert_equal( 1, l[0][:id])
+    assert_equal( :created, l[0][:state])
+    assert_equal( "Ising", l[0][:simulator])
+    assert_equal( 1, l[0][:parameter_id])
+    assert_equal( 1, l[0][:run_id])
+    assert_equal( 1, l[0][:number_of_runs])
+    assert( l[0].has_key?(:created_at) )
+    assert( l[0].has_key?(:updated_at) )
+    assert_equal( 2, l[1][:id])
+    assert_equal( :created, l[1][:state])
+    assert_equal( "Ising", l[1][:simulator])
+    assert_equal( 1, l[1][:parameter_id])
+    assert_equal( 2, l[1][:run_id])
+    assert_equal( 1, l[1][:number_of_runs])
+    assert( l[1].has_key?(:created_at) )
+    assert( l[1].has_key?(:updated_at) )
+    assert_equal( 3, l[2][:id])
+    assert_equal( :created, l[2][:state])
+    assert_equal( "Ising", l[2][:simulator])
+    assert_equal( 1, l[2][:parameter_id])
+    assert_equal( 3, l[2][:run_id])
+    assert_equal( 1, l[2][:number_of_runs])
+    assert( l[2].has_key?(:created_at) )
+    assert( l[2].has_key?(:updated_at) )
+
+    f = @jlc.cancel_jobs( [2])
+    l = @jlc.not_finished_list
+    assert_equal( 2, l.size)
+    assert_equal( 1, l[0][:id])
+    assert_equal( :created, l[0][:state])
+    assert_equal( "Ising", l[0][:simulator])
+    assert_equal( 1, l[0][:parameter_id])
+    assert_equal( 1, l[0][:run_id])
+    assert_equal( 1, l[0][:number_of_runs])
+    assert( l[0].has_key?(:created_at) )
+    assert( l[0].has_key?(:updated_at) )
+    assert_equal( 3, l[1][:id])
+    assert_equal( :created, l[1][:state])
+    assert_equal( "Ising", l[1][:simulator])
+    assert_equal( 1, l[1][:parameter_id])
+    assert_equal( 3, l[1][:run_id])
+    assert_equal( 1, l[1][:number_of_runs])
+    assert( l[1].has_key?(:created_at) )
+    assert( l[1].has_key?(:updated_at) )
+  end
   
   def test_not_finished_list_in_csv
     h, l = @jlc.not_finished_list_in_csv

data/test/test_nera_parameter_layer_controller.rb

@@ -81,6 +81,21 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert( loaded[0].has_key?( :num_finished_runs) ) # format is converted when reverted
     assert( loaded[0].has_key?( :num_all_runs) )
   end
+
+  def test_parameter_sets_list
+    l = @plc.parameters_list
+    assert_equal( [], l)
+    l << {:id => 1}
+    l = @plc.parameters_list
+    assert_equal( [], l)
+    f = @plc.create_a_new_parameter_set( {:L => 96, :K => 0.25, :tmax => 128} )
+    l = @plc.parameters_list
+    assert_equal( 1, l.size)
+    assert_equal( 1, l[0][:id])
+    assert_equal( 96, l[0][:L])
+    assert_equal( 0.25, l[0][:K])
+    assert_equal( 128, l[0][:tmax])
+  end
   
   def test_parameters_list_in_csv
     header, list = @plc.parameters_list_in_csv
@@ -145,8 +160,8 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_nil( @plc.find_ids_by_parameter_hash( {:L => 999}))
   end
   
-  def test_list_of_parameters
-    p1 = @plc.list_of_parameters
+  def test_get_parameter
+    p1 = @plc.get_parameter
     p2 = [ [:L, Integer, 32],
            [:K, Float, 0.223],
            [:tmax, Integer, 512]
@@ -154,14 +169,14 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( p2, p1)
 
     add_three
-    p3 = @plc.list_of_parameters(2)
+    p3 = @plc.get_parameter(2)
     p4 = [ [:L, Integer, 64],
            [:K, Float, 0.02],
            [:tmax, Integer, 2]
          ]
     assert_equal( p4, p3)
 
-    p5 = @plc.list_of_parameters(5)
+    p5 = @plc.get_parameter(5)
     pp p5
     assert_equal( p2, p5)
   end

data/test/test_nera_parameter_records.rb

@@ -228,6 +228,19 @@ class TC_NERA_PARAM_RECS < Test::Unit::TestCase
       @db.find_by_id("3")
     }
   end
+
+  def test_find_similar_parameter_sets
+    add_three
+    assert_nil( @db.find_similar_parameter_sets( 0, :L) )
+    assert_nil( @db.find_similar_parameter_sets( 1, :unknown) )
+    assert_nil( @db.find_similar_parameter_sets( 4, :tmax) )
+    assert_equal( [ [1, 32] ] , @db.find_similar_parameter_sets( 2, :L) )
+    assert_equal( [] , @db.find_similar_parameter_sets( 3, :L) )
+
+    p4 =  { :L => 16, :K => 0.22, :tmax => 512 }
+    @db.add(p4)
+    assert_equal( [ [4,16],[1,32] ] , @db.find_similar_parameter_sets(2, :L) )
+  end
   
   def test_update_state
     add_three

data/test/test_nera_run_layer_controller.rb

@@ -46,6 +46,16 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( @rlc.path_to_run_layer, @dbf.path_to_run_layer(Ising,1) )
   end
 
+  def test_all_runs_list
+    l = @rlc.all_runs_list
+    assert_equal( [], l)
+    @rlc.create_jobs( 2, 3)
+    l = @rlc.all_runs_list
+    assert_equal( 6, l.size)
+    assert( l.all? do |rec| rec.is_a?(Hash) end )
+    assert( l.all? do |rec| rec[:state]==:not_finished end )
+  end
+
   def test_all_runs_list_in_csv
     header, list = @rlc.all_runs_list_in_csv
     str = "id, state, created_at, job_id, seed, start_at, finish_at, included_at, real_time, user_time, host_name, omp_threads, mpi_processes"
@@ -187,6 +197,12 @@ class TC_NERA_RUN_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( 1, l.size)
   end
 
+  def test_find_similar_parameter_sets
+    assert_equal( [], @rlc.find_similar_parameter_sets( :L))
+    assert_equal( [], @rlc.find_similar_parameter_sets( :K))
+    assert_nil( @rlc.find_similar_parameter_sets( :unknown))
+  end
+
   def test_analyze
     logp = @db_folder+'/Tables/logfile.txt'
     s1 = File.open(logp,'r').readlines.size

data/website/index.html

@@ -34,7 +34,7 @@
     <div class="sidebar">
       <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/nera"; return false'>
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/nera" class="numbers">0.5.2</a>
+        <a href="http://rubyforge.org/projects/nera" class="numbers">0.6.0</a>
       </div>
     </div>
     <h2>What</h2>

data/website/temporary/temp.html

@@ -34,7 +34,7 @@
     <div class="sidebar">
       <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/nera"; return false'>
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/nera" class="numbers">0.5.2</a>
+        <a href="http://rubyforge.org/projects/nera" class="numbers">0.6.0</a>
       </div>
     </div>
     <p>The database created by nera is a hierarchical database which consists of three layers.<br />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +09:00
+date: 2010-01-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency