Changeset 343 for ruby

Timestamp:

Nov 12, 2009, 1:43:18 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

ref #55
time calculation is difficult

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/assumed_library_types.rb (modified) (1 diff)
• lib/open_ehr/rm/data_structures/history.rb (modified) (2 diffs)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (4 diffs)
• spec/lib/open_ehr/rm/data_structures/history/event_spec.rb (added)
• spec/lib/open_ehr/rm/data_structures/history/history_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb (modified) (1 diff)

ruby/branches/0.5/lib/open_ehr/assumed_library_types.rb

@@ -583 +583 @@
         self.minutes = $13.to_i
         self.seconds = $15.to_i
-        self.fractional_second = $16.to_f
+        unless $16.nil?
+          self.fractional_second = $16.to_f
+        end
       end
     end # end of ISO8601Duration

ruby/branches/0.5/lib/open_ehr/rm/data_structures/history.rb

@@ -4 +4 @@
 # refs #55
 include OpenEHR::RM::DataStructures
+include OpenEHR::RM::Common::Archetyped
 
 module OpenEHR
@@ -39 +40 @@
         end
 
-        class Event
+        class Event < Locatable
+          attr_reader :data, :time
+          attr_accessor :state
+
+          def initialize(args = { })
+            super(args)
+            self.data = args[:data]
+            self.time = args[:time]
+            self.state = args[:state]
+          end
+
+          def data=(data)
+            raise ArgumentError, 'data is mandatory' if data.nil?
+            @data = data
+          end
+
+          def time=(time)
+            raise ArgumentError, 'time is mandatory' if time.nil?
+            @time = time
+          end
+
+          def offset
+            return @time.diff(@parent.origin)
+          end
         end
       end # end of History

ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -100 +100 @@
 
             def magnitude
-              return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second
+              if @fractional_second.nil?
+                return @hour * 60 * 60 + @minute * 60 + @second
+              else
+                return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second
+              end
             end
 
@@ -109 +113 @@
               second = (diff - hour * 60 *60 - minute * 60).to_i
               fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0
-              return DvDuration.new(:value =>
-                        'P0Y0M0W0DT' + hour.to_s + 'H' +
-                        minute.to_s + 'M' +
-                        second.to_s + fractional_second.to_s[1..-1] + 'S')
+              str = 'P0Y0M0W0DT' + hour.to_s + 'H' +
+                minute.to_s + 'M' + second.to_s
+              if @fractional_second.nil?
+                str += 'S'
+              else
+                str += fractional_second.to_s[1..-1] + 'S'
+              end
+              return DvDuration.new(:value => str)
             end
           end
@@ -161 +169 @@
               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 DvDuration.new(:value => 
-                        date_duration.value + 'T' +
-                        hour.to_s + 'H' +
-                        minute.to_s + 'M' +
-                        second.to_s + fractional_second.to_s[1..-1] + 'S')
+              str = date_duration.value + 'T' + hour.to_s + 'H' +
+                minute.to_s + 'M' + second.to_s
+              if @fractional_second.nil?
+                return DvDuration.new(:value => str +'S')
+              else
+                fractional_second =
+                  ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
+                return DvDuration.new(:value => str +
+                                      fractional_second.to_s[1..-1] + 'S')
+              end
             end
 
@@ -174 +185 @@
             def split_date_time(date_time)
               /^(.*)T(.*)$/ =~ date_time.as_string
-              return DvDate.new($1), DvTime.new($2)
+              return DvDate.new(:value => $1), DvTime.new(:value => $2)
             end
           end

ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/history/history_spec.rb

@@ -4 +4 @@
 include OpenEHR::RM::DataTypes::Text
 include OpenEHR::RM::DataTypes::Quantity::DateTime
+
 describe History do
   before(:each) do

ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb

@@ -18 +18 @@
     @dv_date_time.should == DvDateTime.new(:value => '2009-09-29T15:03:22.3')
   end
+
+  it 'diff should be caluculated from past to future' do
+    future = DvDateTime.new(:value => '2009-10-29T16:23:30.3')
+    @dv_date_time.diff(future).value.should == 'P0Y1M0W0DT1H20M8.0S'
+  end
 end