nera 0.2.3 → 0.3.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.3.1
+* 1 major enhancement:
+  * A new API function is added.
+* 2 bug fixes:
+
+== 0.3.0
+* 1 major enhancement:
+  * When creating a new parameter set, the parameter values which previously selected are set by default.
+* 2 bug fixes:
+
 == 0.2.3
 * 1 major enhancement:
 * 2 bug fixes:

data/lib/nera/nera_cui.rb

@@ -146,11 +146,12 @@ HEADER
       when "return to simulator layer"
         return :simulator_layer
       when "create a new parameter set"
-        plist = plc.list_of_parameters
+        plist = plc.list_of_parameters( @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
           Dialog::message("A new parameter is successfully added to the table.")
+          @parameter_id = f
         else
           Dialog::message("This parameter already exists in the database.")
         end

data/lib/nera/nera_parameter_layer_controller.rb

@@ -63,8 +63,34 @@ module NERA
       return pstr.split(',').first.to_i
     end
 
-    def list_of_parameters
-      return  @sim_class::Parameters.dup
+    def find_ids_by_parameter_hash( param_hash)
+      found_ids = []
+      @param_records.list_all.each do |rec|
+        matched = true
+        param_hash.each_pair do |key,value|
+          unless rec[key] == value
+            matched = false
+            break
+          end
+        end
+        if matched
+          found_ids << rec[:id]
+        end
+      end
+      found_ids = nil unless found_ids.size > 0
+      return found_ids
+    end
+
+    def list_of_parameters( param_id = nil)
+      param_list = []
+      @sim_class::Parameters.each do |elem| param_list << elem.dup end
+      if param_id
+        found = @param_records.list_all.find do |rec| rec[:id] == param_id end
+        if found         # load parameters
+          param_list.each do |param| param[2] = found[ param[0] ] end
+        end
+      end
+      return param_list
     end
 
     def path_to_param_layer

data/lib/nera.rb

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

data/test/test_nera_parameter_layer_controller.rb

@@ -78,6 +78,15 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_equal( 2, @plc.get_id_from_csv_string( list[1]) )
     assert_equal( 3, @plc.get_id_from_csv_string( list[2]) )
   end
+
+  def test_find_ids_by_parameter_hash
+    add_three
+    h = {:L => 96, :K => 0.03, :tmax => 3}
+    assert_equal( [3], @plc.find_ids_by_parameter_hash(h))
+    f = @plc.create_a_new_parameter_set( {:L => 96, :K => 0.03, :tmax => 4} )
+    assert_equal( [3,4], @plc.find_ids_by_parameter_hash( {:L => 96}))
+    assert_nil( @plc.find_ids_by_parameter_hash( {:L => 999}))
+  end
   
   def test_list_of_parameters
     p1 = @plc.list_of_parameters
@@ -86,6 +95,18 @@ class TC_NERA_PARAM_LAYER_CONTROLLER < Test::Unit::TestCase
            [:tmax, Integer, 512]
          ]
     assert_equal( p2, p1)
+
+    add_three
+    p3 = @plc.list_of_parameters(2)
+    p4 = [ [:L, Integer, 64],
+           [:K, Float, 0.02],
+           [:tmax, Integer, 2]
+         ]
+    assert_equal( p4, p3)
+
+    p5 = @plc.list_of_parameters(5)
+    pp p5
+    assert_equal( p2, p5)
   end
 
   def test_path_to_param_layer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 +09:00
+date: 2009-10-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency