From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 19 Jul 2010 12:12:59 +0000 (+0000)
Subject: git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@16694 ac1ea38d-2e2b... 
X-Git-Tag: simantics-1.2.0~175
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=47becd663074e9b7e1b850a68c67020d2846121b;p=simantics%2Fsysdyn.git

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

diff --git a/sysdyn_ontologies/sysdyn.graph b/sysdyn_ontologies/sysdyn.graph
index 83bd0ed6..809a238e 100644
--- a/sysdyn_ontologies/sysdyn.graph
+++ b/sysdyn_ontologies/sysdyn.graph
@@ -844,51 +844,67 @@ CapacityModuleConfiguration @ "Kapasiteettimoduulikonfiguraatio" : Configuration
     Flow3 : Flow
       HasHead Investment
       HasTail DummyCloud2  
+      tag(MOD.Mapped)
     Flow4 : Flow
       HasHead CapacityStock
       HasTail Investment  
+      tag(MOD.Mapped)
     Flow5 : Flow
       HasHead Reductions
       HasTail CapacityStock
+      tag(MOD.Mapped)
     Flow6 : Flow
       HasHead DummyCloud3
-      HasTail Reductions                    
-    _  : Dependency
+      HasTail Reductions   
+      tag(MOD.Mapped)                 
+    Dependency12 : Dependency
       HasHead Reductions
       HasTail CapacityStock
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency13 : Dependency
       HasHead PotentialProduction
       HasTail CapacityStock
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency14 : Dependency
       HasHead CapacityAdjustment
       HasTail CapacityStock
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency15 : Dependency
       HasHead Reductions
       HasTail CapacityLife
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency16 : Dependency
       HasHead Production
       HasTail PotentialProduction
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency17 : Dependency
       HasHead Production
       HasTail DesiredProduction 
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency18 : Dependency
       HasHead DesiredProduction
       HasTail TargetCapacity
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency19 : Dependency
       HasHead CapacityAdjustment
       HasTail TargetCapacity
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency20 : Dependency
       HasHead TargetCapacity
       HasTail WidgetsPerPersonOutput
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency21 : Dependency
       HasHead TargetCapacity
       HasTail WordOfMouthDemandInput2
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency22 : Dependency
       HasHead CapacityAdjustment
       HasTail TimeToAdjustCapacity
-    _  : Dependency
+      tag(MOD.Mapped)
+    Dependency23 : Dependency
       HasHead Investment
-      HasTail CapacityAdjustment                                     
+      HasTail CapacityAdjustment  
+      tag(MOD.Mapped)                                   
       
 CapacityModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
   MOD.DiagramToComposite CapacityModuleConfiguration
@@ -909,10 +925,10 @@ CapacityModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
         DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 115.0, 90.0" : G2D.Transform
     ReductionsElement : ValveSymbol
         MOD.ElementToComponent Reductions
-        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 130.0, 90.0" : G2D.Transform
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 150.0, 90.0" : G2D.Transform
     DummyCloud3Element : CloudSymbol
         MOD.ElementToComponent DummyCloud3
-        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 145.0, 90.0" : G2D.Transform
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 175.0, 90.0" : G2D.Transform
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow3
         flow(DummyCloud2Element, InvestmentElement)
@@ -925,6 +941,70 @@ CapacityModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow6
         flow(ReductionsElement, DummyCloud3Element)
+   
+    CapacityAdjustmentElement : AuxiliarySymbol
+        MOD.ElementToComponent CapacityAdjustment
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 80.0, 105.0" : G2D.Transform
+    TargetCapacityElement : AuxiliarySymbol
+        MOD.ElementToComponent TargetCapacity
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 110.0, 120.0" : G2D.Transform
+    DesiredProductionElement : AuxiliarySymbol
+        MOD.ElementToComponent DesiredProduction
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 140.0, 120.0" : G2D.Transform
+    PotentialProductionElement : AuxiliarySymbol
+        MOD.ElementToComponent PotentialProduction
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 120.0, 105.0" : G2D.Transform
+    ProductionElement : AuxiliarySymbol
+        MOD.ElementToComponent Production
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 145.0, 110.0" : G2D.Transform
+    CapacityLifeElement : AuxiliarySymbol
+        MOD.ElementToComponent CapacityLife
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 150, 100.0" : G2D.Transform
+    TimeToAdjustCapacityElement : AuxiliarySymbol
+        MOD.ElementToComponent TimeToAdjustCapacity
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 70.0, 120.0" : G2D.Transform
+    WidgetsPerPersonOutputElement : AuxiliarySymbol
+        MOD.ElementToComponent WidgetsPerPersonOutput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 130.0, 150.0" : G2D.Transform    
+    WordOfMouthDemandInput2Element : AuxiliarySymbol
+        MOD.ElementToComponent WordOfMouthDemandInput2
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 100.0, 150.0" : G2D.Transform
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency12
+      dep(ReductionsElement, CapacityStockElement, "-1.0")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency13
+      dep(PotentialProductionElement, CapacityStockElement, "-0.1")      
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency14
+      dep(CapacityAdjustmentElement, CapacityStockElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency15
+      dep(ReductionsElement, CapacityLifeElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency16
+      dep(ProductionElement, PotentialProductionElement, "1.04")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency17
+      dep(ProductionElement, DesiredProductionElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency18
+      dep(DesiredProductionElement, TargetCapacityElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency19
+      dep(CapacityAdjustmentElement, TargetCapacityElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency20
+      dep(TargetCapacityElement, WidgetsPerPersonOutputElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency21
+      dep(TargetCapacityElement, WordOfMouthDemandInput2Element, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency22
+      dep(CapacityAdjustmentElement, TimeToAdjustCapacityElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency23
+      dep(InvestmentElement, CapacityAdjustmentElement, "-0.1")       
 
 
 CustomerModule @ "Asiakasmoduuli" <T Module
@@ -975,49 +1055,160 @@ CustomerModuleConfiguration @ "Asiakasmoduulikonfiguraatio" : Configuration
       tag(IsInput)
       
     ### Dependencies    
-    _ : Flow
+    Flow7 : Flow
       HasHead NewCustomers
-      HasTail PotentialCustomersStock  
-    _ : Flow
+      HasTail PotentialCustomersStock 
+      tag(MOD.Mapped) 
+    Flow8 : Flow
       HasHead CustomersStock
       HasTail NewCustomers        
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency24 : Dependency
       HasHead PotentialCustomerConcentration
       HasTail TotalMarket
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency25 : Dependency
       HasHead ContactsOfNoncustomersWithCustomers
       HasTail PotentialCustomerConcentration
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency26 : Dependency
       HasHead WordOfMouthDemandOutput
       HasTail ContactsOfNoncustomersWithCustomers
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency27 : Dependency
       HasHead NewCustomers
       HasTail WordOfMouthDemandOutput
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency28 : Dependency
       HasHead ContactsOfNoncustomersWithCustomers
       HasTail ContactsWithCustomers
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency29 : Dependency
       HasHead ContactsWithCustomers
       HasTail Sociability
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency30 : Dependency
       HasHead ContactsWithCustomers
       HasTail CustomersStock
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency31 : Dependency
       HasHead TotalMarket
       HasTail CustomersStock
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency32 : Dependency
       HasHead TotalMarket
       HasTail PotentialCustomersStock
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency33 : Dependency
       HasHead NewCustomers
       HasTail CapacityInput2
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency34 : Dependency
       HasHead NewCustomers
       HasTail WidgetsPerPersonInput2
-    _  : Dependency
+      tag(MOD.Mapped) 
+    Dependency35 : Dependency
       HasHead WordOfMouthDemandOutput
       HasTail Fruitfulness
-
+      tag(MOD.Mapped) 
+    Dependency36 : Dependency
+      HasHead PotentialCustomerConcentration
+      HasTail PotentialCustomersStock
+      tag(MOD.Mapped) 
+      
+CustomerModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
+  MOD.DiagramToComposite CustomerModuleConfiguration
+  DIA.HasLayer _ @ "Admin" : DIA.Layer
+    DIA.IsActive "true" : L0.Boolean
+    DIA.HasFocusableTag AdminIsFocusable
+    DIA.HasVisibleTag AdminIsVisible
+  #L0.HasTrigger _ : DiagramToCompositeMapping
+  %list_elements      
+    ContactsOfNoncustomersWithCustomersElement : AuxiliarySymbol
+        MOD.ElementToComponent ContactsOfNoncustomersWithCustomers
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 64.0, 45.0" : G2D.Transform
+    ContactsWithCustomersElement : AuxiliarySymbol
+        MOD.ElementToComponent ContactsWithCustomers
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 130.0, 60.0" : G2D.Transform
+    PotentialCustomerConcentrationElement : AuxiliarySymbol
+        MOD.ElementToComponent PotentialCustomerConcentration
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 58.0, 60.0" : G2D.Transform
+    WordOfMouthDemandOutputElement : AuxiliarySymbol
+        MOD.ElementToComponent WordOfMouthDemandOutput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 100.0, 75.0" : G2D.Transform
+    TotalMarketElement : AuxiliarySymbol
+        MOD.ElementToComponent TotalMarket
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 80.0, 120.0" : G2D.Transform 
+    FruitfulnessElement : AuxiliarySymbol
+        MOD.ElementToComponent Fruitfulness
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 105.0, 60.0" : G2D.Transform
+    SociabilityElement : AuxiliarySymbol
+        MOD.ElementToComponent Sociability
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 125.0, 45.0" : G2D.Transform
+    PotentialCustomersStockElement : StockSymbol
+        MOD.ElementToComponent PotentialCustomersStock
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 60.0, 90.0" : G2D.Transform 
+    CustomersStockElement : StockSymbol
+        MOD.ElementToComponent CustomersStock
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 120.0, 90.0" : G2D.Transform 
+    NewCustomersElement : ValveSymbol
+        MOD.ElementToComponent NewCustomers
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 100.0, 90.0" : G2D.Transform
+    CapacityInput2Element : AuxiliarySymbol
+        MOD.ElementToComponent CapacityInput2
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 90.0, 105.0" : G2D.Transform
+    WidgetsPerPersonInput2Element : AuxiliarySymbol
+        MOD.ElementToComponent WidgetsPerPersonInput2
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 130.0, 110.0" : G2D.Transform
+    
+      
+    ### Dependencies    
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection Flow7
+        flow(PotentialCustomersStockElement, NewCustomersElement)      
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection Flow8
+        flow(NewCustomersElement, CustomersStockElement)
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency24
+      dep(PotentialCustomerConcentrationElement, TotalMarketElement, "-1.7")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency25
+      dep(ContactsOfNoncustomersWithCustomersElement, PotentialCustomerConcentrationElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency26
+      dep(WordOfMouthDemandOutputElement, ContactsOfNoncustomersWithCustomersElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency27
+      dep(NewCustomersElement, WordOfMouthDemandOutputElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency28
+      dep(ContactsOfNoncustomersWithCustomersElement, ContactsWithCustomersElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency29
+      dep(ContactsWithCustomersElement, SociabilityElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency30
+      dep(ContactsWithCustomersElement, CustomersStockElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency31
+      dep(TotalMarketElement, CustomersStockElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency32
+      dep(TotalMarketElement, PotentialCustomersStockElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency33
+      dep(NewCustomersElement, CapacityInput2Element, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency34
+      dep(NewCustomersElement, WidgetsPerPersonInput2Element, "-0.6")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency35
+      dep(WordOfMouthDemandOutputElement, FruitfulnessElement, "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection Dependency36
+      dep(PotentialCustomerConcentrationElement, PotentialCustomersStockElement, "-0.1")  
+      
 SysdynModuleTestProject
   L0.IsRelatedTo CustomerModule
   L0.IsRelatedTo CapacityModule