nera 0.3.1 → 0.4.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.4.0
+* 1 major enhancement:
+  * A new format is adopted in parameters_table.
+  * The conversion routine from old format to new format is implemented.
+* 2 bug fixes:
+
 == 0.3.1
 * 1 major enhancement:
   * A new API function is added.

data/Manifest.txt

@@ -5,6 +5,8 @@ Rakefile
 bin/nera
 bin/nera_addhost
 bin/nera_addsim
+config/website.yml
+config/website.yml.sample
 lib/nera.rb
 lib/nera/nera_cui.rb
 lib/nera/nera_database.rb
@@ -23,10 +25,11 @@ lib/nera/nera_simulator_layer_controller.rb
 lib/nera/nera_simulator_records.rb
 lib/nera_addhost/add_hosts.rb
 lib/nera_addsim/make_simulator.rb
-scripts/console
-scripts/destroy
-scripts/generate
-scripts/make_manifest.rb
+script/console
+script/destroy
+script/generate
+script/make_manifest.rb
+script/txt2html
 test/runner.rb
 test/test_helper.rb
 test/test_nera_database.rb
@@ -42,3 +45,10 @@ test/test_nera_run_records.rb
 test/test_nera_simulator.rb
 test/test_nera_simulator_layer_controller.rb
 test/test_nera_simulator_records.rb
+website/index.html
+website/index.txt
+website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/screen.css
+website/template.html.erb
+website/temporary/temp.html
+website/temporary/temp.txt

data/Rakefile

@@ -1,28 +1,30 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/nera'
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+require './lib/nera'
+
+Hoe.plugin :newgem
+Hoe.plugin :website
+# Hoe.plugin :cucumberfeatures
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('nera', NERA::VERSION) do |p|
-  p.developer('Yohsuke Murase', 'murase@serow.t.u-tokyo.ac.jp')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_deps         = [
+$hoe = Hoe.spec 'nera' do
+  self.developer 'Yohsuke Murase', 'murase@serow.t.u-tokyo.ac.jp'
+  # self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  self.rubyforge_name       = self.name # TODO this is default value
+  self.extra_deps         = [
     ['net-ssh','>= 2.0.11'],
     ['net-sftp','>= 2.0.2']
   ]
-  p.extra_dev_deps = [
-    ['newgem', "= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
+require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
+
 # TODO - want other tests/tasks run by default? Add them to the list
+# remove_task :default
 # task :default => [:spec, :features]

data/config/website.yml

@@ -0,0 +1,2 @@
+host: murase@rubyforge.org
+remote_dir: /var/www/gforge-projects/nera

data/config/website.yml.sample

@@ -0,0 +1,2 @@
+host: unknown@rubyforge.org
+remote_dir: /var/www/gforge-projects/nera

data/lib/nera/nera_database.rb

@@ -82,6 +82,7 @@ module NERA
       @filename = path_to_file
       @in_transaction = nil
       @notify_observer_arg = notify_observer_arg
+      @yml_path = nil
       unless File.exist?(@filename)
         raise "No such database : #{@filename}"
       end

data/lib/nera/nera_job_layer_controller.rb

@@ -76,10 +76,13 @@ module NERA
           param_recs.set_yaml_file( @db_folders.path_to_parameters_yaml( klass) )
           run_records = NERA::RunRecords.new( @db_folders.path_to_runs_table( klass, d[:parameter_id]), param_recs, d[:parameter_id] )
           run_records.set_yaml_file( @db_folders.path_to_runs_yaml( klass, d[:parameter_id]) )
-          run_records.transaction {
-            a = run_records.destroy_job_id( jid)
-            raise RuntimeError, "must not happen" unless a
-            FileUtils.rm( @db_folders.path_to_job_script(jid) )
+          param_recs.transaction {
+            run_records.transaction {
+              a = run_records.destroy_job_id( jid)
+              raise RuntimeError, "must not happen" unless a
+              FileUtils.rm( @db_folders.path_to_job_script(jid) )
+              param_recs.update_num_runs( d[:parameter_id], run_records.list_all_finished.size, run_records.list_all.size)
+            }
           }
           destroyed_jobids << jid
           @db_folders.logger.info(self.class.to_s) {
@@ -139,11 +142,14 @@ module NERA
         fpath = @db_folders.path_to_include_layer + filename
         return nil unless File.exist?(fpath)
         jinfo, rinfo = expand_and_parse( fpath)
-        run_layer_path, run_recs = check_consistency( jinfo, rinfo)
-        run_recs.transaction {
-          folder_path = fpath.sub(/.tar.bz2$/,'/')
-          file_move( folder_path, run_layer_path, jinfo[:run_ids])
-          update_tables( run_recs, jinfo, rinfo)
+        run_layer_path, run_recs, param_recs, param_id = check_consistency( jinfo, rinfo)
+        param_recs.transaction {
+          run_recs.transaction {
+            folder_path = fpath.sub(/.tar.bz2$/,'/')
+            file_move( folder_path, run_layer_path, jinfo[:run_ids])
+            update_tables( run_recs, jinfo, rinfo)
+            param_recs.update_num_runs( param_id, run_recs.list_all_finished.size, run_recs.list_all.size)
+          }
         }
         remove_files( fpath)
         @db_folders.logger.info(self.class.to_s) {
@@ -211,7 +217,7 @@ module NERA
       raise "Run info is not consistent with job info!" unless jinfo[:run_ids] == rinfo.keys.sort
       
       run_layer_path = @db_folders.path_to_run_layer( sim_class, jinfo[:param_id])
-      return run_layer_path, run_recs
+      return run_layer_path, run_recs, param_records, jinfo[:param_id]
     end
 
     def conflicting

data/lib/nera/nera_parameter_layer_controller.rb

@@ -35,8 +35,29 @@ module NERA
       p_tab_path = @db_folders.path_to_parameters_table( @sim_class)
       @param_records = NERA::ParameterRecords.new( p_tab_path, sim_records, sim_id)
       @param_records.set_yaml_file( @db_folders.path_to_parameters_yaml( @sim_class) )
+
+      convert_to_recent_format
     end
 
+    # update the parameters table to the most recent one
+    private
+    def convert_to_recent_format
+      @param_records.transaction do
+        recs = @param_records.list_active
+        found = recs.find_all do |rec|
+          rec[:num_finished_runs] == nil or rec[:num_all_runs] == nil
+        end
+        found.each do |rec|
+          param_id = rec[:id]
+          run_records = NERA::RunRecords.new( @db_folders.path_to_runs_table( @sim_class, param_id), @param_records, param_id )
+          num_all_runs = run_records.list_all.size
+          num_finished_runs = run_records.list_all_finished.size
+          @param_records.update_num_runs( param_id, num_finished_runs, num_all_runs)
+        end    
+      end
+    end
+    
+    public
     def parameters_list_in_csv
       l_active = @param_records.list_active
       header = @param_records.keys.dup
@@ -54,8 +75,14 @@ module NERA
             strings << found[2].to_s
           end
         end
+        strings[1] = "#{strings[1]}/#{strings[2]}"
+        strings.delete_at(2)
         csv_list << strings.join(", ")
       end
+
+      header.delete( :num_finished_runs)
+      header[1] = :num_runs
+      
       return header.join(", "), csv_list
     end
 
@@ -150,12 +177,21 @@ module NERA
           elsif p_hash[key]
             strings << p_hash[key].to_s
           elsif p_hash[key] == nil
-            found = @sim_class::Parameters.find do |p| p[0] == key end
-            strings << found[2].to_s
+            if key == :num_finished_runs or key == :num_all_runs
+              strings << 0
+            else
+              found = @sim_class::Parameters.find do |param| param[0] == key end
+              strings << found[2].to_s
+            end
           end
         end
+        strings[1] = "#{strings[1].to_i}/#{strings[2].to_i}"
+        strings.delete_at(2)
         csv_list << strings.join(", ")
       end
+
+      header.delete( :num_finished_runs)
+      header[1] = :num_runs
       return header.join(", "), csv_list
     end
 
@@ -173,6 +209,7 @@ module NERA
         @db_folders.logger.info(self.class.to_s) {
           "reverted a parameter set in the trashbox (#{@sim_class.to_s}/#{id})"
         }
+        convert_to_recent_format
       }
       return true
     end

data/lib/nera/nera_parameter_records.rb

@@ -8,6 +8,8 @@ module NERA
 
     # keys of the parameter table
     ATTRIBUTES_PART = [ [:id, Integer],
+                        [:num_finished_runs, Integer],
+                        [:num_all_runs, Integer],
                         [:created_at, DateTime],
                         [:updated_at, DateTime],
                         [:in_trashbox?, Symbol] ]   # :active or :trashbox
@@ -48,7 +50,7 @@ module NERA
       @db = NERA::Database.new( db_file, sim_id)
       @db.add_observer( sim_records)
     end
-
+    
     # argument is the path to parameters.yml
     def set_yaml_file( yaml_path)
       @db.set_yaml_file( yaml_path)
@@ -74,7 +76,7 @@ module NERA
       NERA::Database.create_table( db_file)
     end
 
-    #
+    # add one record
     def add( param_hash)
       # check the argument
       unless param_hash.is_a?(Hash)
@@ -117,7 +119,7 @@ module NERA
 
       # add a parameter
       d = DateTime.now
-      h = {:created_at => d, :updated_at => d, :in_trashbox? => :active}
+      h = {:num_finished_runs => 0, :num_all_runs => 0, :created_at => d, :updated_at => d, :in_trashbox? => :active}
       ps = param_hash.dup
       @sim_class::Parameters.each do |p|
         ps[ p[0]] = p[3] if ps[p[0]] == nil
@@ -171,6 +173,20 @@ module NERA
       @db.update( found)
     end
 
+    def update_num_runs( id, num_finished, num_all)
+      raise ArgumentError unless id.is_a?(Integer) and num_finished.is_a?(Integer) and num_all.is_a?(Integer)
+      return nil if num_finished < 0 or num_all < 0
+      return nil if num_finished > num_all
+
+      found = @db.find_by_id(id)
+      return nil unless found
+      return nil if found[:in_trashbox?] == :trashbox
+
+      found[:num_finished_runs] = num_finished
+      found[:num_all_runs] = num_all
+      @db.update( found)
+    end
+
     def touch( id)
       raise ArgumentError unless id.is_a?(Integer)
       found = @db.find_by_id( id)

data/lib/nera/nera_run_layer_controller.rb

@@ -17,6 +17,8 @@ module NERA
     @sim_instance
     # id of the parameter set
     @param_id
+    # instance of NERA::ParameterRecords
+    @param_records
     # instance of NERA::RunRecords
     @run_records
 
@@ -39,9 +41,9 @@ module NERA
       
       @sim_instance = sim_class.new
       @param_id = param_id
-      param_records = NERA::ParameterRecords.new( @db_folders.path_to_parameters_table( sim_class), sim_records, sim_id)
-      param_records.set_yaml_file( @db_folders.path_to_parameters_yaml( sim_class) )
-      found = param_records.find_by_id( @param_id)
+      @param_records = NERA::ParameterRecords.new( @db_folders.path_to_parameters_table( sim_class), sim_records, sim_id)
+      @param_records.set_yaml_file( @db_folders.path_to_parameters_yaml( 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]
@@ -52,7 +54,7 @@ module NERA
         end
       end
       
-      @run_records = NERA::RunRecords.new( @db_folders.path_to_runs_table( sim_class, @param_id), param_records, @param_id )
+      @run_records = NERA::RunRecords.new( @db_folders.path_to_runs_table( sim_class, @param_id), @param_records, @param_id )
       @run_records.set_yaml_file( @db_folders.path_to_runs_yaml( @sim_instance.class, @param_id) )
     end
     
@@ -88,21 +90,24 @@ module NERA
       job_recs.set_yaml_file( @db_folders.path_to_jobs_yaml)
       js = NERA::JobScript.new( @db_folders)
       job_recs.transaction {
-        @run_records.transaction {
-          num_jobs.times do |j_idx|
-            run_stat = @run_records.add( num_runs_per_job)
-            rid = run_stat[0][:id]
-            jid = job_recs.add( @sim_instance.class, @param_id, rid, num_runs_per_job)
-            @run_records.set_job_id( rid, num_runs_per_job, jid)
-            sim_records = NERA::SimulatorRecords.new( @db_folders.path_to_simulators_table)
-            sim_records.set_yaml_file( @db_folders.path_to_simulators_yaml )
-            found = sim_records.list.find do |rec| rec[:name] == @sim_instance.class.to_s end
-            path_script = js.create_script( jid, found[:id], @param_id, @sim_instance, run_stat)
-            job_ids << jid
-            @db_folders.logger.info(self.class.to_s) {
-              "created a job (#{@sim_instance.class.to_s}/#{@param_id}/#{rid}, #{num_runs_per_job} runs, jobid:#{jid})"
-            }
-          end
+        @param_records.transaction {
+          @run_records.transaction {
+            num_jobs.times do |j_idx|
+              run_stat = @run_records.add( num_runs_per_job)
+              rid = run_stat[0][:id]
+              jid = job_recs.add( @sim_instance.class, @param_id, rid, num_runs_per_job)
+              @run_records.set_job_id( rid, num_runs_per_job, jid)
+              sim_records = NERA::SimulatorRecords.new( @db_folders.path_to_simulators_table)
+              sim_records.set_yaml_file( @db_folders.path_to_simulators_yaml )
+              found = sim_records.list.find do |rec| rec[:name] == @sim_instance.class.to_s end
+              path_script = js.create_script( jid, found[:id], @param_id, @sim_instance, run_stat)
+              job_ids << jid
+              @db_folders.logger.info(self.class.to_s) {
+                "created a job (#{@sim_instance.class.to_s}/#{@param_id}/#{rid}, #{num_runs_per_job} runs, jobid:#{jid})"
+              }
+            end
+            @param_records.update_num_runs( @param_id, @run_records.list_all_finished.size, @run_records.list_all.size)
+          }
         }
       }
       return job_ids
@@ -144,18 +149,21 @@ module NERA
       job_recs.set_yaml_file( @db_folders.path_to_jobs_yaml)
       destroyed_jobids = []
       job_recs.transaction {
-        @run_records.transaction {
-          job_ids.each do |jid|
-            d = job_recs.destroy(jid)
-            next unless d
-            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
-            @db_folders.logger.info(self.class.to_s) {
-              "canceled a job (jobid:#{jid})"
-            }
-          end
+        @param_records.transaction {
+          @run_records.transaction {
+            job_ids.each do |jid|
+              d = job_recs.destroy(jid)
+              next unless d
+              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
+              @db_folders.logger.info(self.class.to_s) {
+                "canceled a job (jobid:#{jid})"
+              }
+            end
+            @param_records.update_num_runs( @param_id, @run_records.list_all_finished.size, @run_records.list_all.size)
+          }
         }
       }
       destroyed_jobids = nil if destroyed_jobids.size == 0

data/lib/nera/nera_run_records.rb

@@ -22,7 +22,7 @@ module NERA
     # record
     @keys
     attr_accessor :keys
-    
+
     # run record
     def initialize( table_file, param_recs, param_id)
       raise ArgumentError unless param_recs.is_a?( NERA::ParameterRecords) and param_id.is_a?(Integer)
@@ -37,7 +37,6 @@ module NERA
       @db.set_yaml_file( yaml_path)
     end
 
-
     def self.create_table(table_file)
       NERA::Database.create_table( table_file)
     end
@@ -106,7 +105,7 @@ module NERA
       }
       return j_id
     end
-    
+
     def list_all
       matched = @db.find_all do |rec|
         true

data/lib/nera.rb

@@ -22,5 +22,5 @@ require 'nera_simulator_records'
 require 'nera_remote_connector'
 
 module NERA
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/{scripts → script}/console

@@ -5,6 +5,6 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 libs =  " -r irb/completion"
 # Perhaps use a console_lib to store any extra methods I may want available in the cosole
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/mygem.rb'}"
-puts "Loading mygem gem"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/nera.rb'}"
+puts "Loading nera gem"
 exec "#{irb} #{libs} --simple-prompt"

data/script/txt2html

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+load File.dirname(__FILE__) + "/../Rakefile"
+require 'rubyforge'
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+
+download = "http://rubyforge.org/projects/#{$hoe.rubyforge_name}"
+version  = $hoe.version
+
+def rubyforge_project_id
+  RubyForge.new.configure.autoconfig["group_ids"][$hoe.rubyforge_name]
+end
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text_template = fsrc.read
+  body_text = ERB.new(body_text_template).result(binding)
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/test/test_nera_job_layer_controller.rb

@@ -65,7 +65,6 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     s2 = File.open(logp,'r').readlines.size
     assert_equal( s1+2, s2)
 
-
     flag = File.exist?( @dbf.path_to_job_script(1))
     assert_equal( false, flag)
     flag = File.exist?( @dbf.path_to_job_script(2))
@@ -73,6 +72,7 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
 
     h, l = @rlc.not_finished_jobs_list_in_csv
     assert_equal( 1, l.size)
+    assert_equal( "0/1", @plc.parameters_list_in_csv[1][0].split(',')[1].strip)
 
     f = @jlc.cancel_jobs( [1000] )
     assert_nil( f)
@@ -162,6 +162,8 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( 2, l.size)
     h, l = @rlc.not_finished_jobs_list_in_csv
     assert_equal( 2, l.size)
+    assert_equal( "1/3", @plc.parameters_list_in_csv[1][0].split(',')[1].strip)
+
   end
 
   def test_include_all
@@ -174,6 +176,7 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( [], a)
     h, l = @jlc.not_finished_list_in_csv
     assert_equal( [], l)
+    assert_equal( "3/3", @plc.parameters_list_in_csv[1][0].split(',')[1].strip)
     h, l = @rlc.not_finished_jobs_list_in_csv
     assert_equal( [], l)
     s2 = File.open(logp,'r').readlines.size

data/test/test_nera_parameter_layer_controller.rb

@@ -33,11 +33,59 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
       x = NERA::ParameterLayerController.new( @db_folder, "Unknown")
     }
   end
+
+  def test_convert_to_recent_format
+    f = @plc.create_a_new_parameter_set( {:L => 96, :K => 0.25, :tmax => 128} )
+    io = File.open( File.join( @db_folder, "Tables", "Ising", "parameters.pstore") ,'w')
+    d = DateTime.now
+    Marshal.dump({ 1 => {:id => 1, :created_at => d, :updated_at => d, :in_trashbox? => :active, :L => 96, :K => 0.25, :tmax => 128 }, :max_id => 1} , io )
+    io.flush
+    plc = NERA::ParameterLayerController.new( @db_folder, "Ising")
+    loaded = YAML.load( File.open( File.join( @db_folder, "Ising", "parameters.yml") ) )
+    assert( loaded[0].has_key?( :num_finished_runs) )
+    assert( loaded[0].has_key?( :num_all_runs) )
+    assert_equal( 0, loaded[0][:num_all_runs])
+    assert_equal( 0, loaded[0][:num_finished_runs])
+
+    f = @plc.create_a_new_parameter_set( {:L => 32, :K => 0.25, :tmax => 128} )
+    rlc = NERA::RunLayerController.new( @db_folder, "Ising", f)
+    assert( rlc.create_jobs(3) )
+    io = File.open( File.join( @db_folder, "Tables", "Ising", "parameters.pstore") ,'w')
+    Marshal.dump( { 1 => {:id => 1, :created_at => d, :updated_at => d, :in_trashbox? => :active, :L => 96, :K => 0.25, :tmax => 128 },
+                    2 => {:id => 2, :created_at => d, :updated_at => d, :in_trashbox? => :active, :L => 32, :K => 0.25, :tmax => 128 },
+                    :max_id => 2 } , io )
+    io.flush
+    
+    plc = NERA::ParameterLayerController.new( @db_folder, "Ising")
+    loaded = YAML.load( File.open( File.join( @db_folder, "Ising", "parameters.yml") ) )
+    assert( loaded[1].has_key?( :num_finished_runs) )
+    assert( loaded[1].has_key?( :num_all_runs) )
+    assert_equal( 3, loaded[1][:num_all_runs])
+    assert_equal( 0, loaded[1][:num_finished_runs])
+
+    assert( @plc.move_a_parameter_set_into_trashbox(1) )
+    io = File.open( File.join( @db_folder, "Tables", "Ising", "parameters.pstore") ,'w')
+    Marshal.dump( { 1 => {:id => 1, :created_at => d, :updated_at => d, :in_trashbox? => :trashbox, :L => 96, :K => 0.25, :tmax => 128 },
+                    2 => {:id => 2, :created_at => d, :updated_at => d, :in_trashbox? => :active, :L => 32, :K => 0.25, :tmax => 128 },
+                    :max_id => 2 } , io )
+    io.flush
+    plc = NERA::ParameterLayerController.new( @db_folder, "Ising")
+    loaded = YAML.load( File.open( File.join( @db_folder, "Ising", "parameters.yml") ) )
+    assert_equal( false, loaded[0].has_key?( :num_finished_runs) ) # only active records can be updated
+    assert_equal( false, loaded[0].has_key?( :num_all_runs) )
+    assert( loaded[1].has_key?( :num_finished_runs) ) # only active records can be updated
+    assert( loaded[1].has_key?( :num_all_runs) )
+
+    assert( plc.revert_a_parameter_set_in_trashbox(1) )
+    loaded = YAML.load( File.open( File.join( @db_folder, "Ising", "parameters.yml") ) )
+    assert( loaded[0].has_key?( :num_finished_runs) ) # format is converted when reverted
+    assert( loaded[0].has_key?( :num_all_runs) )
+  end
   
   def test_parameters_list_in_csv
     header, list = @plc.parameters_list_in_csv
     assert( header.is_a?(String) )
-    assert_equal( "id, created_at, updated_at, L, K, tmax", header)
+    assert_equal( "id, num_runs, created_at, updated_at, L, K, tmax", header)
     assert( list.is_a?(Array) )
     assert_equal( 0, list.size)
 
@@ -45,24 +93,33 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( 1, f)
     header, list = @plc.parameters_list_in_csv
     assert( header.is_a?(String) )
-    assert_equal( "id, created_at, updated_at, L, K, tmax", header)
+    assert_equal( "id, num_runs, created_at, updated_at, L, K, tmax", header)
     assert( list.is_a?(Array) )
     assert_equal( 1, list.size)
     dstr = DateTime.now.to_s.split('T')[0]
-    assert_equal( "1, #{dstr}, #{dstr}, 96, 0.25, 128", list[0])
+    assert_equal( "1, 0/0, #{dstr}, #{dstr}, 96, 0.25, 128", list[0])
 
     f = @plc.create_a_new_parameter_set( {:L => 32} )
     assert_equal( 2, f)
     header, list = @plc.parameters_list_in_csv
     assert_equal( 2, list.size)
-    assert_equal( "1, #{dstr}, #{dstr}, 96, 0.25, 128", list[0])
+    assert_equal( "1, 0/0, #{dstr}, #{dstr}, 96, 0.25, 128", list[0])
     dstr = DateTime.now.to_s.split('T')[0]
-    assert_equal( "2, #{dstr}, #{dstr}, 32, 0.223, 512", list[1])
+    assert_equal( "2, 0/0, #{dstr}, #{dstr}, 32, 0.223, 512", list[1])
 
     @plc.move_a_parameter_set_into_trashbox(1)
     header, list = @plc.parameters_list_in_csv
     assert_equal( 1, list.size)
-    assert_equal( "2, #{dstr}, #{dstr}, 32, 0.223, 512", list[0])
+    assert_equal( "2, 0/0, #{dstr}, #{dstr}, 32, 0.223, 512", list[0])
+
+=begin    
+    rlc = NERA::RunLayerController.new( @db_folder, "Ising", 2)
+    assert( rlc.create_jobs(3), 2 )
+    header, list = @plc.parameters_list_in_csv
+    assert_equal( "2, 0/6, #{dstr}, #{dstr}, 32, 0.223, 512", list[0])
+    assert( rlc.create_jobs(1) )
+    assert_equal( "2, 0/4, #{dstr}, #{dstr}, 32, 0.223, 512", list[0])
+=end
   end
 
   def add_three
@@ -137,9 +194,9 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     }
     header, list = @plc.parameters_list_in_csv
     d = DateTime.now.to_s.split('T')[0]
-    l = [ "1, #{d}, #{d}, 32, 0.01, 1",
-          "2, #{d}, #{d}, 64, 0.02, 512",
-          "3, #{d}, #{d}, 96, 0.223, 3"]
+    l = [ "1, 0/0, #{d}, #{d}, 32, 0.01, 1",
+          "2, 0/0, #{d}, #{d}, 64, 0.02, 512",
+          "3, 0/0, #{d}, #{d}, 96, 0.223, 3"]
     assert_equal( l, list)
   end