Changeset 143 for ruby/trunk

Timestamp:

Jun 22, 2009, 7:04:01 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

ref #26,#50

Location:

ruby/trunk/lib/models

Files:

• assumed_library_types.rb (modified) (3 diffs)
• tests/rm/test_data_types.rb (modified) (2 diffs)
• tests/test_assumed_library_types.rb (modified) (2 diffs)

ruby/trunk/lib/models/assumed_library_types.rb

@@ -8 +8 @@
       
     end # of Any
+
     class Interval < Any
-      attr_reader :lower, :lower_included, :lower_unbounded
-      attr_reader :upper, :upper_included, :upper_unbounded
+      attr_reader :lower, :upper
+      
       def initialize(lower, upper, 
                      lower_included = nil, upper_included = nil)
         check_lower_upper(lower, upper)
-        set_lower_included(lower_included)
-        set_upper_included(upper_included)
-      end
-
-      def set_lower(lower)
+        self.lower_included = lower_included
+        self.upper_included = upper_included
+      end
+
+      def lower=(lower)
         check_lower_upper(lower, @upper)
       end
 
-      def set_upper(upper)
+      def upper=(upper)
         check_lower_upper(@lower, upper)
       end
 
-      def set_lower_included(lower_included)
+      def lower_included?
+        return @lower_included
+      end
+
+      def lower_included=(lower_included)
         if (lower == nil) && (lower_included != nil)
           raise ArgumentError, "lower is not set"
@@ -32 +37 @@
         @lower_included = lower_included
       end
-
-      def set_upper_included(upper_included)
-        @upper_included = upper_included
+      
+      def lower_unbounded?
+        return @lower.nil?
+      end
+
+      def upper_included?
+        return @upper_included
+      end
+
+      def upper_included=(upper_included)
         if (upper == nil) && (upper_included != nil)
           raise ArgumentError, "upper is not set"
         end
+        @upper_included = upper_included
+      end
+
+      def upper_unbounded?
+        return @upper.nil?
       end
 
@@ -56 +73 @@
           raise ArgumentError, "Either lower or upper must be assigned"
         end
-        if (lower == nil) && (upper != nil)
-          @lower_unbounded = true          
-        elsif (lower != nil) && (upper == nil)
-          @upper_unbounded = true
-        elsif lower > upper
-          raise ArgumentError, "Upper must be larger than lower."
+        unless (lower.nil? || upper.nil?)
+          if lower > upper
+            raise ArgumentError, "Upper must be larger than lower."
+          end
         end
         @lower = lower
         @upper = upper
-      end      
+      end
     end # end of Interval
-
+  
     class TIME_DEFINITIONS < Any
       DAYS_IN_LEAP_YEAR = 366

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

@@ -212 +212 @@
   end
 
+  def test_dv_interval
+    assert 
+  end
+
   def test_reference_range
-    assert_equal 'normal', @reference_range.meaning.value
-    
+    assert_equal 'normal', @reference_range.meaning.value    
   end
 
@@ -223 +226 @@
   def test_dv_amount
 
-  end
-
-  def test_dv_interval
-    
   end
 

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

@@ -25 +25 @@
   def test_limits_comparable
     assert @interval.lower < @interval.upper
-    assert_nothing_raised(Exception){@interval.set_lower(1.0)}
-    assert_nothing_raised(Exception){@interval.set_upper(2.0)}
+    assert_nothing_raised(Exception){@interval.lower=1.0}
+    assert_nothing_raised(Exception){@interval.upper=2.0}
     assert @interval.lower < @interval.upper
   end
@@ -34 +34 @@
     assert !@interval.has?(3.0)
     assert !@interval.has?(0.5)
-    assert_nothing_raised(Exception){@interval.set_lower_included(true)}
+    assert_nothing_raised(Exception){@interval.lower_included=true}
     assert @interval.has?(1.0)
-    assert_nothing_raised(Exception){@interval.set_lower_included(false)}
+    assert_nothing_raised(Exception){@interval.lower_included=false}
     assert !@interval.has?(1.0)
-    assert_nothing_raised(Exception){@interval.set_upper_included(true)}
+    assert_nothing_raised(Exception){@interval.upper_included=true}
     assert @interval.has?(2.0)
-    assert_nothing_raised(Exception){@interval.set_upper_included(false)}
+    assert_nothing_raised(Exception){@interval.upper_included=false}
     assert !@interval.has?(2.0)
   end
+
   def test_lower_included_valid
-    assert_nothing_raised(Exception){@interval.set_lower(nil)}
-    assert @interval.lower_unbounded
-    assert !@interval.lower_included
-    assert_nothing_raised(Exception){@interval.set_lower(1.0)}
-  end
+    assert_nothing_raised(Exception){@interval.lower=nil}
+    assert @interval.lower_unbounded?
+    assert !@interval.lower_included?
+    assert_nothing_raised(Exception){@interval.lower=1.0}
+  end
+
   def test_upper_included_valid
-    assert_nothing_raised(Exception){@interval.set_upper(nil)}
-    assert @interval.upper_unbounded
-    assert !@interval.upper_included
+    assert_nothing_raised(Exception){@interval.upper=nil}
+    assert @interval.upper_unbounded?
+    assert !@interval.upper_included?
   end