HOL-OCL
/
su4sml
1
0
Fork 0
Code Issues Pull Requests Releases Activity

git-svn-id: https://projects.brucker.ch/su4sml/svn/su4sml/trunk@7762 3260e6d1-4efc-4170-b0a7-36055960796d

This commit is contained in:
Manuel Krucker 2008-04-26 12:06:20 +00:00
parent f34a9d514e
commit db2517626e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
su4sml/src/wfcpog/data_model_consistency.sml
View File

@ -76,13 +76,13 @@ fun c_allInstance_term (c:Classifier) =
(* get class as an holocl term *)
val holocl_class_name = get_class_of (name_of c)
val class_type = type_of c
val class_predicate = Predicate(Variable("c",class_type),class_type,holocl_class_name,[])
val class = Variable("c",class_type)
(* OclAny.allInstances() *)
val allInstances = OperationCall (class_predicate,DummyT,["oclLib","OclAny","allInstances"],[],DummyT)
val allInstances = OperationCall (class,class_type,["oclLib","OclAny","allInstances"],[],Set (class_type))
(* x.oclIsTypeOf () *)
val oclIsTypeOf = OperationWithType (x,DummyT,"oclIsTypeOf",type_of c,Boolean)
(* Iterator exists *)
val exists = Iterator("exists",[("x",DummyT)],allInstances,DummyT,oclIsTypeOf,Boolean,Boolean)
val exists = Iterator("exists",[("x",class_type)],allInstances,Set(class_type),oclIsTypeOf,Boolean,Boolean)
val _ = trace function_ends ("WF_data_CS.c_allInstances\n")
in
exists
@ -94,7 +94,7 @@ fun single_model_consistency (c:Classifier) (model as (clist,alist)) =
val _ = trace function_calls("WFCPOG_Data_Model_Consistency_Constraint.single_model_consistency\n")
val term = c_allInstance_term c
val dummy_body = Variable("dummy_body",DummyT)
val res = Iterator("holOclLib.exists",[("\\<tau>",DummyT)],term,DummyT,dummy_body,DummyT,Boolean)
val res = Iterator("holOclLib.exists",[("\\<tau>",DummyT)],term,Boolean,dummy_body,DummyT,Boolean)
val _ = trace function_ends("WFCPOG_Data_Model_Consistency_Constraint.single_model_consistency\n")
in
res
@ -118,7 +118,7 @@ fun strong_model_consistency_help classes model =
val terms = List.map (c_allInstance_term) classes
val n_term = nest_source terms
val dummy_body = Variable("dummy_body",DummyT)
val res = [("strong_model",Iterator("holOclLib.exists",[("\\<tau>",DummyT)],n_term,DummyT,dummy_body,DummyT,Boolean))]
val res = [("strong_model",Iterator("holOclLib.exists",[("\\<tau>",DummyT)],n_term,Boolean,dummy_body,DummyT,Boolean))]
val _ = trace function_ends("WFCPOG_Data_Model_Consistency_Constraint.strong_model_consistency\n")
in
res

2
su4sml/src/wfcpog/test-suite.sml
View File

@ -34,7 +34,7 @@ type testcase =
exception TestSuitError of string
val prefix = "../../../examples/"
val prefix = "../../../hol-ocl/examples/"
val testcase =
{