Changeset 139 for ruby

Timestamp:

Jun 16, 2009, 7:49:25 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #50
Quantity package is difficult to solve.

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/quantity.rb (modified) (6 diffs)
• tests/rm/test_data_types.rb (modified) (1 diff)

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

@@ -38 +38 @@
           end
 
-          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?
@@ -48 +44 @@
             
             @other_reference_ranges = other_reference_ranges
-          end
-
-          def normal_status=(normal_status)
-            @normal_status = normal_status
           end
 
@@ -63 +55 @@
           def initialize(normal_range=nil, normal_status = nil,
                          other_reference_ranges=nil)
+            super(normal_range, normal_status, other_reference_ranges)
             
             
@@ -72 +65 @@
 
           def <=>(others)
-            
+            @symbol.
           end
 
@@ -85 +78 @@
           end
 
+          def <=>(other)
+              @symbol.
+          end
           def limits
           end
@@ -118 +114 @@
           
         end
+
+        module Proportion_Kind
+          PK_RATIO = 0
+          PK_UNITARY = 1
+          PK_PERCENT = 2
+          PK_FRACTION = 3
+          PK_INTEGER_FRACTION = 4
+
+          def Proportion_Kind.valid_proportion_kind?(kind)
+            return true if kind >= 0 && kind <= 4
+            return false
+          end
+        end
       end # of Quantity
     end # of Data_Types

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

@@ -206 +206 @@
   end
 
-  def test_dv_quantifie
-
+  def test_dv_quantified
+
+  end
+
+  def test_proportion_kind
+    assert_equal 0, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_RATIO
+    assert_equal 1, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_UNITARITY
+    assert_equal 2, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_PERCENT
+    assert_equal 3, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_FRACTION
+    assert_equal 4, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_INTEGER_FRACTION
+    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(0)
+    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(4)
+    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(-1)
+    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(5)
   end
 end