Yet another fixing commit

[simantics/platform.git] / bundles / org.simantics.structural.ontology / graph / Structural.pgraph

diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index 0393439f6c89781c09b891e83f1b0239122d8451..d6d2c4aec34a1035b0f463b483d7680d5919f8aa 100644 (file)
--- a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
+++ b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
@@ -23,6 +23,7 @@ STR.ComponentType <T L0.Type
     >-- STR.ComponentType.HasDefaultPropertyRelationType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultPropertyValueType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultMonitorValueType --> STR.MonitorValueType <R L0.IsRelatedTo
+    @L0.assert L0X.HasGeneratedNamePrefix ""
 
 STR.MonitorValueType <T L0.Entity
 STR.MonitorValue <T L0.SCLValue : STR.MonitorValueType
@@ -35,12 +36,15 @@ STR.AbstractDefinedComponentType <T STR.ComponentType
 
 STR.DefinedComponentType <T STR.AbstractDefinedComponentType
 
+STR.ReplaceableDefinedComponentType <T STR.AbstractDefinedComponentType
+
 STR.ProceduralComponentType <T STR.AbstractDefinedComponentType
     >-- STR.ProceduralComponentType.code --> STR.ProceduralComponentTypeCode <R L0.HasProperty : L0.TotalFunction
     >-- STR.ProceduralComponentType.environment --> L0.SCLValue.Environment <R L0.IsRelatedTo : L0.FunctionalRelation
 
 STR.ProceduralComponentTypeCode <T L0.String
 
+
 //STR.proceduralConnectionPointPath --> L0.String <R L0.HasProperty : L0.FunctionalRelation
 
 /*
@@ -106,14 +110,16 @@ STR.Connection <T L0.Entity
 STR.ConnectionVariable <T STR.Variable <T STR.Connection
     //[STR.Binds all STR.ConnectionRelation]
 */
+
+STR.Functions.connectionValueAccessor : L0.ExternalValue
+    L0.HasValueType "ValueAccessor"
+
 STR.ConnectionRelation <T L0.Relation
     @L0.assert L0.SharedRange STR.ConnectionRelation
     >-- STR.ConnectionRelation.connectionRequired --> L0.Boolean <R L0.HasProperty : L0.FunctionalRelation
     >-- STR.ConnectionRelation.equivalentConnectionPoint --> STR.ConnectionRelation <R L0.IsRelatedTo
         L0.InverseOf STR.ConnectionRelation.equivalentConnectionPoint
-    @L0.assert L0.valueAccessor 
-        STR.Functions.connectionValueAccessor : L0.ExternalValue
-            L0.HasValueType "ValueAccessor"
+    @L0.assert L0.valueAccessor STR.Functions.connectionValueAccessor
     @L0.assert L0.domainProperties L0.Functions.standardPropertyDomainProperties
     @L0.assert L0.domainChildren L0.Functions.standardPropertyDomainChildren            
 
@@ -259,6 +265,7 @@ STR.Component
   @L0.assert L0.domainChildren 
     STR.Functions.structuralChildDomainChildren : L0.ExternalValue
       L0.HasValueType "VariableMap"
+  @L0.sclAssertion L0.typeResource "structuralTypeResource" "Variable -> Resource -> <ReadGraph> Resource"
 
 STR.Run
   @L0.assert L0.domainChildren 
@@ -268,10 +275,8 @@ STR.Run
 STR.Connection
   @L0.assert L0.domainProperties L0.Functions.standardPropertyDomainProperties
   @L0.assert L0.domainChildren L0.Functions.standardPropertyDomainChildren
-  @L0.assert L0.valueAccessor 
-    STR.Functions.connectionValueAccessor : L0.ExternalValue
-      L0.HasValueType "ValueAccessor"
-      
+  @L0.assert L0.valueAccessor STR.Functions.connectionValueAccessor
+
 STR.SCLValue <T L0.SCLValue
   @L0.assert L0.ConvertsToValueWith STR.Functions.computeExpression
   @L0.assert L0.SCLValue.environment
@@ -331,6 +336,12 @@ STR.input <R L0.HasProperty : L0.FunctionalRelation
 
 STR.UserDefinedProperty <T L0.Entity
 
+STR.TypeOverride <T L0.Entity
+    >-- STR.TypeOverride.HasOriginalType --> STR.ComponentType <R L0.IsRelatedTo : L0.TotalFunction
+    >-- STR.TypeOverride.HasReplacementType --> STR.ComponentType <R L0.IsRelatedTo : L0.TotalFunction 
+STR.HasTypeOverride --> STR.TypeOverride <R L0.IsRelatedTo
+
+
 STR.ComponentType
     // This relation is inherited from L0.IsComposedOf because changes in the code
     // need to be propagated to the component type