Changeset 142 for ruby/trunk

Timestamp:

Jun 22, 2009, 3:52:37 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

ref #50

Location:

ruby/trunk/lib/models

Files:

• Rakefile (modified) (1 diff)
• rm/data_types/quantity.rb (modified) (3 diffs)
• rm/data_types/quantity/date_time.rb (modified) (1 diff)
• tests/rm/test_data_types.rb (modified) (4 diffs)

ruby/trunk/lib/models/Rakefile

@@ -1 +1 @@
 require 'rubygems'
-Gem::manage_gems
+#Gem::manage_gems
 require 'rake'
 require 'rake/testtask'

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

@@ -46 +46 @@
           end
 
-          def is_strictry_comparable_to?(other)
+          def is_strictly_comparable_to?(other)
             raise NotImplementedError, 'this method should be implemented'
           end
@@ -54 +54 @@
 
         end
-        
+
         class DV_Quantified < DV_Ordered
 
@@ -76 +76 @@
 
         class DV_Ordinal < DV_Ordered
-          attr_reader :value, :symbol
-          def initialize(value, symbol, normal_range=nil, normal_status = nil,
-                         other_reference_ranges=nil)
+          attr_reader :value, :symbol, :limits
+
+          def initialize(value, symbol, limits=nil, normal_range=nil,
+                         normal_status = nil, other_reference_ranges=nil)
+            self.value = value
+            self.symbol = symbol
+            self.limits = limits
+            super(normal_range, normal_status, other_reference_ranges)
           end
 
-          def is_strictly_comparable_to?
+          def value=(value)
+            raise ArgumentError, 'value should not be nil' if value.nil?
+            @value = value
+          end
 
+          def symbol=(symbol)
+            raise ArgumentError,'symbol should not be nil' if symbol.nil?
+            @symbol = symbol
+          end
+
+          def is_strictly_comparable_to?(others)
+            unless others.instance_of? OpenEHR::RM::Data_Types::Quantity::DV_Ordinal
+              return false
+            end
+            unless others.symbol.defining_code.terminology_id.value ==
+                @symbol.defining_code.terminology_id.value
+              return false
+            end
+            return true
           end
 
           def <=>(other)
-              @value <=> other.value
+            @value <=> other.value
           end
 
-          def limits
-
+          def limits=(limits)
+            unless limits.nil? or limits.meaning.value == 'limits'
+              raise ArgumentError, 'invalid limits'
+            else
+              @limits = limits
+            end
           end
         end

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

@@ -43 +43 @@
             end
           end
-
-          class DV_Interval
-            def initialize
-            end
-          end
         end # of Date_Time
       end # of Quantity

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

@@ -165 +165 @@
       @dv_ordered = OpenEHR::RM::Data_Types::Quantity::DV_Ordered.new }
     assert_nothing_raised(Exception){
-      @dv_interval = OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval.new}
+      @dv_interval = OpenEHR::RM::Data_Types::Quantity::DV_Interval.new(1,10)}
     meaning = OpenEHR::RM::Data_Types::Text::DV_Text.new('normal')
     assert_nothing_raised(Exception){
       @reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new(meaning)}
     assert_nothing_raised(Exception){
-      @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new(1,'+')}
+      terminology = OpenEHR::RM::Support::Identification::Terminology_ID.new('urine', '')
+      code_phrase = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('protein',terminology)
+      urinary_protein = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new('+', code_phrase)
+      @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new(1, urinary_protein)}
     assert_nothing_raised(Exception){
       @dv_quantified = OpenEHR::RM::Data_Types::Quantity::DV_Quantified.new }
@@ -182 +185 @@
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Ordered, @dv_ordered
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Quantified, @dv_quantified
-     assert_instance_of OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval, @dv_interval
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Interval, @dv_interval
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::Reference_Range, @reference_range
      
@@ -206 +209 @@
     other = OpenEHR::RM::Data_Types::Quantity::DV_Ordered.new
     assert_raise(NotImplementedError){
-      @dv_ordered.is_strictry_comparable_to?(other)}
+      @dv_ordered.is_strictly_comparable_to?(other)}
   end
 
   def test_reference_range
     assert_equal 'normal', @reference_range.meaning.value
+    
   end
 
@@ -226 +230 @@
 
   def test_dv_ordinal
-    
+    assert_equal 1, @dv_ordinal.value
+    assert_equal '+', @dv_ordinal.symbol.value
+    assert_raise(ArgumentError){@dv_ordinal.symbol = nil}
+    assert_raise(ArgumentError){@dv_ordinal.value = nil}
+    terminology = OpenEHR::RM::Support::Identification::Terminology_ID.new('urine', '')
+    code_phrase = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('protein',terminology)
+    urinary_protein = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new('++', code_phrase)
+    assert_nothing_raised(Exception){
+      @dv_ordinal2 = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new(2, urinary_protein)}
+    assert @dv_ordinal.is_strictly_comparable_to?(@dv_ordinal2)
+    assert @dv_ordinal < @dv_ordinal2
+    assert @dv_ordinal2 > @dv_ordinal
+    @dv_ordinal.value = 3
+    assert 3, @dv_ordinal.value
+    assert @dv_ordinal > @dv_ordinal2
+    assert_raise(ArgumentError){@dv_ordinal.limits = @reference_range}
+    meaning = OpenEHR::RM::Data_Types::Text::DV_Text.new('limits')
+    limit_reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new(meaning)
+    assert_nothing_raised(Exception){@dv_ordinal.limits = limit_reference_range}
+    assert_equal 'limits', @dv_ordinal.limits.meaning.value
   end