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

Timestamp:

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

Author:

KOBAYASHI, Shinji

Message:

ref #50

File:

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

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