From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 5 Aug 2010 12:44:24 +0000 (+0000)
Subject: Another example model (simulation not working)
X-Git-Tag: simantics-1.2.0~133
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1719b7cb976b7629188cf0d5d9a34b1f2ca6e7f0;p=simantics%2Fsysdyn.git

Another example model (simulation not working)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@16964 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 da9f555a..e95f4987 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/SysdynResource.java
@@ -21,6 +21,8 @@ import org.simantics.db.exception.DatabaseException;
 public class SysdynResource {
     
     public final Resource Admin1;
+    public final Resource Admin1;
+    public final Resource Admin2;
     public final Resource Admin2;
     public final Resource Auxiliary;
     public final Resource AuxiliarySymbol;
@@ -41,7 +43,6 @@ public class SysdynResource {
     public final Resource DiagramToCompositeMapping;
     public final Resource Experiment;
     public final Resource Expression;
-    public final Resource FirstModule;
     public final Resource Flow;
     public final Resource FlowConnection;
     public final Resource GameExperiment;
@@ -86,7 +87,6 @@ public class SysdynResource {
     public final Resource RefersTo;
     public final Resource Result;
     public final Resource RootConfigurationDiagram;
-    public final Resource SecondModule;
     public final Resource SimulateOnChangeExperiment;
     public final Resource Stock;
     public final Resource StockExpression;
@@ -100,11 +100,18 @@ public class SysdynResource {
     public final Resource ValveSymbol;
     public final Resource Variable;
     public final Resource WithLookupExpression;
+    public final Resource WorkModelConfigurationDiagram;
+    public final Resource WorkModuleConfigurationDiagram;
+    public final Resource WorkSymbol;
+    public final Resource WorkforceModuleConfigurationDiagram;
+    public final Resource WorkforceSymbol;
     public final Resource angle;
     
     public static class URIs {
+        public static final String Admin1 = "http://www.simantics.org/Sysdyn-1.0/Admin1";
         public static final String Admin1 = "http://www.simantics.org/Sysdyn-1.0/Admin1";
         public static final String Admin2 = "http://www.simantics.org/Sysdyn-1.0/Admin2";
+        public static final String Admin2 = "http://www.simantics.org/Sysdyn-1.0/Admin2";
         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";
@@ -124,7 +131,6 @@ public class SysdynResource {
         public static final String DiagramToCompositeMapping = "http://www.simantics.org/Sysdyn-1.0/DiagramToCompositeMapping";
         public static final String Experiment = "http://www.simantics.org/Sysdyn-1.0/Experiment";
         public static final String Expression = "http://www.simantics.org/Sysdyn-1.0/Expression";
-        public static final String FirstModule = "http://www.simantics.org/Sysdyn-1.0/FirstModule";
         public static final String Flow = "http://www.simantics.org/Sysdyn-1.0/Flow";
         public static final String FlowConnection = "http://www.simantics.org/Sysdyn-1.0/FlowConnection";
         public static final String GameExperiment = "http://www.simantics.org/Sysdyn-1.0/GameExperiment";
@@ -169,7 +175,6 @@ public class SysdynResource {
         public static final String RefersTo = "http://www.simantics.org/Sysdyn-1.0/RefersTo";
         public static final String Result = "http://www.simantics.org/Sysdyn-1.0/Result";
         public static final String RootConfigurationDiagram = "http://www.simantics.org/Sysdyn-1.0/RootConfigurationDiagram";
-        public static final String SecondModule = "http://www.simantics.org/Sysdyn-1.0/SecondModule";
         public static final String SimulateOnChangeExperiment = "http://www.simantics.org/Sysdyn-1.0/SimulateOnChangeExperiment";
         public static final String Stock = "http://www.simantics.org/Sysdyn-1.0/Stock";
         public static final String StockExpression = "http://www.simantics.org/Sysdyn-1.0/StockExpression";
@@ -183,6 +188,11 @@ public class SysdynResource {
         public static final String ValveSymbol = "http://www.simantics.org/Sysdyn-1.0/ValveSymbol";
         public static final String Variable = "http://www.simantics.org/Sysdyn-1.0/Variable";
         public static final String WithLookupExpression = "http://www.simantics.org/Sysdyn-1.0/WithLookupExpression";
+        public static final String WorkModelConfigurationDiagram = "http://www.simantics.org/Sysdyn-1.0/WorkModelConfigurationDiagram";
+        public static final String WorkModuleConfigurationDiagram = "http://www.simantics.org/Sysdyn-1.0/WorkModuleConfigurationDiagram";
+        public static final String WorkSymbol = "http://www.simantics.org/Sysdyn-1.0/WorkSymbol";
+        public static final String WorkforceModuleConfigurationDiagram = "http://www.simantics.org/Sysdyn-1.0/WorkforceModuleConfigurationDiagram";
+        public static final String WorkforceSymbol = "http://www.simantics.org/Sysdyn-1.0/WorkforceSymbol";
         public static final String angle = "http://www.simantics.org/Sysdyn-1.0/angle";
     }
     
@@ -197,6 +207,8 @@ public class SysdynResource {
     
     public SysdynResource(ReadGraph graph) {
         Admin1 = getResourceOrNull(graph, URIs.Admin1);
+        Admin1 = getResourceOrNull(graph, URIs.Admin1);
+        Admin2 = getResourceOrNull(graph, URIs.Admin2);
         Admin2 = getResourceOrNull(graph, URIs.Admin2);
         Auxiliary = getResourceOrNull(graph, URIs.Auxiliary);
         AuxiliarySymbol = getResourceOrNull(graph, URIs.AuxiliarySymbol);
@@ -217,7 +229,6 @@ public class SysdynResource {
         DiagramToCompositeMapping = getResourceOrNull(graph, URIs.DiagramToCompositeMapping);
         Experiment = getResourceOrNull(graph, URIs.Experiment);
         Expression = getResourceOrNull(graph, URIs.Expression);
-        FirstModule = getResourceOrNull(graph, URIs.FirstModule);
         Flow = getResourceOrNull(graph, URIs.Flow);
         FlowConnection = getResourceOrNull(graph, URIs.FlowConnection);
         GameExperiment = getResourceOrNull(graph, URIs.GameExperiment);
@@ -262,7 +273,6 @@ public class SysdynResource {
         RefersTo = getResourceOrNull(graph, URIs.RefersTo);
         Result = getResourceOrNull(graph, URIs.Result);
         RootConfigurationDiagram = getResourceOrNull(graph, URIs.RootConfigurationDiagram);
-        SecondModule = getResourceOrNull(graph, URIs.SecondModule);
         SimulateOnChangeExperiment = getResourceOrNull(graph, URIs.SimulateOnChangeExperiment);
         Stock = getResourceOrNull(graph, URIs.Stock);
         StockExpression = getResourceOrNull(graph, URIs.StockExpression);
@@ -276,6 +286,11 @@ public class SysdynResource {
         ValveSymbol = getResourceOrNull(graph, URIs.ValveSymbol);
         Variable = getResourceOrNull(graph, URIs.Variable);
         WithLookupExpression = getResourceOrNull(graph, URIs.WithLookupExpression);
+        WorkModelConfigurationDiagram = getResourceOrNull(graph, URIs.WorkModelConfigurationDiagram);
+        WorkModuleConfigurationDiagram = getResourceOrNull(graph, URIs.WorkModuleConfigurationDiagram);
+        WorkSymbol = getResourceOrNull(graph, URIs.WorkSymbol);
+        WorkforceModuleConfigurationDiagram = getResourceOrNull(graph, URIs.WorkforceModuleConfigurationDiagram);
+        WorkforceSymbol = getResourceOrNull(graph, URIs.WorkforceSymbol);
         angle = getResourceOrNull(graph, URIs.angle);
     }
     
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
index f3abe32e..21aef064 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
@@ -24,20 +24,21 @@ import org.simantics.sysdyn.representation.Stock;
 import org.simantics.sysdyn.representation.IndependentVariable;
 import org.simantics.sysdyn.representation.Variable;
 import org.simantics.sysdyn.representation.expressions.IExpression;
-import org.simantics.sysdyn.representation.expressions.WithLookupExpression;
 
 public class ModelicaWriter {
 
     StringBuilder b = new StringBuilder();
     String app;
     boolean initialEquations = false;
-    boolean insertInterpolate = false;
+    boolean functionsWritten = false;
 
     public void write(Configuration conf) {
 
         writeConfiguration(conf);
 
-        if(insertInterpolate)
+        if(!functionsWritten) {
+
+            // THIS INTERPOLATE DOESN'T WORK PROPERLY
             b.append(
                     "\nfunction Interpolate\n" +
                     "    input Real table[:, 2];\n" +
@@ -54,7 +55,23 @@ public class ModelicaWriter {
                     "    yp := table[i,2] + (xp - table[i,1]) * (table[i+1,2] - table[i,2]) / (table[i+1,1] - table[i,1]);\n" +
                     "    end if;\n" +
                     "    end for;\n" +
-            " end Interpolate;\n");
+            "end Interpolate;\n");
+
+            b.append(
+                    "function xidz\n" +
+                    "    input Real first;\n" +
+                    "    input Real second;\n" +
+                    "    input Real x;\n" +
+                    "    output Real answer;\n" +
+                    "algorithm\n" +
+                    "    if second > 0.0 or second < 0.0 then\n" +
+                    "        answer := first / second;\n" +
+                    "    else\n" +
+                    "        answer := x;\n" +
+                    "    end if;\n" +
+            "end xidz;\n\n\n");
+            functionsWritten = true;
+        }
     }
 
     private void writeConfiguration(Configuration configuration) {
@@ -68,7 +85,7 @@ public class ModelicaWriter {
         ArrayList<Dependency> inputDependencies = new ArrayList<Dependency>();
         ArrayList<Dependency> outputDependencies = new ArrayList<Dependency>();
         HashMap<String, ArrayList<Input>> moduleInputs = new HashMap<String, ArrayList<Input>>();
-        
+
         // Initialize lists
         for(IElement element : configuration.getElements()) {
             if(element instanceof IndependentVariable) {
@@ -98,31 +115,30 @@ public class ModelicaWriter {
         ModuleType mt = configuration.getModuleType();
         String className = mt != null ? (mt.getName().replace(" ", "")) : (configuration.getName().replace(" ", ""));
         b.append("class ").append(className).append('\n');
-        
+
         b.append("// Variable definitions\n");
         for(IndependentVariable variable : variables) {
             IExpression expr = variable.getExpression();
-            if(expr != null && insertInterpolate == false) {
+            if(expr != null) {
                 app = expr.getDeclaration(variable);
                 if (app != null) b.append(app);
-                if (expr instanceof WithLookupExpression) insertInterpolate = true;
             }
         }
-        
+
         if(!modules.isEmpty()) {
             b.append("// Module definitions\n");
             for(Module m : modules) {
                 b.append("    " + m.getType().getName() + " " + m.getName() + ";\n");
             }
         }
-        
+
         if(!inputs.isEmpty()) {
             b.append("// Input definitions\n");
             for(Input i : inputs) {
                 b.append("    " + i.getType() + " " + i.getName() + ";\n");
             }
         }
-        
+
         for(Stock stock : stocks) {
             IExpression expr = stock.getExpression();
             if(expr != null) {
@@ -166,21 +182,21 @@ public class ModelicaWriter {
             b.append("    " + module.getName() + "." + reference.getName() + " = " + variable.getName() + ";\n");
             moduleInputs.get(module.getName()).remove(reference);
         }
-        
+
         b.append("// Default values for inputs in modules\n");
         for(String moduleLabel : moduleInputs.keySet()) {
             for(Input input : moduleInputs.get(moduleLabel)) {
                 b.append("    " + moduleLabel + "." + input.getName() + " = " + input.getDefaultInputValue() + ";\n");
             }
         }
-        
+
         b.append("end ").append(className).append(";\n\n");
 
 
 //        for(Module m : modules) {
 //            writeConfiguration(m.getConfiguration());
 //        }
-        
+
     }
 
     public String escape(String name) {
diff --git a/sysdyn_ontologies/sysdyn.graph b/sysdyn_ontologies/sysdyn.graph
index ce872424..78f3a9b7 100644
--- a/sysdyn_ontologies/sysdyn.graph
+++ b/sysdyn_ontologies/sysdyn.graph
@@ -453,132 +453,626 @@ DependencyConnection <T DIA.Connection
   assert(angle, "0.1" : L0.Double)  
   MOD.DiagramConnectionTypeToConnectionType
     Dependency
-    
+
 ######################################################################
-# Example model with modules
+# Work model with two modules
 ######################################################################
 
-ModuleModel @ "ModuleModel" : SysdynModel
-  L0.HasLabel "Malli" : L0.String
-#  L0.PartOf SysdynModuleTestProject
-  SIMU.HasConfiguration ModuleConfiguration
-  L0.ConsistsOf _ @ "Experiment" : Experiment
-    L0.HasLabel "Experiment" : L0.String
-      
-  
-ModuleConfiguration @ "ModuleConfiguration" : Configuration
-  L0.HasLabel "Mallikonfiguraatio" : L0.String
+%define dep($e1, $e2, $angle)
+    $subject
+        tag(AdminIsVisible)
+        tag(AdminIsFocusable)
+        ST.HasConnectionType SysdynConnectionType
+        angle $angle : L0.Double
+        DIA.HasArrowConnector _ : DIA.Connector
+            HasHeadTerminal $e1
+            DIA.AreConnected _ : DIA.Connector 
+              HasTailTerminal $e2
+              DIA.IsPlainConnectorOf $subject
+
+%define flow($e1, $e2)
+    $subject
+        tag(AdminIsVisible)
+        tag(AdminIsFocusable)
+        ST.HasConnectionType SysdynConnectionType
+        DIA.HasPlainConnector _ : DIA.Connector
+            HasTailTerminal $e2
+            DIA.AreConnected _ : DIA.Connector 
+              HasHeadTerminal $e1
+              DIA.IsArrowConnectorOf $subject
+              
+%define conf_dep($v1, $v2)
+    $subject
+        tag(MOD.Mapped)
+        HasHead $v1
+        HasTail $v2
+
+%define conf_dep_ref($v1, $v2, $ref)
+    $subject
+        tag(MOD.Mapped)
+        HasHead $v1
+        HasTail $v2
+        RefersTo $ref              
+              
+WorkSymbol <T ModuleSymbol
+  MOD.SymbolToComponentType WorkModule
+  ST.IsDefinedBy %list : DIA.Composite <R L0.HasNext
+      _ : SysdynTerminal
+        terminal(ModuleSymbol, IsHeadOfTerminal)
+      _ : SysdynTerminal
+        terminal(ModuleSymbol, IsTailOfTerminal)
+
+WorkforceSymbol <T ModuleSymbol
+  MOD.SymbolToComponentType WorkforceModule
+  ST.IsDefinedBy %list : DIA.Composite <R L0.HasNext
+      _ : SysdynTerminal
+        terminal(ModuleSymbol, IsHeadOfTerminal)
+      _ : SysdynTerminal
+        terminal(ModuleSymbol, IsTailOfTerminal)
+
+_ @ "WorkModel" : SysdynModel
+  L0.HasLabel "Work Model" : L0.String
+  L0.PartOf SysdynModuleTestProject
+  SIMU.HasConfiguration WorkModelConfiguration
+  L0.ConsistsOf 
+    _ @ "Experiment" : Experiment
+      L0.HasLabel "Experiment" : L0.String
+    WorkModule
+    WorkforceModule  
+    WorkModelConfiguration   
+
+
+WorkModelConfiguration @ "WorkModelConfiguration" : Configuration
+  L0.HasLabel "WorkModelConfiguration" : L0.String
   HasStartTime "0.0" : L0.Double
-  HasStopTime "100.0" : L0.Double
+  HasStopTime "20.0" : L0.Double
   L0.ConsistsOf
-    Moduuli1 @ "Moduuli1" : Module1
-      L0.HasLabel "EkaModuuli" : L0.String
-    ToinenModuuli1 @ "ToinenModuuli1" : Module1
-      L0.HasLabel "ToinenEkaModuuli" : L0.String
-    RootAux1 @ "Aux1" : Auxiliary
-      HasUnit "m" : L0.String
-      HasExpression _ : NormalExpression
-        HasEquation "1+1" : L0.String
-    RootAux2 @ "Aux2" : Auxiliary
-      HasUnit "s" : L0.String
-      HasExpression _ : NormalExpression
-        HasEquation "Aux1" : L0.String
-    RootInput1 @ "rootInput" : Auxiliary
-      HasUnit "s" : L0.String
+    ### Modules
+    Workforce @ "Workforce" : WorkforceModule
+      tag(MOD.Mapped)
+      L0.HasLabel "Workforce" : L0.String
+    Work1 @ "Work1" : WorkModule
+      tag(MOD.Mapped)
+      L0.HasLabel "Work1" : L0.String   
+    Work2 @ "Work2" : WorkModule
+      tag(MOD.Mapped)
+      L0.HasLabel "Work2" : L0.String       
+      
+    ## Parameters
+    Work1CompletionTime @ "Work1CompletionTime" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : ParameterExpression
+        HasEquation "10" : L0.String     
+    Work2CompletionTime @ "Work2CompletionTime" : Auxiliary
+      tag(MOD.Mapped)    
+      HasExpression _ : ParameterExpression
+        HasEquation "11" : L0.String    
+     
+    ## Inputs
+    TotalPossibleWorkingSpeedInput @ "TotalPossibleWorkingSpeedInput" : Input
+      tag(MOD.Mapped)
+    RequiredWorkingSpeed1 @ "RequiredWorkingSpeed1" : Input
+      tag(MOD.Mapped)
+    RequiredWorkingSpeed2 @ "RequiredWorkingSpeed2" : Input
+      tag(MOD.Mapped)     
+      
+    ## Auxiliaries    
+    RequiredWorkingSpeedTotal @ "RequiredWorkingSpeedTotal" : Auxiliary
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "1000" : L0.String
-    _ : Dependency
-      HasHead RootAux2
-      HasTail RootAux1
-    _  : Dependency
-      HasHead Moduuli1
-      HasTail RootAux2
-      RefersTo FirstModuleInput2
-    _  : Dependency
-      HasHead ToinenModuuli1
-      HasTail RootAux2
-      RefersTo FirstModuleInput2
-    _  : Dependency
-      HasHead RootInput1
-      HasTail Moduuli1
-      RefersTo FirstModuleOutput1
-  
-Module1 @ "FirstModule" <T Module
-  ST.IsDefinedBy Module1Configuration
+        HasEquation "RequiredWorkingSpeed1+RequiredWorkingSpeed2" : L0.String                           
+          
+    d1  : Dependency
+      conf_dep_ref(TotalPossibleWorkingSpeedInput, Workforce, PossibleWorkingSpeed)        
+    d2  : Dependency
+      conf_dep_ref(Work1, TotalPossibleWorkingSpeedInput, PossibleWorkingSpeedInput)       
+    d3  : Dependency
+      conf_dep_ref(Work1, Work1CompletionTime, WorkCompletionTimeInput)       
+    d4  : Dependency
+      conf_dep_ref(Work1, RequiredWorkingSpeed2, RequiredWorkingSpeedOtherProjectsInput)       
+    d5  : Dependency
+      conf_dep_ref(RequiredWorkingSpeed1, Work1, RequiredWorkingSpeed)       
+    d6  : Dependency
+      conf_dep_ref(Work2, TotalPossibleWorkingSpeedInput, PossibleWorkingSpeedInput)       
+    d7  : Dependency
+      conf_dep_ref(Work2, Work2CompletionTime, WorkCompletionTimeInput)       
+    d8  : Dependency
+      conf_dep_ref(Work2, RequiredWorkingSpeed1, RequiredWorkingSpeedOtherProjectsInput)       
+    d9  : Dependency
+      conf_dep_ref(RequiredWorkingSpeed2, Work2, RequiredWorkingSpeed)       
+    d10  : Dependency
+      conf_dep_ref(Workforce, RequiredWorkingSpeedTotal, RequiredWorkingSpeedInput)    
+    d11  : Dependency
+      conf_dep(RequiredWorkingSpeedTotal, RequiredWorkingSpeed1) 
+    d12  : Dependency
+      conf_dep(RequiredWorkingSpeedTotal, RequiredWorkingSpeed2)
+             
+WorkModelConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
+  MOD.DiagramToComposite WorkModelConfiguration
+  DIA.HasLayer _ @ "Admin" : DIA.Layer
+    DIA.IsActive "true" : L0.Boolean
+    DIA.HasFocusableTag AdminIsFocusable @ "Admin1" <R DIA.IsFocusable
+      symmetric()
+    DIA.HasVisibleTag AdminIsVisible @ "Admin2" <R DIA.IsVisible
+      symmetric()
+  L0.HasTrigger _ : DiagramToCompositeMapping
+  #DIA.NavigationEnabled "false" : L0.Boolean
+  %list_elements
+    WorkforceElement : WorkforceSymbol
+        MOD.ElementToComponent Workforce
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 101.0, 50.0" : G2D.Transform
+    Work1Element : WorkSymbol
+        MOD.ElementToComponent Work1
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 114.0, 87.0" : G2D.Transform
+    Work2Element : WorkSymbol
+        MOD.ElementToComponent Work2
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 108.0, 161.0" : G2D.Transform        
+    Work1CompletionTimeElement : AuxiliarySymbol
+        MOD.ElementToComponent Work1CompletionTime
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 165.0, 99.0" : G2D.Transform        
+    Work2CompletionTimeElement : AuxiliarySymbol
+        MOD.ElementToComponent Work2CompletionTime
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 165.0, 153.0" : G2D.Transform   
+    RequiredWorkingSpeedTotalElement : AuxiliarySymbol
+        MOD.ElementToComponent RequiredWorkingSpeedTotal
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 32.0, 76.0" : G2D.Transform           
+    TotalPossibleWorkingSpeedInputElement : InputSymbol
+        MOD.ElementToComponent TotalPossibleWorkingSpeedInput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 141.0, 60.0" : G2D.Transform
+    RequiredWorkingSpeed1Element : InputSymbol
+        MOD.ElementToComponent RequiredWorkingSpeed1
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 65.0, 125.0" : G2D.Transform
+    RequiredWorkingSpeed2Element : InputSymbol
+        MOD.ElementToComponent RequiredWorkingSpeed2
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 100.0, 122.0" : G2D.Transform
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d1 
+        dep(TotalPossibleWorkingSpeedInputElement, WorkforceElement, "-0.1")        
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d2
+        dep(Work1Element, TotalPossibleWorkingSpeedInputElement,  "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d3 
+        dep(Work1Element , Work1CompletionTimeElement, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d4 
+        dep(Work1Element , RequiredWorkingSpeed2Element, "-0.1")        
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d5 
+        dep(RequiredWorkingSpeed1Element , Work1Element, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d6
+        dep(Work2Element , TotalPossibleWorkingSpeedInputElement,  "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d7 
+        dep(Work2Element , Work2CompletionTimeElement, "-0.1")        
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d8 
+        dep(Work2Element , RequiredWorkingSpeed1Element, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d9
+        dep(RequiredWorkingSpeed2Element , Work2Element, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d10
+        dep(WorkforceElement, RequiredWorkingSpeedTotalElement, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d11
+        dep(RequiredWorkingSpeedTotalElement, RequiredWorkingSpeed1Element, "-0.1")      
+    _ : DependencyConnection
+        MOD.DiagramConnectionToConnection d12
+        dep(RequiredWorkingSpeedTotalElement, RequiredWorkingSpeed2Element, "-0.1")                      
+                                                     
+        
+WorkModule @ "WorkModule" <T Module
+  ST.IsDefinedBy WorkModuleConfiguration
+
+WorkModuleConfiguration @ "WorkModuleConfiguration" : Configuration
+  L0.ConsistsOf   
   
-Module1Configuration @ "Mod1Conf" : Configuration
-  L0.ConsistsOf 
-    Moduuli2 @ "Moduuli2" : Module2
-      L0.HasLabel "TokaModuuli" : L0.String
-    FirstModuleInput1 @ "Aux1" : Auxiliary
-      HasUnit "s" : L0.String
+    ## Parameters
+    MaximumWorkingSpeed @ "MaximumWorkingSpeed" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : ParameterExpression
+        HasEquation "500" : L0.String     
+    ProjectWorkAmount @ "ProjectWorkAmount" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : ParameterExpression
+        HasEquation "1000" : L0.String     
+    WorkQuality @ "WorkQuality" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : ParameterExpression
+        HasEquation "0.9" : L0.String 
+                                     
+    ## Valves
+    WorkingSpeed @ "WorkingSpeed" : Valve
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "2+2" : L0.String
-    FirstModuleInput2 @ "Aux2" : Auxiliary
-      HasUnit "s" : L0.String
+        HasEquation "if ProjectIsReady > 0 then 0 else WorkAllocation" : L0.String
+    ErrorsGenerated @ "ErrorsGenerated" : Valve
+      tag(MOD.Mapped)
+      HasExpression _ : NormalExpression
+        HasEquation "(1-WorkQuality)*WorkingSpeed" : L0.String                                                         
+    ErrorsFoundRate @ "ErrorsFoundRate" : Valve
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "2+2" : L0.String
-    FirstModuleStock @ "Stock1" : Stock
+        HasEquation "Errors/ErrorsFoundTime" : L0.String   
+        
+    ## Stocks
+    WorkToDo @ "WorkToDo" : Stock
+      tag(MOD.Mapped)
+      HasExpression _ : StockExpression
+        HasInitialEquation "ProjectWorkAmount" : L0.String     
+    WorkDone @ "WorkDone" : Stock
+      tag(MOD.Mapped)
       HasExpression _ : StockExpression
-        HasInitialEquation "0" : L0.String
-    FirstModuleCloud : Cloud
-    FirstModuleOutput1 @ "Valve" : Valve
-      HasUnit "s" : L0.String
+        HasInitialEquation "0" : L0.String    
+    Errors @ "Errors" : Stock
+      tag(MOD.Mapped)
+      HasExpression _ : StockExpression
+        HasInitialEquation "0" : L0.String           
+        
+    ## Auxiliaries    
+    TimeToDeadline @ "TimeToDeadline" : Auxiliary
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "Aux1 + Aux2" : L0.String    
-      tag(IsOutput)  
-    _ : Flow
-      HasHead FirstModuleOutput1
-      HasTail FirstModuleCloud
-    _ : Flow
-      HasHead FirstModuleStock
-      HasTail FirstModuleOutput1
-    _ : Dependency
-      HasHead FirstModuleOutput1
-      HasTail FirstModuleInput1
-    _ : Dependency
-      HasHead FirstModuleOutput1
-      HasTail FirstModuleInput2
-    _  : Dependency
-      HasHead Moduuli2
-      HasTail FirstModuleOutput1
-      RefersTo SecondModuleInput1
-  
-Module2 @ "SecondModule" <T Module
-  ST.IsDefinedBy Module2Configuration
-
-Module2Configuration @ "Mod2Conf" : Configuration
-  L0.ConsistsOf 
-    SecondModuleInput1 @ "Aux1" : Auxiliary
-      HasUnit "s" : L0.String
+        HasEquation "max(0, WorkCompletionTimeInput-time)" : L0.String     
+    RequiredWorkingSpeed @ "RequiredWorkingSpeed" : Auxiliary
+      tag(MOD.Mapped)
+      tag(IsOutput)
+      HasExpression _ : NormalExpression
+        HasEquation "if ProjectIsReady  > 0 then 0 else if TimeToDeadline < 0.0 or TimeToDeadline > 0.0 then WorkToDo / TimeToDeadline else MaximumWorkingSpeed" : L0.String     
+    WorkAllocation @ "WorkAllocation" : Auxiliary
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "2+2" : L0.String
-    SecondModuleInput2 @ "Aux2" : Auxiliary
-      HasUnit "s" : L0.String
+        HasEquation "xidz(first = RequiredWorkingSpeed, second = RequiredWorkingSpeed + RequiredWorkingSpeedOtherProjectsInput, x = 0.0) * PossibleWorkingSpeedInput" : L0.String     
+    ProjectIsReady @ "ProjectIsReady" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : NormalExpression
+        HasEquation "if ProjectReadyness >= 1 then 1 else 0" : L0.String     
+    ProjectReadyness @ "ProjectReadyness" : Auxiliary
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "2+2" : L0.String
-    SecondModuleStock @ "Stock1" : Stock
+        HasEquation "WorkDone/ProjectWorkAmount" : L0.String     
+    ErrorsFoundTime @ "ErrorsFoundTime" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : WithLookupExpression
+        HasEquation "ProjectReadyness" : L0.String   
+        HasLookup "{{0,5},{0.5,3},{1,0.5},{2,0.5}}" : L0.String   
+
+    ## Inputs
+    WorkCompletionTimeInput @ "WorkCompletionTimeInput" : Input
+      tag(MOD.Mapped)
+    PossibleWorkingSpeedInput @ "PossibleWorkingSpeedInput" : Input
+      tag(MOD.Mapped)   
+    RequiredWorkingSpeedOtherProjectsInput @ "RequiredWorkingSpeedOtherProjectsInput" : Input
+      tag(MOD.Mapped)                                    
+   
+    c31 : Cloud
+   
+    d31  : Dependency
+      conf_dep(TimeToDeadline, WorkCompletionTimeInput)     
+    d32  : Dependency
+      conf_dep(RequiredWorkingSpeed, MaximumWorkingSpeed)     
+    d33  : Dependency
+      conf_dep(RequiredWorkingSpeed, TimeToDeadline)     
+    d34  : Dependency
+      conf_dep(RequiredWorkingSpeed, ProjectIsReady)     
+    d35  : Dependency
+      conf_dep(RequiredWorkingSpeed, WorkToDo)     
+    d36  : Dependency
+      conf_dep(WorkAllocation, RequiredWorkingSpeedOtherProjectsInput)     
+    d37  : Dependency
+      conf_dep(WorkAllocation, PossibleWorkingSpeedInput)     
+    d38  : Dependency
+      conf_dep(WorkAllocation, RequiredWorkingSpeed)     
+    d39  : Dependency
+      conf_dep(ProjectIsReady, ProjectReadyness)     
+    d40  : Dependency
+      conf_dep(ProjectReadyness, WorkDone)     
+    d41  : Dependency
+      conf_dep(ProjectReadyness, ProjectWorkAmount)     
+    d42 : Dependency
+      conf_dep(WorkingSpeed, WorkAllocation)     
+    d43 : Dependency
+      conf_dep(WorkingSpeed, ProjectIsReady)     
+    d44 : Dependency
+      conf_dep(ErrorsGenerated, WorkingSpeed)     
+    d45 : Dependency
+      conf_dep(ErrorsGenerated, WorkQuality)     
+    d46 : Dependency
+      conf_dep(ErrorsFoundRate, Errors)     
+    d47 : Dependency
+      conf_dep(ErrorsFoundRate, ErrorsFoundTime)     
+    d48 : Dependency
+      conf_dep(ErrorsFoundTime, ProjectReadyness)     
+    f31  : Flow
+      conf_dep(WorkingSpeed, WorkToDo)   
+    f32  : Flow
+      conf_dep(WorkDone, WorkingSpeed)   
+    f33  : Flow
+      conf_dep(ErrorsGenerated, c31)   
+    f34  : Flow
+      conf_dep(Errors, ErrorsGenerated)   
+    f35  : Flow
+      conf_dep(ErrorsFoundRate, Errors)   
+    f36  : Flow
+      conf_dep(ErrorsFoundRate, WorkDone)   
+    f37  : Flow
+      conf_dep(WorkToDo, ErrorsFoundRate)   
+       
+WorkModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
+  MOD.DiagramToComposite WorkModuleConfiguration
+  DIA.HasLayer _ @ "Admin" : DIA.Layer
+    DIA.IsActive "true" : L0.Boolean
+    DIA.HasFocusableTag AdminIsFocusable
+    DIA.HasVisibleTag AdminIsVisible
+  L0.HasTrigger _ : DiagramToCompositeMapping
+  %list_elements  
+        
+    WorkCompletionTimeInputElement : InputSymbol
+        MOD.ElementToComponent WorkCompletionTimeInput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 30.0, 65.0" : G2D.Transform           
+    PossibleWorkingSpeedInputElement : InputSymbol
+        MOD.ElementToComponent PossibleWorkingSpeedInput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 155.0, 35.0" : G2D.Transform           
+    RequiredWorkingSpeedOtherProjectsInputElement : InputSymbol
+        MOD.ElementToComponent RequiredWorkingSpeedOtherProjectsInput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 70.0, 27.0" : G2D.Transform           
+      
+    WorkingSpeedElement : ValveSymbol
+        MOD.ElementToComponent WorkingSpeed
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 107.0, 75.0" : G2D.Transform    
+    ErrorsGeneratedElement : ValveSymbol
+        MOD.ElementToComponent ErrorsGenerated
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 120.0, 90.0" : G2D.Transform    
+    ErrorsFoundRateElement : ValveSymbol
+        MOD.ElementToComponent ErrorsFoundRate
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 125.0, 125.0" : G2D.Transform    
+        
+    WorkToDoElement : StockSymbol
+        MOD.ElementToComponent WorkToDo
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 60.0, 75.0" : G2D.Transform          
+    WorkDoneElement : StockSymbol
+        MOD.ElementToComponent WorkDone
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 141.0, 75.0" : G2D.Transform   
+    ErrorsElement : StockSymbol
+        MOD.ElementToComponent Errors
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 135.0, 90.0" : G2D.Transform   
+          
+    MaximumWorkingSpeedElement : AuxiliarySymbol
+        MOD.ElementToComponent MaximumWorkingSpeed
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 65.0, 35.0" : G2D.Transform   
+    ProjectWorkAmountElement : AuxiliarySymbol
+        MOD.ElementToComponent ProjectWorkAmount
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 185.0, 50.0" : G2D.Transform   
+    WorkQualityElement : AuxiliarySymbol
+        MOD.ElementToComponent WorkQuality
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 105.0, 110.0" : G2D.Transform   
+    TimeToDeadlineElement : AuxiliarySymbol
+        MOD.ElementToComponent TimeToDeadline
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 55.0, 50.0" : G2D.Transform   
+    RequiredWorkingSpeedElement : AuxiliarySymbol
+        MOD.ElementToComponent RequiredWorkingSpeed
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 85.0, 55.0" : G2D.Transform   
+    WorkAllocationElement : AuxiliarySymbol
+        MOD.ElementToComponent WorkAllocation
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 120.0, 40.0" : G2D.Transform   
+    ProjectIsReadyElement : AuxiliarySymbol
+        MOD.ElementToComponent ProjectIsReady
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 145.0, 55.0" : G2D.Transform   
+    ProjectReadynessElement : AuxiliarySymbol
+        MOD.ElementToComponent ProjectReadyness
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 167.0, 65.0" : G2D.Transform   
+    ErrorsFoundTimeElement : AuxiliarySymbol
+        MOD.ElementToComponent ErrorsFoundTime
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 145.0, 135.0" : G2D.Transform   
+
+    c31Element : CloudSymbol
+        MOD.ElementToComponent c31
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 80.0, 90.0" : G2D.Transform   
+              
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d31
+      dep(TimeToDeadlineElement, WorkCompletionTimeInputElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d32
+      dep(RequiredWorkingSpeedElement, MaximumWorkingSpeedElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d33
+      dep(RequiredWorkingSpeedElement, TimeToDeadlineElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d34
+      dep(RequiredWorkingSpeedElement, ProjectIsReadyElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d35
+      dep(RequiredWorkingSpeedElement, WorkToDoElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d36
+      dep(WorkAllocationElement, RequiredWorkingSpeedOtherProjectsInputElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d37
+      dep(WorkAllocationElement, PossibleWorkingSpeedInputElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d38
+      dep(WorkAllocationElement, RequiredWorkingSpeedElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d39
+      dep(ProjectIsReadyElement, ProjectReadynessElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d40
+      dep(ProjectReadynessElement, WorkDoneElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d41
+      dep(ProjectReadynessElement, ProjectWorkAmountElement  , "-0.1")      
+    _ : DependencyConnection      
+      MOD.DiagramConnectionToConnection d42
+      dep(WorkingSpeedElement, WorkAllocationElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d43
+      dep(WorkingSpeedElement, ProjectIsReadyElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d44
+      dep(ErrorsGeneratedElement, WorkingSpeedElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d45
+      dep(ErrorsGeneratedElement, WorkQualityElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d46
+      dep(ErrorsFoundRateElement, ErrorsElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d47
+      dep(ErrorsFoundRateElement, ErrorsFoundTimeElement  , "-0.1")  
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d48
+      dep(ErrorsFoundTimeElement, ProjectReadynessElement  , "-0.1")  
+
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f31
+        flow(WorkingSpeedElement, WorkToDoElement  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f32
+        flow(WorkDoneElement, WorkingSpeedElement  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f33
+        flow(ErrorsGeneratedElement, c31Element  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f34
+        flow(ErrorsElement, ErrorsGeneratedElement  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f35
+        flow(ErrorsFoundRateElement, ErrorsElement  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f36
+        flow(ErrorsFoundRateElement, WorkDoneElement  ) 
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f37
+        flow(WorkToDoElement, ErrorsFoundRateElement  ) 
+                      
+      
+WorkforceModule @ "WorkforceModule" <T Module
+  ST.IsDefinedBy WorkforceModuleConfiguration
+
+WorkforceModuleConfiguration @ "WorkforceModuleConfiguration" : Configuration
+  L0.ConsistsOf   
+  
+    ## Parameters
+    TimeToAllocateResources @ "TimeToAllocateResources" : Auxiliary
+      tag(MOD.Mapped)
+      HasExpression _ : ParameterExpression
+        HasEquation "2" : L0.String    
+    Productivity @ "Productivity" : Auxiliary
+      tag(MOD.Mapped)      
+      HasExpression _ : ParameterExpression
+        HasEquation "1" : L0.String      
+    
+    ## Valve
+    NetResources @ "NetResources" : Valve
+      tag(MOD.Mapped)
+      HasExpression _ : NormalExpression
+        HasEquation "(WorkForceRequired-WorkforceStock)/TimeToAllocateResources" : L0.String      
+
+    ## Stock
+    WorkforceStock @ "WorkforceStock" : Stock
+      tag(MOD.Mapped)
       HasExpression _ : StockExpression
-        HasInitialEquation "0" : L0.String
-    SecondModuleCloud : Cloud
-    SecondModuleOutput1 @ "Valve" : Valve
-      HasUnit "s" : L0.String
+        HasInitialEquation "0" : L0.String        
+    
+    ## Auxiliaries    
+    WorkForceRequired @ "WorkForceRequired" : Auxiliary
+      tag(MOD.Mapped)
       HasExpression _ : NormalExpression
-        HasEquation "Aux1 + Aux2" : L0.String      
+        HasEquation "RequiredWorkingSpeedInput/Productivity" : L0.String     
+    PossibleWorkingSpeed @ "PossibleWorkingSpeed" : Auxiliary
+      tag(MOD.Mapped)
       tag(IsOutput)
-    _ : Flow
-      HasHead SecondModuleOutput1
-      HasTail SecondModuleCloud
-    _ : Flow
-      HasHead SecondModuleStock
-      HasTail SecondModuleOutput1
-    _ : Dependency
-      HasHead SecondModuleOutput1
-      HasTail SecondModuleInput1
-    _ : Dependency
-      HasHead SecondModuleOutput1
-      HasTail SecondModuleInput2
-  
+      HasExpression _ : NormalExpression
+        HasEquation "WorkforceStock*Productivity" : L0.String     
+                
+    ## Inputs
+    RequiredWorkingSpeedInput @ "RequiredWorkingSpeedInput" : Input
+      tag(MOD.Mapped)     
+      
+    c21 : Cloud
+      
+    d21  : Dependency
+      conf_dep(NetResources, TimeToAllocateResources)     
+    d22  : Dependency
+      conf_dep(NetResources, WorkforceStock)  
+    d23  : Dependency
+      conf_dep(NetResources, WorkForceRequired)  
+    d24  : Dependency
+      conf_dep(WorkForceRequired, Productivity)  
+    d25  : Dependency
+      conf_dep(WorkForceRequired, RequiredWorkingSpeedInput)   
+    d26  : Dependency
+      conf_dep(PossibleWorkingSpeed, WorkforceStock)  
+    d27  : Dependency
+      conf_dep(PossibleWorkingSpeed, Productivity)                                                
+    f21  : Flow
+      conf_dep(WorkforceStock, NetResources)     
+    f22  : Flow
+      conf_dep(NetResources, c21)  
+   
+WorkforceModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
+  MOD.DiagramToComposite WorkforceModuleConfiguration
+  DIA.HasLayer _ @ "Admin" : DIA.Layer
+    DIA.IsActive "true" : L0.Boolean
+    DIA.HasFocusableTag AdminIsFocusable
+    DIA.HasVisibleTag AdminIsVisible
+  L0.HasTrigger _ : DiagramToCompositeMapping
+  %list_elements  
+    TimeToAllocateResourcesElement : AuxiliarySymbol
+        MOD.ElementToComponent TimeToAllocateResources
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 45.0, 75.0" : G2D.Transform   
+    ProductivityElement : AuxiliarySymbol
+        MOD.ElementToComponent Productivity
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 120.0, 115.0" : G2D.Transform
+    NetResourcesElement : ValveSymbol
+        MOD.ElementToComponent NetResources
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 60.0, 84.0" : G2D.Transform    
+    WorkforceStockElement : StockSymbol
+        MOD.ElementToComponent WorkforceStock
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 93.0, 84.0" : G2D.Transform               
+    WorkForceRequiredElement : AuxiliarySymbol
+        MOD.ElementToComponent WorkForceRequired
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 82.0, 117.0" : G2D.Transform
+    PossibleWorkingSpeedElement : AuxiliarySymbol
+        MOD.ElementToComponent PossibleWorkingSpeed
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 115.0, 102.0" : G2D.Transform    
+    RequiredWorkingSpeedInputElement : InputSymbol
+        MOD.ElementToComponent RequiredWorkingSpeedInput
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 45.0, 127.0" : G2D.Transform     
+    c21Element : CloudSymbol
+        MOD.ElementToComponent c21
+        DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 45.0, 85.0" : G2D.Transform       
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d21
+      dep(NetResourcesElement, TimeToAllocateResourcesElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d22
+      dep(NetResourcesElement, WorkforceStockElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d23
+      dep(NetResourcesElement, WorkForceRequiredElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d24
+      dep(WorkForceRequiredElement, ProductivityElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d25
+      dep(WorkForceRequiredElement, RequiredWorkingSpeedInputElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d26
+      dep(PossibleWorkingSpeedElement, WorkforceStockElement , "-0.1")
+    _ : DependencyConnection
+      MOD.DiagramConnectionToConnection d27
+      dep(PossibleWorkingSpeedElement, ProductivityElement , "-0.1")        
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f21
+        flow(WorkforceStockElement, NetResourcesElement )              
+    _ : FlowConnection
+        MOD.DiagramConnectionToConnection f22
+        flow(c21Element, NetResourcesElement )                                    
+        
   
 ######################################################################
 # Customer model
@@ -611,39 +1105,13 @@ _ @ "CustomerModel" : SysdynModel
     CapacityModule  
     RootConfiguration   
 
-# Layerit ja connectiontype!
-
-%define dep($e1, $e2, $angle)
-    $subject
-        tag(AdminIsVisible)
-        tag(AdminIsFocusable)
-        ST.HasConnectionType SysdynConnectionType
-        angle $angle : L0.Double
-        DIA.HasArrowConnector _ : DIA.Connector
-            HasHeadTerminal $e1
-            DIA.AreConnected _ : DIA.Connector 
-              HasTailTerminal $e2
-              DIA.IsPlainConnectorOf $subject
-
-%define flow($e1, $e2)
-    $subject
-        tag(AdminIsVisible)
-        tag(AdminIsFocusable)
-        ST.HasConnectionType SysdynConnectionType
-        DIA.HasPlainConnector _ : DIA.Connector
-            HasTailTerminal $e1
-            DIA.AreConnected _ : DIA.Connector 
-              HasHeadTerminal $e2
-              DIA.IsArrowConnectorOf $subject
-
-
 RootConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
   MOD.DiagramToComposite RootConfiguration
   DIA.HasLayer _ @ "Admin" : DIA.Layer
     DIA.IsActive "true" : L0.Boolean
-    DIA.HasFocusableTag AdminIsFocusable @ "Admin1" <R DIA.IsFocusable
+    DIA.HasFocusableTag AdminIsFocusableCM @ "Admin1" <R DIA.IsFocusable
       symmetric()
-    DIA.HasVisibleTag AdminIsVisible @ "Admin2" <R DIA.IsVisible
+    DIA.HasVisibleTag AdminIsVisibleCM @ "Admin2" <R DIA.IsVisible
       symmetric()
   L0.HasTrigger _ : DiagramToCompositeMapping
   #DIA.NavigationEnabled "false" : L0.Boolean
@@ -683,10 +1151,10 @@ RootConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
         DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 136.0, 90.0" : G2D.Transform
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow1 
-        flow(DummyCloudElement, SalesRevenueElement)
+        flow(SalesRevenueElement, DummyCloudElement)
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow2
-        flow(SalesRevenueElement, CumulativeRevenueElement)
+        flow(CumulativeRevenueElement ,SalesRevenueElement)
     _ : DependencyConnection
         MOD.DiagramConnectionToConnection Dependency1 
         dep(SalesRevenueElement, PriceElement, "-0.1")
@@ -760,56 +1228,37 @@ RootConfiguration @ "RootConfiguration" : Configuration
     WordOfMouthDemandInput @ "PuskaradioKysynta" : Input
       tag(MOD.Mapped)
     CapacityInput @ "KapasiteettiInput" : Input
+      tag(MOD.Mapped) 
+    Flow1 : Flow
       tag(MOD.Mapped)
-
-%define conf_dep($v1, $v2)
-    $subject
-        tag(MOD.Mapped)
-        HasHead $v1
-        HasTail $v2
-        L0.PartOf RootConfiguration
-
-%define conf_dep_ref($v1, $v2, $ref)
-    $subject
-        tag(MOD.Mapped)
-        HasHead $v1
-        HasTail $v2
-        L0.PartOf RootConfiguration
-        RefersTo $ref
-
-## RootConfiguration Dependencies    
-Flow1 : Flow
-  tag(MOD.Mapped)
-  HasHead SalesRevenue
-  HasTail DummyCloud
-  L0.PartOf RootConfiguration
-Flow2 : Flow
-  tag(MOD.Mapped)
-  HasHead CumulativeRevenue
-  HasTail SalesRevenue      
-  L0.PartOf RootConfiguration
-Dependency1 : Dependency
-  conf_dep(SalesRevenue, Price)
-Dependency2 : Dependency
-  conf_dep(SalesRevenue, Sales)
-Dependency3 : Dependency
-  conf_dep(Sales, NewCustomersInput)
-Dependency4 : Dependency
-  conf_dep(Sales, WidgetsPerPersonInput)
-Dependency5  : Dependency
-  conf_dep_ref(Customers, CapacityInput, CapacityInput2)
-Dependency6  : Dependency
-  conf_dep_ref(Customers, WidgetsPerPersonInput, WidgetsPerPersonInput2)
-Dependency7  : Dependency
-  conf_dep_ref(WordOfMouthDemandInput, Customers, WordOfMouthDemandOutput)
-Dependency8  : Dependency
-  conf_dep_ref(Capacity, WordOfMouthDemandInput, WordOfMouthDemandInput2)
-Dependency9  : Dependency
-  conf_dep_ref(NewCustomersInput, Customers, NewCustomers)
-Dependency10  : Dependency
-  conf_dep_ref(WidgetsPerPersonInput, Capacity, WidgetsPerPersonOutput)
-Dependency11  : Dependency
-  conf_dep_ref(CapacityInput, Capacity, CapacityStock)
+      HasHead SalesRevenue
+      HasTail DummyCloud
+    Flow2 : Flow
+      tag(MOD.Mapped)
+      HasHead CumulativeRevenue
+      HasTail SalesRevenue      
+    Dependency1 : Dependency
+      conf_dep(SalesRevenue, Price)
+    Dependency2 : Dependency
+      conf_dep(SalesRevenue, Sales)
+    Dependency3 : Dependency
+      conf_dep(Sales, NewCustomersInput)
+    Dependency4 : Dependency
+      conf_dep(Sales, WidgetsPerPersonInput)
+    Dependency5  : Dependency
+      conf_dep_ref(Customers, CapacityInput, CapacityInput2)
+    Dependency6  : Dependency
+      conf_dep_ref(Customers, WidgetsPerPersonInput, WidgetsPerPersonInput2)
+    Dependency7  : Dependency
+      conf_dep_ref(WordOfMouthDemandInput, Customers, WordOfMouthDemandOutput)
+    Dependency8  : Dependency
+      conf_dep_ref(Capacity, WordOfMouthDemandInput, WordOfMouthDemandInput2)
+    Dependency9  : Dependency
+      conf_dep_ref(NewCustomersInput, Customers, NewCustomers)
+    Dependency10  : Dependency
+      conf_dep_ref(WidgetsPerPersonInput, Capacity, WidgetsPerPersonOutput)
+    Dependency11  : Dependency
+      conf_dep_ref(CapacityInput, Capacity, CapacityStock)
       
 CapacityModule @ "Kapasiteettimoduuli" <T Module
   ST.IsDefinedBy CapacityModuleConfiguration
@@ -830,7 +1279,7 @@ CapacityModuleConfiguration @ "Kapasiteettimoduulikonfiguraatio" : Configuration
         HasEquation "Kapasiteetti" : L0.String
     Production @ "Tuotanto" : Auxiliary
       HasExpression _ : NormalExpression
-        HasEquation "min({Tavoitetuotanto, PotentiaalinenTuotanto})" : L0.String
+        HasEquation "min(Tavoitetuotanto, PotentiaalinenTuotanto)" : L0.String
     CapacityLife @ "Kapasiteettielama" : Auxiliary
       HasExpression _ : ParameterExpression
         HasEquation "20" : L0.String        
@@ -928,8 +1377,8 @@ CapacityModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
   MOD.DiagramToComposite CapacityModuleConfiguration
   DIA.HasLayer _ @ "Admin" : DIA.Layer
     DIA.IsActive "true" : L0.Boolean
-    DIA.HasFocusableTag AdminIsFocusable
-    DIA.HasVisibleTag AdminIsVisible
+    DIA.HasFocusableTag AdminIsFocusableCM
+    DIA.HasVisibleTag AdminIsVisibleCM
   L0.HasTrigger _ : DiagramToCompositeMapping
   %list_elements
     DummyCloud2Element : CloudSymbol
@@ -949,16 +1398,16 @@ CapacityModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
         DIA.HasTransform "1.0, 0.0, 0.0, 1.0, 175.0, 90.0" : G2D.Transform
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow3
-        flow(DummyCloud2Element, InvestmentElement)
+        flow(InvestmentElement, DummyCloud2Element)
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow4
-        flow(InvestmentElement, CapacityStockElement)
+        flow(CapacityStockElement, InvestmentElement)
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow5
-        flow(CapacityStockElement, ReductionsElement)
+        flow(ReductionsElement, CapacityStockElement)
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow6
-        flow(ReductionsElement, DummyCloud3Element)
+        flow(DummyCloud3Element, ReductionsElement)
    
     CapacityAdjustmentElement : AuxiliarySymbol
         MOD.ElementToComponent CapacityAdjustment
@@ -1062,7 +1511,7 @@ CustomerModuleConfiguration @ "Asiakasmoduulikonfiguraatio" : Configuration
         HasInitialEquation "1000" : L0.String           
     NewCustomers @ "UudetAsiakkaat" : Valve
       HasExpression _ : NormalExpression
-        HasEquation " min({Puskaradiokysynta, Kapasiteetti/WidgettejaHenkilolle})" : L0.String    
+        HasEquation " min(Puskaradiokysynta, Kapasiteetti/WidgettejaHenkilolle)" : L0.String    
       tag(IsOutput)
     ### Input variables
     CapacityInput2 @ "Kapasiteetti" : Input
@@ -1134,8 +1583,8 @@ CustomerModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
   MOD.DiagramToComposite CustomerModuleConfiguration
   DIA.HasLayer _ @ "Admin" : DIA.Layer
     DIA.IsActive "true" : L0.Boolean
-    DIA.HasFocusableTag AdminIsFocusable
-    DIA.HasVisibleTag AdminIsVisible
+    DIA.HasFocusableTag AdminIsFocusableCM
+    DIA.HasVisibleTag AdminIsVisibleCM
   L0.HasTrigger _ : DiagramToCompositeMapping
   %list_elements      
     ContactsOfNoncustomersWithCustomersElement : AuxiliarySymbol
@@ -1179,10 +1628,10 @@ CustomerModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
     ### Dependencies    
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow7
-        flow(PotentialCustomersStockElement, NewCustomersElement)      
+        flow(NewCustomersElement, PotentialCustomersStockElement)      
     _ : FlowConnection
         MOD.DiagramConnectionToConnection Flow8
-        flow(NewCustomersElement, CustomersStockElement)
+        flow(CustomersStockElement, NewCustomersElement)
     _ : DependencyConnection
       MOD.DiagramConnectionToConnection Dependency24
       dep(PotentialCustomerConcentrationElement, TotalMarketElement, "-1.7")
@@ -1222,3 +1671,4 @@ CustomerModuleConfigurationDiagram : ConfigurationDiagram <R L0.HasNext
     _ : DependencyConnection
       MOD.DiagramConnectionToConnection Dependency36
       dep(PotentialCustomerConcentrationElement, PotentialCustomersStockElement, "-0.1")  
+        
\ No newline at end of file