From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 2 Jul 2010 13:35:24 +0000 (+0000)
Subject: Customer Model with two modules
X-Git-Tag: simantics-1.2.0~185
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=9960508e9724efb6b98e12fc5d9bafd774ce0bf7;p=simantics%2Fsysdyn.git

Customer Model with two modules

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java
index ed8ef24d..f9c329fd 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java
@@ -20,6 +20,7 @@ import org.simantics.db.exception.DatabaseException;
 
 public class SysdynResource {
     
+    public final Resource Asiakasmoduuli;
     public final Resource Auxiliary;
     public final Resource AuxiliarySymbol;
     public final Resource BasicExperiment;
@@ -67,6 +68,7 @@ public class SysdynResource {
     public final Resource IsOutput;
     public final Resource IsTailOf;
     public final Resource IsTailOfTerminal;
+    public final Resource Kapasiteettimoduuli;
     public final Resource LookupExpression;
     public final Resource Module;
     public final Resource NormalExpression;
@@ -89,6 +91,7 @@ public class SysdynResource {
     public final Resource WithLookupExpression;
     
     public static class URIs {
+        public static final String Asiakasmoduuli = "http://www.simantics.org/Sysdyn-1.0/Asiakasmoduuli";
         public static final String Auxiliary = "http://www.simantics.org/Sysdyn-1.0/Auxiliary";
         public static final String AuxiliarySymbol = "http://www.simantics.org/Sysdyn-1.0/AuxiliarySymbol";
         public static final String BasicExperiment = "http://www.simantics.org/Sysdyn-1.0/BasicExperiment";
@@ -136,6 +139,7 @@ public class SysdynResource {
         public static final String IsOutput = "http://www.simantics.org/Sysdyn-1.0/IsOutput";
         public static final String IsTailOf = "http://www.simantics.org/Sysdyn-1.0/IsTailOf";
         public static final String IsTailOfTerminal = "http://www.simantics.org/Sysdyn-1.0/IsTailOfTerminal";
+        public static final String Kapasiteettimoduuli = "http://www.simantics.org/Sysdyn-1.0/Kapasiteettimoduuli";
         public static final String LookupExpression = "http://www.simantics.org/Sysdyn-1.0/LookupExpression";
         public static final String Module = "http://www.simantics.org/Sysdyn-1.0/Module";
         public static final String NormalExpression = "http://www.simantics.org/Sysdyn-1.0/NormalExpression";
@@ -168,6 +172,7 @@ public class SysdynResource {
     }
     
     public SysdynResource(ReadGraph graph) {
+        Asiakasmoduuli = getResourceOrNull(graph, URIs.Asiakasmoduuli);
         Auxiliary = getResourceOrNull(graph, URIs.Auxiliary);
         AuxiliarySymbol = getResourceOrNull(graph, URIs.AuxiliarySymbol);
         BasicExperiment = getResourceOrNull(graph, URIs.BasicExperiment);
@@ -215,6 +220,7 @@ public class SysdynResource {
         IsOutput = getResourceOrNull(graph, URIs.IsOutput);
         IsTailOf = getResourceOrNull(graph, URIs.IsTailOf);
         IsTailOfTerminal = getResourceOrNull(graph, URIs.IsTailOfTerminal);
+        Kapasiteettimoduuli = getResourceOrNull(graph, URIs.Kapasiteettimoduuli);
         LookupExpression = getResourceOrNull(graph, URIs.LookupExpression);
         Module = getResourceOrNull(graph, URIs.Module);
         NormalExpression = getResourceOrNull(graph, URIs.NormalExpression);
diff --git a/sysdyn_ontologies/sysdyn.graph b/sysdyn_ontologies/sysdyn.graph
index 0d047e80..5b9e1c64 100644
--- a/sysdyn_ontologies/sysdyn.graph
+++ b/sysdyn_ontologies/sysdyn.graph
@@ -145,6 +145,9 @@ IndependentVariable <T Variable
     [L0.HasDescription card "0..1"]
 
 Auxiliary <T IndependentVariable
+  L0.Asserts _ : L0.Assertion
+    L0.HasPredicate L0.HasType
+    L0.HasObject "Real" : L0.String
 
 Valve <T IndependentVariable
   L0.Asserts _ : L0.Assertion
@@ -422,29 +425,26 @@ ModuleModel @ "ModuleModel" : SysdynModel
   L0.HasLabel "Malli" : L0.String
   L0.PartOf SysdynModuleTestProject
   SIMU.HasConfiguration ModuleConfiguration
+  HasStartTime "0.0" : L0.Double
+  HasStopTime "10.0" : L0.Double
       
   
 ModuleConfiguration @ "ModuleConfiguration" : Configuration
   L0.HasLabel "Mallikonfiguraatio" : L0.String
-  HasStartTime "0.0" : L0.Double
-  HasStopTime "10.0" : L0.Double
   L0.ConsistsOf
     Moduuli1 @ "Moduuli1" : Module1
       L0.HasLabel "EkaModuuli" : L0.String
     ToinenModuuli1 @ "ToinenModuuli1" : Module1
       L0.HasLabel "ToinenEkaModuuli" : L0.String
     RootAux1 @ "Aux1" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "m" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "1+1" : L0.String
     RootAux2 @ "Aux2" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "Aux1" : L0.String
     RootInput1 @ "rootInput" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "1000" : L0.String
@@ -472,13 +472,11 @@ Module1Configuration @ "Mod1Conf" : Configuration
     Moduuli2 @ "Moduuli2" : Module2
       L0.HasLabel "TokaModuuli" : L0.String
     FirstModuleInput1 @ "Aux1" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "2+2" : L0.String
       tag(IsInput)
     FirstModuleInput2 @ "Aux2" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "2+2" : L0.String
@@ -515,13 +513,11 @@ Module2 @ "SecondModule" <T Module
 Module2Configuration @ "Mod2Conf" : Configuration
   L0.ConsistsOf 
     SecondModuleInput1 @ "Aux1" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "2+2" : L0.String
       tag(IsInput)
     SecondModuleInput2 @ "Aux2" : Auxiliary
-      L0.HasType "Real" : L0.String
       HasUnit "s" : L0.String
       HasExpression _ : NormalExpression
         HasEquation "2+2" : L0.String
@@ -548,3 +544,273 @@ Module2Configuration @ "Mod2Conf" : Configuration
       HasHead SecondModuleOutput1
       HasTail SecondModuleInput2
   
+  
+######################################################################
+# Customer model
+######################################################################
+
+
+_ @ "CustomerModel" : SysdynModel
+  L0.HasLabel "Asiakasmalli" : L0.String
+  L0.PartOf SysdynModuleTestProject
+  SIMU.HasConfiguration RootConfiguration
+  HasStartTime "0.0" : L0.Double
+  HasStopTime "10.0" : L0.Double
+  
+  
+RootConfiguration @ "RootConfiguration" : Configuration
+  L0.HasLabel "Konfiguraatio" : L0.String
+  L0.ConsistsOf
+    ### Modules
+    Customers @ "Asiakkaat" : CustomerModule
+      L0.HasLabel "Asiakkaat" : L0.String
+    Capacity @ "Kapasiteetti" : CapacityModule
+      L0.HasLabel "Kapasiteetti" : L0.String    
+    ### Variables
+    Price @ "Hinta" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "30" : L0.String
+    Sales @ "Myynti" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "UusiaAsiakkaita * WidgettejaHenkilolle" : L0.String        
+    CumulativeRevenue @ "KumulatiivisetTulot" : Stock
+      HasExpression _ : StockExpression
+        HasInitialEquation "0" : L0.String        
+    SalesRevenue @ "Myyntitulot" : Valve
+      HasExpression _ : NormalExpression
+        HasEquation "Myynti * Hinta" : L0.String      
+    DummyCloud : Cloud
+    ### Input variables
+    WidgetsPerPersonInput @ "WidgettejaHenkilolle" : Auxiliary
+    NewCustomersInput @ "UusiaAsiakkaita" : Auxiliary
+    WordOfMouthDemandInput @ "PuskaradioKysynta" : Auxiliary
+    CapacityInput @ "Kapasiteetti" : Auxiliary
+    ### Dependencies    
+    _ : Flow
+      HasHead SalesRevenue
+      HasTail DummyCloud
+    _ : Flow
+      HasHead CumulativeRevenue
+      HasTail SalesRevenue      
+    _ : Dependency
+      HasHead SalesRevenue
+      HasTail Price
+    _ : Dependency
+      HasHead SalesRevenue
+      HasTail Sales
+    _ : Dependency
+      HasHead Sales
+      HasTail NewCustomersInput
+    _ : Dependency
+      HasHead Sales
+      HasTail WidgetsPerPersonInput     
+    _  : Dependency
+      HasHead Customers
+      HasTail CapacityInput
+      RefersTo CapacityInput2
+    _  : Dependency
+      HasHead Customers
+      HasTail WidgetsPerPersonInput
+      RefersTo WidgetsPerPersonInput2
+    _  : Dependency
+      HasHead WordOfMouthDemandInput
+      HasTail Customers
+      RefersTo WordOfMouthDemandOutput
+    _  : Dependency
+      HasHead NewCustomersInput
+      HasTail Customers
+      RefersTo NewCustomers
+    _  : Dependency
+      HasHead WidgetsPerPersonInput
+      HasTail Capacity
+      RefersTo WidgetsPerPersonOutput
+    _  : Dependency
+      HasHead CapacityInput
+      HasTail Capacity
+      RefersTo CapacityStock
+      
+      
+CapacityModule @ "Kapasiteettimoduuli" <T Module
+  ST.IsDefinedBy CapacityModuleConfiguration
+
+CapacityModuleConfiguration @ "Kapasiteettimoduulikonfiguraatio" : Configuration
+  L0.ConsistsOf   
+    CapacityAdjustment @ "Kapasiteettisaato" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "(Tavoitekapasiteetti - Kapasiteetti)/Kapasiteetinsaatoaika" : L0.String
+    TargetCapacity @ "Tavoitekapasiteetti" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "PuskaradioKysynta * WidgettejaHenkilolle" : L0.String
+    DesiredProduction @ "Tavoitetuotanto" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "Tavoitekapasiteetti" : L0.String
+    PotentialProduction @ "PotentiaalinenTuotanto" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "Kapasiteetti" : L0.String
+    Production @ "Tuotanto" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "min({Tavoitetuotanto, PotentiaalinenTuotanto})" : L0.String
+    CapacityLife @ "Kapasiteettielama" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "20" : L0.String        
+    TimeToAdjustCapacity @ "Kapasiteetinsaatoaika" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "12" : L0.String     
+    WidgetsPerPersonOutput @ "WidgettejaHenkilolle" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "1" : L0.String       
+      tag(IsOutput)
+                    
+    DummyCloud2 : Cloud
+    DummyCloud3 : Cloud                        
+    CapacityStock @ "Kapasiteetti" : Stock
+      HasExpression _ : StockExpression
+        HasInitialEquation "Tavoitekapasiteetti" : L0.String
+      tag(IsOutput)        
+    Investment @ "Sijoitus" : Valve
+      HasExpression _ : NormalExpression
+        HasEquation "Kapasiteettisaato" : L0.String    
+    Reductions @ "Vahennys" : Valve
+      HasExpression _ : NormalExpression
+        HasEquation "Kapasiteetti/Kapasiteettielama" : L0.String     
+                   
+    ### Input variables
+    WordOfMouthDemandInput2 @ "PuskaradioKysynta" : Auxiliary
+      tag(IsInput)
+
+    ### Dependencies    
+    _ : Flow
+      HasHead Investment
+      HasTail DummyCloud2  
+    _ : Flow
+      HasHead CapacityStock
+      HasTail Investment  
+    _ : Flow
+      HasHead Reductions
+      HasTail CapacityStock
+    _ : Flow
+      HasHead DummyCloud3
+      HasTail Reductions                    
+    _  : Dependency
+      HasHead Reductions
+      HasTail CapacityStock
+    _  : Dependency
+      HasHead PotentialProduction
+      HasTail CapacityStock
+    _  : Dependency
+      HasHead CapacityAdjustment
+      HasTail CapacityStock
+    _  : Dependency
+      HasHead Reductions
+      HasTail CapacityLife
+    _  : Dependency
+      HasHead Production
+      HasTail PotentialProduction
+    _  : Dependency
+      HasHead Production
+      HasTail DesiredProduction 
+    _  : Dependency
+      HasHead DesiredProduction
+      HasTail TargetCapacity
+    _  : Dependency
+      HasHead CapacityAdjustment
+      HasTail TargetCapacity
+    _  : Dependency
+      HasHead TargetCapacity
+      HasTail WidgetsPerPersonOutput
+    _  : Dependency
+      HasHead TargetCapacity
+      HasTail WordOfMouthDemandInput2
+    _  : Dependency
+      HasHead CapacityAdjustment
+      HasTail TimeToAdjustCapacity
+    _  : Dependency
+      HasHead Investment
+      HasTail CapacityAdjustment                                     
+      
+CustomerModule @ "Asiakasmoduuli" <T Module
+  ST.IsDefinedBy CustomerModuleConfiguration
+
+CustomerModuleConfiguration @ "Asiakasmoduulikonfiguraatio" : Configuration
+  L0.ConsistsOf 
+    ContactsOfNoncustomersWithCustomers @ "EiAsiakkaidenJaAsiakkaidenKohtaamiset" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "AsiakkaidenKohtaamiset * PotentiaalisetAsiakaskeskittymat" : L0.String
+    ContactsWithCustomers @ "AsiakkaidenKohtaamiset" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "Asiakkaat * Sosiaalisuus" : L0.String
+    PotentialCustomerConcentration @ "PotentiaalisetAsiakaskeskittymat" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "MahdollisetAsiakkaat" : L0.String
+    WordOfMouthDemandOutput @ "Puskaradiokysynta / MarkkinoidenKoko" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "EiAsiakkaidenJaAsiakkaidenKohtaamiset * Hedelmallisyys" : L0.String
+      tag(IsOutput)
+    TotalMarket @ "MarkkinoidenKoko" : Auxiliary
+      HasExpression _ : NormalExpression
+        HasEquation "Asiakkaat + MahdollisetAsiakkaat" : L0.String     
+    Fruitfulness @ "Hedelmallisyys" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "0.01" : L0.String       
+    Sociability @ "Sosiaalisuus" : Auxiliary
+      HasExpression _ : ParameterExpression
+        HasEquation "20" : L0.String                                             
+    PotentialCustomersStock @ "MahdollisetAsiakkaat" : Stock
+      HasExpression _ : StockExpression
+        HasInitialEquation "1e+006" : L0.String   
+    CustomersStock @ "Asiakkaat" : Stock
+      HasExpression _ : StockExpression
+        HasInitialEquation "1000" : L0.String           
+    NewCustomers @ "UudetAsiakkaat" : Valve
+      HasExpression _ : NormalExpression
+        HasEquation " min({Puskaradiokysynta, Kapasiteetti/WidgettejaHenkilolle})" : L0.String    
+      tag(IsOutput)
+    ### Input variables
+    CapacityInput2 @ "Kapasiteetti" : Auxiliary
+      tag(IsInput)
+    WidgetsPerPersonInput2 @ "WidgettejaHenkilolle" : Auxiliary
+      tag(IsInput)
+      
+    ### Dependencies    
+    _ : Flow
+      HasHead NewCustomers
+      HasTail PotentialCustomersStock  
+    _ : Flow
+      HasHead CustomersStock
+      HasTail NewCustomers        
+    _  : Dependency
+      HasHead PotentialCustomerConcentration
+      HasTail TotalMarket
+    _  : Dependency
+      HasHead ContactsOfNoncustomersWithCustomers
+      HasTail PotentialCustomerConcentration
+    _  : Dependency
+      HasHead WordOfMouthDemandOutput
+      HasTail ContactsOfNoncustomersWithCustomers
+    _  : Dependency
+      HasHead NewCustomers
+      HasTail WordOfMouthDemandOutput
+    _  : Dependency
+      HasHead ContactsOfNoncustomersWithCustomers
+      HasTail ContactsWithCustomers
+    _  : Dependency
+      HasHead ContactsWithCustomers
+      HasTail Sociability
+    _  : Dependency
+      HasHead ContactsWithCustomers
+      HasTail CustomersStock
+    _  : Dependency
+      HasHead TotalMarket
+      HasTail Customers
+    _  : Dependency
+      HasHead TotalMarket
+      HasTail PotentialCustomersStock
+    _  : Dependency
+      HasHead NewCustomers
+      HasTail CapacityInput2
+    _  : Dependency
+      HasHead NewCustomers
+      HasTail WidgetsPerPersonInput2
+    _  : Dependency
+      HasHead WordOfMouthDemandOutput
+      HasTail Fruitfulness                    
\ No newline at end of file