Changeset 140 for ruby/trunk

Timestamp:

Jun 18, 2009, 11:45:47 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #50

Location:

ruby/trunk/lib/models

Files:

• rm.rb (modified) (1 diff)
• rm/data_types/quantity.rb (modified) (5 diffs)
• rm/data_types/quantity/date_time.rb (modified) (1 diff)
• tests/rm/test_data_types.rb (modified) (7 diffs)
• tests/rm/test_security.rb (modified) (1 diff)

ruby/trunk/lib/models/rm.rb

@@ -42 +42 @@
       autoload :Data_Structure, "rm/data_structure.rb"
     end
+
+    module Security
+      autoload :Security, 'rm/security.rb'
+    end
   end
 

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

@@ -42 +42 @@
               raise ArgumentError, "Other reference ranges validity error"
             end
-            
             @other_reference_ranges = other_reference_ranges
           end
@@ -56 +55 @@
                          other_reference_ranges=nil)
             super(normal_range, normal_status, other_reference_ranges)
-            
-            
           end
 
@@ -65 +62 @@
 
           def <=>(others)
-            @symbol.
+            @value <=> others.value
           end
 
           def valid_magnitude_status(s)
+
           end
         end
 
         class DV_Ordinal < DV_Ordered
-          attr_reader :symbol, :value
+          attr_reader :value, :symbol
+          def initialize(value, symbol, normal_range=nil, normal_status = nil,
+                         other_reference_ranges=nil)
+          end
 
           def is_strictly_comparable_to?
+
           end
 
           def <=>(other)
-              @symbol.
+              @value <=> other.value
           end
+
           def limits
+
           end
         end
@@ -103 +107 @@
         class DV_Amount < DV_Quantified
           attr_reader :accuracy, :accuracy_is_percent
+
           def infix(dv_amount, op)
             raise NotImplementError, 'infix must be implemented'
           end
+          
           def accuracy=(accuracy)
             raise ArgumentError, 'accuracy invalid'
           end
+        end
+
+        class DV_Quantity < DV_Amount
+
         end
 
@@ -126 +136 @@
             return false
           end
-        end
+        end # end of Proportion_Kind
       end # of Quantity
     end # of Data_Types

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::DV_Interval.new}
+      @dv_interval = OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval.new}
     assert_nothing_raised(Exception){
       @reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new}
     assert_nothing_raised(Exception){
-      @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new}
+      @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new(1,'+')}
     assert_nothing_raised(Exception){
       @dv_quantified = OpenEHR::RM::Data_Types::Quantity::DV_Quantified.new }
@@ -181 +181 @@
      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::DV_Interval, @dv_interval
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval, @dv_interval
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::Reference_Range, @reference_range
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Ordinal, @dv_ordinal
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Quantified, @dv_quantified
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Amount, @dv_amount
-     assert_instance_of OpenEHR::RM::Data_Types::Quantity:DV_Quantity, @dv_quantity
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Quantity, @dv_quantity
   end
 
@@ -194 +194 @@
     assert_nil @dv_ordered.normal_range
     assert_nil @dv_ordered.other_refference_ranges
-    assert @dv_orderd.is_simple?
+    assert @dv_ordered.is_simple?
     assert_raise(NotImplementedError){@dv_ordered<=>1}
     openehr_terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new('openEHR','')
@@ -202 +202 @@
       @dv_ordered.normal_status = normal_code }
     assert @dv_ordered.is_normal?
+    other = OpenEHR::RM::Data_Types::Quantity::DV_Ordered.new
     assert_raise(NotImplementedError){
-      @dv_ordered.is_strictry_comparable_to? }
+      @dv_ordered.is_strictry_comparable_to?(other)}
   end
 
@@ -212 +213 @@
   def test_proportion_kind
     assert_equal 0, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_RATIO
-    assert_equal 1, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_UNITARITY
+    assert_equal 1, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_UNITARY
     assert_equal 2, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_PERCENT
     assert_equal 3, OpenEHR::RM::Data_Types::Quantity::Proportion_Kind::PK_FRACTION
@@ -218 +219 @@
     assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(0)
     assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(4)
-    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(-1)
-    assert OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(5)
+    assert !OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(-1)
+    assert !OpenEHR::RM::Data_Types::Quantity::Proportion_Kind.valid_proportion_kind?(5)
   end
 end
@@ -231 +232 @@
     assert_instance_of OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Temporal, @dv_temporal
   end
+
   def test_dv_temporal
     assert_equal '2008', @dv_temporal.value

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

@@ -5 +5 @@
   def setup
     assert_nothing_raised(Exception){
-      @access_control_setting = OpenEHR::RM::Security::Access_Control_Setting.new}
+      @access_control_setting = OpenEHR::RM::Security::Access_Control_Settings.new}
   end
 
   def test_init
-    assert_instance_of OpenEHR::RM::Security::Access_Control_Setting, @access_control_setting
+    assert_instance_of OpenEHR::RM::Security::Access_Control_Settings, @access_control_setting
   end
 end