Changeset 104 for ruby/trunk/lib/models/rm/data_types

Timestamp:

Sep 23, 2008, 9:14:41 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #46
refs #62, #65, #50

arranged structure of test_reference_model.rb
divided test classes

Location:

ruby/trunk/lib/models/rm/data_types

Files:

• quantity.rb (modified) (4 diffs)
• uri.rb (modified) (3 diffs)

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

@@ -6 +6 @@
     module Data_Types
       module Quantity
-        module DV_Ordered < OpenEHR::RM::Data_Types::Basic::Data_Value
+        class DV_Ordered < OpenEHR::RM::Data_Types::Basic::Data_Value
           include Comparable
           attr_accessor :other_refference_ranges, :normal_range
@@ -31 +31 @@
         end
 
-        module DV_Quantified
-          include DV_Ordered
+        class DV_Quantified < DV_Ordered
           def magnitude
           end
@@ -39 +38 @@
         end
 
-        class DV_Ordinal
-          include DV_Ordered
+        class DV_Ordinal < DV_Ordered
           attr_reader :symbol, :value
           def is_strictly_comparable_to?
@@ -48 +46 @@
         end
 
-        module DV_Absolute_Quantity
-          include DV_Quantified
+        class DV_Absolute_Quantity < DV_Quantified
           attr_reader :accuracy
 

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

@@ +1 @@
+# This module is implemented from this UML:
+#http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109701308832_384250_6986Report.html
+# Ticket refs #46
+
 require 'uri'
 #require 'uri/generic'
@@ -19 +23 @@
   @@schemes['EHR'] = EHR
 end
+
 module OpenEHR
   module RM
@@ -51 +56 @@
           end
         end
+
         class DV_EHR_URI < DV_URI
           def initialize(value)