Changeset 148 for ruby/trunk

Timestamp:

Jun 29, 2009, 9:38:35 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #50

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/quantity.rb (modified) (3 diffs)
• tests/rm/test_data_types.rb (modified) (3 diffs)

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

@@ -85 +85 @@
           end
 
-          def accuracy=(accuracy)
-            raise NotImplementedError, 'subclasses need to implemented'
-          end
-
           def accuracy_unknown?
-            return accuracy.nil?
+            return @accuracy.nil?
           end
 
@@ -149 +145 @@
 
         class DV_Absolute_Quantity < DV_Quantified
-          attr_reader :accuracy
+          attr_accessor :accuracy
+
+          def initialize(magnitude, magnitude_status=nil, accuracy=nil,
+                         normal_range=nil, normal_status = nil,
+                         other_reference_ranges=nil)
+            super (magnitude, magnitude_status, normal_range,
+                   normal_status, other_reference_ranges)
+            self.accuracy = accuracy
+          end
 
           def add(a_diff)
@@ -318 +322 @@
             self.denominator = denominator
             self.precision = precision
+            self.magnitude_status = magnitude_status
+            unless accuracy.nil?
+              set_accuracy(accuracy, accuracy_percent)
+            else
+              @accuracy, @accuracy_percent = nil, nil
+            end
+            self.normal_range = normal_range
+            self.normal_status = normal_status
+            self.other_reference_ranges = other_reference_ranges
           end
 

ruby/trunk/lib/models/tests/rm/test_data_types.rb

@@ -187 +187 @@
     assert_nothing_raised(Exception){
       @dv_proportion = OpenEHR::RM::Data_Types::Quantity::DV_Proportion.new(2,3,0)}
+    assert_nothing_raised(Exception){
+      @dv_absolute_quantity = OpenEHR::RM::Data_Types::Quantity::DV_Absolute_Quantity.new(7,'=')}
    end
 
@@ -201 +203 @@
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Count, @dv_count
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Proportion, @dv_proportion
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Absolute_Quantity, @dv_absolute_quantity
   end
 
@@ -250 +253 @@
     assert_nothing_raised(Exception){@dv_quantified.magnitude_status = nil}
     assert_equal '=',  @dv_quantified.magnitude_status
+  end
+
+  def test_dv_absolute_quantity
+    assert_equal 7, @dv_absolute_quantity.magnitude
+    assert @dv_absolute_quantity.accuracy_unknown?
+    assert_nothing_raised(Exception){@dv_absolute_quantity.accuracy = 0.5}
+    assert_equal 0.5, @dv_absolute_quantity.accuracy
+    assert !@dv_absolute_quantity.accuracy_unknown?
   end