Changeset 145 for ruby/trunk

Timestamp:

Jun 23, 2009, 8:00:51 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

ref #50
DV_Amount finished

Location:

ruby/trunk/lib/models

Files:

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

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

@@ -56 +56 @@
 
         class DV_Quantified < DV_Ordered
-          attr_reader :magnitude, :accuracy, :magnitude_status
+          attr_reader :magnitude, :magnitude_status, :accuracy
 
           def initialize(magnitude, magnitude_status=nil,
@@ -165 +165 @@
 
         class DV_Amount < DV_Quantified
-          attr_reader :accuracy, :accuracy_is_percent
-
-          def infix(dv_amount, op)
-            raise NotImplementError, 'infix must be implemented'
-          end
-          
-          def accuracy=(accuracy)
-            raise ArgumentError, 'accuracy invalid'
+          attr_reader :accuracy_is_percent
+          def initialize(magnitude, magnitude_status=nil, accuracy=nil,
+                         accuracy_percent=nil, normal_range=nil,
+                         normal_status = nil, other_reference_ranges=nil)
+            super(magnitude, magnitude_status, normal_range,
+                  normal_status, other_reference_ranges)
+            set_accuracy(accuracy, accuracy_percent) unless accuracy.nil?
+          end
+          def +(other)
+            raise NotImplementError, '+ operator must be overloaded'
+          end
+
+          def -(other)
+            raise NotImplementError, '- operator must be overloaded'
+          end
+
+          def set_accuracy(accuracy, accuracy_percent)
+            if accuracy_percent
+              raise ArgumentError, 'accuracy invalid' if accuracy < 0.0 || accuracy > 100.0
+            else
+              raise ArgumentError, 'accuracy invaild' if accuracy < 0.0 || accuracy > 1.0
+            end
+            @accuracy, @accuracy_percent = accuracy, accuracy_percent
+          end
+
+          def accuracy_is_percent?
+            return @accuracy_percent
           end
         end

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

@@ -180 +180 @@
       @dv_quantified = OpenEHR::RM::Data_Types::Quantity::DV_Quantified.new(1,'=')}
     assert_nothing_raised(Exception){
-      @dv_amount = OpenEHR::RM::Data_Types::Quantity::DV_Amount.new(1)}
-    assert_nothing_raised(Exception){
-      @dv_quantity = OpenEHR::RM::Data_Types::Quantity::DV_Quantity.new(1)}
+      @dv_amount = OpenEHR::RM::Data_Types::Quantity::DV_Amount.new(2,'<')}
+    assert_nothing_raised(Exception){
+      @dv_quantity = OpenEHR::RM::Data_Types::Quantity::DV_Quantity.new(3,'~')}
    end
 
@@ -247 +247 @@
 
   def test_dv_amount
-
+    assert_equal 2, @dv_amount.magnitude
+    assert_equal '<', @dv_amount.magnitude_status
+    assert @dv_amount.accuracy_unknown?
+    assert_nothing_raised(Exception){@dv_amount.set_accuracy(50,true)}
+    assert_equal 50, @dv_amount.accuracy
+    assert @dv_amount.accuracy_is_percent?
+    assert_nothing_raised(Exception){@dv_amount.set_accuracy(0.3, false)}
+    assert_equal 0.3, @dv_amount.accuracy
+    assert !@dv_amount.accuracy_is_percent?
+    assert !@dv_amount.accuracy_unknown?
   end