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

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