diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000000000000000000000000000000000..1e07852e8b5c3e85d721d1844066698175706011 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,76 @@ +////////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// This program and the accompanying materials are made available +// under the terms of the MIT License which is available at +// https://opensource.org/licenses/MIT +// +// SPDX-License-Identifier: MIT +////////////////////////////////////////////////////////////////////////////// + +pipeline { + agent { + // The 'centos-7' pod template allows UI tests. + kubernetes { + label 'centos-7' + } + } + + tools { + jdk 'oracle-jdk8-latest' + maven 'apache-maven-3.6.3' + } + + options { + buildDiscarder(logRotator(numToKeepStr: '5')) + timeout(time: 1, unit: 'HOURS') + timestamps() + } + + stages { + stage('Build & Test') { + steps { + wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { + sh ''' + java -version + mvn -version + ./build.sh + ''' + } + } + + post { + success { + // Documentation. + archiveArtifacts '*/org.eclipse.escet.*documentation/target/*.zip' + + // Update site. + archiveArtifacts 'products/org.eclipse.escet.product/target/*.zip' + + // Product. + archiveArtifacts 'products/org.eclipse.escet.product/target/products/*.tar.gz' + archiveArtifacts 'products/org.eclipse.escet.product/target/products/*.zip' + } + } + } + } + + post { + // Send an e-mail on unsuccessful builds (unstable, failure, aborted). + unsuccessful { + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()] + } + + // Send an e-mail on fixed builds (back to normal). + fixed { + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()] + } + } +} diff --git a/cif/org.eclipse.escet.cif.cif2plc/src/org/eclipse/escet/cif/cif2plc/writers/PlcOpenXmlWriter.java b/cif/org.eclipse.escet.cif.cif2plc/src/org/eclipse/escet/cif/cif2plc/writers/PlcOpenXmlWriter.java index 23bc1be6e527f54dfd0f4b003ac75b60ac60e91d..344842462b535a3fee7a0d3a4a2a2bd716845e17 100644 --- a/cif/org.eclipse.escet.cif.cif2plc/src/org/eclipse/escet/cif/cif2plc/writers/PlcOpenXmlWriter.java +++ b/cif/org.eclipse.escet.cif.cif2plc/src/org/eclipse/escet/cif/cif2plc/writers/PlcOpenXmlWriter.java @@ -23,8 +23,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.Instant; +import java.time.format.DateTimeFormatter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -126,9 +126,9 @@ public class PlcOpenXmlWriter { fileHeader.setAttribute("companyName", "Eclipse Foundation"); fileHeader.setAttribute("productName", "CIF to Structured Text"); fileHeader.setAttribute("productVersion", "0.0"); // Dummy version. - Date date = new Date(0); // Dummy date, to allow for automated testing. - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - fileHeader.setAttribute("creationDateTime", sdf.format(date)); + Instant instant = Instant.ofEpochMilli(0); // Dummy instant, to allow for automated testing. + String formattedDateTime = DateTimeFormatter.ISO_INSTANT.format(instant); + fileHeader.setAttribute("creationDateTime", formattedDateTime); Element contentHeader = doc.createElement("contentHeader"); root.appendChild(contentHeader); diff --git a/cif/org.eclipse.escet.cif.tests/META-INF/MANIFEST.MF b/cif/org.eclipse.escet.cif.tests/META-INF/MANIFEST.MF index 2117276a3adc8fa1b559ad3be560ce279d7593f6..d483370a99b4c5a10821b7d893803f767ec808de 100644 --- a/cif/org.eclipse.escet.cif.tests/META-INF/MANIFEST.MF +++ b/cif/org.eclipse.escet.cif.tests/META-INF/MANIFEST.MF @@ -23,6 +23,7 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.escet.cif.explorer;bundle-version="0.1.0", org.eclipse.escet.cif.merger;bundle-version="0.1.0", org.eclipse.escet.cif.simulator;bundle-version="0.1.0", - org.eclipse.escet.cif.cif2cif.app;bundle-version="0.1.0" + org.eclipse.escet.cif.cif2cif.app;bundle-version="0.1.0", + org.eclipse.escet.common.java;bundle-version="0.1.0" Export-Package: org.eclipse.escet.cif.tests Automatic-Module-Name: org.eclipse.escet.cif.tests diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1.plcopen.xml index 4475ce67c40e0ba77105f3da6f958d7e133f1592..335518fb30d2e853da5915eef1e833e399c74dcd 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all2.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all2.plcopen.xml index 36637c36ae3d0471fcb6b59d3a95517440ce458d..9780dc195f7ced015130c831d335d3fa93bce840 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all2.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all2.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all3.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all3.plcopen.xml index 406d320ccc608f3f218e8a116de7fc5eaeefc7ad..aaf20f7760a78f96eda676b370f6e05a17ec12e5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all3.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all3.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/array_tuple_mix.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/array_tuple_mix.plcopen.xml index cbe3fb57dae3fd2d5a65c7608573126f9c182dfc..d30b5b2c4d75f3684a089ebbe78a60ae650d63a9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/array_tuple_mix.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/array_tuple_mix.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/arrays.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/arrays.plcopen.xml index ad329d15aa6fc4b90378df7c949f89c0b6274a92..376e6f357187658313ccbe832776e6bba4df9bea 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/arrays.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/arrays.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/asgn_var_parts.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/asgn_var_parts.plcopen.xml index 5f509f2698541a8bd2c39e95403d6096a67364ad..df317e4b2844757745b4b5d885b362fbd640a654 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/asgn_var_parts.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/asgn_var_parts.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/button_lamp.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/button_lamp.plcopen.xml index ac8ee1f79bb49b8bfe14e908c610126482065c55..102b84da1fdad6fa01812072666b4269decf7029 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/button_lamp.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/button_lamp.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_elim.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_elim.plcopen.xml index c71ad74053941e8826d274ab9a5870b12f226840..ff1a38b662afe8a87175e07d5cd98a7cb5e4f1cd 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_elim.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_elim.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_keep.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_keep.plcopen.xml index 633601a2882ad93717c616c77bc4c4b950517c2f..824eb8c83381bbbc481c54918f2d2320abad9336 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_keep.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/constants_keep.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_all.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_all.plcopen.xml index 2d56e5655fce0599d1b971edbd3393e55d8b5a22..fb12256c516c9aa6ff60cd9bd587819a953e7069 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_all.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_all.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_others.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_others.plcopen.xml index 1d9492a6728422dc4ac5d80b1e7c9f38725fc125..e03281648af0dcad4ec93b2f41ac71d1332a8e7b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_others.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_others.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_std.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_std.plcopen.xml index a66f6337d07cfcd6af7f5e669401fd8084f7190f..e7fa28ca216d386b710ab9477817c96be514e8c1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_std.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_all_std.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_all.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_all.plcopen.xml index 60f8367aeb7f1a7574f9bf7b098b7d6cd9b5e0ce..a0b3b866d62c89366ce0f1f475a8d98c214b2001 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_all.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_all.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_others.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_others.plcopen.xml index 8096c836e0e6c49e2371f25d14654f23eae7b6fd..c721c146cf91be6e9acc83e97be5097933bde40d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_others.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_others.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_std.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_std.plcopen.xml index 7670d23d913c244eb2054236b192c57a6fb27ed3..ca0854f6f787b1108e8af02fbe0f3484db3102a0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_std.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_multi_std.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_all.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_all.plcopen.xml index cba6019ba791cc27bc6f6ea418be09cec63add64..159f91133875e94453d002b31afefa82daa6a7e6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_all.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_all.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_others.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_others.plcopen.xml index cba6019ba791cc27bc6f6ea418be09cec63add64..159f91133875e94453d002b31afefa82daa6a7e6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_others.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_others.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_std.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_std.plcopen.xml index cba6019ba791cc27bc6f6ea418be09cec63add64..159f91133875e94453d002b31afefa82daa6a7e6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_std.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/formal_finvoke_none_std.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/int_funcs.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/int_funcs.plcopen.xml index badb4779433784bbec49b4e2bfb0e5381671f10d..fe0956d3ad412258f08ff9f8803b15c6dcfcf1b1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/int_funcs.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/int_funcs.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/negative_zero.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/negative_zero.plcopen.xml index c74356e808547e40639af4c5d72ced25f644240c..3799fa50a88585a595c256ed37e372f0304b6f38 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/negative_zero.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/negative_zero.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/option_max_iter_inf.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/option_max_iter_inf.plcopen.xml index 1b4ba39feb607eef64c9f37ee551309d4be89f5a..b261290f553b4b8cff4e8d225e2681b9a5d76015 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/option_max_iter_inf.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/option_max_iter_inf.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/options.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/options.plcopen.xml index ef635b463d4c4a55e2a69187c217c7eff027880b..b1667608e10ba1faa37f940102b01a3850753a2a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/options.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/options.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/renaming.plcopen.xml b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/renaming.plcopen.xml index c9283799aeb0c49f97f4d152619f0b8899297324..26c6a653d394aa240ff19122d89dc6c2420efc33 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/renaming.plcopen.xml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/renaming.plcopen.xml @@ -1,5 +1,5 @@ - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.model.graphml index 1b06b20f48ce423723303bd9a731adc394221d98..8a6359698759eacba0fc7e3a2e9366869134623f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">grp1</span></html> @@ -38,7 +38,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1</span></html> @@ -54,7 +54,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">evt1</span><span style="color:#402020;">;</span></html> @@ -63,7 +63,7 @@ - + Declarations ... @@ -79,7 +79,7 @@ location loc - + <html><span style="color:#000000;">loc</span></html> @@ -90,7 +90,7 @@ <init> - + @@ -127,7 +127,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1b</span></html> @@ -141,7 +141,7 @@ location - + <html></html> @@ -152,7 +152,7 @@ <init> - + @@ -191,7 +191,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">defs2</span></html> @@ -213,7 +213,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Grp2</span><span style="color:#402020;">()</span></html> @@ -235,7 +235,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Aut2</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">param2</span><span style="color:#402020;">;</span>&nbsp;<span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">param3</span><span style="color:#402020;">)</span></html> @@ -249,7 +249,7 @@ location - + <html></html> @@ -260,7 +260,7 @@ <init> - + @@ -298,7 +298,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut2b</span></html> @@ -312,7 +312,7 @@ location - + <html></html> @@ -323,7 +323,7 @@ <init> - + @@ -354,7 +354,7 @@ - + Instantiations <html><span style="color:#000000;">aut2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Aut2</span><span style="color:#402020;">(</span><span style="color:#000000;">grp1.aut1.evt1</span><span style="color:#402020;">,</span>&nbsp;<span style="color:#000000;">grp1.aut1.loc</span><span style="color:#402020;">);</span></html> @@ -362,7 +362,7 @@ - + Instantiations ... @@ -381,7 +381,7 @@ - + Instantiations <html><span style="color:#000000;">grp2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Grp2</span><span style="color:#402020;">();</span></html> @@ -389,7 +389,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.relations.graphml index 5d54f2d4f500d5e9ac6ec6248217325986e451c4..ff3c6d41285f668ef574a42eafa7b7be1a907f8d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/all_colors.relations.graphml @@ -96,7 +96,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">defs2</span></html> @@ -120,7 +120,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Grp2</span><span style="color:#402020;">()</span></html> @@ -144,7 +144,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Aut2</span><span style="color:#402020;">()</span></html> @@ -158,7 +158,7 @@ event param2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">param2</span></html> @@ -170,7 +170,7 @@ location param3 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">param3</span></html> @@ -182,7 +182,7 @@ param3 - + @@ -192,7 +192,7 @@ param2 - + <html></html> @@ -213,7 +213,7 @@ - + Component definitions @@ -237,7 +237,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">aut2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Aut2</span><span style="color:#402020;">()</span></html> @@ -251,7 +251,7 @@ event param2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">param2</span></html> @@ -263,7 +263,7 @@ location param3 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">param3</span></html> @@ -285,7 +285,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut2b</span></html> @@ -299,7 +299,7 @@ evt1 - + <html></html> @@ -320,7 +320,7 @@ - + Components @@ -344,7 +344,7 @@ - + Component definitions @@ -368,7 +368,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">grp2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Grp2</span><span style="color:#402020;">()</span></html> @@ -390,7 +390,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut2b</span></html> @@ -404,7 +404,7 @@ evt1 - + <html></html> @@ -425,7 +425,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">aut2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Aut2</span><span style="color:#402020;">()</span></html> @@ -439,7 +439,7 @@ event param2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">param2</span></html> @@ -451,7 +451,7 @@ location param3 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">param3</span></html> @@ -475,7 +475,7 @@ - + Components @@ -499,7 +499,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">grp1</span></html> @@ -521,7 +521,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1b</span></html> @@ -535,7 +535,7 @@ evt1 - + <html></html> @@ -556,7 +556,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1</span></html> @@ -570,7 +570,7 @@ evt1 - + <html></html> @@ -581,7 +581,7 @@ location loc - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc</span></html> @@ -593,7 +593,7 @@ event evt1 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">evt1</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.model.graphml index 5ebeba646d7adbdb90f1da46e43299e50ca4dc09..7b66eb52f804318cb72e0ce6cd6ee9a3b9d62a98 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">plant</span>&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">snd</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -78,7 +78,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">requirement</span>&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">rcv</span></html> @@ -92,7 +92,7 @@ location - + <html></html> @@ -103,7 +103,7 @@ <init> - + @@ -140,7 +140,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">sync</span></html> @@ -154,7 +154,7 @@ location - + <html></html> @@ -165,7 +165,7 @@ <init> - + @@ -196,7 +196,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -205,7 +205,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.relations.graphml index 8405f1192b7c150515504f1433c22d2e278ea6aa..3bdd6ab9a2f7f5547e299cb7edb7977ec6ea8c42 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_auts.relations.graphml @@ -32,7 +32,7 @@ event e !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -52,7 +52,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">sync</span></html> @@ -66,7 +66,7 @@ e - + <html></html> @@ -87,7 +87,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">requirement</span>&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">rcv</span></html> @@ -101,7 +101,7 @@ e ? - + <html><span style="color:#402020;">?</span></html> @@ -122,7 +122,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">plant</span>&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">snd</span></html> @@ -136,7 +136,7 @@ e ! - + <html><span style="color:#402020;">!</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.model.graphml index 19f266b8819e36579268d716497229d3a8f65044..6c6bdb04c85dab2686b63505334974702f64a48d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Send</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">s</span><span style="color:#402020;">)</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -78,7 +78,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Recv</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">)</span></html> @@ -92,7 +92,7 @@ location - + <html></html> @@ -103,7 +103,7 @@ <init> - + @@ -140,7 +140,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Sync</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">)</span></html> @@ -154,7 +154,7 @@ location - + <html></html> @@ -165,7 +165,7 @@ <init> - + @@ -196,7 +196,7 @@ - + Instantiations <html><span style="color:#000000;">send</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Send</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">recv</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Recv</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">sync</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Sync</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span></html> @@ -204,7 +204,7 @@ - + Instantiations ... @@ -221,7 +221,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -230,7 +230,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.relations.graphml index d7137986343c100609bc724d5dca13b166a4e64f..a7d492388c1c792a4502d740ca9fcdfb85f82336 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_def_inst.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Send</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event s !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">s</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -44,7 +44,7 @@ s ! - + <html><span style="color:#402020;">!</span></html> @@ -65,7 +65,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Recv</span><span style="color:#402020;">()</span></html> @@ -79,7 +79,7 @@ event r !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">r</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -91,7 +91,7 @@ r ? - + <html><span style="color:#402020;">?</span></html> @@ -112,7 +112,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">Sync</span><span style="color:#402020;">()</span></html> @@ -126,7 +126,7 @@ event c - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -138,7 +138,7 @@ c - + <html></html> @@ -159,7 +159,7 @@ - + Component definitions @@ -183,7 +183,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">send</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Send</span><span style="color:#402020;">()</span></html> @@ -197,7 +197,7 @@ event s !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">s</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -219,7 +219,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">recv</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Recv</span><span style="color:#402020;">()</span></html> @@ -233,7 +233,7 @@ event r !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">r</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -255,7 +255,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">sync</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">Sync</span><span style="color:#402020;">()</span></html> @@ -269,7 +269,7 @@ event c - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -283,7 +283,7 @@ event e !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -303,7 +303,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.model.graphml index 99b1a7d23617515d0f160c480ba11547976d49db..093f1029da9e2a4066314636b4ef0be58378a65a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -87,7 +87,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -101,7 +101,7 @@ location - + <html></html> @@ -112,7 +112,7 @@ <init> - + @@ -158,7 +158,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -172,7 +172,7 @@ location - + <html></html> @@ -183,7 +183,7 @@ <init> - + @@ -223,7 +223,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">h</span><span style="color:#402020;">;</span></html> @@ -232,7 +232,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.relations.graphml index 4a3517e73cac22fa8bb9292af1e87673d1beead2..16078b309ebc77b58360761ac24deae282dbff6d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comm_sync.relations.graphml @@ -56,7 +56,7 @@ event h !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">h</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -68,7 +68,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -88,7 +88,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -102,7 +102,7 @@ h - + <html></html> @@ -113,7 +113,7 @@ e - + <html></html> @@ -134,7 +134,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -148,7 +148,7 @@ h ? - + <html><span style="color:#402020;">?</span></html> @@ -159,7 +159,7 @@ e - + <html></html> @@ -180,7 +180,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -194,7 +194,7 @@ h ! - + <html><span style="color:#402020;">!</span></html> @@ -205,7 +205,7 @@ e - + <html></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comp_param.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comp_param.model.graphml index de7224dd07616706b72e49f36b47c8829a03c9b2..33a87ae0cbd2a55c14cfe96d297fdb16b907925d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comp_param.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/comp_param.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g6</span></html> @@ -38,7 +38,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">G7</span><span style="color:#402020;">()</span></html> @@ -60,7 +60,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g8</span></html> @@ -82,7 +82,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a9</span></html> @@ -98,7 +98,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e10</span><span style="color:#402020;">;</span></html> @@ -107,7 +107,7 @@ - + Declarations ... @@ -123,7 +123,7 @@ location - + <html></html> @@ -134,7 +134,7 @@ <init> - + @@ -168,7 +168,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g1</span></html> @@ -190,7 +190,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">G2</span><span style="color:#402020;">(</span><span style="color:#000000;">g6.G7</span>&nbsp;<span style="color:#000000;">p3</span><span style="color:#402020;">)</span></html> @@ -212,7 +212,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g4</span></html> @@ -234,7 +234,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A5</span><span style="color:#402020;">()</span></html> @@ -248,7 +248,7 @@ location - + <html></html> @@ -259,7 +259,7 @@ <init> - + @@ -290,7 +290,7 @@ - + Instantiations <html><span style="color:#000000;">a5</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A5</span><span style="color:#402020;">();</span></html> @@ -298,7 +298,7 @@ - + Instantiations ... @@ -321,7 +321,7 @@ - + Instantiations <html><span style="color:#000000;">g2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">g1.G2</span><span style="color:#402020;">(</span><span style="color:#000000;">g7</span><span style="color:#402020;">);</span><br><span style="color:#000000;">g7</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">g6.G7</span><span style="color:#402020;">();</span></html> @@ -329,7 +329,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.model.graphml index ec462fd29bde3c4a31f2cff9bc0b2754dc7e947d..2a470266ea56b5687627f93269eb742c8deb3eed 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">real</span>&nbsp;<span style="color:#000000;">v</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">z</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -119,7 +119,7 @@ location l1 - + <html><span style="color:#000000;">l1</span></html> @@ -130,7 +130,7 @@ <init> - + @@ -157,7 +157,7 @@ location l2 - + <html><span style="color:#000000;">l2</span></html> @@ -181,7 +181,7 @@ - + Declarations <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">real</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#0000ff;">if</span>&nbsp;<span style="color:#000000;">b.l1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#006100;">1.0</span>&nbsp;<span style="color:#0000ff;">elif</span>&nbsp;<span style="color:#000000;">b.l2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#006100;">2.0</span>&nbsp;<span style="color:#0000ff;">else</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#006100;">3.0</span>&nbsp;<span style="color:#0000ff;">end</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">input</span>&nbsp;<span style="color:#0000ff;">real</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">z</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span></html> @@ -190,7 +190,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.relations.graphml index 05659d34dc5f80b4072ddfa80d8de9dc06c5f816..bab28515efd1455105ce73e9aab32d69be38c6c3 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_all.relations.graphml @@ -88,7 +88,7 @@ cont z - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">z</span></html> @@ -100,7 +100,7 @@ input y - + <html><span style="color:#0000ff;">input</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -112,7 +112,7 @@ alg x - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">x</span></html> @@ -132,7 +132,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -146,7 +146,7 @@ location l2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l2</span></html> @@ -158,7 +158,7 @@ location l1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l1</span></html> @@ -180,7 +180,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -194,7 +194,7 @@ v - + @@ -204,7 +204,7 @@ e - + <html></html> @@ -215,7 +215,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -227,7 +227,7 @@ disc v - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">v</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.model.graphml index af054c43f6f238102d774945f001b9a1f6ae6564..4bf83f7a33dd2e6195fd74a9f7e7d983546b8cb6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g</span></html> @@ -38,7 +38,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc</span><span style="color:#402020;">;</span>&nbsp;<span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">)</span></html> @@ -54,7 +54,7 @@ - + Declarations <html><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">0</span><span style="color:#402020;">;</span></html> @@ -63,7 +63,7 @@ - + Declarations ... @@ -79,7 +79,7 @@ location l1 - + <html><span style="color:#000000;">l1</span></html> @@ -90,7 +90,7 @@ <init> - + @@ -117,7 +117,7 @@ location l2 - + <html><span style="color:#000000;">l2</span></html> @@ -141,7 +141,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.l1</span><span style="color:#402020;">,</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">);</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a1.l2</span><span style="color:#402020;">,</span>&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">);</span></html> @@ -149,7 +149,7 @@ - + Instantiations ... @@ -166,7 +166,7 @@ - + Declarations <html><span style="color:#0000ff;">input</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span></html> @@ -175,7 +175,7 @@ - + Declarations ... @@ -195,7 +195,7 @@ - + Declarations <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">g.y</span><span style="color:#402020;">;</span></html> @@ -204,7 +204,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.relations.graphml index 70d29ef35963e3f47fc0fb9440e08c14072451dd..1eefaf7dbd834b5579ab602cb8b1b8565daae614 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_basic.relations.graphml @@ -72,7 +72,7 @@ alg x - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">x</span></html> @@ -92,7 +92,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g</span></html> @@ -116,7 +116,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -130,7 +130,7 @@ location loc - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc</span></html> @@ -142,7 +142,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -154,7 +154,7 @@ p - + @@ -164,7 +164,7 @@ location l2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l2</span></html> @@ -176,7 +176,7 @@ location l1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l1</span></html> @@ -198,7 +198,7 @@ - + Component definitions @@ -222,7 +222,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -236,7 +236,7 @@ location loc - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc</span></html> @@ -248,7 +248,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -260,7 +260,7 @@ location l2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l2</span></html> @@ -282,7 +282,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -296,7 +296,7 @@ location loc - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc</span></html> @@ -308,7 +308,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -320,7 +320,7 @@ location l1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l1</span></html> @@ -334,7 +334,7 @@ input y - + <html><span style="color:#0000ff;">input</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -354,7 +354,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.model.graphml index 2575ef1b8b8ea673e400fe69a1d7ea78a101710b..9f55574ceba5df9bd2b96c275e05da65154ad570 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">)</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">v</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">v</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">(</span><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">)</span></html> @@ -121,7 +121,7 @@ - + Declarations <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">pp</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">*</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">0</span><span style="color:#402020;">;</span></html> @@ -130,7 +130,7 @@ - + Declarations ... @@ -156,7 +156,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1</span></html> @@ -172,7 +172,7 @@ - + Declarations <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c3</span><span style="color:#402020;">;</span></html> @@ -181,7 +181,7 @@ - + Declarations ... @@ -197,7 +197,7 @@ location l1 - + <html><span style="color:#000000;">l1</span><br><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c3</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">;</span></html> @@ -208,7 +208,7 @@ <init> - + @@ -235,7 +235,7 @@ location l2 - + <html><span style="color:#000000;">l2</span><br><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c3</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">;</span></html> @@ -256,7 +256,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut2</span></html> @@ -272,7 +272,7 @@ - + Declarations <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c4</span><span style="color:#402020;">;</span></html> @@ -281,7 +281,7 @@ - + Declarations ... @@ -297,7 +297,7 @@ location - + <html><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c4</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">;</span></html> @@ -308,7 +308,7 @@ <init> - + @@ -336,7 +336,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut3</span></html> @@ -352,7 +352,7 @@ - + Declarations <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">z</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">z</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span></html> @@ -361,7 +361,7 @@ - + Declarations ... @@ -377,7 +377,7 @@ location - + <html><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">0</span><span style="color:#402020;">;</span></html> @@ -388,7 +388,7 @@ <init> - + @@ -416,7 +416,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut4</span></html> @@ -432,7 +432,7 @@ - + Declarations <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">bool</span>&nbsp;<span style="color:#000000;">b1</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">l1</span><span style="color:#402020;">;</span></html> @@ -441,7 +441,7 @@ - + Declarations ... @@ -457,7 +457,7 @@ location l1 - + <html><span style="color:#000000;">l1</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">b1</span><span style="color:#402020;">;</span></html> @@ -468,7 +468,7 @@ <init> - + @@ -499,7 +499,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.v</span><span style="color:#402020;">);</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.v</span><span style="color:#402020;">);</span><br><span style="color:#000000;">g1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">(</span><span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">);</span><br><span style="color:#000000;">g2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">(</span><span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">*</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">*</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">);</span></html> @@ -507,7 +507,7 @@ - + Instantiations ... @@ -524,7 +524,7 @@ - + Declarations <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">9</span><span style="color:#402020;">..</span><span style="color:#006100;">9</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">3</span><span style="color:#402020;">..</span><span style="color:#006100;">3</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">3</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">func</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">f</span><span style="color:#402020;">(</span><span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">a</span><span style="color:#402020;">;</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">):</span><br>&nbsp;&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">c</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">a</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">;</span><br>&nbsp;&nbsp;<span style="color:#0000ff;">return</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">end</span><br><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">z</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">f</span><span style="color:#402020;">(</span><span style="color:#000000;">x</span><span style="color:#402020;">,</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">);</span><br><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">real</span>&nbsp;<span style="color:#000000;">r</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5.0</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c1</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c2</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c5</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#000000;">c6</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c6</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">c5</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#006100;">1.0</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c7</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#000000;">c7</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c2</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">;</span></html> @@ -533,7 +533,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.relations.graphml index 174be903c800d81f52ec7c27e105a71654f3da4b..2a2c2c1f47811665344b473b5cbf5e73f935580d 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/data_refs.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -44,7 +44,7 @@ p - + @@ -54,7 +54,7 @@ v - + @@ -64,7 +64,7 @@ disc v - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">v</span></html> @@ -86,7 +86,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">()</span></html> @@ -100,7 +100,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -112,7 +112,7 @@ p - + @@ -122,7 +122,7 @@ alg pp - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">pp</span></html> @@ -144,7 +144,7 @@ - + Component definitions @@ -168,7 +168,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -182,7 +182,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -204,7 +204,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -218,7 +218,7 @@ disc v - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">v</span></html> @@ -240,7 +240,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut1</span></html> @@ -254,7 +254,7 @@ location l2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l2</span></html> @@ -266,7 +266,7 @@ location l1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l1</span></html> @@ -278,7 +278,7 @@ cont c3 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c3</span></html> @@ -300,7 +300,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut2</span></html> @@ -314,7 +314,7 @@ cont c4 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c4</span></html> @@ -336,7 +336,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">g1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">()</span></html> @@ -350,7 +350,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -372,7 +372,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">g2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">()</span></html> @@ -386,7 +386,7 @@ alg p - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -408,7 +408,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut3</span></html> @@ -422,7 +422,7 @@ x - + @@ -432,7 +432,7 @@ disc y - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -444,7 +444,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> @@ -456,7 +456,7 @@ disc z - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">z</span></html> @@ -478,7 +478,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut4</span></html> @@ -492,7 +492,7 @@ location l1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">l1</span></html> @@ -504,7 +504,7 @@ alg b1 - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">b1</span></html> @@ -518,7 +518,7 @@ alg x - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">x</span></html> @@ -530,7 +530,7 @@ alg y - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -542,7 +542,7 @@ alg z - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">z</span></html> @@ -554,7 +554,7 @@ alg r - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">r</span></html> @@ -566,7 +566,7 @@ cont c1 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c1</span></html> @@ -578,7 +578,7 @@ cont c2 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c2</span></html> @@ -590,7 +590,7 @@ cont c5 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c5</span></html> @@ -602,7 +602,7 @@ cont c6 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c6</span></html> @@ -614,7 +614,7 @@ cont c7 - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c7</span></html> @@ -634,7 +634,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.model.graphml index af91b44f0ee043468c930c133208404a36b0a420..d86134a0e7300221aa840ad4ad09a54594614b6b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -69,7 +69,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">)</span></html> @@ -91,7 +91,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g</span></html> @@ -107,7 +107,7 @@ - + Declarations <html><span style="color:#0000ff;">const</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">5</span><span style="color:#402020;">..</span><span style="color:#006100;">5</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span></html> @@ -116,7 +116,7 @@ - + Declarations ... @@ -144,7 +144,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">)</span></html> @@ -166,7 +166,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g</span></html> @@ -182,7 +182,7 @@ - + Declarations <html><span style="color:#0000ff;">const</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">5</span><span style="color:#402020;">..</span><span style="color:#006100;">5</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span></html> @@ -191,7 +191,7 @@ - + Declarations ... @@ -217,7 +217,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">h</span></html> @@ -240,7 +240,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -254,7 +254,7 @@ location - + <html></html> @@ -265,7 +265,7 @@ <init> - + @@ -304,7 +304,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">E</span><span style="color:#402020;">()</span></html> @@ -326,7 +326,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">i</span></html> @@ -351,7 +351,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -365,7 +365,7 @@ location - + <html></html> @@ -376,7 +376,7 @@ <init> - + @@ -404,7 +404,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g1</span></html> @@ -427,7 +427,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g2</span></html> @@ -449,7 +449,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g3</span></html> @@ -471,7 +471,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g4</span></html> @@ -496,7 +496,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g5</span></html> @@ -521,7 +521,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g6</span></html> @@ -543,7 +543,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g7</span></html> @@ -559,7 +559,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -568,7 +568,7 @@ - + Declarations ... @@ -594,7 +594,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g8</span></html> @@ -617,7 +617,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g9</span></html> @@ -639,7 +639,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -653,7 +653,7 @@ location - + <html></html> @@ -664,7 +664,7 @@ <init> - + @@ -701,7 +701,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g10</span></html> @@ -717,7 +717,7 @@ - + Declarations <html><span style="color:#0000ff;">const</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">5</span><span style="color:#402020;">..</span><span style="color:#006100;">5</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5</span><span style="color:#402020;">;</span></html> @@ -726,7 +726,7 @@ - + Declarations ... @@ -750,7 +750,7 @@ - + Instantiations <html><span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">();</span><br><span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#006100;">5</span><span style="color:#402020;">);</span><br><span style="color:#000000;">d1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">(</span><span style="color:#000000;">g6.g7.e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">d2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">(</span><span style="color:#000000;">ee</span><span style="color:#402020;">);</span><br><span style="color:#000000;">e</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">E</span><span style="color:#402020;">();</span></html> @@ -758,7 +758,7 @@ - + Instantiations ... @@ -775,7 +775,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ee</span><span style="color:#402020;">;</span></html> @@ -784,7 +784,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.relations.graphml index c8de9baeb4fa2c9aaa044f047a36ddd902d81c89..4766fb3d634880b2c9ee1f0e35afdffc0f9b52e9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/empty_comps.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ alg y - + <html><span style="color:#0000ff;">alg</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -52,7 +52,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g</span></html> @@ -66,7 +66,7 @@ y - + @@ -88,7 +88,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">()</span></html> @@ -102,7 +102,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -122,7 +122,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -136,7 +136,7 @@ e - + <html></html> @@ -159,7 +159,7 @@ - + Component definitions @@ -183,7 +183,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g6</span></html> @@ -205,7 +205,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g9</span></html> @@ -227,7 +227,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -241,7 +241,7 @@ e - + <html></html> @@ -264,7 +264,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">g7</span></html> @@ -278,7 +278,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -302,7 +302,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">d1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">()</span></html> @@ -316,7 +316,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -338,7 +338,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">d2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">D</span><span style="color:#402020;">()</span></html> @@ -352,7 +352,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -366,7 +366,7 @@ event ee - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ee</span></html> @@ -386,7 +386,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.model.graphml index 277182554a17fa6536a8880f4df3d1356b7baee9..46508906054f433231320d4d16acae96de5f6503 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span><span style="color:#402020;">;</span>&nbsp;<span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">h2</span><span style="color:#402020;">)</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -87,7 +87,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -103,7 +103,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -112,7 +112,7 @@ - + Declarations ... @@ -128,7 +128,7 @@ location - + <html></html> @@ -139,7 +139,7 @@ <init> - + @@ -185,7 +185,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -199,7 +199,7 @@ location - + <html></html> @@ -210,7 +210,7 @@ <init> - + @@ -250,7 +250,7 @@ - + Instantiations <html><span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#000000;">a.e</span><span style="color:#402020;">,</span>&nbsp;<span style="color:#000000;">h</span><span style="color:#402020;">);</span></html> @@ -258,7 +258,7 @@ - + Instantiations ... @@ -275,7 +275,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">h</span><span style="color:#402020;">;</span></html> @@ -284,7 +284,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.relations.graphml index dd795951b3f6e975ef2df01453fd986561b94051..cadcdc28e88b3cade7ee0651c27e491a04906f64 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_local_use.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event e2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span></html> @@ -44,7 +44,7 @@ event h2 !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">h2</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -56,7 +56,7 @@ h2 ? - + <html><span style="color:#402020;">?</span></html> @@ -67,7 +67,7 @@ e2 - + <html></html> @@ -88,7 +88,7 @@ - + Component definitions @@ -112,7 +112,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -126,7 +126,7 @@ h ! - + <html><span style="color:#402020;">!</span></html> @@ -137,7 +137,7 @@ e - + <html></html> @@ -148,7 +148,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -170,7 +170,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -184,7 +184,7 @@ event e2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span></html> @@ -196,7 +196,7 @@ event h2 !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">h2</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -218,7 +218,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -232,7 +232,7 @@ h - + <html></html> @@ -243,7 +243,7 @@ e - + <html></html> @@ -256,7 +256,7 @@ event h !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">h</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -276,7 +276,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.model.graphml index d6476c13a27d1e510b5f76c1585ece7727f703ed..9c552923d99f90bb4f1786ef188d8c14a56e58a0 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">X</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">)</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -78,7 +78,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">N</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">)</span></html> @@ -92,7 +92,7 @@ location - + <html></html> @@ -103,7 +103,7 @@ <init> - + @@ -140,7 +140,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">S</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">!)</span></html> @@ -154,7 +154,7 @@ location - + <html></html> @@ -165,7 +165,7 @@ <init> - + @@ -202,7 +202,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">R</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">?)</span></html> @@ -216,7 +216,7 @@ location - + <html></html> @@ -227,7 +227,7 @@ <init> - + @@ -264,7 +264,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">~)</span></html> @@ -278,7 +278,7 @@ location - + <html></html> @@ -289,7 +289,7 @@ <init> - + @@ -326,7 +326,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SR</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">!?)</span></html> @@ -340,7 +340,7 @@ location - + <html></html> @@ -351,7 +351,7 @@ <init> - + @@ -388,7 +388,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SC</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">!~)</span></html> @@ -402,7 +402,7 @@ location - + <html></html> @@ -413,7 +413,7 @@ <init> - + @@ -450,7 +450,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">RC</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">?~)</span></html> @@ -464,7 +464,7 @@ location - + <html></html> @@ -475,7 +475,7 @@ <init> - + @@ -512,7 +512,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SRC</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">p</span><span style="color:#402020;">!?~)</span></html> @@ -526,7 +526,7 @@ location - + <html></html> @@ -537,7 +537,7 @@ <init> - + @@ -568,7 +568,7 @@ - + Instantiations <html><span style="color:#000000;">x</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">X</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">n</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">N</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">s</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">S</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">r</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">R</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">sr</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SR</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">sc</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SC</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">rc</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">RC</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">src</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SRC</span><span style="color:#402020;">(</span><span style="color:#000000;">e</span><span style="color:#402020;">);</span></html> @@ -576,7 +576,7 @@ - + Instantiations ... @@ -593,7 +593,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -602,7 +602,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.relations.graphml index b5bfa58ee2b915a1ebf5d9e83b4f32027996b127..9e66812eca24c6d6a39b301c70b19eb4e502f33b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_param_directions.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">X</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event p - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -44,7 +44,7 @@ p - + <html></html> @@ -65,7 +65,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">N</span><span style="color:#402020;">()</span></html> @@ -79,7 +79,7 @@ event p !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -91,7 +91,7 @@ p - + <html></html> @@ -112,7 +112,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">S</span><span style="color:#402020;">()</span></html> @@ -126,7 +126,7 @@ event p ! - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!</span></html> @@ -138,7 +138,7 @@ p ! - + <html><span style="color:#402020;">!</span></html> @@ -159,7 +159,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">R</span><span style="color:#402020;">()</span></html> @@ -173,7 +173,7 @@ event p ? - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">?</span></html> @@ -185,7 +185,7 @@ p ? - + <html><span style="color:#402020;">?</span></html> @@ -206,7 +206,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -220,7 +220,7 @@ event p ~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">~</span></html> @@ -232,7 +232,7 @@ p - + <html></html> @@ -253,7 +253,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SR</span><span style="color:#402020;">()</span></html> @@ -267,7 +267,7 @@ event p !? - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?</span></html> @@ -279,7 +279,7 @@ p ? - + <html><span style="color:#402020;">?</span></html> @@ -300,7 +300,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SC</span><span style="color:#402020;">()</span></html> @@ -314,7 +314,7 @@ event p !~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!~</span></html> @@ -326,7 +326,7 @@ p - + <html></html> @@ -347,7 +347,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">RC</span><span style="color:#402020;">()</span></html> @@ -361,7 +361,7 @@ event p ?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">?~</span></html> @@ -373,7 +373,7 @@ p - + <html></html> @@ -394,7 +394,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">SRC</span><span style="color:#402020;">()</span></html> @@ -408,7 +408,7 @@ event p !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -420,7 +420,7 @@ p - + <html></html> @@ -441,7 +441,7 @@ - + Component definitions @@ -465,7 +465,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">X</span><span style="color:#402020;">()</span></html> @@ -479,7 +479,7 @@ event p - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span></html> @@ -501,7 +501,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">n</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">N</span><span style="color:#402020;">()</span></html> @@ -515,7 +515,7 @@ event p !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -537,7 +537,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">s</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">S</span><span style="color:#402020;">()</span></html> @@ -551,7 +551,7 @@ event p ! - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!</span></html> @@ -573,7 +573,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">r</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">R</span><span style="color:#402020;">()</span></html> @@ -587,7 +587,7 @@ event p ? - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">?</span></html> @@ -609,7 +609,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -623,7 +623,7 @@ event p ~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">~</span></html> @@ -645,7 +645,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">sr</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SR</span><span style="color:#402020;">()</span></html> @@ -659,7 +659,7 @@ event p !? - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?</span></html> @@ -681,7 +681,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">sc</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SC</span><span style="color:#402020;">()</span></html> @@ -695,7 +695,7 @@ event p !~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!~</span></html> @@ -717,7 +717,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">rc</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">RC</span><span style="color:#402020;">()</span></html> @@ -731,7 +731,7 @@ event p ?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">?~</span></html> @@ -753,7 +753,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">src</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">SRC</span><span style="color:#402020;">()</span></html> @@ -767,7 +767,7 @@ event p !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">p</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -781,7 +781,7 @@ event e !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -801,7 +801,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.model.graphml index 5de369b62ae30d48a942322bc567babe38962ef2..d11db44e2bbae8803893181ffb4f522c034329c6 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">)</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">)</span></html> @@ -121,7 +121,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span><span style="color:#402020;">;</span></html> @@ -130,7 +130,7 @@ - + Declarations ... @@ -146,7 +146,7 @@ location - + <html></html> @@ -157,7 +157,7 @@ <init> - + @@ -188,7 +188,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a1.ea</span><span style="color:#402020;">);</span><br><span style="color:#000000;">b1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#000000;">b1.eb</span><span style="color:#402020;">);</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">b2.eb</span><span style="color:#402020;">);</span><br><span style="color:#000000;">b2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.ea</span><span style="color:#402020;">);</span></html> @@ -196,7 +196,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.relations.graphml index b638ab4d445ba3e9d56799614c06b689ca6f0052..c33223dc84ca617fd83a75d3a6feccc97c4dacbe 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_params.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -44,7 +44,7 @@ e - + <html></html> @@ -55,7 +55,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -77,7 +77,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -91,7 +91,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -103,7 +103,7 @@ e - + <html></html> @@ -114,7 +114,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -136,7 +136,7 @@ - + Component definitions @@ -160,7 +160,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -174,7 +174,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -186,7 +186,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -208,7 +208,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -222,7 +222,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -234,7 +234,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -256,7 +256,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.model.graphml index 632c535163ed7dcb34c50eabb4196d8d74f47e4a..8e8a4b189b64f951f6aeb8454d6a3d7265ead621 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gA</span></html> @@ -38,7 +38,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -54,7 +54,7 @@ - + Instantiations <html><span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gB.B</span><span style="color:#402020;">();</span></html> @@ -62,7 +62,7 @@ - + Instantiations ... @@ -89,7 +89,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gB</span></html> @@ -111,7 +111,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -127,7 +127,7 @@ - + Instantiations <html><span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gC.C</span><span style="color:#402020;">();</span></html> @@ -135,7 +135,7 @@ - + Instantiations ... @@ -162,7 +162,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gC</span></html> @@ -184,7 +184,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -200,7 +200,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -209,7 +209,7 @@ - + Declarations ... @@ -225,7 +225,7 @@ location - + <html></html> @@ -236,7 +236,7 @@ <init> - + @@ -275,7 +275,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">ga</span></html> @@ -291,7 +291,7 @@ - + Instantiations <html><span style="color:#000000;">a</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gA.A</span><span style="color:#402020;">();</span></html> @@ -299,7 +299,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.relations.graphml index 184a7f050e318e1e1b5e3fc4e53d42df3779c9ae..cd8455a7706b870aaa5c428a8423eb1ed8c81441 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_complex.relations.graphml @@ -40,7 +40,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">ga</span></html> @@ -62,7 +62,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gA.A</span><span style="color:#402020;">()</span></html> @@ -84,7 +84,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gB.B</span><span style="color:#402020;">()</span></html> @@ -106,7 +106,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gC.C</span><span style="color:#402020;">()</span></html> @@ -120,7 +120,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -148,7 +148,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gC</span></html> @@ -170,7 +170,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -184,7 +184,7 @@ e - + <html></html> @@ -195,7 +195,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -219,7 +219,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gB</span></html> @@ -241,7 +241,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -263,7 +263,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gC.C</span><span style="color:#402020;">()</span></html> @@ -277,7 +277,7 @@ e - + <html></html> @@ -302,7 +302,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#000000;">gA</span></html> @@ -324,7 +324,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -346,7 +346,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gB.B</span><span style="color:#402020;">()</span></html> @@ -368,7 +368,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">gC.C</span><span style="color:#402020;">()</span></html> @@ -382,7 +382,7 @@ e - + <html></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.model.graphml index d9e2b61f253cca4d875bedc915d439e1afe626fa..e7376a530f5f249bf5367e3c234f95362358b228 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A1</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e1</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A2</span><span style="color:#402020;">()</span></html> @@ -121,7 +121,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span><span style="color:#402020;">;</span></html> @@ -130,7 +130,7 @@ - + Declarations ... @@ -146,7 +146,7 @@ location - + <html></html> @@ -157,7 +157,7 @@ <init> - + @@ -188,7 +188,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A1</span><span style="color:#402020;">();</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A2</span><span style="color:#402020;">();</span></html> @@ -196,7 +196,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.relations.graphml index ba1739778136daa690fe084af47e84e9e5564538..e420241b2cf76f54a09d886c2c5b83b2ae713a3f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_cross.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A1</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ e2 - + <html></html> @@ -43,7 +43,7 @@ event e1 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e1</span></html> @@ -65,7 +65,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A2</span><span style="color:#402020;">()</span></html> @@ -79,7 +79,7 @@ e1 - + <html></html> @@ -90,7 +90,7 @@ event e2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span></html> @@ -112,7 +112,7 @@ - + Component definitions @@ -136,7 +136,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A1</span><span style="color:#402020;">()</span></html> @@ -150,7 +150,7 @@ e2 - + <html></html> @@ -161,7 +161,7 @@ event e1 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e1</span></html> @@ -183,7 +183,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A2</span><span style="color:#402020;">()</span></html> @@ -197,7 +197,7 @@ e1 - + <html></html> @@ -208,7 +208,7 @@ event e2 - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e2</span></html> @@ -230,7 +230,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.model.graphml index 30b2e85a4366fb4ccb8cb63339c887b538dbf00d..5f6063136e36a431673203fc401844eeecde0d7a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span><span style="color:#402020;">)</span></html> @@ -38,7 +38,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span><span style="color:#402020;">)</span></html> @@ -60,7 +60,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span><span style="color:#402020;">)</span></html> @@ -74,7 +74,7 @@ location - + <html></html> @@ -85,7 +85,7 @@ <init> - + @@ -116,7 +116,7 @@ - + Instantiations <html><span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#000000;">eb</span><span style="color:#402020;">);</span></html> @@ -124,7 +124,7 @@ - + Instantiations ... @@ -143,7 +143,7 @@ - + Instantiations <html><span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#000000;">ea</span><span style="color:#402020;">);</span></html> @@ -151,7 +151,7 @@ - + Instantiations ... @@ -168,7 +168,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -177,7 +177,7 @@ - + Declarations ... @@ -197,7 +197,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a1.e</span><span style="color:#402020;">);</span></html> @@ -205,7 +205,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.relations.graphml index 9896c0593385f51accbfcb0f8f4f75ebc7f099c7..8a5e18c29eadcfce2b0fb2d3f523dab71d9a256a 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_def_in_def.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -54,7 +54,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -68,7 +68,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -90,7 +90,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -104,7 +104,7 @@ event ec - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span></html> @@ -116,7 +116,7 @@ ec - + <html></html> @@ -137,7 +137,7 @@ - + Component definitions @@ -161,7 +161,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -175,7 +175,7 @@ event ec - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span></html> @@ -197,7 +197,7 @@ - + Components @@ -221,7 +221,7 @@ - + Component definitions @@ -245,7 +245,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -259,7 +259,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -273,7 +273,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -293,7 +293,7 @@ - + Components @@ -317,7 +317,7 @@ - + Component definitions @@ -341,7 +341,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -355,7 +355,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -367,7 +367,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -389,7 +389,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -403,7 +403,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -415,7 +415,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -437,7 +437,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.model.graphml index 1970deda224b189572a4fd555b86dbeaebdf83a8..ef4b4ebf64ad44df2f34c9914404b4e7caa0e29f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span><span style="color:#402020;">)</span></html> @@ -32,7 +32,7 @@ - + Instantiations <html><span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#000000;">ea</span><span style="color:#402020;">);</span></html> @@ -40,7 +40,7 @@ - + Instantiations ... @@ -57,7 +57,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -66,7 +66,7 @@ - + Declarations ... @@ -92,7 +92,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span><span style="color:#402020;">)</span></html> @@ -108,7 +108,7 @@ - + Instantiations <html><span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#000000;">eb</span><span style="color:#402020;">);</span></html> @@ -116,7 +116,7 @@ - + Instantiations ... @@ -141,7 +141,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">(</span><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span><span style="color:#402020;">)</span></html> @@ -155,7 +155,7 @@ location - + <html></html> @@ -166,7 +166,7 @@ <init> - + @@ -197,7 +197,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a2.e</span><span style="color:#402020;">);</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">(</span><span style="color:#000000;">a1.e</span><span style="color:#402020;">);</span></html> @@ -205,7 +205,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.relations.graphml index 8e13995fd79ca340b8aea9d1db28fbdbeed317f1..cb8032cb5593f634c998cdab637de17b880985bb 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_passed_along.relations.graphml @@ -18,7 +18,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -44,7 +44,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -64,7 +64,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">b</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -78,7 +78,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -102,7 +102,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -116,7 +116,7 @@ event eb - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">eb</span></html> @@ -136,7 +136,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -150,7 +150,7 @@ event ec - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span></html> @@ -174,7 +174,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">C</span><span style="color:#402020;">()</span></html> @@ -188,7 +188,7 @@ event ec - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ec</span></html> @@ -200,7 +200,7 @@ ec - + <html></html> @@ -221,7 +221,7 @@ - + Component definitions @@ -245,7 +245,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -259,7 +259,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -271,7 +271,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -293,7 +293,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -307,7 +307,7 @@ event ea - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">ea</span></html> @@ -319,7 +319,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -341,7 +341,7 @@ - + Components diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.model.graphml index 082d33d3344ffe6e03c9b89341f642a704e2a645..c442be6f216adc84b70aa13c1035c4094b090a77 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -67,7 +67,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -89,7 +89,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut</span></html> @@ -103,7 +103,7 @@ location - + <html></html> @@ -114,7 +114,7 @@ <init> - + @@ -145,7 +145,7 @@ - + Instantiations <html><span style="color:#000000;">a</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span></html> @@ -153,7 +153,7 @@ - + Instantiations ... @@ -172,7 +172,7 @@ - + Instantiations <html><span style="color:#000000;">b1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">();</span><br><span style="color:#000000;">b2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">();</span></html> @@ -180,7 +180,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.relations.graphml index 1ebfd996277e105a105ed15955b0a6991d847c1f..a08aeeaf23963198ccc7916c5016d2bed66e28ce 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/evt_ref_via_inst.relations.graphml @@ -24,7 +24,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">B</span><span style="color:#402020;">()</span></html> @@ -46,7 +46,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut</span></html> @@ -60,7 +60,7 @@ e - + <html></html> @@ -81,7 +81,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#000000;">a</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -95,7 +95,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -119,7 +119,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -133,7 +133,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.model.graphml index c94112a68a2fb2651691e77d119d10e6ff0899a6..e3ab77583d60ee6b21ab621da91c380a87203b40 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">0</span><span style="color:#402020;">..</span><span style="color:#006100;">10</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#0061c0;">in</span>&nbsp;<span style="color:#0000ff;">any</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">0</span><span style="color:#402020;">..</span><span style="color:#006100;">10</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#0061c0;">in</span>&nbsp;<span style="color:#0000ff;">any</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location f - + <html><span style="color:#000000;">f</span></html> @@ -86,7 +86,7 @@ location t1 - + <html><span style="color:#000000;">t1</span></html> @@ -97,7 +97,7 @@ <init> - + @@ -124,7 +124,7 @@ location t2 - + <html><span style="color:#000000;">t2</span></html> @@ -135,7 +135,7 @@ <init> - + @@ -153,7 +153,7 @@ location p1 - + <html><span style="color:#000000;">p1</span></html> @@ -164,7 +164,7 @@ <init> - + @@ -187,7 +187,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -196,7 +196,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.relations.graphml index 94153a99b3890bc4bf9e717732f2fb6d5d66532e..637dea885b1963872cd36792e0eac1b5ce94b7a1 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/inits.relations.graphml @@ -32,7 +32,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -52,7 +52,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -66,7 +66,7 @@ e - + <html></html> @@ -77,7 +77,7 @@ location p1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">p1</span></html> @@ -89,7 +89,7 @@ location t2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">t2</span></html> @@ -101,7 +101,7 @@ location t1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">t1</span></html> @@ -113,7 +113,7 @@ location f - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">f</span></html> @@ -125,7 +125,7 @@ disc y - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -137,7 +137,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/insts.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/insts.model.graphml index 2d5cdba163d0799ddc7466c7afaaf8413118496f..1358a953b4406867da134bec65524ef94f72ebb9 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/insts.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/insts.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">()</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -69,7 +69,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">group</span>&nbsp;<span style="color:#0000ff;">def</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">()</span></html> @@ -86,7 +86,7 @@ - + Instantiations <html><span style="color:#000000;">a1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span><br><span style="color:#000000;">a2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span><br><span style="color:#000000;">a3</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span><br><span style="color:#000000;">a4</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span><br><span style="color:#000000;">a5</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">A</span><span style="color:#402020;">();</span><br><span style="color:#000000;">g1</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">();</span><br><span style="color:#000000;">g2</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">();</span><br><span style="color:#000000;">g3</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">();</span><br><span style="color:#000000;">g4</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">();</span><br><span style="color:#000000;">g5</span><span style="color:#402020;">:</span>&nbsp;<span style="color:#000000;">G</span><span style="color:#402020;">();</span></html> @@ -94,7 +94,7 @@ - + Instantiations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.model.graphml index b47b1fa13a62d99f194a7d35b44c50aa9b8802fd..ef3f863cc5c91d8a8603c73359beb1489c508070 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">controllable</span>&nbsp;<span style="color:#006100;">c_add</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">controllable</span>&nbsp;<span style="color:#006100;">c_remove</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">uncontrollable</span>&nbsp;<span style="color:#800000;">u_added</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">uncontrollable</span>&nbsp;<span style="color:#800000;">u_removed</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#c06100;">e_update</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#c06100;">e_snd</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#c06100;">e_rcv</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">0</span><span style="color:#402020;">..</span><span style="color:#006100;">10</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">0</span><span style="color:#402020;">..</span><span style="color:#006100;">10</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">y</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">0</span><span style="color:#402020;">..</span><span style="color:#006100;">10</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">z</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location loc1 - + <html><span style="color:#000000;">loc1</span></html> @@ -68,7 +68,7 @@ <init> - + @@ -104,7 +104,7 @@ location loc2 - + <html><span style="color:#000000;">loc2</span></html> @@ -142,7 +142,7 @@ location loc3 - + <html><span style="color:#000000;">loc3</span></html> @@ -162,7 +162,7 @@ location loc4 - + <html><span style="color:#000000;">loc4</span><br><br><span style="color:#0000ff;">marked</span><span style="color:#402020;">;</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.relations.graphml index 9ebcb83877094013e73bb44564dbfdd85093140e..515238c3cdcd0f4028e499097e21cdf540b00a17 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/locs_edges.relations.graphml @@ -112,7 +112,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">aut</span></html> @@ -126,7 +126,7 @@ e_rcv ? - + <html><span style="color:#402020;">?</span></html> @@ -137,7 +137,7 @@ e_snd ! - + <html><span style="color:#402020;">!</span></html> @@ -148,7 +148,7 @@ u_removed - + <html></html> @@ -159,7 +159,7 @@ u_added - + <html></html> @@ -170,7 +170,7 @@ e_update - + <html></html> @@ -181,7 +181,7 @@ c_remove - + <html></html> @@ -192,7 +192,7 @@ c_add - + <html></html> @@ -203,7 +203,7 @@ location loc4 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc4</span></html> @@ -215,7 +215,7 @@ location loc3 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc3</span></html> @@ -227,7 +227,7 @@ location loc2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc2</span></html> @@ -239,7 +239,7 @@ location loc1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc1</span></html> @@ -251,7 +251,7 @@ disc z - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">z</span></html> @@ -263,7 +263,7 @@ disc y - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">y</span></html> @@ -275,7 +275,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> @@ -287,7 +287,7 @@ event e_rcv !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#c06100;">e_rcv</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -299,7 +299,7 @@ event e_snd !?~ - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#c06100;">e_snd</span>&nbsp;<span style="color:#402020;">!?~</span></html> @@ -311,7 +311,7 @@ event e_update - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#c06100;">e_update</span></html> @@ -323,7 +323,7 @@ event u_removed - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#800000;">u_removed</span></html> @@ -335,7 +335,7 @@ event u_added - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#800000;">u_added</span></html> @@ -347,7 +347,7 @@ event c_remove - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#006100;">c_remove</span></html> @@ -359,7 +359,7 @@ event c_add - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#006100;">c_add</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.model.graphml index 7536ce243ec150cd673490f1620d38e99d4203ab..28ca0334020f9a4e746ce96e190877c7f475bd1c 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">alphabet</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">monitor</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">const</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">1</span><span style="color:#402020;">..</span><span style="color:#006100;">1</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">1</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">initial</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">marked</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">print</span>&nbsp;<span style="color:#c00000;">&quot;b&quot;</span>&nbsp;<span style="color:#0000ff;">for</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -121,7 +121,7 @@ - + Declarations <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">;</span></html> @@ -130,7 +130,7 @@ - + Declarations ... @@ -146,7 +146,7 @@ location loc1 - + <html><span style="color:#000000;">loc1</span><br><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5.0</span><span style="color:#402020;">;</span></html> @@ -166,7 +166,7 @@ location loc2 - + <html><span style="color:#000000;">loc2</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">a.x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">6.0</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">urgent</span><span style="color:#402020;">;</span></html> @@ -181,7 +181,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">print</span>&nbsp;<span style="color:#c00000;">&quot;a&quot;</span><span style="color:#402020;">;</span></html> @@ -190,7 +190,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.relations.graphml index b296d9d47adcbfcb818da9dc64b65df8e04b0d78..8309ea0dd6263dd2ee765fe421a67bac9892fed5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_all.relations.graphml @@ -64,7 +64,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -84,7 +84,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -98,7 +98,7 @@ e - + <html></html> @@ -109,7 +109,7 @@ location loc2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc2</span></html> @@ -121,7 +121,7 @@ location loc1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc1</span></html> @@ -133,7 +133,7 @@ cont c - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -155,7 +155,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -169,7 +169,7 @@ x - + @@ -179,7 +179,7 @@ e - + <html></html> @@ -190,7 +190,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.model.graphml index 86fe87b1940aea7d4baa69aaabc62d9dc68b819c..aa675d0556f8ba382c190fb74777563218f929b4 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">alphabet</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">monitor</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#0000ff;">int</span>&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">const</span>&nbsp;<span style="color:#0000ff;">int</span><span style="color:#402020;">[</span><span style="color:#006100;">1</span><span style="color:#402020;">..</span><span style="color:#006100;">1</span><span style="color:#402020;">]</span>&nbsp;<span style="color:#000000;">y</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">1</span><span style="color:#402020;">;</span><br><br><span style="color:#0000ff;">initial</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">marked</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#006100;">2</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html></html> @@ -68,7 +68,7 @@ <init> - + @@ -105,7 +105,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -121,7 +121,7 @@ - + Declarations <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">;</span></html> @@ -130,7 +130,7 @@ - + Declarations ... @@ -146,7 +146,7 @@ location loc1 - + <html><span style="color:#000000;">loc1</span><br><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">5.0</span><span style="color:#402020;">;</span></html> @@ -166,7 +166,7 @@ location loc2 - + <html><span style="color:#000000;">loc2</span><br><br><span style="color:#0000ff;">invariant</span>&nbsp;<span style="color:#000000;">a.x</span>&nbsp;<span style="color:#402020;">&gt;</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">equation</span>&nbsp;<span style="color:#000000;">c</span><span style="color:#402020;">'</span>&nbsp;<span style="color:#402020;">=</span>&nbsp;<span style="color:#006100;">6.0</span><span style="color:#402020;">;</span><br><span style="color:#0000ff;">urgent</span><span style="color:#402020;">;</span></html> @@ -181,7 +181,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -190,7 +190,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.relations.graphml index b296d9d47adcbfcb818da9dc64b65df8e04b0d78..8309ea0dd6263dd2ee765fe421a67bac9892fed5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_default.relations.graphml @@ -64,7 +64,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -84,7 +84,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -98,7 +98,7 @@ e - + <html></html> @@ -109,7 +109,7 @@ location loc2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc2</span></html> @@ -121,7 +121,7 @@ location loc1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc1</span></html> @@ -133,7 +133,7 @@ cont c - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -155,7 +155,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -169,7 +169,7 @@ x - + @@ -179,7 +179,7 @@ e - + <html></html> @@ -190,7 +190,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.model.graphml index e34252c1418b3352098841b7f4506d87c6ef1b67..98fc72f5bb2df94b2f008d6d17e98dec009f1600 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -30,7 +30,7 @@ location - + <html></html> @@ -41,7 +41,7 @@ <init> - + @@ -78,7 +78,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -92,7 +92,7 @@ location loc1 - + <html><span style="color:#000000;">loc1</span></html> @@ -112,7 +112,7 @@ location loc2 - + <html><span style="color:#000000;">loc2</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.relations.graphml index b296d9d47adcbfcb818da9dc64b65df8e04b0d78..8309ea0dd6263dd2ee765fe421a67bac9892fed5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/model_filter_none.relations.graphml @@ -64,7 +64,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> @@ -84,7 +84,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">b</span></html> @@ -98,7 +98,7 @@ e - + <html></html> @@ -109,7 +109,7 @@ location loc2 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc2</span></html> @@ -121,7 +121,7 @@ location loc1 - + <html><span style="color:#0000ff;">location</span>&nbsp;<span style="color:#000000;">loc1</span></html> @@ -133,7 +133,7 @@ cont c - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">c</span></html> @@ -155,7 +155,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -169,7 +169,7 @@ x - + @@ -179,7 +179,7 @@ e - + <html></html> @@ -190,7 +190,7 @@ disc x - + <html><span style="color:#0000ff;">disc</span>&nbsp;<span style="color:#000000;">x</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.model.graphml index ded07aaec52aa57d771aed4373eb50dfe9abfe89..51316163623a76883e3a7751591049fcb4096b23 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.model.graphml @@ -16,7 +16,7 @@ - + automaton a @@ -32,7 +32,7 @@ - + Declarations event e; @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + marked; @@ -68,7 +68,7 @@ <init> - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.relations.graphml index 4765e9d7dc808ea3e1729181453ef775fa3ce0f1..7d255aa800670ba86b28a545079178fb0ac424f5 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/opt_syntax_highlight.relations.graphml @@ -24,7 +24,7 @@ - + automaton a @@ -38,7 +38,7 @@ e - + @@ -48,7 +48,7 @@ event e - + event e diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.model.graphml index f574cbc16b07aab608da97d5f26b4d76a85814fb..3972df415148b95911549cdabef9c435a6f8ef1f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.model.graphml @@ -10,7 +10,7 @@ - + Declarations <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#0000ff;">der</span>&nbsp;<span style="color:#000000;">x</span>&nbsp;<span style="color:#402020;">+</span>&nbsp;<span style="color:#000000;">x</span><span style="color:#402020;">;</span></html> @@ -19,7 +19,7 @@ - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.relations.graphml index b0c799daf5c1762dcbd07411adeca0bdf04bfa42..74ffda47897df93e3c82b0bff30465988dee7a14 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/rel_cont_der.relations.graphml @@ -16,7 +16,7 @@ cont x - + <html><span style="color:#0000ff;">cont</span>&nbsp;<span style="color:#000000;">x</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/relations_none.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/relations_none.model.graphml index a9f3920439e5c75bb57237331590703481331e21..05934b3d7edad3cdf2d2537bc03310ac08f84942 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/relations_none.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/relations_none.model.graphml @@ -16,7 +16,7 @@ - + group g @@ -38,7 +38,7 @@ - + automaton a @@ -52,7 +52,7 @@ location - + @@ -63,7 +63,7 @@ <init> - + @@ -94,7 +94,7 @@ - + Declarations input int y; event e; @@ -104,7 +104,7 @@ event e; - + Declarations ... @@ -124,7 +124,7 @@ event e; - + Declarations alg int x = g.y; @@ -133,7 +133,7 @@ event e; - + Declarations ... diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.model.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.model.graphml index 28e6441be4a5f8231c6c15dc56bfefe828ea39b2..69eecb6dceef6720c8612d573840abc264309780 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.model.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.model.graphml @@ -16,7 +16,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -32,7 +32,7 @@ - + Declarations <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span><span style="color:#402020;">;</span></html> @@ -41,7 +41,7 @@ - + Declarations ... @@ -57,7 +57,7 @@ location - + <html><span style="color:#0000ff;">marked</span><span style="color:#402020;">;</span></html> @@ -68,7 +68,7 @@ <init> - + diff --git a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.relations.graphml b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.relations.graphml index 981efbb0674417e32ccc16d99a144765cd55770f..1f5cf5fcb97152717c40d2a9d5b92f8da423169b 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.relations.graphml +++ b/cif/org.eclipse.escet.cif.tests/tests/cif2yed/small.relations.graphml @@ -24,7 +24,7 @@ - + <html>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="color:#0000ff;">automaton</span>&nbsp;<span style="color:#000000;">a</span></html> @@ -38,7 +38,7 @@ e - + <html></html> @@ -49,7 +49,7 @@ event e - + <html><span style="color:#0000ff;">event</span>&nbsp;<span style="color:#000000;">e</span></html> diff --git a/cif/org.eclipse.escet.cif.tests/tests/test_cif2yed.tooldef b/cif/org.eclipse.escet.cif.tests/tests/test_cif2yed.tooldef index 2246f6f30e730e26c2d3ec8cbaf272c38c217519..80bdce8be740a538b4272c3755be32308d68cd2f 100644 --- a/cif/org.eclipse.escet.cif.tests/tests/test_cif2yed.tooldef +++ b/cif/org.eclipse.escet.cif.tests/tests/test_cif2yed.tooldef @@ -12,6 +12,7 @@ ////////////////////////////////////////////////////////////////////////////// from "lib:cif" import cif2yed; +import org.eclipse.escet.common.java:org.eclipse.escet.common.java.Strings.replaceRegex; // Configuration. string test_path = "cif2yed"; @@ -67,6 +68,20 @@ for test in tests: options = options + ["-o", yed_real, "-k", out_type]; cif2yed([test] + options, stdout=test_out_real, stderr=test_err_real, ignoreNonZeroExitCode=true); + // Replace layout information in yEd files, as it may differ for different platforms. + if isfile(yed_real): + list string yed_real_lines = readlines(yed_real); + for i in range(yed_real_lines): + yed_real_lines[i] = replaceRegex(yed_real_lines[i], + "", + "\"/>"); + yed_real_lines[i] = replaceRegex(yed_real_lines[i], + "", + "\" width=\"\"/>"); + end + writefile(yed_real, yed_real_lines); + end + // Compare output. bool stderr_diff = diff(test_err_exp, test_err_real, missingAsEmpty=true, warnOnDiff=true); bool stdout_diff = diff(test_out_exp, test_out_real, missingAsEmpty=true, warnOnDiff=true); diff --git a/common/org.eclipse.escet.common.java/src/org/eclipse/escet/common/java/Strings.java b/common/org.eclipse.escet.common.java/src/org/eclipse/escet/common/java/Strings.java index b4935be520a8a4231a401d0610a78fc37c9e6658..202f46ce9f385dbc9bdd0a9bc40275a15634a561 100644 --- a/common/org.eclipse.escet.common.java/src/org/eclipse/escet/common/java/Strings.java +++ b/common/org.eclipse.escet.common.java/src/org/eclipse/escet/common/java/Strings.java @@ -573,4 +573,21 @@ public final class Strings { public static String str(Object obj) { return String.valueOf(obj); } + + /** + * Replaces all occurrences of a regular expression pattern in the given input string by the given replacement. + * + *

+ * Is equal to {@code input.}{@link String#replaceAll replaceAll}{@code (pattern, replacement)}. This method thus + * provides the same functionality, but as a static method. + *

+ * + * @param input The input string. + * @param regex The regular expression pattern to find. + * @param replacement The replacement. May contain references to captured subsequences. + * @return The string with replacements performed. + */ + public static String replaceRegex(String input, String regex, String replacement) { + return input.replaceAll(regex, replacement); + } } diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index df1327ead472affc6d19e32ca9cf6c539bf49280..51e61c2455a2324f05c6937421370a212333b3b6 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -65,7 +65,7 @@ - eclipse-escet-incubation-${qualifiedVersion} + eclipse-escet-incubation-ide-${qualifiedVersion}