Changeset 123 for ruby/trunk/lib/models/rm

Timestamp:

May 19, 2009, 4:58:03 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39,#49,#50

Location:

ruby/trunk/lib/models/rm

Files:

• data_structures/data_structure.rb (modified) (1 diff)
• data_types/quantity.rb (modified) (2 diffs)
• data_types/quantity/date_time.rb (modified) (3 diffs)

ruby/trunk/lib/models/rm/data_structures/data_structure.rb

@@ -1 +1 @@
 # rm::data_structures
 # class DATA_STRUCTURE
-module DataStructures
-  class DataStructure
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140447518205_872539_864Report.html
+# refs #59
+module Data_Structures
+  class Data_Structure 
     def as_hierarchy
       raise NotImplementError, "as_hirarchy must be implemented"

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

@@ -12 +12 @@
           def initialize(normal_range=nil, other_reference_ranges=nil,
                          normal_status = nil)
-            other_reference_ranges_validity(other_reference_ranges)
-            @normal_range = normal_range
-            @other_reference_ranges = other_reference_ranges
-            @normal_status = normal_status
+            self.normal_range = normal_range
+            self.other_reference_ranges = other_reference_ranges
+            self.normal_status = normal_status
           end          
 
           def is_normal?
-            !normal_range.nil? or !normal_status.nil
+            !normal_range.nil? or !normal_status.nil?
           end
 
@@ -31 +30 @@
 
           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?
+              raise ArgumentError, "Other reference ranges validity error"
+            end
+            
+            @other_reference_ranges = other_reference_ranges
           end
 
-          private
-          def other_reference_ranges_validity(other_reference_ranges)
-            if !other_reference_ranges.nil? or other_reference_ranges.is_empty?
-              raise ArgumentError, "Other reference ranges validity error"
-            end
+          def normal_status=(normal_status)
+            @normal_status = normal_status
           end
+
         end
 

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

@@ -9 +9 @@
           class DV_Temporal < OpenEHR::RM::Data_Types::Quantity::DV_Absolute_Quantity
             attr_reader :value
+
             def initialize(value)
               self.value = value
             end
+
             def value=(value)
               if value.empty? or value.nil?
@@ -18 +20 @@
               @value = value
             end
+
             def diff(value)
               raise NotImplementedError, 'diff must be implemented'
@@ -24 +27 @@
 
           class DV_Date < DV_Temporal
+            include OpenEHR::Assumed_Library_Types::ISO8601_DATE_MODULE
+            def initialize
+              
+            end
+
+          end
+          
+          class DV_Time
+            def initialize
+            end
+          end
+
+          class DV_Date_Time
             def initialize
             end