diff --git a/docs/Measuring-E2E-MS-Performance.md b/docs/Measuring-E2E-MS-Performance.md
index ad3fa8de7a54c2925fd43e1b1df69821d20f0a11..20a5c51ad297c145901f082af1d63e2ab7bf0d3a 100644
--- a/docs/Measuring-E2E-MS-Performance.md
+++ b/docs/Measuring-E2E-MS-Performance.md
@@ -157,15 +157,21 @@ Imagine a media service that both stores and processes high volumes of complex m
-In the figure above the green arcs indicate service request travel whilst the blue denotes the response path. The shortest route directs the request to SFR 'B' and the consequent storage request travels on to SFR 'C'. __Responses return along the path used by the request__. Let's see the same request from client 2, who has just joined the network:
+In the figure above the green arcs indicate service request travel whilst the blue denotes the response path. The shortest route directs the request to SFR 'B' and the consequent storage request travels on to SFR 'C'. __Responses return along the path used by the request__. Indicative service response times are provided by numeric values in the active MC boxes. Let's see the same request from client 2, who has just joined the network:
-For this client, the _locality of reference_ for processing and then storing her data is high: both of the associated MCs are located on VMs attached to the same SFR. We could expect client 2's response time to be low for this reason. _Now for the sake of example only, let us assume that the hardware running MC Processor A can only effectively handle one request at any time and that any more than this will result in a substantial degradation in processing performance_. Client 3 joins the network:
+For this client, the _locality of reference_ for processing and then storing her data is high: both of the associated MCs are located on VMs attached to the same SFR. We could expect client 2's response time to be low for this reason.
-__TO DO__
+_Now for the sake of example only, let us assume that the hardware running MC Processor A can only effectively handle one request at any time and that any more than this will result in a substantial degradation in processing performance_.
-## E2E Measurement
+Client 3 joins the network:
+
+
+
+In calculating a service function route that optimizes for the complete _round trip_ delay, we need to take into account the likely delays that are incurred from both network related latencies and also service response times. The orange route illustrated above shows how the gains made by selecting a fast route through the network are offset by penalities in using a processor MC that is overloaded; conversely a slower route that selects a MC with computational resources to spare resolves to an over-all faster round-trip response time.
+
+## E2E Measurement
Our aim is to aggregate network measurement points with media service measurement points to obtain a third measurement from which we can easily understand both end-to-end and round-trip performance of a media service. This is achieved by using a CLMC E2E monitoring process that aggregates data from network and media service measurements within a given sample period, e.g. every 10 seconds. This process then posts the aggregated data back to Influx in a new measurement.
diff --git a/docs/figures/e2eFigures.graphml b/docs/figures/e2eFigures.graphml
index 492baa997725dd38345822bbe8b48d1b03888798..c7bd6fa3c0a27422a2c93e16f84f1279f6de6216 100644
--- a/docs/figures/e2eFigures.graphml
+++ b/docs/figures/e2eFigures.graphml
@@ -15,6 +15,27 @@
<graph edgedefault="directed" id="G">
<data key="d0"/>
<node id="n0">
+ <data key="d6">
+ <y:SVGNode>
+ <y:Geometry height="22.891233402652546" width="20.06220742959614" x="820.3669601387119" y="986.4070328236099"/>
+ <y:Fill color="#CCCCFF" transparent="false"/>
+ <y:BorderStyle color="#000000" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.031103714798064" y="26.89123340265246">
+ <y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:SVGNodeProperties usingVisualBounds="true"/>
+ <y:SVGModel svgBoundsPolicy="0">
+ <y:SVGContent refid="1"/>
+ </y:SVGModel>
+ </y:SVGNode>
+ </data>
+ </node>
+ <node id="n1">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="152.4000000000001" width="142.72602478550982" x="222.89999999999998" y="986.8"/>
@@ -25,7 +46,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n1">
+ <node id="n2">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="152.4000000000001" width="142.72602478550982" x="222.89999999999998" y="663.4"/>
@@ -36,7 +57,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2" yfiles.foldertype="group">
+ <node id="n3" yfiles.foldertype="group">
<data key="d4"/>
<data key="d6">
<y:ProxyAutoBoundsNode>
@@ -64,8 +85,8 @@
</y:Realizers>
</y:ProxyAutoBoundsNode>
</data>
- <graph edgedefault="directed" id="n2:">
- <node id="n2::n0">
+ <graph edgedefault="directed" id="n3:">
+ <node id="n3::n0">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="839.2703500920416" y="130.07829132080082"/>
@@ -85,7 +106,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n2::n1">
+ <node id="n3::n1">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="833.5004289799808" y="232.2862953603186"/>
@@ -96,7 +117,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n2">
+ <node id="n3::n2">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="715.8504289799812" y="436.2612953603185"/>
@@ -107,7 +128,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n3">
+ <node id="n3::n3">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="952.7504289799808" y="436.2612953603185"/>
@@ -118,7 +139,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n4">
+ <node id="n3::n4">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="827.0254289799809" y="366.2862953603186"/>
@@ -135,7 +156,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n5">
+ <node id="n3::n5">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="1002.050428979981" y="339.52028728128323"/>
@@ -155,7 +176,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n2::n6">
+ <node id="n3::n6">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="896.8406101048615" y="153.4505065377179"/>
@@ -175,7 +196,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n2::n7">
+ <node id="n3::n7">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="722.1004289799812" y="512.7612953603185"/>
@@ -186,7 +207,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n8">
+ <node id="n3::n8">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="922.7504289799808" y="512.7612953603185"/>
@@ -197,7 +218,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n2::n9">
+ <node id="n3::n9">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="1002.5305078679205" y="512.7612953603185"/>
@@ -210,7 +231,7 @@
</node>
</graph>
</node>
- <node id="n3" yfiles.foldertype="group">
+ <node id="n4" yfiles.foldertype="group">
<data key="d4"/>
<data key="d6">
<y:ProxyAutoBoundsNode>
@@ -238,8 +259,8 @@
</y:Realizers>
</y:ProxyAutoBoundsNode>
</data>
- <graph edgedefault="directed" id="n3:">
- <node id="n3::n0">
+ <graph edgedefault="directed" id="n4:">
+ <node id="n4::n0">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="256.84492111206055" y="130.07829132080082"/>
@@ -259,7 +280,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n3::n1">
+ <node id="n4::n1">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="251.07499999999982" y="232.2862953603186"/>
@@ -270,7 +291,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n3::n2">
+ <node id="n4::n2">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="133.42500000000018" y="436.2612953603185"/>
@@ -281,7 +302,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n3::n3">
+ <node id="n4::n3">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="370.3249999999998" y="436.2612953603185"/>
@@ -292,7 +313,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n3::n4">
+ <node id="n4::n4">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="244.5999999999999" y="366.2862953603186"/>
@@ -309,7 +330,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n3::n5">
+ <node id="n4::n5">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="419.625" y="339.52028728128323"/>
@@ -329,7 +350,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n3::n6">
+ <node id="n4::n6">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="420.1050788879395" y="512.7612953603185"/>
@@ -342,7 +363,7 @@
</node>
</graph>
</node>
- <node id="n4">
+ <node id="n5">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="67.64492111206054" y="726.3883582041351"/>
@@ -362,7 +383,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n5">
+ <node id="n6">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="201.47499999999985" y="722.8013247624681"/>
@@ -373,7 +394,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n6">
+ <node id="n7">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="346.84492111206026" y="722.8013247624681"/>
@@ -384,7 +405,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n7">
+ <node id="n8">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="509.81484222412064" y="729.0513247624681"/>
@@ -395,7 +416,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n8">
+ <node id="n9">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="67.64492111206062" y="1052.188358204135"/>
@@ -415,7 +436,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n9">
+ <node id="n10">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="201.4749999999999" y="1048.6013247624683"/>
@@ -426,7 +447,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n10">
+ <node id="n11">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="42.5" width="42.5" x="346.8449211120603" y="1048.6013247624683"/>
@@ -437,7 +458,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n11">
+ <node id="n12">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="509.81484222412064" y="1054.8513247624683"/>
@@ -448,7 +469,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n12">
+ <node id="n13">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="30.0" x="279.2630123927549" y="892.3026495249364"/>
@@ -459,7 +480,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n13">
+ <node id="n14">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="835.4490886803685" y="654.3896829666031"/>
@@ -479,7 +500,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n14">
+ <node id="n15">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="21.0" width="21.0" x="782.6626280068207" y="826.5539742874045"/>
@@ -490,7 +511,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n15">
+ <node id="n16">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="15.0" width="15.0" x="785.6626280068207" y="886.404048954476"/>
@@ -501,7 +522,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n16">
+ <node id="n17">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="21.0" width="21.0" x="899.2912191224618" y="826.5539742874045"/>
@@ -512,7 +533,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n17">
+ <node id="n18">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="15.0" width="15.0" x="987.6387035271686" y="886.404048954476"/>
@@ -523,7 +544,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n18">
+ <node id="n19">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="21.0" width="21.0" x="840.429167568308" y="729.0513247624681"/>
@@ -534,7 +555,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n19">
+ <node id="n20">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="15.0" width="15.0" x="902.2912191224618" y="886.404048954476"/>
@@ -545,7 +566,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n20">
+ <node id="n21">
<data key="d6">
<y:SVGNode>
<y:Geometry height="35.32593311666594" width="30.960157775878884" x="1162.0434929124954" y="685.8129035619129"/>
@@ -559,7 +580,7 @@
</y:SVGNode>
</data>
</node>
- <node id="n21">
+ <node id="n22">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="21.0" width="21.0" x="1128.131571876991" y="779.8773298641443"/>
@@ -570,7 +591,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n22">
+ <node id="n23">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="15.0" width="15.0" x="1216.479056281698" y="839.7274045312158"/>
@@ -581,7 +602,7 @@
</y:ShapeNode>
</data>
</node>
- <node id="n23">
+ <node id="n24">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="15.0" width="15.0" x="1131.131571876991" y="839.7274045312158"/>
@@ -592,43 +613,309 @@
</y:ShapeNode>
</data>
</node>
- <edge id="n2::e0" source="n2::n1" target="n2::n3">
+ <node id="n25">
+ <data key="d6">
+ <y:SVGNode>
+ <y:Geometry height="35.32593311666594" width="30.960157775878884" x="840.429167568308" y="980.1896829666033"/>
+ <y:Fill color="#CCCCFF" transparent="false"/>
+ <y:BorderStyle color="#000000" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="37.90625" x="-3.4730461120605014" y="39.32593311666608">Client 3<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:SVGNodeProperties usingVisualBounds="true"/>
+ <y:SVGModel svgBoundsPolicy="0">
+ <y:SVGContent refid="1"/>
+ </y:SVGModel>
+ </y:SVGNode>
+ </data>
+ </node>
+ <node id="n26">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="21.0" width="21.0" x="787.6427068947602" y="1152.3539742874045"/>
+ <y:Fill color="#FFFFFF" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="w" textColor="#000000" verticalTextPosition="bottom" visible="true" width="37.2666015625" x="-41.2666015625" y="2.37451171875">SFR 'B'</y:NodeLabel>
+ <y:Shape type="ellipse"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n27">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="790.6427068947602" y="1212.204048954476"/>
+ <y:Fill color="#FFCC00" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="s" textColor="#000000" verticalTextPosition="bottom" visible="true" width="80.611328125" x="-32.8056640625" y="19.0">Processor 'A' MC</y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n28">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="21.0" width="21.0" x="904.2712980104013" y="1152.3539742874045"/>
+ <y:Fill color="#FFFFFF" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="n" textColor="#000000" verticalTextPosition="bottom" visible="true" width="37.818359375" x="-8.4091796875" y="-20.2509765625">SFR 'C'</y:NodeLabel>
+ <y:Shape type="ellipse"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n29">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="992.6187824151081" y="1212.204048954476"/>
+ <y:Fill color="#FFFFFF" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="s" textColor="#000000" verticalTextPosition="bottom" visible="true" width="57.3544921875" x="-21.17724609375" y="19.0">Storage MC</y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n30">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="21.0" width="21.0" x="845.4092464562475" y="1054.8513247624683"/>
+ <y:Fill color="#FFFFFF" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="w" textColor="#000000" verticalTextPosition="bottom" visible="true" width="37.2666015625" x="-41.2666015625" y="2.37451171875">SFR 'A'</y:NodeLabel>
+ <y:Shape type="ellipse"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n31">
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="907.2712980104013" y="1212.204048954476"/>
+ <y:Fill color="#FFFFFF" transparent="false"/>
+ <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="10" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="16.2509765625" horizontalTextPosition="center" iconTextGap="4" modelName="sides" modelPosition="s" textColor="#000000" verticalTextPosition="bottom" visible="true" width="80.611328125" x="-32.8056640625" y="19.0">Processor 'B' MC</y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n32">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="790.6427068947602" y="1212.204048954476"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="17.34765625" x="-1.173828125" y="0.599609375">150<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n33">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="907.2712980104013" y="1212.204048954476"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="17.34765625" x="-1.173828125" y="0.599609375">100<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n34">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="992.6187824151081" y="1212.204048954476"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">10<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n35">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="800.4092464562475" y="1098.503899620333"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="8.44921875" x="3.275390625" y="0.599609375">5<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n36">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="896.4092464562475" y="1098.503899620333"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">10<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n37">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="848.4092464562475" y="1162.65659876567"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="8.44921875" x="3.275390625" y="0.599609375">5<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n38">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="785.6626280068207" y="886.404048954476"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">50<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n39">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="987.6387035271686" y="886.404048954476"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">10<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n40">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="1131.131571876991" y="839.7274045312158"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">50<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <node id="n41">
+ <data key="d5"/>
+ <data key="d6">
+ <y:ShapeNode>
+ <y:Geometry height="15.0" width="15.0" x="1216.479056281698" y="839.7274045312158"/>
+ <y:Fill hasColor="false" transparent="false"/>
+ <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.8984375" x="1.05078125" y="0.599609375">10<y:LabelModel>
+ <y:SmartNodeLabelModel distance="4.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+ </y:ModelParameter>
+ </y:NodeLabel>
+ <y:Shape type="rectangle"/>
+ </y:ShapeNode>
+ </data>
+ </node>
+ <edge id="n3::e0" source="n3::n1" target="n3::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="standard" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="center_on_edge" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="14.0107421875" x="54.292258431999926" y="76.12963032125606">10<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" placement="center" side="on_edge" sideReference="relative_to_edge_flow"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="center_on_edge" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="14.0107421875" x="55.292258431999926" y="76.12963032125606">10<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" placement="center" side="on_edge" sideReference="relative_to_edge_flow"/>
</y:EdgeLabel>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e1" source="n2::n3" target="n2::n2">
+ <edge id="n3::e1" source="n3::n3" target="n3::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="standard" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="9.00537109375" x="-101.70268381298774" y="-16.025875049837737">5<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="9.00537109375" x="-101.70268381298774" y="-17.025875049837737">5<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
</y:EdgeLabel>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e2" source="n2::n1" target="n2::n2">
+ <edge id="n3::e2" source="n3::n1" target="n3::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="standard" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="9.00537109375" x="-62.54654294166278" y="76.06703876852168">5<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="9" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="15.02587890625" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="9.00537109375" x="-63.54654294166278" y="76.06703876852168">5<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
</y:EdgeLabel>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e3" source="n2::n0" target="n2::n1">
+ <edge id="n3::e3" source="n3::n0" target="n3::n1">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -638,7 +925,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e4" source="n2::n5" target="n2::n3">
+ <edge id="n3::e4" source="n3::n5" target="n3::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -648,7 +935,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e5" source="n2::n6" target="n2::n1">
+ <edge id="n3::e5" source="n3::n6" target="n3::n1">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -658,7 +945,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e6" source="n2::n2" target="n2::n7">
+ <edge id="n3::e6" source="n3::n2" target="n3::n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -668,7 +955,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e7" source="n2::n3" target="n2::n8">
+ <edge id="n3::e7" source="n3::n3" target="n3::n8">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -678,7 +965,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n2::e8" source="n2::n3" target="n2::n9">
+ <edge id="n3::e8" source="n3::n3" target="n3::n9">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -688,7 +975,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e0" source="n3::n1" target="n3::n3">
+ <edge id="n4::e0" source="n4::n1" target="n4::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -698,7 +985,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e1" source="n3::n3" target="n3::n2">
+ <edge id="n4::e1" source="n4::n3" target="n4::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -708,7 +995,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e2" source="n3::n1" target="n3::n2">
+ <edge id="n4::e2" source="n4::n1" target="n4::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -718,7 +1005,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e3" source="n3::n0" target="n3::n1">
+ <edge id="n4::e3" source="n4::n0" target="n4::n1">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -728,7 +1015,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e4" source="n3::n5" target="n3::n3">
+ <edge id="n4::e4" source="n4::n5" target="n4::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -738,7 +1025,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="n3::e5" source="n3::n3" target="n3::n6">
+ <edge id="n4::e5" source="n4::n3" target="n4::n6">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -748,7 +1035,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e0" source="n4" target="n5">
+ <edge id="e0" source="n5" target="n6">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -760,7 +1047,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e1" source="n5" target="n5">
+ <edge id="e1" source="n6" target="n6">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -780,7 +1067,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e2" source="n5" target="n6">
+ <edge id="e2" source="n6" target="n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -792,7 +1079,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e3" source="n6" target="n7">
+ <edge id="e3" source="n7" target="n8">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -804,7 +1091,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e4" source="n6" target="n6">
+ <edge id="e4" source="n7" target="n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -824,7 +1111,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e5" source="n8" target="n9">
+ <edge id="e5" source="n9" target="n10">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -836,7 +1123,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e6" source="n9" target="n9">
+ <edge id="e6" source="n10" target="n10">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -856,7 +1143,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e7" source="n9" target="n10">
+ <edge id="e7" source="n10" target="n11">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -868,7 +1155,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e8" source="n10" target="n11">
+ <edge id="e8" source="n11" target="n12">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -880,7 +1167,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e9" source="n10" target="n10">
+ <edge id="e9" source="n11" target="n11">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -900,7 +1187,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e10" source="n12" target="n12">
+ <edge id="e10" source="n13" target="n13">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -920,7 +1207,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e11" source="n13" target="n18">
+ <edge id="e11" source="n14" target="n19">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -935,7 +1222,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e12" source="n18" target="n14">
+ <edge id="e12" source="n19" target="n15">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -950,7 +1237,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e13" source="n14" target="n15">
+ <edge id="e13" source="n15" target="n16">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -965,8 +1252,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e14" source="n15" target="n14">
- <data key="d9"/>
+ <edge id="e14" source="n16" target="n15">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -978,8 +1264,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e15" source="n14" target="n16">
- <data key="d9"/>
+ <edge id="e15" source="n15" target="n17">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -991,8 +1276,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e16" source="n16" target="n17">
- <data key="d9"/>
+ <edge id="e16" source="n17" target="n18">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -1002,8 +1286,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e17" source="n17" target="n16">
- <data key="d9"/>
+ <edge id="e17" source="n18" target="n17">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="-2.175385463925977" tx="0.0" ty="0.0">
@@ -1015,8 +1298,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e18" source="n16" target="n14">
- <data key="d9"/>
+ <edge id="e18" source="n17" target="n15">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1028,8 +1310,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e19" source="n18" target="n13">
- <data key="d9"/>
+ <edge id="e19" source="n19" target="n14">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1041,8 +1322,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e20" source="n14" target="n18">
- <data key="d9"/>
+ <edge id="e20" source="n15" target="n19">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1054,8 +1334,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e21" source="n16" target="n19">
- <data key="d9"/>
+ <edge id="e21" source="n17" target="n20">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -1065,8 +1344,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e22" source="n21" target="n22">
- <data key="d9"/>
+ <edge id="e22" source="n22" target="n23">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1078,8 +1356,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e23" source="n22" target="n21">
- <data key="d9"/>
+ <edge id="e23" source="n23" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="-2.175385463925977" tx="0.0" ty="0.0">
@@ -1091,8 +1368,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e24" source="n20" target="n21">
- <data key="d9"/>
+ <edge id="e24" source="n21" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-14.980663742331217" sy="15.468648468886613" tx="0.0" ty="0.0">
@@ -1104,8 +1380,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e25" source="n21" target="n20">
- <data key="d9"/>
+ <edge id="e25" source="n22" target="n21">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="14.818145939894293" ty="17.656223449753725">
@@ -1117,8 +1392,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e26" source="n21" target="n23">
- <data key="d9"/>
+ <edge id="e26" source="n22" target="n24">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1130,8 +1404,7 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e27" source="n23" target="n21">
- <data key="d9"/>
+ <edge id="e27" source="n24" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -1143,6 +1416,68 @@
</y:PolyLineEdge>
</data>
</edge>
+ <edge id="e28" source="n30" target="n34">
+ <data key="d9"/>
+ <data key="d10">
+ <y:PolyLineEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="786.16382775501" y="1161.9550581506196"/>
+ <y:Point x="795.7136771353722" y="1211.8264938036223"/>
+ <y:Point x="808.4136504432845" y="1159.8991877979026"/>
+ <y:Point x="904.4426914347049" y="1159.8991877979026"/>
+ <y:Point x="915.0867943899003" y="1174.6881906577692"/>
+ </y:Path>
+ <y:LineStyle color="#FF9900" type="line" width="1.0"/>
+ <y:Arrows source="standard" target="standard"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="side_slider" preferredPlacement="anywhere" ratio="0.0" textColor="#FF9900" verticalTextPosition="bottom" visible="true" width="128.48828125" x="-148.19656670838287" y="12.111822809343266">Faster route; slower round-trip time<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+ </y:EdgeLabel>
+ <y:BendStyle smoothed="true"/>
+ </y:PolyLineEdge>
+ </data>
+ </edge>
+ <edge id="e29" source="n30" target="n34">
+ <data key="d9"/>
+ <data key="d10">
+ <y:PolyLineEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="914.0257000143044" y="1154.8106920877026"/>
+ <y:Point x="914.0257000143044" y="1212.109788369876"/>
+ <y:Point x="924.6366437702625" y="1165.4216358436606"/>
+ </y:Path>
+ <y:LineStyle color="#800080" type="line" width="1.0"/>
+ <y:Arrows source="standard" target="standard"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="8" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="13.80078125" horizontalTextPosition="center" iconTextGap="4" modelName="free" modelPosition="anywhere" preferredPlacement="anywhere" ratio="0.5" textColor="#800080" verticalTextPosition="bottom" visible="true" width="127.16015625" x="19.58796425033279" y="10.61881404443966">Slower route; faster round-trip time<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+ </y:EdgeLabel>
+ <y:BendStyle smoothed="true"/>
+ </y:PolyLineEdge>
+ </data>
+ </edge>
+ <edge id="e30" source="n25" target="n30">
+ <data key="d9"/>
+ <data key="d10">
+ <y:PolyLineEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="829.1049907674028" y="1036.6644652049567"/>
+ </y:Path>
+ <y:LineStyle color="#000000" type="line" width="1.0"/>
+ <y:Arrows source="none" target="standard"/>
+ <y:BendStyle smoothed="false"/>
+ </y:PolyLineEdge>
+ </data>
+ </edge>
+ <edge id="e31" source="n30" target="n25">
+ <data key="d9"/>
+ <data key="d10">
+ <y:PolyLineEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="887.1335894327984" y="1039.9803851286938"/>
+ </y:Path>
+ <y:LineStyle color="#000000" type="line" width="1.0"/>
+ <y:Arrows source="none" target="standard"/>
+ <y:BendStyle smoothed="false"/>
+ </y:PolyLineEdge>
+ </data>
+ </edge>
</graph>
<data key="d7">
<y:Resources>
diff --git a/docs/image/e2e-extended-client1-path.png b/docs/image/e2e-extended-client1-path.png
index 9fff73977eeb874e0dca050b9cca158a3b95fd76..0124e963bd676f22ae603ca3fec8d8339bfc1567 100644
Binary files a/docs/image/e2e-extended-client1-path.png and b/docs/image/e2e-extended-client1-path.png differ
diff --git a/docs/image/e2e-extended-client2-path.png b/docs/image/e2e-extended-client2-path.png
index a5709f8211323de58da4c0becbde43f16e13b3f5..13513f0ac128eb44d2241e1082ee2990d32925ef 100644
Binary files a/docs/image/e2e-extended-client2-path.png and b/docs/image/e2e-extended-client2-path.png differ
diff --git a/docs/image/e2e-extended-client3-path.png b/docs/image/e2e-extended-client3-path.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab35ec6c0bf0bf865c3f315685d4881ac660dda
Binary files /dev/null and b/docs/image/e2e-extended-client3-path.png differ