Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions ConceptualModel/Brewery.csm.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Language: XML
$Author:$
$Date:$
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csm:Model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:doc="http://www.cosmotech.com/csm_doc/11.5" xmlns:dbk="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" xmlns:csm="http://www.cosmotech.com/csm/11.5">
<csm:Model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:csm="http://www.cosmotech.com/csm/12.0">
<csm:ModelName>Brewery</csm:ModelName>
<csm:Compound>
<csm:Environment>ModelEnvironment</csm:Environment>
</csm:Compound>
<csm:DataType xsi:type="csm:BoolType" name="Boolean"/>
<csm:DataType xsi:type="csm:IntType" name="Integer" bits="32" signed="1"/>
<csm:DataType xsi:type="csm:IntType" name="Integer" bits="32" signed="true"/>
<csm:DataType xsi:type="csm:FloatType" name="FloatingPoint" bits="32"/>
<csm:DataType xsi:type="csm:StringType" name="String"/>
<csm:BasicEntity name="Customer">
Expand Down Expand Up @@ -158,7 +151,7 @@ csmForEachTypedSubEntity(BE_Customer, customer)
</csm:Compound>
</csm:CompoundEntity>
<csm:Environment xsi:type="csm:NoEnvironment" name="NoEnvironment"/>
<csm:Environment xmlns:csmRoom="http://www.cosmotech.com/csm_room/11.5" xsi:type="csmRoom:Room" name="ModelEnvironment"/>
<csm:Environment xmlns:csmRoom="http://www.cosmotech.com/csm_room/12.0" xsi:type="csmRoom:Room" name="ModelEnvironment"/>
<csm:Environment xsi:type="csm:Graph" name="CustomerGraph">
<csm:Arc name="Satisfaction">
<csm:Source>Customer</csm:Source>
Expand Down
2 changes: 1 addition & 1 deletion Simulation/ADTBrewerySimulation.sml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/11.5">
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/12.0">
<csmSon:Documentation/>
<csmSon:ModelInstance type="Brewery" id="Model">
<csmSon:Loader type="cexADTModelLoader">
Expand Down
14 changes: 3 additions & 11 deletions Simulation/BreweryDemoSimulation.sml.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Language: XML
$Author:$
$Date:$
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/11.5">
<csmSon:Documentation/>
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/12.0">
<csmSon:ModelInstance type="Brewery" id="Model">
<csmSon:Loader type="csmXMLInstantiation">
<csmSon:Property name="File">MyBrewery</csmSon:Property>
Expand All @@ -30,12 +22,12 @@
</csmSon:Condition>
<csmSon:SequentialTaskBlock>
<csmSon:ModelTask>Model</csmSon:ModelTask>
<csmSon:ForEachParallelTask recursiveLevel="1" concurrencyLevel="-1">
<csmSon:ForEachParallelTask recursiveLevel="1" concurrencyLevel="-1" runOrder="deterministic" runOrderData="">
<csmSon:ModelName>Model</csmSon:ModelName>
<csmSon:Entity>MyBar</csmSon:Entity>
<csmSon:SubEntityType>Customer</csmSon:SubEntityType>
</csmSon:ForEachParallelTask>
<csmSon:ForEachTask recursiveLevel="1" concurrencyLevel="1">
<csmSon:ForEachTask recursiveLevel="1" concurrencyLevel="1" runOrder="deterministic" runOrderData="">
<csmSon:ModelName>Model</csmSon:ModelName>
<csmSon:Entity>MyBar</csmSon:Entity>
<csmSon:SubEntityType>Customer</csmSon:SubEntityType>
Expand Down
2 changes: 1 addition & 1 deletion Simulation/BreweryDemoSimulationWithConnector.sml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/11.5">
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/12.0">
<csmSon:Documentation/>
<csmSon:ModelInstance type="Brewery" id="Model">
<csmSon:Loader type="csmXMLModelInstancePart">
Expand Down
10 changes: 1 addition & 9 deletions Simulation/BreweryTutorialSimulation.sml.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Language: XML
$Author:$
$Date:$
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/11.5">
<csmSon:Documentation/>
<csmSon:Simulation xmlns:csmSon="http://www.cosmotech.com/csm_simulation/12.0">
<csmSon:ModelInstance type="Brewery" id="Model">
<csmSon:Loader type="csmXMLInstantiation">
<csmSon:Property name="File">MyBrewery</csmSon:Property>
Expand Down
2 changes: 1 addition & 1 deletion Simulation/MyBrewery.ist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csm:Model xmlns:doc="http://www.cosmotech.com/csm_doc/11.5" xmlns:dbk="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" xmlns:csm="http://www.cosmotech.com/csm/11.5">
<csm:Model xmlns:doc="http://www.cosmotech.com/csm_doc/12.0" xmlns:dbk="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" xmlns:csm="http://www.cosmotech.com/csm/12.0">
<csm:Scheduler>
<csm:RunTask>
<csm:Entity>1</csm:Entity>
Expand Down
2 changes: 1 addition & 1 deletion Simulation/Resource/ADTLoaders.isp.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<csmSon:ModelPart xmlns:csmSon="http://www.cosmotech.com/csm_modelpart/11.5">
<csmSon:ModelPart xmlns:csmSon="http://www.cosmotech.com/csm_modelpart/12.0">
<csmSon:Loader type="cexCSVEntityLoader" name="ADT CSV loader for entity type: Bar">
<csmSon:Property name="DefaultType">Bar</csmSon:Property>
<csmSon:Property name="FieldSeparator">,</csmSon:Property>
Expand Down
2 changes: 1 addition & 1 deletion Simulation/Resource/Studio-MeKuOa.ini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmIni:Model xmlns:csmIni="http://www.cosmotech.com/csm_initialization/11.5">
<csmIni:Model xmlns:csmIni="http://www.cosmotech.com/csm_initialization/12.0">
<csmIni:Entity id="1">
<csmIni:State>
<csmIni:Attribute name="NbWaiters">
Expand Down
21 changes: 7 additions & 14 deletions Simulator/Simulator.sor.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Language: XML
$Author:$
$Date:$
$Revision$
$Copyright: [2010-2017] Cosmo Tech, All Rights Reserved $
-->
<csmSor:Simulator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:csmSor="http://www.cosmotech.com/csm_simulator/11.5">
<csmSor:Simulator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:csmSor="http://www.cosmotech.com/csm_simulator/12.0">
<csmSor:Name>BrewerySampleSolution</csmSor:Name>
<csmSor:Version><![CDATA[3.0.0-dev]]></csmSor:Version>
<csmSor:Description><![CDATA[A project generated with CoSMo]]></csmSor:Description>
Expand All @@ -23,27 +16,27 @@
<csmSor:Observables>
<csmSor:EntityReference name="CustomerSatisfactionObs">{Model}Brewery::{Entity}Customer</csmSor:EntityReference>
</csmSor:Observables>
<csmSor:Measure xsi:type="csmSor:DataType" name="CustomerSatisfactionMeasure" updateRate="OncePerObservablesValue" owned="1">
<csmSor:Measure xsi:type="csmSor:DataType" name="CustomerSatisfactionMeasure" updateRate="OncePerObservablesValue" owned="true">
<csmSor:DataTypeReference>{Model}Brewery::{DataType}Integer</csmSor:DataTypeReference>
<csmSor:Implementation language="cpp">
<csmSor:Code>GetCustomerSatisfactionMeasure() = GetCustomerSatisfactionObs()-&gt;GetSatisfaction();</csmSor:Code>
<csmSor:Code><![CDATA[GetCustomerSatisfactionMeasure() = GetCustomerSatisfactionObs()->GetSatisfaction();]]></csmSor:Code>
</csmSor:Implementation>
</csmSor:Measure>
<csmSor:Dimension xsi:type="csmSor:DataType" name="CustomerNameDimension" updateRate="OncePerObservablesValue" owned="1">
<csmSor:Dimension xsi:type="csmSor:DataType" name="CustomerNameDimension" updateRate="OncePerObservablesValue" owned="true">
<csmSor:DataTypeReference>{Model}Brewery::{DataType}String</csmSor:DataTypeReference>
<csmSor:Implementation language="cpp">
<csmSor:Code>GetCustomerNameDimension() = GetCustomerSatisfactionObs()-&gt;GetName();</csmSor:Code>
<csmSor:Code><![CDATA[GetCustomerNameDimension() = GetCustomerSatisfactionObs()->GetName();]]></csmSor:Code>
</csmSor:Implementation>
</csmSor:Dimension>
</csmSor:Probe>
<csmSor:Probe xsi:type="csmSor:StarProbe" name="StockProbe">
<csmSor:Observables>
<csmSor:EntityReference name="BarObs">{Model}Brewery::{Entity}Bar</csmSor:EntityReference>
</csmSor:Observables>
<csmSor:Measure xsi:type="csmSor:DataType" name="StockMeasure" updateRate="OncePerObservablesValue" owned="1">
<csmSor:Measure xsi:type="csmSor:DataType" name="StockMeasure" updateRate="OncePerObservablesValue" owned="true">
<csmSor:DataTypeReference>{Model}Brewery::{DataType}Integer</csmSor:DataTypeReference>
<csmSor:Implementation language="cpp">
<csmSor:Code>GetStockMeasure() = GetBarObs()-&gt;GetStock();</csmSor:Code>
<csmSor:Code><![CDATA[GetStockMeasure() = GetBarObs()->GetStock();]]></csmSor:Code>
</csmSor:Implementation>
</csmSor:Measure>
</csmSor:Probe>
Expand Down
2 changes: 1 addition & 1 deletion project.csm
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[General]
Version=11.5
Version=12.0
Description=