Changeset 123 for ruby/trunk/lib/models/rm/data_types/quantity.rb

Timestamp:

May 19, 2009, 4:58:03 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39,#49,#50

File:

• ruby/trunk/lib/models/rm/data_types/quantity.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/data_types/quantity.rb

@@ -12 +12 @@
           def initialize(normal_range=nil, other_reference_ranges=nil,
                          normal_status = nil)
-            other_reference_ranges_validity(other_reference_ranges)
-            @normal_range = normal_range
-            @other_reference_ranges = other_reference_ranges
-            @normal_status = normal_status
+            self.normal_range = normal_range
+            self.other_reference_ranges = other_reference_ranges
+            self.normal_status = normal_status
           end          
 
           def is_normal?
-            !normal_range.nil? or !normal_status.nil
+            !normal_range.nil? or !normal_status.nil?
           end
 
@@ -31 +30 @@
 
           def normal_range=(normal_range)
+            @normal_range = normal_range
           end
 
           def other_reference_ranges=(other_reference_ranges)
+            unless other_reference_ranges.nil? or !other_reference_ranges.is_empty?
+              raise ArgumentError, "Other reference ranges validity error"
+            end
+            
+            @other_reference_ranges = other_reference_ranges
           end
 
-          private
-          def other_reference_ranges_validity(other_reference_ranges)
-            if !other_reference_ranges.nil? or other_reference_ranges.is_empty?
-              raise ArgumentError, "Other reference ranges validity error"
-            end
+          def normal_status=(normal_status)
+            @normal_status = normal_status
           end
+
         end