Changes in ruby/trunk/models/am/archetype/constraint_model/primitive.rb [26:4]

File:

• ruby/trunk/models/am/archetype/constraint_model/primitive.rb (modified) (4 diffs)

ruby/trunk/models/am/archetype/constraint_model/primitive.rb

@@ -3 +3 @@
     module Archetype
       module Constraint_Model
-
         module Primitive
-
-          class C_PRIMITIVE
+          class C_Primitive
             def assumed_value
               raise NotImplementedError, "assumed_value should be implemented"
@@ -20 +18 @@
             end
           end
-
-          class C_BOOLEAN < C_PRIMITIVE
-            attr_reader :true_valid, :false_valid, :assumed_value
-
-            def initialize(args = { })
-              @true_valid = args[:true_valid] ? args[:true_valid] : false
-              @false_valid = args[:false_valid] ? args[:false_valid] : false
-              @assumed_value = args[:assumed_value] ? args[:assumed_value] : false
-              binary_consistency(@true_valid, @false_valid)
+          class C_Boolean < C_Primitive
+            attr_accessor :assumed_value
+            def initialize(true_valid, false_valid, assumed_value)
+              binary_consistency(true_valid, false_valid)
+              @true_valid = true_valid
+              @false_valid = false_valid
+              @assumed_value = assumed_value
             end
-
-            def true_valid=(true_valid)
+            def set_true_valid(true_valid)
               binary_consistency(true_valid, @false_valid)
               @true_valid = true_valid
             end
-
-            def false_valid=(false_valid)
+            def set_false_valid(false_valid)
               binary_consistency(@true_valid,false_valid)
               @false_valid = false_valid 
             end
-
+            def true_valid?
+              @true_valid
+            end
+            def false_valid?
+              @false_valid
+            end
             def valid_value?
               
             end
-
-            def default_value(a_value = nil)
+            def default_value(a_value=nil)
               if a_value == nil
                 @true_valid
@@ -52 +50 @@
               end              
             end
-
             private 
-
             def binary_consistency(true_valid, false_valid)
               if !true_valid && !false_valid
@@ -61 +57 @@
             end
           end # of C_Boolean
-
-          class C_STRING < C_PRIMITIVE
+          class C_Integer < C_Primitive
             
           end
-
-          class C_INTEGER < C_PRIMITIVE
-            
-          end
-
-          class C_REAL < C_PRIMITIVE
-            
-          end
-
-          class C_TIME < C_PRIMITIVE
-            
-          end
-
-          class C_DATE < C_PRIMITIVE
-            
-          end
-
-          class C_DATE_TIME < C_PRIMITIVE
-            
-          end
-
-          class C_DURATION < C_PRIMITIVE
-            attr_accessor :years_allowed, :months_allowed, :weeks_allowed, :days_allowed, :hours_allowed, :minutes_allowed, :seconds_allowed, :fractional_seconds_allowed, :range, :assumed_value
-          end
-
-
-
         end # of Primitive
       end # of Constraint_Model