Changeset 151

Timestamp:

Jul 1, 2009, 10:11:42 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #49

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/quantity/date_time.rb (modified) (2 diffs)
• tests/rm/quantity/ts_date_time.rb (modified) (3 diffs)
• tests/test_assumed_library_types.rb (modified) (2 diffs)

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

@@ -3 +3 @@
 # Ticket refs #49
 require 'assumed_library_types'
-
+require 'date'
 
 module OpenEHR
@@ -119 +119 @@
               minute = ((diff - hour*60*60)/60).to_i
               second = (diff - hour * 60 *60 - minute * 60).to_i
-              fractional_second = ((diff - diff.to_i)*1000.0).to_i/1000.0
-              return 'P0Y0M0W0DT' + hour.to_s + 'H' + minute.to_s + 'M' +
-                second.to_s + fractional_second.to_s[1..-1] + 'S'
-            end
-          end
-
-          class DV_Date_Time < DV_Date
-            include OpenEHR::Assumed_Library_Types::ISO8601_TIME_MODULE
-            
-            def initialize
+              fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0
+              return DV_Duration.new('P0Y0M0W0DT' + hour.to_s + 'H' +
+                        minute.to_s + 'M' +
+                        second.to_s + fractional_second.to_s[1..-1] + 'S')
+            end
+          end
+
+          class DV_Date_Time < DV_Temporal
+            include OpenEHR::Assumed_Library_Types::ISO8601_DATE_TIME_MODULE
+            attr_reader :value
+
+            def initialize(value, magnitude_status=nil, accuracy=nil,
+                           normal_range=nil, normal_status=nil,
+                           other_reference_range=nil)
+              super(value, magnitude_status, accuracy, normal_range,
+                    normal_status, other_reference_range)
+            end
+
+            def value=(value)              
+              super(value)
+              iso8601date_time = Assumed_Library_Types::ISO8601_DATE_TIME.new(value)
+              self.year = iso8601date_time.year
+              self.month = iso8601date_time.month
+              self.day = iso8601date_time.day
+              self.minute = iso8601date_time.minute
+              self.second = iso8601date_time.second
+              self.hour = iso8601date_time.hour
+              self.fractional_second = iso8601date_time.fractional_second
+              self.timezone = iso8601date_time.timezone
+            end
+
+            def magnitude
+              return DateTime.new(@year,@month,@day,@hour,@minute,@second) - 
+                DateTime.new(0000,1,1,0,0,0) + @fractional_second
+            end
+
+            undef magnitude=
+
+            def diff(other)
+              if self.magnitude >= other.magnitude
+                past, future = other, self
+              else
+                past, future = self, other
+              end
+              past_date, past_time = split_date_time(past)
+              future_date, future_time = split_date_time(future)
+              time_diff = future_time.magnitude - past_time.magnitude
+              if future_time.magnitude < past_time.magnitude
+                future_date.day = future_date.day - 1
+                time_diff += 24 * 60 * 60
+              end
+              date_duration = past_date.diff(future_date)
+              hour = (time_diff / 60 / 60).to_i
+              minute = ((time_diff - hour*60*60)/60).to_i
+              second = (time_diff - hour * 60 *60 - minute * 60).to_i
+              fractional_second = ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
+
+              return DV_Duration.new(date_duration.value + 'T' + 
+                        hour.to_s + 'H' +
+                        minute.to_s + 'M' +
+                        second.to_s + fractional_second.to_s[1..-1] + 'S')
+                                   
+            end
+
+            private
+
+            def split_date_time(date_time)
+              /^(.*)T(.*)$/ =~ date_time.as_string
+              return DV_Date.new($1), DV_Time.new($2)             
             end
           end

ruby/trunk/lib/models/tests/rm/quantity/ts_date_time.rb

@@ -12 +12 @@
       @dv_time = DV_Time.new('12:34:56.78')}
     assert_nothing_raised(Exception){
+      @dv_date_time = DV_Date_Time.new('2009-06-29T12:34:56.78')}
+    assert_nothing_raised(Exception){
       @dv_duration = DV_Duration.new('P1Y2M3W4DT5H6M7.8S')}
   end
@@ -19 +21 @@
     assert_instance_of DV_Date, @dv_date
     assert_instance_of DV_Time, @dv_time
+    assert_instance_of DV_Date_Time, @dv_date_time
     assert_instance_of DV_Duration, @dv_duration
   end
@@ -45 +48 @@
 
   def test_dv_time
+    assert_equal '12:34:56.78', @dv_time.value
     assert_equal 12, @dv_time.hour
     assert_equal 34, @dv_time.minute
     assert_equal 56, @dv_time.second
     assert_equal 0.78, @dv_time.fractional_second
-    assert_equal (12*60*60 + 34 * 60 + 56 + 0.78), @dv_time.magnitude
+    assert_equal((12*60*60 + 34 * 60 + 56 + 0.78), @dv_time.magnitude)
     dv_time2 = DV_Time.new('15:36:48.05')
-    assert_equal 'P0Y0M0W0DT3H1M51.27S', @dv_time.diff(dv_time2)
+    assert_equal 'P0Y0M0W0DT3H1M51.27S', @dv_time.diff(dv_time2).value
+  end
+
+  def test_dv_date_time
+    assert_equal '2009-06-29T12:34:56.78', @dv_date_time.value
+    assert_equal 2009, @dv_date_time.year
+    assert_equal 6, @dv_date_time.month
+    assert_equal 29, @dv_date_time.day
+    assert_equal 12, @dv_date_time.hour
+    assert_equal 34, @dv_date_time.minute
+    assert_equal 56, @dv_date_time.second
+    assert_equal 0.78, @dv_date_time.fractional_second
+    dv_date_time2 = DV_Date_Time.new('1970-04-19T13:55:30.12')
+    assert_equal 'P39Y2M1W9DT22H39M26.66S', @dv_date_time.diff(dv_date_time2).value
   end
 

ruby/trunk/lib/models/tests/test_assumed_library_types.rb

@@ -7 +7 @@
   def setup
     assert_nothing_raised(Exception){@interval = OpenEHR::Assumed_Library_Types::Interval.new(1,2)}
-    assert_nothing_raised(Exception){@time_definition = OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS.new}
     assert_nothing_raised(Exception){@iso8601_date = OpenEHR::Assumed_Library_Types::ISO8601_DATE.new('2009-04-27')}
     assert_nothing_raised(Exception){@iso8601_time = OpenEHR::Assumed_Library_Types::ISO8601_TIME.new('15:55:37.32+0900')}
@@ -17 +16 @@
   def test_initialize
     assert_instance_of OpenEHR::Assumed_Library_Types::Interval, @interval
-    assert_instance_of OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS, @time_definition
     assert_instance_of OpenEHR::Assumed_Library_Types::ISO8601_DATE, @iso8601_date
     assert_instance_of OpenEHR::Assumed_Library_Types::ISO8601_TIME, @iso8601_time