Changeset 88 for ruby/trunk

Timestamp:

Jul 21, 2008, 4:45:02 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #49, #50

Location:

ruby/trunk/lib/models/rm/data_types

Files:

• quantity.rb (modified) (3 diffs)
• quantity/data_time.rb (modified) (1 diff)

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

@@ +1 @@
+# This modules are implemented from the UML shown bellow
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109599337877_94556_1510Report.html
+# Ticket refs #50
 module OpenEHR
   module RM
@@ -15 +18 @@
           end          
           def is_normal?
-            normal_range != nil or normal_status != nil
+            !normal_range.nil? or !normal_status.nil
           end
           def is_simple?
-            normal_status == nil and other_refference_ranges == nil
+            normal_status.nil? and other_refference_ranges.nil?
           end
           private
           def other_reference_ranges_validity(other_reference_ranges)
-            if other_reference_ranges != null or other_reference_ranges.is_empty?
+            if !other_reference_ranges.nil? or other_reference_ranges.is_empty?
               raise ArgumentError, "Other reference ranges validity error"
             end
           end
         end
+
         module DV_Quantified
           include DV_Ordered
@@ -34 +38 @@
           end
         end
+
+        class DV_Ordinal
+          include DV_Ordered
+          attr_reader :symbol, :value
+          def is_strictly_comparable_to?
+          end
+          def limits
+          end
+        end
+
+        module DV_Absolute_Quantity
+          include DV_Quantified
+          attr_reader :accuracy
+
+          def add(a_diff)
+          end
+
+          def diff(other)
+          end
+
+          def subtract(a_diff)
+          end
+        end
       end # of Quantity
     end # of Data_Types

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

@@ +1 @@
+# This module is implementation of the UML:
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109696321450_28117_5362Report.html
+# Ticket refs #49
 module OpenEHR
   module RM
     module Data_Types
       module Quantity
-        module Date_
+        module Date_Time
+          class DV_Date < DV_Temporal
+          end
+        end
       end # of Quantity
     end # of Data_Types