diff --git a/dnimm3/plugin.xml b/dnimm3/plugin.xml index 46a8d33d4a5c9d11d0d5d3aabbe09f04d96016c1..1204e65f901979ac6300db0cbc9500268323c388 100644 --- a/dnimm3/plugin.xml +++ b/dnimm3/plugin.xml @@ -8,7 +8,7 @@ <extension point="org.eclipse.emf.ecore.generated_package"> <!-- @generated Dnimm3 --> <package - uri="dnimm3/2016/05/31/2333" + uri="dnimm3/2016/07/07/1729" class="dnimm3.Dnimm3Package" genModel="model/Dnimm3.xcore"/> </extension> diff --git a/xtend-epsilon-standalone/src/epsilonStandalone/DNIRunner_mk.xtend b/xtend-epsilon-standalone/src/epsilonStandalone/DNIRunner_mk.xtend index 19a1899e125b542bc1c24aca0aabd58ea18a5309..d7e7e5c64f5cd132f4662f24623c079638656687 100644 --- a/xtend-epsilon-standalone/src/epsilonStandalone/DNIRunner_mk.xtend +++ b/xtend-epsilon-standalone/src/epsilonStandalone/DNIRunner_mk.xtend @@ -18,7 +18,7 @@ class DNIRunner_mk extends DNIRunner { public def reset(){ simQpnParser.interestingPlaces = newLinkedList("SW35_i_SW01_rx")//, "SW_SDN_Switching_QP_SwitchSDN(HP3500)", "HW_SDN_Switching_QP_SwitchSDN(HP3500)") - simQpnParser.interestingColors = newLinkedList("Traffic_send") + simQpnParser.interestingColors = newLinkedList("Traffic_") simQpnParser.interestingMetrics = newLinkedList("arrivThrPut")//, "deptThrPut") dniModels.clear diff --git a/xtend-epsilon-standalone/src/epsilonStandalone/eol/scenario1_auto_gen.eol b/xtend-epsilon-standalone/src/epsilonStandalone/eol/scenario1_auto_gen.eol index 26bdd620f95b49428f50c1f0b2cd810818ac4fd9..0ae590cccc143e8dd4de5f58faf8d716699eaf3f 100644 --- a/xtend-epsilon-standalone/src/epsilonStandalone/eol/scenario1_auto_gen.eol +++ b/xtend-epsilon-standalone/src/epsilonStandalone/eol/scenario1_auto_gen.eol @@ -1,6 +1,8 @@ import "../eol/dependency.eol"; var emfTool : new Native("org.eclipse.epsilon.emc.emf.tools.EmfTool"); + + var numClients = param_num_clients_1A; var trfc= DNI.getAllOfKind("NetworkTraffic").first();