Changeset 143 for ruby/trunk
- Timestamp:
- Jun 22, 2009, 7:04:01 PM (15 years ago)
- Location:
- ruby/trunk/lib/models
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ruby/trunk/lib/models/assumed_library_types.rb
r128 r143 8 8 9 9 end # of Any 10 10 11 class Interval < Any 11 attr_reader :lower, : lower_included, :lower_unbounded12 attr_reader :upper, :upper_included, :upper_unbounded12 attr_reader :lower, :upper 13 13 14 def initialize(lower, upper, 14 15 lower_included = nil, upper_included = nil) 15 16 check_lower_upper(lower, upper) 16 se t_lower_included(lower_included)17 se t_upper_included(upper_included)18 end 19 20 def set_lower(lower)17 self.lower_included = lower_included 18 self.upper_included = upper_included 19 end 20 21 def lower=(lower) 21 22 check_lower_upper(lower, @upper) 22 23 end 23 24 24 def set_upper(upper)25 def upper=(upper) 25 26 check_lower_upper(@lower, upper) 26 27 end 27 28 28 def set_lower_included(lower_included) 29 def lower_included? 30 return @lower_included 31 end 32 33 def lower_included=(lower_included) 29 34 if (lower == nil) && (lower_included != nil) 30 35 raise ArgumentError, "lower is not set" … … 32 37 @lower_included = lower_included 33 38 end 34 35 def set_upper_included(upper_included) 36 @upper_included = upper_included 39 40 def lower_unbounded? 41 return @lower.nil? 42 end 43 44 def upper_included? 45 return @upper_included 46 end 47 48 def upper_included=(upper_included) 37 49 if (upper == nil) && (upper_included != nil) 38 50 raise ArgumentError, "upper is not set" 39 51 end 52 @upper_included = upper_included 53 end 54 55 def upper_unbounded? 56 return @upper.nil? 40 57 end 41 58 … … 56 73 raise ArgumentError, "Either lower or upper must be assigned" 57 74 end 58 if (lower == nil) && (upper != nil) 59 @lower_unbounded = true 60 elsif (lower != nil) && (upper == nil) 61 @upper_unbounded = true 62 elsif lower > upper 63 raise ArgumentError, "Upper must be larger than lower." 75 unless (lower.nil? || upper.nil?) 76 if lower > upper 77 raise ArgumentError, "Upper must be larger than lower." 78 end 64 79 end 65 80 @lower = lower 66 81 @upper = upper 67 end 82 end 68 83 end # end of Interval 69 84 70 85 class TIME_DEFINITIONS < Any 71 86 DAYS_IN_LEAP_YEAR = 366 -
ruby/trunk/lib/models/tests/rm/test_data_types.rb
r142 r143 212 212 end 213 213 214 def test_dv_interval 215 assert 216 end 217 214 218 def test_reference_range 215 assert_equal 'normal', @reference_range.meaning.value 216 219 assert_equal 'normal', @reference_range.meaning.value 217 220 end 218 221 … … 223 226 def test_dv_amount 224 227 225 end226 227 def test_dv_interval228 229 228 end 230 229 -
ruby/trunk/lib/models/tests/test_assumed_library_types.rb
r127 r143 25 25 def test_limits_comparable 26 26 assert @interval.lower < @interval.upper 27 assert_nothing_raised(Exception){@interval. set_lower(1.0)}28 assert_nothing_raised(Exception){@interval. set_upper(2.0)}27 assert_nothing_raised(Exception){@interval.lower=1.0} 28 assert_nothing_raised(Exception){@interval.upper=2.0} 29 29 assert @interval.lower < @interval.upper 30 30 end … … 34 34 assert !@interval.has?(3.0) 35 35 assert !@interval.has?(0.5) 36 assert_nothing_raised(Exception){@interval. set_lower_included(true)}36 assert_nothing_raised(Exception){@interval.lower_included=true} 37 37 assert @interval.has?(1.0) 38 assert_nothing_raised(Exception){@interval. set_lower_included(false)}38 assert_nothing_raised(Exception){@interval.lower_included=false} 39 39 assert !@interval.has?(1.0) 40 assert_nothing_raised(Exception){@interval. set_upper_included(true)}40 assert_nothing_raised(Exception){@interval.upper_included=true} 41 41 assert @interval.has?(2.0) 42 assert_nothing_raised(Exception){@interval. set_upper_included(false)}42 assert_nothing_raised(Exception){@interval.upper_included=false} 43 43 assert !@interval.has?(2.0) 44 44 end 45 45 46 def test_lower_included_valid 46 assert_nothing_raised(Exception){@interval.set_lower(nil)} 47 assert @interval.lower_unbounded 48 assert !@interval.lower_included 49 assert_nothing_raised(Exception){@interval.set_lower(1.0)} 50 end 47 assert_nothing_raised(Exception){@interval.lower=nil} 48 assert @interval.lower_unbounded? 49 assert !@interval.lower_included? 50 assert_nothing_raised(Exception){@interval.lower=1.0} 51 end 52 51 53 def test_upper_included_valid 52 assert_nothing_raised(Exception){@interval. set_upper(nil)}53 assert @interval.upper_unbounded 54 assert !@interval.upper_included 54 assert_nothing_raised(Exception){@interval.upper=nil} 55 assert @interval.upper_unbounded? 56 assert !@interval.upper_included? 55 57 end 56 58
Note:
See TracChangeset
for help on using the changeset viewer.