From: niemisto <niemisto@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 19 Nov 2009 15:04:12 +0000 (+0000)
Subject: git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@13149 ac1ea38d-2e2b... 
X-Git-Tag: simantics-1.0~120
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=dd4eb07643e1fee63546462257765bf911e6ba2d;p=simantics%2Fsysdyn.git

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@13149 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/sysdyn_ontologies/sysdyn.graph b/sysdyn_ontologies/sysdyn.graph
index 14f13607..ab012257 100644
--- a/sysdyn_ontologies/sysdyn.graph
+++ b/sysdyn_ontologies/sysdyn.graph
@@ -47,17 +47,19 @@ HasX <R L0.HasProperty : L0.FunctionalRelation
     L0.HasRange L0.Double
 HasY <R L0.HasProperty : L0.FunctionalRelation
     L0.HasRange L0.Double        
-HasValue <R L0.HasProperty : L0.FunctionalRelation
-    L0.HasRange L0.String
+HasExpression <R L0.IsRelatedTo : L0.FunctionalRelation
+    L0.HasRange Expression
 
 IndependentVariable <T Variable
     [L0.HasName card "1"]
 
 Auxiliary <T IndependentVariable
+    [HasExpression card "0..1"]
 Stock <T IndependentVariable
+    [HasExpression card "0..1"]
 Valve <T IndependentVariable
-    [HasValue card "0..1"]
-Cloud <T IndependentVariable  
+    [HasExpression card "0..1"]
+Cloud <T IndependentVariable      
 
 ######################################################################
 # Connections
@@ -81,6 +83,18 @@ Dependency <T ST.Connection
 Flow <T ST.Connection
     [HasHead card "1"]
     [HasTail card "1"]
+
+######################################################################
+# Expression
+######################################################################
+    
+HasText <R L0.HasProperty
+    L0.HasRange L0.String  
+    
+Expression <T L0.Entity
+
+NormalExpression <T Expression
+    [HasText card "1"]    
     
 ######################################################################
 # Test configuration