measurements for the different violation types, comparison for differenct generation config

88 files changed, 2149 insertions, 347 deletions

diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
index 67ee5625..683b1de1 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
@@ -1,6 +1 @@
 /ca/
-/socialnetwork.aird
-/socialnetwork.ecore
-/socialnetwork.genmodel
-/socialnetwork/
-/statistics/
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.aird b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.aird
new file mode 100644
index 00000000..e7e28ecd
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.aird
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_TZr30HA1EemKP426GDjFOg" selectedViews="_Ta8cEHA1EemKP426GDjFOg" version="14.1.0.201810161215">
+    <semanticResources>socialnetwork.ecore</semanticResources>
+    <semanticResources>socialnetwork.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_Ta8cEHA1EemKP426GDjFOg">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_TbTBZXA1EemKP426GDjFOg" name="socialnetwork" repPath="#_TbTBYHA1EemKP426GDjFOg">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="socialnetwork.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_TbTBYHA1EemKP426GDjFOg" name="socialnetwork">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_TbTBYXA1EemKP426GDjFOg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_TbTBYnA1EemKP426GDjFOg">
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_ZZkWoHA1EemKP426GDjFOg" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_ZZkWoXA1EemKP426GDjFOg" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_ZZkWonA1EemKP426GDjFOg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_TbTBZnA1EemKP426GDjFOg" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_TbTBZ3A1EemKP426GDjFOg" type="Sirius" element="_TbTBYHA1EemKP426GDjFOg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_Ur9YAHA1EemKP426GDjFOg" type="2003" element="_Ur5GkHA1EemKP426GDjFOg">
+          <children xmi:type="notation:Node" xmi:id="_Ur9YA3A1EemKP426GDjFOg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Ur9YBHA1EemKP426GDjFOg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_W_L-4HA1EemKP426GDjFOg" type="3010" element="_W_DcAHA1EemKP426GDjFOg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_W_L-4XA1EemKP426GDjFOg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_W_L-4nA1EemKP426GDjFOg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Ur9YBXA1EemKP426GDjFOg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ur9YBnA1EemKP426GDjFOg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Ur9YAXA1EemKP426GDjFOg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ur9YAnA1EemKP426GDjFOg" x="285" y="165" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_X2ASIHA1EemKP426GDjFOg" type="2003" element="_X14WUHA1EemKP426GDjFOg">
+          <children xmi:type="notation:Node" xmi:id="_X2A5MHA1EemKP426GDjFOg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_X2A5MXA1EemKP426GDjFOg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_jitw4HA1EemKP426GDjFOg" type="3010" element="_jirUoHA1EemKP426GDjFOg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_jitw4XA1EemKP426GDjFOg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_jitw4nA1EemKP426GDjFOg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_X2A5MnA1EemKP426GDjFOg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_X2A5M3A1EemKP426GDjFOg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_X2ASIXA1EemKP426GDjFOg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2ASInA1EemKP426GDjFOg" x="690" y="180" width="120" height="100"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_TbTBaHA1EemKP426GDjFOg"/>
+        <edges xmi:type="notation:Edge" xmi:id="_ZZnZ8HA1EemKP426GDjFOg" type="4001" element="_ZZjvkHA1EemKP426GDjFOg" source="_Ur9YAHA1EemKP426GDjFOg" target="_X2ASIHA1EemKP426GDjFOg">
+          <children xmi:type="notation:Node" xmi:id="_ZZnZ9HA1EemKP426GDjFOg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZZnZ9XA1EemKP426GDjFOg" x="6" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZZnZ9nA1EemKP426GDjFOg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZZnZ93A1EemKP426GDjFOg" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZZnZ-HA1EemKP426GDjFOg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZZnZ-XA1EemKP426GDjFOg" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ZZnZ8XA1EemKP426GDjFOg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ZZnZ8nA1EemKP426GDjFOg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZZnZ83A1EemKP426GDjFOg" points="[0, 0, -287, 4]$[143, 0, -144, 4]$[143, -4, -144, 0]$[287, -4, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZZnZ-nA1EemKP426GDjFOg" id="(1.0,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZZnZ-3A1EemKP426GDjFOg" id="(0.0,0.30612244897959184)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_f8gfMHA1EemKP426GDjFOg" type="4001" element="_f8eC8HA1EemKP426GDjFOg" source="_X2ASIHA1EemKP426GDjFOg" target="_X2ASIHA1EemKP426GDjFOg">
+          <children xmi:type="notation:Node" xmi:id="_f8gfNHA1EemKP426GDjFOg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f8gfNXA1EemKP426GDjFOg" x="-8" y="7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f8hGQHA1EemKP426GDjFOg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f8hGQXA1EemKP426GDjFOg" x="12" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f8hGQnA1EemKP426GDjFOg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f8hGQ3A1EemKP426GDjFOg" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_f8gfMXA1EemKP426GDjFOg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_f8gfMnA1EemKP426GDjFOg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f8gfM3A1EemKP426GDjFOg" points="[4, 1, 0, -21]$[51, 1, 47, -21]$[51, -53, 47, -75]$[-25, -53, -29, -75]$[-25, -8, -29, -30]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8hGRHA1EemKP426GDjFOg" id="(0.9666666666666667,0.09)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8hGRXA1EemKP426GDjFOg" id="(1.0,0.30612244897959184)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_eUOggHA6EemKP426GDjFOg" type="4001" element="_eULdMHA6EemKP426GDjFOg" source="_X2ASIHA1EemKP426GDjFOg" target="_X2ASIHA1EemKP426GDjFOg">
+          <children xmi:type="notation:Node" xmi:id="_eUOghHA6EemKP426GDjFOg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUOghXA6EemKP426GDjFOg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eUOghnA6EemKP426GDjFOg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUOgh3A6EemKP426GDjFOg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eUOgiHA6EemKP426GDjFOg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eUOgiXA6EemKP426GDjFOg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_eUOggXA6EemKP426GDjFOg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_eUOggnA6EemKP426GDjFOg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eUOgg3A6EemKP426GDjFOg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eUOginA6EemKP426GDjFOg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eUOgi3A6EemKP426GDjFOg" id="(0.5,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Ur5GkHA1EemKP426GDjFOg" name="SocialNetwork" tooltipText="" outgoingEdges="_ZZjvkHA1EemKP426GDjFOg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="socialnetwork.ecore#//SocialNetwork"/>
+      <semanticElements xmi:type="ecore:EClass" href="socialnetwork.ecore#//SocialNetwork"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XY_mAHA1EemKP426GDjFOg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_W_DcAHA1EemKP426GDjFOg" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="socialnetwork.ecore#//SocialNetwork/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="socialnetwork.ecore#//SocialNetwork/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_XZANEHA1EemKP426GDjFOg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_X14WUHA1EemKP426GDjFOg" name="Person" tooltipText="" outgoingEdges="_f8eC8HA1EemKP426GDjFOg _eULdMHA6EemKP426GDjFOg" incomingEdges="_ZZjvkHA1EemKP426GDjFOg _f8eC8HA1EemKP426GDjFOg _eULdMHA6EemKP426GDjFOg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="socialnetwork.ecore#//Person"/>
+      <semanticElements xmi:type="ecore:EClass" href="socialnetwork.ecore#//Person"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kAhuQHA1EemKP426GDjFOg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_jirUoHA1EemKP426GDjFOg" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="socialnetwork.ecore#//Person/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="socialnetwork.ecore#//Person/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kAiVUHA1EemKP426GDjFOg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ZZjvkHA1EemKP426GDjFOg" name="[0..*] persons" sourceNode="_Ur5GkHA1EemKP426GDjFOg" targetNode="_X14WUHA1EemKP426GDjFOg">
+      <target xmi:type="ecore:EReference" href="socialnetwork.ecore#//SocialNetwork/persons"/>
+      <semanticElements xmi:type="ecore:EReference" href="socialnetwork.ecore#//SocialNetwork/persons"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ZZkWo3A1EemKP426GDjFOg" description="_ZZkWoHA1EemKP426GDjFOg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ZZkWpHA1EemKP426GDjFOg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ZZkWpXA1EemKP426GDjFOg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_f8eC8HA1EemKP426GDjFOg" name="[0..*] friends" sourceNode="_X14WUHA1EemKP426GDjFOg" targetNode="_X14WUHA1EemKP426GDjFOg">
+      <target xmi:type="ecore:EReference" href="socialnetwork.ecore#//Person/friends"/>
+      <semanticElements xmi:type="ecore:EReference" href="socialnetwork.ecore#//Person/friends"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_erMusHA9EemKP426GDjFOg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_erMusXA9EemKP426GDjFOg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_erMusnA9EemKP426GDjFOg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_eULdMHA6EemKP426GDjFOg" sourceNode="_X14WUHA1EemKP426GDjFOg" targetNode="_X14WUHA1EemKP426GDjFOg" beginLabel="[0..*] children" endLabel="[0..2] parents">
+      <target xmi:type="ecore:EReference" href="socialnetwork.ecore#//Person/parents"/>
+      <semanticElements xmi:type="ecore:EReference" href="socialnetwork.ecore#//Person/children"/>
+      <semanticElements xmi:type="ecore:EReference" href="socialnetwork.ecore#//Person/parents"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_eUMEQHA6EemKP426GDjFOg" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_eUMEQXA6EemKP426GDjFOg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_eUMEQnA6EemKP426GDjFOg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_TbTBZHA1EemKP426GDjFOg"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <target xmi:type="ecore:EPackage" href="socialnetwork.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.ecore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.ecore
new file mode 100644
index 00000000..cacf9921
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.ecore
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="socialnetwork" nsURI="http://ecse.mcgill.ca/socialnetwork" nsPrefix="socialnetwork">
+  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SocialNetwork">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="SocialNetwork"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="persons" upperBound="-1"
+        eType="#//Person" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Person">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="friends" upperBound="-1"
+        eType="#//Person"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="Name"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.genmodel b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.genmodel
new file mode 100644
index 00000000..c9515653
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/socialnetwork.genmodel
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/SocialNetwork_plugin/encore_gen" creationIcons="false"
+    editDirectory="/ca.mcgill.ecse.socialnetwork.edit/src-gen" editorDirectory="/ca.mcgill.ecse.socialnetwork.editor/src-gen"
+    modelPluginID="SocialNetwork_plugin" modelName="Socialnetwork" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
+    copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>socialnetwork.ecore</foreignModel>
+  <testsDirectory xsi:nil="true"/>
+  <genPackages prefix="Socialnetwork" disposableProviderFactory="true" ecorePackage="socialnetwork.ecore#/">
+    <genClasses ecoreClass="socialnetwork.ecore#//SocialNetwork">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute socialnetwork.ecore#//SocialNetwork/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference socialnetwork.ecore#//SocialNetwork/persons"/>
+    </genClasses>
+    <genClasses ecoreClass="socialnetwork.ecore#//Person">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference socialnetwork.ecore#//Person/friends"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute socialnetwork.ecore#//Person/name"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/200_nodes.jpg b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/200_nodes.jpg
new file mode 100644
index 00000000..a35c291b
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/200_nodes.jpg
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/220_nodes.jpg b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/220_nodes.jpg
new file mode 100644
index 00000000..4d41dff7
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/220_nodes.jpg
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/260_nodes.jpg b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/260_nodes.jpg
new file mode 100644
index 00000000..b16cdfb2
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/260_nodes.jpg
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/280_nodes.jpg b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/280_nodes.jpg
new file mode 100644
index 00000000..16c0ee23
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/280_nodes.jpg
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/output.txt b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/output.txt
new file mode 100644
index 00000000..35158e20
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/output.txt
@@ -0,0 +1,300 @@
+1
+9
+7
+0
+4
+6
+16
+0
+2
+4
+17
+20
+1
+5
+2
+3
+11
+6
+4
+0
+2
+1
+3
+5
+9
+13
+11
+0
+1
+10
+3
+0
+1
+1
+0
+17
+0
+4
+2
+0
+1
+10
+10
+0
+24
+9
+0
+14
+1
+11
+2
+17
+3
+3
+3
+0
+3
+1
+3
+2
+2
+1
+0
+3
+6
+3
+16
+3
+10
+6
+6
+6
+11
+6
+10
+20
+1
+4
+13
+0
+0
+3
+2
+0
+12
+0
+0
+22
+4
+0
+0
+20
+1
+10
+9
+11
+5
+27
+1
+3
+9
+0
+23
+10
+9
+23
+0
+3
+7
+2
+0
+9
+3
+0
+12
+11
+7
+6
+9
+2
+0
+3
+4
+3
+9
+3
+0
+7
+2
+1
+9
+1
+11
+6
+5
+16
+0
+19
+14
+9
+13
+2
+8
+0
+6
+1
+1
+2
+0
+3
+15
+3
+0
+3
+17
+1
+15
+5
+1
+21
+8
+2
+7
+3
+16
+11
+1
+5
+1
+5
+1
+6
+3
+16
+6
+17
+3
+5
+7
+2
+9
+2
+1
+11
+1
+0
+3
+5
+6
+2
+5
+1
+4
+9
+0
+11
+1
+10
+13
+6
+2
+1
+3
+4
+0
+1
+2
+10
+12
+3
+3
+3
+0
+2
+4
+2
+18
+3
+8
+7
+5
+3
+16
+1
+4
+8
+15
+1
+11
+15
+1
+8
+7
+1
+2
+0
+9
+5
+2
+1
+3
+6
+4
+8
+3
+12
+4
+21
+9
+2
+3
+2
+1
+3
+11
+2
+9
+0
+10
+6
+1
+2
+0
+8
+5
+2
+3
+8
+1
+13
+8
+2
+2
+11
+4
+21
+6
+5
+0
+8
+8
+12
+0
+0
+4
+1
+19
+5
+3
+1
+3
+12
+2
+6
+11
+8
+8
+2
+18
+0
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/plot_distribution.m b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/plot_distribution.m
new file mode 100644
index 00000000..4c67a191
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/statistics/plot_distribution.m
@@ -0,0 +1,11 @@
+clear;
+clc;
+
+matrix = load('-ascii', "output.txt");
+hist(matrix,unique(matrix));
+hold on;
+[a,b] = hist(matrix,unique(matrix))
+plot(b, a)
+hold off;
+sum(matrix)
+average = sum(matrix) / length(matrix)
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/mpc_rep/R_2016324.xmi b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/mpc_rep/R_2016324.xmi
new file mode 100644
index 00000000..493a1731
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/mpc_rep/R_2016324.xmi
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.1/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <regions>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.0">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+            </vertices>
+          </regions>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.11/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.11/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.12/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.12/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.12"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.11"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.13/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.13/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.13"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.9"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry" incomingTransitions="//@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.2 //@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.1"/>
+      </regions>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/na_rep/R_2017419.xmi b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/na_rep/R_2017419.xmi
new file mode 100644
index 00000000..369760bf
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/na_rep/R_2017419.xmi
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.5/@outgoingTransitions.0">
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.3">
+          <outgoingTransitions target="//@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.3">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.3 //@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.4/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.1/@regions.0/@vertices.7/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.6/@outgoingTransitions.0"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.6/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.0"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@outgoingTransitions.1 //@regions.0/@vertices.3/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.0"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.6/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.5"/>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/out_d_rep/R_2015225.xmi b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/out_d_rep/R_2015225.xmi
new file mode 100644
index 00000000..21fee5a9
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/data/Yakinduum/out_d_rep/R_2015225.xmi
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.2 //@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.3/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <outgoingTransitions target="//@regions.0/@vertices.5"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.4/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.6/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.9"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.8/@outgoingTransitions.1 //@regions.0/@vertices.5/@outgoingTransitions.2"/>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.6"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.4/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.4/@regions.0/@vertices.6/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.2"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.2/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.3/@outgoingTransitions.0"/>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.4"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.9"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.3"/>
+      <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.7"/>
+      <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.5"/>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
index 72ea45d1..e1698e5b 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java
@@ -4,6 +4,10 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.viatra.query.runtime.matchers.aggregators.count;
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain;
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.KSDistance;
@@ -23,59 +27,127 @@ public class Main {
                 return message;
         }
         
+        private static String configFolder = "yakinduum/";
+        private static String configFileName = configFolder + "info.csv";
+        private static String aggregateViolationMeasureFileName = configFolder + "aggregateInfo2.csv";
+        
         public static void main(String args[]) {
 //              try {
                 
+                
+                long begin = System.currentTimeMillis();
+                String message = null;//runWithPath("yakinduGeneration.vsconfig");
+                long elapsed = System.currentTimeMillis() - begin;
+
+                if(message != null) {
+                        return;
+                }
                 ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+                String time = formatTime(elapsed);
+                ArrayList<String> infoOutput = new ArrayList<String>();
+                infoOutput.add(time);
+                output.add(infoOutput);
+                System.out.println(time);
+                //CsvFileWriter.write(output, configFileName);
+                
+                
+                output = new ArrayList<ArrayList<String>>();
                 output.add(prepareInfo());
-                CsvFileWriter.write(output, "yakinduum/info.csv");
-                //YakinduumModel.init();
-                generateModel(1);
-//              }catch(Exception e) {
-//                      e.printStackTrace();
-//              }finally {
-//                      outDegreeStatistic();
+                //CsvFileWriter.append(output, configFileName);
+                
+//              for(int i = 0; i < 50; i++) {
+//                      singleModelViolationMeasure(i+1);
 //              }
-//              outDegreeStatistic();
-
+                aggregateViolationMeasure(50);
+                System.out.println("Finished");
         }
-        
+
         public static void generateModel(int run) {
+                String filename = run+"_1.xmi";
                 //prepare initial info
-                long begin = System.currentTimeMillis();
-                String message = runWithPath("yakinduGeneration.vsconfig");
+                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+                ArrayList<String> infoOutput = new ArrayList<String>();
+                infoOutput.add(run+ "");
+                infoOutput.addAll(calculateMetric(run));
+
+                YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename);
+                int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum);
+                infoOutput.add(violationCount + "");
+
+                
+                
+                //save model to another directory
+                model.save(configFolder + run + ".xmi");
+                
+                CsvFileWriter.append(output, configFileName);
+        }
         
+        public static void singleModelViolationMeasure(int run) {
+                String filename = run+".xmi";
+                //prepare initial info
+                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+                ArrayList<String> infoOutput = new ArrayList<String>();
+                infoOutput.add(run+ "");
+
+                YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename);
                 
+                //parse map of violation counts to two list and add them to the result list 
+                Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
+                ArrayList<String> counts = new ArrayList<String>();
+                ArrayList<String> violationNames = new ArrayList<String>(map.keySet());
+                for(int i = 0; i < violationNames.size(); i++) {
+                        String name = violationNames.get(i);
+                        int total = map.get(name);
+                        counts.add(total + "");
+                }
+                output.add(infoOutput);
+                output.add(violationNames);
+                output.add(counts);
+                
+                CsvFileWriter.append(output, configFileName);
+        }
+        
+        public static void aggregateViolationMeasure(int size) {
+                ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
+                ArrayList<String> counts = new ArrayList<String>();
+                ArrayList<String> violationNames = null;
+                for(int run = 1; run < size+1; run++) {
+                        String filename = run+".xmi";
+                        YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename);
+
+                        Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
+                        if(run == 1) {
+                                violationNames = new ArrayList<String>(map.keySet());
+                                for(int i = 0; i < violationNames.size(); i++) {
+                                        String name = violationNames.get(i);
+                                        int total = map.get(name);
+                                        counts.add(total + "");
+                                }
+                        }else {
+                                for(int i = 0; i < violationNames.size(); i++) {
+                                        int count = Integer.parseInt(counts.get(i));
+                                        String name = violationNames.get(i);
+                                        int total = count + map.get(name);
+                                        counts.set(i, total + "");
+                                }
+                        }
+                }
                 
-                if(message == null) {
-                        ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
-                        long elapsed = System.currentTimeMillis() - begin;
-                        String time = formatTime(elapsed);
-                        
-                        ArrayList<String> infoOutput = new ArrayList<String>();
-                        infoOutput.add(run+ "");
-                        infoOutput.add(time);
-                        infoOutput.addAll(calculateMetric());
-                        
-                        YakinduumModel model = new YakinduumModel("output/Viatra_100/1.xmi");
-                        int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum);
-                        infoOutput.add(violationCount + "");
-                        
-                        //save model to another directory
-                        model.save("yakinduum/" + run + ".xmi");
-                        
-                        output.add(infoOutput);
-                        CsvFileWriter.append(output, "yakinduum/info.csv");
-                        System.out.println("Finished");
+                for(int i = 0; i < counts.size(); i++) {
+                        double count = Integer.parseInt(counts.get(i)) / (double) size;
+                        counts.set(i, count + "");
                 }
                 
+                output.add(violationNames);
+                output.add(counts);
+                CsvFileWriter.write(output, aggregateViolationMeasureFileName);
         }
         
-        public static ArrayList<String> calculateMetric() {
+        public static ArrayList<String> calculateMetric(int run) {
                 //read model and metric
                 ArrayList<String> output = new ArrayList<String>();
                 GraphReader reader = new GraphReader(YakindummPackage.eINSTANCE);
-                EMFGraph graph = reader.readModels("output/Viatra_100/").get(0);
+                EMFGraph graph = reader.readModels("output/Viatra_100/run"+run+"/").get(0);
                 
                 //KS distance
                 KSDistance ks = new KSDistance(Domain.Yakinduum);
@@ -86,17 +158,18 @@ public class Main {
                 output.add(ks.outDegreeDistance(samples.outDegreeSamples) + "");
                 output.add(ks.naDistance(samples.naSamples)+ "");
                 output.add(ks.mpcDistance(samples.mpcSamples) + "");
+                output.add(ks.typedOutDegreeDistance(samples.typedOutDegreeSamples) + "");
                 return output;
         }
         
         public static ArrayList<String> prepareInfo() {
                 ArrayList<String> info = new ArrayList<String>();
                 info.add("ID");
-                info.add("Time");
                 info.add("# of Nodes");
                 info.add("Out Degree");
                 info.add("Node Activity");
                 info.add("MPC");
+                info.add("Typed Out Degree");
                 info.add("Violations");
                 return info;
         }
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
index cf08c562..14e1a3f7 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduGeneration.vsconfig
@@ -1,5 +1,5 @@
-import epackage "../VIATRA-Generator/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.ecore"
-import viatra   "../VIATRA-Generator/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql"
+import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.ecore"
+import viatra   "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql"
 
 generate {
         metamodel = { package yakindumm excluding { Synchronization}}
@@ -13,7 +13,7 @@ generate {
         }
         
         number = 1
-        runs = 1
+        runs = 50
         config = {
                 log-level = none
         }
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/.gitignore
new file mode 100644
index 00000000..17126b28
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/.gitignore
@@ -0,0 +1,4 @@
+# ignore everything in this folder except for this folder it self
+
+*
+!.gitignore
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/1.xmi b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/1.xmi
deleted file mode 100644
index 6bee747f..00000000
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/1.xmi
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
-  <regions>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.1"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Exit" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.5 //@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.7">
-      <outgoingTransitions target="//@regions.0/@vertices.3"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Exit" incomingTransitions="//@regions.1/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.5/@regions.0/@vertices.0/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.7/@outgoingTransitions.2"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.3/@outgoingTransitions.4 //@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.4">
-      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.1"/>
-      <outgoingTransitions target="//@regions.0/@vertices.5"/>
-      <outgoingTransitions target="//@regions.0/@vertices.5"/>
-      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.0"/>
-      <outgoingTransitions target="//@regions.0/@vertices.3"/>
-      <outgoingTransitions target="//@regions.1/@vertices.1"/>
-      <regions>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.3/@outgoingTransitions.3">
-          <outgoingTransitions target="//@regions.1/@vertices.3"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.3/@outgoingTransitions.1">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.1"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.4"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.0">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
-          <outgoingTransitions target="//@regions.0/@vertices.0"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.5"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.3/@outgoingTransitions.0">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.0"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.5"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5"/>
-          <outgoingTransitions target="//@regions.1/@vertices.3"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.1 //@regions.0/@vertices.5/@regions.0/@vertices.4/@outgoingTransitions.2"/>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.1/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.7/@outgoingTransitions.1">
-          <outgoingTransitions target="//@regions.1/@vertices.0"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
-          <outgoingTransitions target="//@regions.0/@vertices.2"/>
-        </vertices>
-      </regions>
-      <regions>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.0/@outgoingTransitions.0">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.0"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.1/@vertices.2/@outgoingTransitions.0 //@regions.1/@vertices.8/@outgoingTransitions.1">
-          <outgoingTransitions target="//@regions.0/@vertices.4"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.1"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.5"/>
-          <outgoingTransitions target="//@regions.1/@vertices.7"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3"/>
-          <outgoingTransitions target="//@regions.0/@vertices.1"/>
-          <outgoingTransitions target="//@regions.1/@vertices.6"/>
-          <outgoingTransitions target="//@regions.0/@vertices.1"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.1"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.3/@outgoingTransitions.0">
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.3"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.1"/>
-        </vertices>
-      </regions>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.5/@outgoingTransitions.3">
-      <outgoingTransitions target="//@regions.0/@vertices.6"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.2 //@regions.0/@vertices.3/@outgoingTransitions.1 //@regions.0/@vertices.3/@outgoingTransitions.2 //@regions.0/@vertices.5/@outgoingTransitions.2 //@regions.1/@vertices.2/@outgoingTransitions.0">
-      <outgoingTransitions target="//@regions.1/@vertices.2"/>
-      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.6"/>
-      <outgoingTransitions target="//@regions.0/@vertices.5"/>
-      <outgoingTransitions target="//@regions.0/@vertices.4"/>
-      <regions>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.1/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.5/@regions.0/@vertices.0/@outgoingTransitions.2">
-          <outgoingTransitions target="//@regions.0/@vertices.3"/>
-          <outgoingTransitions target="//@regions.0/@vertices.2"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.0"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.5"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Exit" incomingTransitions="//@regions.1/@vertices.8/@outgoingTransitions.0"/>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
-          <outgoingTransitions/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@regions.0/@vertices.3/@outgoingTransitions.1">
-          <outgoingTransitions target="//@regions.1/@vertices.0"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.3"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.1">
-          <outgoingTransitions target="//@regions.1/@vertices.3"/>
-          <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.4"/>
-          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.6"/>
-        </vertices>
-        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Exit" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.2 //@regions.0/@vertices.5/@regions.0/@vertices.0/@outgoingTransitions.3"/>
-      </regions>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.1/@vertices.0/@outgoingTransitions.1 //@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.1/@vertices.2/@outgoingTransitions.1"/>
-  </regions>
-  <regions>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.5/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.1/@vertices.0/@outgoingTransitions.2">
-      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
-      <outgoingTransitions target="//@regions.0/@vertices.6"/>
-      <outgoingTransitions target="//@regions.1/@vertices.0"/>
-      <outgoingTransitions target="//@regions.1/@vertices.5"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.1/@vertices.5/@outgoingTransitions.2 //@regions.0/@vertices.3/@outgoingTransitions.5"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.0">
-      <outgoingTransitions target="//@regions.0/@vertices.5"/>
-      <outgoingTransitions target="//@regions.0/@vertices.6"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Exit" incomingTransitions="//@regions.0/@vertices.5/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.3 //@regions.0/@vertices.3/@regions.0/@vertices.0/@outgoingTransitions.0"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
-      <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.0"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.1/@vertices.0/@outgoingTransitions.3 //@regions.1/@vertices.5/@outgoingTransitions.1">
-      <outgoingTransitions target="//@regions.0/@vertices.2"/>
-      <outgoingTransitions target="//@regions.1/@vertices.5"/>
-      <outgoingTransitions target="//@regions.1/@vertices.1"/>
-      <outgoingTransitions target="//@regions.1/@vertices.8"/>
-    </vertices>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.6"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState" incomingTransitions="//@regions.0/@vertices.3/@regions.1/@vertices.1/@outgoingTransitions.3"/>
-    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.1/@vertices.5/@outgoingTransitions.3">
-      <outgoingTransitions target="//@regions.0/@vertices.5/@regions.0/@vertices.1"/>
-      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.1/@vertices.1"/>
-    </vertices>
-  </regions>
-</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv
index e11b75f9..c79bc07f 100644
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv
@@ -1,2 +1,150 @@
-ID,Time,# of Nodes,Out Degree,Node Activity,MPC,Violations
-1,3 : 50.959,100,0.031818181818181815,0.10775510204081633,0.10059701492537314,4
+1
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,12,6,0,0,0,8
+2
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,12,13,4,0,0,2
+3
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,4,9,3,0,0,0
+4
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,7,12,3,0,0,2
+5
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,8,7,6,0,0,2
+6
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,11,6,4,0,1,6
+7
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,2,9,10,4,1,0,2
+8
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,9,7,5,0,0,0
+9
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,6,0,13,8,4,0,0,10
+10
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,2,0,7,8,2,0,0,4
+11
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,2,0,8,7,3,0,0,2
+12
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,13,4,1,0,0,2
+13
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,12,20,2,0,0,2
+14
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,6,0,13,7,2,0,0,0
+15
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,2,0,15,12,3,0,2,2
+16
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,6,10,1,0,0,2
+17
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,1,9,7,2,0,0,4
+18
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,8,12,4,0,0,0
+19
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,10,10,1,0,0,0
+20
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,2,11,11,6,0,0,2
+21
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,15,12,4,1,0,2
+22
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,14,4,1,0,0,4
+23
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,8,11,4,0,0,2
+24
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,12,10,4,0,0,0
+25
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,1,9,1,4,0,0,2
+26
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,9,4,7,1,0,2
+27
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,11,31,0,0,0,2
+28
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,6,12,0,1,0,2
+29
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,10,10,3,0,0,0
+30
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,10,23,4,0,0,2
+31
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,4,8,3,0,0,2
+32
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,20,3,1,0,0,2
+33
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,1,9,11,7,0,0,2
+34
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,3,1,11,7,0,0,2
+35
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,2,0,7,14,6,0,0,0
+36
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,7,10,1,0,0,0
+37
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,13,8,3,0,1,2
+38
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,10,2,5,0,0,4
+39
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,11,8,5,0,0,2
+40
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,12,19,4,0,0,6
+41
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,7,0,2,14,1,2,0,2
+42
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,1,17,5,2,0,0,0
+43
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,10,6,2,0,0,0
+44
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,9,5,4,0,0,0
+45
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,1,0,7,13,4,0,0,2
+46
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,8,6,1,1,0,4
+47
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,5,0,8,11,6,0,0,0
+48
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,2,0,22,4,3,1,0,4
+49
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,4,0,10,5,2,0,0,2
+50
+choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
+0,0,3,0,13,11,2,0,0,6
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/mpc_rep/R_2016324.xmi b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/mpc_rep/R_2016324.xmi
new file mode 100644
index 00000000..493a1731
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/mpc_rep/R_2016324.xmi
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.1/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <regions>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.0">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+            </vertices>
+            <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0">
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+              <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+            </vertices>
+          </regions>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.11/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.11/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.12/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.12/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.12"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.11"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.13/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.13/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.13"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.9"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.2"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry" incomingTransitions="//@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.2 //@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.1"/>
+      </regions>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/na_rep/R_2017419.xmi b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/na_rep/R_2017419.xmi
new file mode 100644
index 00000000..369760bf
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/na_rep/R_2017419.xmi
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.5/@outgoingTransitions.0">
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.2 //@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.3">
+          <outgoingTransitions target="//@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.3/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.3">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.7/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.5/@outgoingTransitions.3 //@regions.0/@vertices.0/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.0/@regions.0/@vertices.9/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.10"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.0/@regions.0/@vertices.8/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.0/@regions.0/@vertices.8"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.0/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.4/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.1/@regions.0/@vertices.7/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.6/@outgoingTransitions.0"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.6/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.7"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1/@regions.0/@vertices.0"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@outgoingTransitions.1 //@regions.0/@vertices.3/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.0"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.1/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.1/@regions.0/@vertices.1/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.6/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.0"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.5"/>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/out_d_rep/R_2015225.xmi b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/out_d_rep/R_2015225.xmi
new file mode 100644
index 00000000..21fee5a9
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/data/Yakinduum/out_d_rep/R_2015225.xmi
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.2 //@regions.0/@vertices.2/@outgoingTransitions.0 //@regions.0/@vertices.3/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.2"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.10/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.0/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.10/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.9/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.10"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.7/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.8/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.2/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.1 //@regions.0/@vertices.2/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.6"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.5"/>
+          <outgoingTransitions target="//@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.0"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.2/@regions.0/@vertices.1/@outgoingTransitions.2">
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+          <outgoingTransitions target="//@regions.0/@vertices.2/@regions.0/@vertices.1"/>
+        </vertices>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.1"/>
+      <outgoingTransitions target="//@regions.0/@vertices.5"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.6/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.5/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.8/@outgoingTransitions.0 //@regions.0/@vertices.3/@regions.0/@vertices.1/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.4/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.8"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.2/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.1 //@regions.0/@vertices.3/@regions.0/@vertices.6/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.3/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.9"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.3/@regions.0/@vertices.8/@outgoingTransitions.1 //@regions.0/@vertices.5/@outgoingTransitions.2"/>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.5/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.6"/>
+      <regions>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.1"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.0/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.2"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.4/@outgoingTransitions.0 //@regions.0/@vertices.4/@regions.0/@vertices.1/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.4"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.8"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.1/@outgoingTransitions.0 //@regions.0/@vertices.4/@regions.0/@vertices.6/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.9"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.6"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.2/@outgoingTransitions.0">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.2"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.5"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.4/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.2"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.3/@outgoingTransitions.1">
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.3"/>
+          <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.7"/>
+        </vertices>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.6/@outgoingTransitions.1 //@regions.0/@vertices.6/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.2/@outgoingTransitions.1"/>
+        <vertices xsi:type="hu.bme.mit.inf.yakindumm:State" incomingTransitions="//@regions.0/@vertices.4/@regions.0/@vertices.3/@outgoingTransitions.0"/>
+      </regions>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.3/@outgoingTransitions.1">
+      <outgoingTransitions target="//@regions.0/@vertices.4"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.7"/>
+      <outgoingTransitions target="//@regions.0/@vertices.3/@regions.0/@vertices.9"/>
+    </vertices>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice" incomingTransitions="//@regions.0/@vertices.4/@outgoingTransitions.0">
+      <outgoingTransitions target="//@regions.0/@vertices.3"/>
+      <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.7"/>
+      <outgoingTransitions target="//@regions.0/@vertices.4/@regions.0/@vertices.5"/>
+    </vertices>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend
index 1745bc35..58ac7aea 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend
@@ -35,7 +35,7 @@ class Main {
                 
                 //human input has different package declaration
 //              reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE);
-                val human = new RWInformation("inputs/Fake_Random_Random/", "outputs/", 1);
+                val human = new RWInformation("inputs/config7/", "outputs/", 1);
                 calculateAllModels(human.inputFolder, human.outputFolder,human.numRuns, reader);
                 
                 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend
index 45986ecf..cdce185a 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend
@@ -1,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app
 
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.EuclideanDistance
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.JSDistance
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.KSDistance
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.StateData
@@ -8,6 +9,7 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.predictor.LinearModel
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
 import java.util.ArrayList
@@ -21,6 +23,7 @@ class PartialInterpretationMetricDistance {
         
         var KSDistance ks;
         var JSDistance js;
+        var EuclideanDistance ed;
         var Map<Object, StateData> stateAndHistory;
         var OLSMultipleLinearRegression regression;
         List<StateData> samples;
@@ -32,6 +35,7 @@ class PartialInterpretationMetricDistance {
         new(){
                 ks = new KSDistance(Domain.Yakinduum);
                 js = new JSDistance(Domain.Yakinduum);
+                ed = new EuclideanDistance(Domain.Yakinduum);
                 regression = new OLSMultipleLinearRegression();
                 regression.noIntercept = false;
                 stateAndHistory = new HashMap<Object, StateData>();
@@ -44,6 +48,7 @@ class PartialInterpretationMetricDistance {
                 metrics.add(new OutDegreeMetric());
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
+                metrics.add(new TypedOutDegree());
                 
                 val metricCalculator = new PartialInterpretationGraph(partial, metrics, null);          
                 var metricSamples = metricCalculator.evaluateAllMetricsToSamples();
@@ -51,6 +56,24 @@ class PartialInterpretationMetricDistance {
                 var mpc = ks.mpcDistance(metricSamples.mpcSamples);
                 var na = ks.naDistance(metricSamples.naSamples);
                 var outDegree = ks.outDegreeDistance(metricSamples.outDegreeSamples);
+                var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples);
+                
+                return new MetricDistanceGroup(mpc, na, outDegree, typedOutDegree);
+        }
+        
+        def MetricDistanceGroup calculateMetricEuclidean(PartialInterpretation partial){
+                val metrics = new ArrayList<Metric>();
+                metrics.add(new OutDegreeMetric());
+                metrics.add(new NodeActivityMetric());
+                metrics.add(new MultiplexParticipationCoefficientMetric());
+                metrics.add(new TypedOutDegree());
+                
+                val metricCalculator = new PartialInterpretationGraph(partial, metrics, null);          
+                var metricSamples = metricCalculator.evaluateAllMetricsToSamples();
+                
+                var mpc = ed.mpcDistance(metricSamples.mpcSamples);
+                var na = ed.naDistance(metricSamples.naSamples);
+                var outDegree = ed.outDegreeDistance(metricSamples.outDegreeSamples);
                 
                 return new MetricDistanceGroup(mpc, na, outDegree);
         }
@@ -132,14 +155,13 @@ class PartialInterpretationMetricDistance {
         }
         
         def double[] calculateFeature(int step, int violations){
-                var features = newDoubleArrayOfSize(5);
+                var features = newDoubleArrayOfSize(2);
                 //constant term
                 features.set(0, 1);
                 
                 features.set(1, 1.0 / step);
-                features.set(2, violations);
-                features.set(3, Math.pow(violations, 2));
-                features.set(4, Math.pow(violations, 0.5));
+//              features.set(2, violations);
+//              features.set(3, Math.pow(violations, 2));
                 
                 return features;
         }
@@ -149,6 +171,14 @@ class MetricDistanceGroup{
         var double mpcDistance;
         var double naDistance;
         var double outDegreeDistance;
+        var double typedOutDegreeDistance;
+        
+        new(double mpcDistance, double naDistance, double outDegreeDistance, double typedOutDegreeDistance){
+                this.mpcDistance = mpcDistance;
+                this.naDistance = naDistance;
+                this.outDegreeDistance = outDegreeDistance;
+                this.typedOutDegreeDistance = typedOutDegreeDistance;
+        }
         
         new(double mpcDistance, double naDistance, double outDegreeDistance){
                 this.mpcDistance = mpcDistance;
@@ -156,6 +186,10 @@ class MetricDistanceGroup{
                 this.outDegreeDistance = outDegreeDistance;
         }
         
+        def double getTypedOutDegreeDistance(){
+                return this.typedOutDegreeDistance;
+        }
+        
         def double getMPCDistance(){
                 return this.mpcDistance
         }
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/CostDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/CostDistance.xtend
index 33d10fa3..613f0f43 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/CostDistance.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/CostDistance.xtend
@@ -1,9 +1,25 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance
 
+import java.text.DecimalFormat
+import java.util.HashMap
+import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
 
-class CostDistance {
-
+abstract class CostDistance {
+        def abstract double naDistance(List<Double> samples);   
+        def abstract double mpcDistance(List<Double> samples);
+        def abstract double outDegreeDistance(List<Double> samples);
+        
+        def protected pmfFromSamples(double[] samples, DecimalFormat formatter){
+                var length = samples.length;
+                var pmfMap = new HashMap<String, Double>();
+                
+                for(sample : samples){
+                        pmfMap.put(formatter.format(sample), pmfMap.getOrDefault(formatter.format(sample), 0.0) + 1.0 / length);
+                }
+                
+                return pmfMap;
+        }
 }
 
 class StateData{
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/EuclideanDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/EuclideanDistance.xtend
new file mode 100644
index 00000000..b945d97b
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/EuclideanDistance.xtend
@@ -0,0 +1,73 @@
+package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance
+
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.RepMetricsReader
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
+import com.google.common.collect.Sets
+import java.text.DecimalFormat
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.List
+import java.util.Map
+import java.util.Set
+
+class EuclideanDistance extends CostDistance{
+        var MetricSampleGroup g;
+        var HashMap<String, Double> mpcPMF;
+        var HashMap<String, Double> naPMF;
+        var HashMap<String, Double> outDegreePMF;
+        var DecimalFormat formatter;
+        
+        new(Domain d){
+                var metrics = RepMetricsReader.read(d);
+                this.g = metrics;
+                
+                var mpcSamples = metrics.mpcSamples;
+                var naSamples = metrics.naSamples.stream.mapToDouble([it]).toArray();
+                var outDegreeSamples = metrics.outDegreeSamples.stream.mapToDouble([it]).toArray();
+                
+                //needs to format the number to string avoid precision issue
+                formatter = new DecimalFormat("#0.00000");  
+                
+                mpcPMF = pmfFromSamples(mpcSamples, formatter);
+                naPMF = pmfFromSamples(naSamples, formatter);
+                outDegreePMF = pmfFromSamples(outDegreeSamples, formatter);     
+        }
+        
+        override naDistance(List<Double> samples) {
+                var pmfMap = pmfFromSamples(samples, formatter);
+                return euclideanDistance(pmfMap, naPMF);
+        }
+        
+        override mpcDistance(List<Double> samples) {
+                var pmfMap = pmfFromSamples(samples, formatter);
+                return euclideanDistance(pmfMap, mpcPMF);
+        }
+        
+        override outDegreeDistance(List<Double> samples) {
+                var pmfMap = pmfFromSamples(samples, formatter);
+                return euclideanDistance(pmfMap, outDegreePMF);
+        }
+        
+        
+        def private euclideanDistance(HashMap<String, Double> pmf1, HashMap<String, Double> pmf2){
+                var keys = Sets.union(pmf1.keySet(), pmf2.keySet());
+                var pmfList1 = pmfMapToList(pmf1, keys);
+                var pmfList2 = pmfMapToList(pmf2, keys);
+                var distance = 0.0;
+                for(var i = 0; i < pmfList1.size(); i++){
+                        distance += Math.pow(pmfList1.get(i) + pmfList2.get(i), 2);
+                }
+                
+                return Math.sqrt(distance);
+        }       
+        
+        def private pmfMapToList(Map<String, Double> map, Set<String> keys){
+                var list = new ArrayList<Double>();
+                for(key : keys){
+                        var value = map.getOrDefault(key, 0.0);
+                        list.add(value);
+                }
+                return list;
+        }
+}
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/JSDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/JSDistance.xtend
index ced9eadb..df65b81f 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/JSDistance.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/JSDistance.xtend
@@ -7,7 +7,7 @@ import java.text.DecimalFormat
 import java.util.HashMap
 import java.util.List
 
-class JSDistance {
+class JSDistance extends CostDistance {
         var HashMap<String, Double> mpcPMF;
         var HashMap<String, Double> naPMF;
         var HashMap<String, Double> outDegreePMF;
@@ -27,17 +27,6 @@ class JSDistance {
                 outDegreePMF = pmfFromSamples(outDegreeSamples, formatter);     
         }
         
-        def private pmfFromSamples(double[] samples, DecimalFormat formatter){
-                var length = samples.length;
-                var pmfMap = new HashMap<String, Double>();
-                
-                for(sample : samples){
-                        pmfMap.put(formatter.format(sample), pmfMap.getOrDefault(formatter.format(sample), 0.0) + 1.0 / length);
-                }
-                
-                return pmfMap;
-        }
-        
         def private combinePMF(HashMap<String, Double> pmf1, HashMap<String, Double> pmf2){
                 var pmfMap = new HashMap<String, Double>();
                 
@@ -68,7 +57,7 @@ class JSDistance {
                 return distance;
         }
         
-        def double mpcDistance(List<Double> samples){
+        override double mpcDistance(List<Double> samples){
                 // map list to array
                 var map = pmfFromSamples(samples.stream().mapToDouble([it]).toArray(), formatter);
                 //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
@@ -76,7 +65,7 @@ class JSDistance {
                 return jsDivergence(map, mpcPMF);
         }
         
-        def double naDistance(List<Double> samples){
+        override double naDistance(List<Double> samples){
                 // map list to array
                 var map = pmfFromSamples(samples.stream().mapToDouble([it]).toArray(), formatter);
                 
@@ -85,7 +74,7 @@ class JSDistance {
                 return jsDivergence(map, naPMF);
         }
         
-        def double outDegreeDistance(List<Double> samples){
+        override double outDegreeDistance(List<Double> samples){
                 // map list to array
                 var map = pmfFromSamples(samples.stream().mapToDouble([it]).toArray(), formatter);
                 //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/KSDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/KSDistance.xtend
index 58e0a8a3..86f5f23c 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/KSDistance.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/distance/KSDistance.xtend
@@ -2,46 +2,65 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.RepMetricsReader
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
+import java.util.HashMap
+import java.util.HashSet
 import java.util.List
+import java.util.Set
 import org.apache.commons.math3.stat.inference.KolmogorovSmirnovTest
 
-class KSDistance {
+class KSDistance extends CostDistance {
         var static ksTester = new KolmogorovSmirnovTest();
-        var double[] mpcSamples;
-        var double[] naSamples;
-        var double[] outDegreeSamples;
-        
+        var MetricSampleGroup g;
         new(Domain d){
                 var metrics = RepMetricsReader.read(d);
-                mpcSamples = metrics.mpcSamples;
-                naSamples = metrics.naSamples.stream.mapToDouble([it]).toArray();
-                outDegreeSamples = metrics.outDegreeSamples.stream.mapToDouble([it]).toArray();
+                this.g = metrics;
         }
         
-        def double mpcDistance(List<Double> samples){
-                // map list to array
-                var arr = samples.stream.mapToDouble([it]).toArray();
-                
+        override double mpcDistance(List<Double> samples){
                 //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
-                if(arr.size < 2) return 1;
-                return ksTester.kolmogorovSmirnovStatistic(mpcSamples, arr);
+                if(samples.size < 2) return 1;
+                return ksTester.kolmogorovSmirnovStatistic(g.mpcSamples, samples);
         }
         
-        def double naDistance(List<Double> samples){
-                // map list to array
-                var arr = samples.stream.mapToDouble([it]).toArray();
-                
+        override double naDistance(List<Double> samples){
                 //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
-                if(arr.size < 2) return 1;
-                return ksTester.kolmogorovSmirnovStatistic(naSamples as double[], arr);
+                if(samples.size < 2) return 1;
+                return ksTester.kolmogorovSmirnovStatistic(g.naSamples as double[], samples);
         }
         
-        def double outDegreeDistance(List<Double> samples){
+        override double outDegreeDistance(List<Double> samples){
+                //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
+                if(samples.size < 2) return 1;
+                return ksTester.kolmogorovSmirnovStatistic(g.outDegreeSamples, samples);
+        }
+        
+        def double typedOutDegreeDistance(HashMap<String, List<Integer>> map){
+                var value = 0.0;
                 // map list to array
-                var arr = samples.stream.mapToDouble([it]).toArray();
+                val keySet = new HashSet<String>(map.keySet);
+                keySet.addAll(g.typedOutDegreeSamples.keySet);
+                for(key : keySet){
+                        if(!map.containsKey(key) ){
+                                value += 1;
+                        }else if(!g.typedOutDegreeSamples.containsKey(key)){
+                                value += map.get(key).size * 100;       
+                        }else{
+                                var double[] rep = g.typedOutDegreeSamples.get(key).stream().mapToDouble([it|it]).toArray();
+                                var double[] ins = map.get(key).stream().mapToDouble([it|it]).toArray();
+                                if((rep.size < 2 || ins.size < 2) ){
+                                        if(rep.size < 2 && rep.containsAll(ins)){
+                                                value += 0;
+                                        }else{
+                                                value += 1;
+                                        }
+                                }else if(rep.size >= 2 && ins.size >= 2){
+                                        value += ksTester.kolmogorovSmirnovStatistic(rep, ins);
+                                }
+                        }
+                } 
                 
-                //if the size of array is smaller than 2, ks distance cannot be performed, simply return 1
-                if(arr.size < 2) return 1;
-                return ksTester.kolmogorovSmirnovStatistic(outDegreeSamples, arr);
+                
+                return value;
         }
 }
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend
index 5c161f4b..b4c57bd8 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend
@@ -2,13 +2,14 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import java.util.ArrayList
+import java.util.HashSet
 import java.util.List
 import org.eclipse.emf.common.util.EList
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
 
 class EMFGraph extends Graph{   
-        def void init (EObject root, List<Metric> metrics, String name, List<String> referenceTypes){
+        def void init (EObject root, List<Metric> metrics, String name, List<EReference> referenceTypes){
                 val otherContents = root.eAllContents.toList();
                 otherContents.add(root);
                 init(otherContents, metrics, name, referenceTypes);
@@ -21,13 +22,15 @@ class EMFGraph extends Graph{
          * @param name: name of the instance model
          * @param ReferenceTypes: reference types defined in the meta model
          */
-        def void init(List<EObject> objects, List<Metric> metrics, String name, List<String> referenceTypes){
+        def void init(List<EObject> objects, List<Metric> metrics, String name, List<EReference> referenceTypes){
                 objects.forEach[it|
-                        statistic.addNode(it);
+                        var types = new HashSet(it.eClass.EAllSuperTypes.map[it|it.name]);
+                        types.add(it.eClass.name);
+                        statistic.addNodeWithAllTypes(it, types);
                 ]
                 
                 referenceTypes.forEach[it|
-                        statistic.addType(it);
+                        statistic.addEdgeType(it.name);
                 ];
                 
                 objects.forEach[source|
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
index cf4aedba..6b400b0d 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
@@ -2,11 +2,15 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
-import java.util.ArrayList
-import java.util.List
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.List
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric
 
 abstract class Graph {
         
@@ -42,11 +46,17 @@ abstract class Graph {
                 
                 for(metric : this.metrics){
                         if(metric instanceof MultiplexParticipationCoefficientMetric){
-                                sample.mpcSamples = metric.evaluateSamples(this.statistic);                             
+                                sample.mpcSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;                                
                         }else if(metric instanceof NodeActivityMetric){
-                                sample.naSamples = metric.evaluateSamples(this.statistic);
+                                sample.naSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;
                         }else if(metric instanceof OutDegreeMetric){
-                                sample.outDegreeSamples = metric.evaluateSamples(this.statistic);
+                                sample.outDegreeSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;
+                        }else if(metric instanceof TypedOutDegree){
+                                sample.typedOutDegreeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, List<Integer>>;
+                        }else if(metric instanceof NodeTypeMetric){
+                                sample.nodeTypeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, Double>;
+                        }else if (metric instanceof EdgeTypeMetric){
+                                sample.edgeTypeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, Double>;
                         }
                 }
                 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
index 7ed58094..9b8fd0e3 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
@@ -5,20 +5,22 @@ import com.google.common.collect.Multimap
 import java.util.HashMap
 import java.util.HashSet
 import java.util.List
+import java.util.Map
+import java.util.Set
 import org.eclipse.emf.ecore.EObject
 
 class GraphStatistic {
         val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
         val outcomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
-        
+
         val edgeTypes = new HashSet<String>();
-        val nodes = new HashSet<EObject>();
-                
+        val nodeToType = new HashMap<EObject, Set<String>>();   
+
         /**
          * Add an edge type to to the graph
          * @param type: type to add
          */
-        def void addType(String type){
+        def void addEdgeType(String type){
                 if(edgeTypes.contains(type)){
                         return;
                 }
@@ -28,15 +30,20 @@ class GraphStatistic {
         }
         
         /**
-         * Add a node to he graph 
+         * Add a node to the graph with one type in its type hierarchy
          * @param node: node to add
          */
-         def void addNode(EObject n){
-                if(nodes.contains(n)){
-                        return;
-                }
-                
-                nodes.add(n);
+         def void addNodeWithType(EObject n, String Type){
+                var types = nodeToType.getOrDefault(n, new HashSet<String>());
+                types.add(Type);
+                nodeToType.put(n, types);
+         }
+         
+         /**
+          * Add a node to the graph with all types in its type hierarchy
+          */
+         def void addNodeWithAllTypes(EObject n, Set<String> types){
+                nodeToType.put(n, types);
          }
          
          /**
@@ -82,7 +89,7 @@ class GraphStatistic {
           }
           
           /**
-           * calculate the number of edge types for a given degree.
+           * calculate the number of edge types for a given node.
            */
           def int numOfEdgeTypes(EObject o){
                 var count = 0;
@@ -100,8 +107,17 @@ class GraphStatistic {
                 return edgeTypes.toList();
           }
           
+          def Map<EObject, Set<String>> getNodeToTypesMap(){
+                return nodeToType;
+          }
+          
           def List<EObject> getAllNodes(){
-                return nodes.toList();
+                return nodeToType.keySet().toList();
           }
+          
+          def HashMap<String, Multimap<EObject, EObject>> getOutgoingEdges(){
+                return outcomingEdges; 
+          }
+          
 }
 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
index 14337ab0..91d7c5f9 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
@@ -4,11 +4,13 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.BooleanElementImpl
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialComplexTypeInterpretationImpl
 import java.util.ArrayList
 import java.util.List
 
 class PartialInterpretationGraph extends Graph{
+        val typeToExclude = "undefinedpart";
+        val classSuffix = " class";
         
         /**
          * Define a new PartialInterpretationGraph by parse every element from a PartialInterpretation
@@ -16,17 +18,21 @@ class PartialInterpretationGraph extends Graph{
         new(PartialInterpretation partial, List<Metric> metrics, String name){          
                 //the edge types are defined in terms of RelationDeclaration
                 partial.problem.relations.filter(RelationDeclaration).forEach[
-                        this.statistic.addType(it.name);
+                        //only need the name of the reference type (remove everything with and after "reference")
+                        this.statistic.addEdgeType(it.name.split(" ").get(0));
                 ]
                 // add all elements
-                val elements = getElements(partial);
-                for(element : elements){
-                        statistic.addNode(element)
+                val typeInterpretations = getTypes(partial);
+                for(type : typeInterpretations){
+                        var typeName = type.interpretationOf.name.replace(classSuffix, '');
+                        for(node : type.elements){
+                                this.statistic.addNodeWithType(node, typeName);
+                        }
                 }
                 
                 for(relationInterpretation : partial.partialrelationinterpretation) {
-                        val type = relationInterpretation.interpretationOf.name
-                        
+                        //only need the name of the reference type (remove everything with and after "reference")
+                        val type = relationInterpretation.interpretationOf.name.split(" ").get(0);
                         for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){
                                 statistic.addEdge(edge.param1, edge.param2, type);
                         }                       
@@ -62,8 +68,11 @@ class PartialInterpretationGraph extends Graph{
                 output.add(stateInfo);
         }
         
-        private def getElements(PartialInterpretation partial){
-                return partial.newElements.filter[!(it instanceof BooleanElementImpl)] + partial.problem.elements;
+        private def getTypes(PartialInterpretation partial){
+                //only the complex type interpretations are the ones defined in meta model
+                //do not care about undefined types as it will be included in the class type
+                return partial.partialtypeinterpratation.filter(PartialComplexTypeInterpretationImpl)
+                                                                                                .filter[!it.interpretationOf.name.toLowerCase.contains(typeToExclude)];
         }
         
         override getStatistic() {
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend
index fc56e142..8f1feb9d 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend
@@ -17,10 +17,18 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage
 
 class GraphReader{
         val ResourceSet resSet = new ResourceSetImpl();
-        val referenceTypes = new ArrayList<String>();
+        val referenceTypes = new ArrayList<EReference>();
+        
+        def static void main(String[] args){
+                var g = new GraphReader(YakindummPackage.eINSTANCE);
+        }
         
         new(EPackage metaModel) {
                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)
@@ -28,7 +36,7 @@ class GraphReader{
                 //find all reference types in the meta model
                 metaModel.eAllContents.forEach[
                         if(it instanceof EReference){
-                                referenceTypes.add(it.name);
+                                referenceTypes.add(it);
                         }
                 ]
         }
@@ -45,7 +53,10 @@ class GraphReader{
                 metrics.add(new OutDegreeMetric());
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
-                                
+                metrics.add(new TypedOutDegree());              
+                metrics.add(new NodeTypeMetric());
+                metrics.add(new EdgeTypeMetric());
+                
                 //check all files in the directory with xmi
                 for(String name : dir.list.filter[it| it.endsWith(".xmi")]){
                         val file = new File(name);
@@ -71,7 +82,7 @@ class GraphReader{
                         }
                 } catch(Exception e) {
                         e.printStackTrace();
-                        throw new FileNotFoundException(getURI(path, name).toString + "reason: " + e.message)
+                        throw new Exception(getURI(path, name).toString());
                 }
         }
         
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
index 867ddd1a..2ea12581 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
@@ -1,79 +1,43 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric
-import java.io.File
-import java.util.List
-import java.util.Scanner
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.YakindummPackageImpl
 
 /**
  * Read the sample of the distribution of a metric provided the csv file of the metric
  */
 class RepMetricsReader {
         static def read(Domain d){
-                var domainRepPath = CsvDataName.REP_PATH + d.name + '/';
+                var reader = new GraphReader(YakindummPackageImpl.eINSTANCE);
+                
+                
+                var domainRepPath = DataName.REP_PATH + d.name + '/';
                 var rep = new MetricSampleGroup()
-                rep.mpcSamples = readFile(domainRepPath + CsvDataName.MPC_REP, MultiplexParticipationCoefficientMetric.valueName,
-                                                          MultiplexParticipationCoefficientMetric.countName).map[Double.parseDouble(it)];
-                rep.naSamples = readFile(domainRepPath+CsvDataName.NA_REP, NodeActivityMetric.valueName, NodeActivityMetric.countName
-                                                        ).map[Double.parseDouble(it)];
-                rep.outDegreeSamples = readFile(domainRepPath+CsvDataName.OUT_D_REP, OutDegreeMetric.valueName, OutDegreeMetric.countName
-                                                        ).map[Double.parseDouble(it)];
+                var out_d = readMetrics(reader, domainRepPath + DataName.OUT_D_REP);
+                rep.mpcSamples = readMetrics(reader, domainRepPath + DataName.MPC_REP).mpcSamples;
+                rep.outDegreeSamples = out_d.outDegreeSamples;
+                rep.naSamples = readMetrics(reader, domainRepPath + DataName.NA_REP).naSamples;
+                rep.typedOutDegreeSamples = out_d.typedOutDegreeSamples;
+                rep.edgeTypeSamples = out_d.edgeTypeSamples;
+                rep.nodeTypeSamples = out_d.nodeTypeSamples;
                 return rep;
         }
         
         /**
-         * read metric data and parse it to samples
+         * Read representative model
          */
-        private static def List<String> readFile(String filename, String valueDataName, String countDataName){
-                var s = new Scanner(new File(filename));
-                val counts = newArrayList();
-                val values = newArrayList();
-                //read data from csv
-                while(s.hasNext()){
-                        var data = s.nextLine().split(',');     
-                        
-                        if(data.size >= 1){
-                                if(data.get(0).equals(countDataName)){
-                                        //add all data with parsing them as integers
-                                        counts.addAll(data.subList(1, data.size()).map[Integer.parseInt(it)]);
-                                }else if(data.get(0).equals(valueDataName)){
-                                        //add all data without parsing (there can be either double or string, to be parsed later)
-                                        values.addAll(data.subList(1, data.size()));
-                                }
-                        }
-                }
-                
-                return createSamples(counts, values);
+        private static def readMetrics(GraphReader r, String path){
+                var model = r.readModels(path).head;
+                return model.evaluateAllMetricsToSamples();
         }
         
-        // create samples from values and counts
-        private static def List<String> createSamples(List<Integer> counts, List<String> values){
-                val samples = newArrayList();
-                
-                if(counts.size() != values.size()){
-                        throw new RuntimeException("counts and values should have the same size!");
-                }
-                
-                for(var i = 0; i < counts.size(); i++){
-                        for(var j = 0; j < counts.get(i); j++){
-                                samples.add(values.get(i));
-                        }
-                }
-                
-                return samples;
-        }
-        
-        
 }
 
-class CsvDataName{
+class DataName{
         public static val REP_PATH = 'data/';
-        public static val MPC_REP = 'mpc_rep.csv';
-        public static val NA_REP = 'na_rep.csv';
-        public static val OUT_D_REP = 'out_d_rep.csv';
+        public static val MPC_REP = 'mpc_rep';
+        public static val NA_REP = 'na_rep';
+        public static val OUT_D_REP = 'out_d_rep';
 }
 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/EdgeTypeMetric.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/EdgeTypeMetric.xtend
new file mode 100644
index 00000000..0c0fe3b8
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/EdgeTypeMetric.xtend
@@ -0,0 +1,41 @@
+package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics
+
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.GraphStatistic
+import java.util.ArrayList
+import java.util.HashMap
+
+class EdgeTypeMetric extends Metric {
+        
+        override evaluate(GraphStatistic g) {
+                var map = evaluateSamples(g) as HashMap<String, Double>;
+                var output = new ArrayList<String[]>();
+                output.add(newArrayList('Edge Type'));
+                
+                var keys = map.keySet;
+                var values = newArrayList();
+                for(key : keys){
+                        values.add(map.get(key)+'');
+                }
+                
+                output.add(keys);
+                output.add(values);
+                
+                return output;
+        }
+        
+        override evaluateSamples(GraphStatistic g) {
+                val map = new HashMap<String, Double>();
+                var outgoingEdges = g.outgoingEdges;
+                
+                //get the total number of edges
+                val edgeCount = outgoingEdges.values.fold(0, [r, t| r + t.asMap.values.fold(0, [r1, t1| r1 + t1.size])]) as double;
+                outgoingEdges.forEach[k, v|
+                        var value = v.asMap.values.fold(0, [r, t| r + t.size]) / edgeCount;
+                        map.put(k, value);
+                ]
+                
+                        
+                return map;
+        }
+        
+}
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/Metric.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/Metric.xtend
index 38ef72f2..cb242a5b 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/Metric.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/Metric.xtend
@@ -4,5 +4,5 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.GraphStatis
 
 abstract class Metric {
         abstract def String[][] evaluate(GraphStatistic g);
-        abstract def double[] evaluateSamples(GraphStatistic g);
+        abstract def Object evaluateSamples(GraphStatistic g);
 }
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/MetricSampleGroup.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/MetricSampleGroup.xtend
index 8cd3daee..4e25bb86 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/MetricSampleGroup.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/MetricSampleGroup.xtend
@@ -1,9 +1,13 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics
 
+import java.util.HashMap
 import java.util.List
 
 class MetricSampleGroup{
         public var List<Double> mpcSamples;
         public var List<Double> naSamples;
         public var List<Double> outDegreeSamples;
+        public var HashMap<String, List<Integer>> typedOutDegreeSamples;
+        public var HashMap<String, Double> nodeTypeSamples;
+        public var HashMap<String, Double> edgeTypeSamples;
 }
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend
new file mode 100644
index 00000000..94eaa445
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend
@@ -0,0 +1,44 @@
+package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics
+
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.GraphStatistic
+import java.util.ArrayList
+import java.util.HashMap
+
+class NodeTypeMetric extends Metric {
+        
+        
+        override evaluate(GraphStatistic g) {
+                var map = evaluateSamples(g) as HashMap<String, Double>;
+                var output = new ArrayList<String[]>();
+                output.add(newArrayList('Node Type'));
+                var keys = map.keySet;
+                var values = newArrayList();
+                
+                for(key : keys){
+                        values.add(map.get(key)+'');
+                }
+                
+                output.add(keys);
+                output.add(values);
+                
+                return output;
+        }
+        
+        override evaluateSamples(GraphStatistic g) {
+                var map = new HashMap<String, Double>();
+                var nodes = g.allNodes;
+                var single = 1.0 / nodes.size();
+                for(node : nodes){
+                        var classes = new ArrayList(node.eClass.ESuperTypes);
+                        classes.add(node.eClass);
+                        
+                        for(cl : classes){
+                                var value = map.getOrDefault(cl.name, 0.0);
+                                map.put(cl.name, value + single);
+                        }       
+                }
+                
+                return map;
+        }
+        
+}
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedOutDegree.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedOutDegree.xtend
new file mode 100644
index 00000000..3b5dbcc5
--- /dev/null
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedOutDegree.xtend
@@ -0,0 +1,60 @@
+package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics
+
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.GraphStatistic
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.List
+
+class TypedOutDegree extends Metric{
+        
+        def private calculateMetric(GraphStatistic g){
+                var outgoingEdges = g.outgoingEdges;
+                //record metric as a list of samples for each node type / edge type pair
+                var metric = new HashMap<String, List<Integer>>();
+                var nodeToTypes = g.nodeToTypesMap;
+                
+                for(edgeType : outgoingEdges.keySet){
+                        for(node : outgoingEdges.get(edgeType).keySet){
+                                //find all classes the node belongs to
+                                var classes = nodeToTypes.get(node);
+                                for(cl : classes){
+                                        // get or create entry for node type / edge type pair
+                                        var key = cl + ' ' + edgeType;
+                                        var typeCount = metric.get(key);
+                                        if(typeCount === null){
+                                                typeCount = new ArrayList<Integer>();
+                                                metric.put(key, typeCount);
+                                        }
+                                        
+                                        // get or create sample list
+                                        typeCount.add(outgoingEdges.get(edgeType).get(node).size);
+                                }
+                        }
+                }
+                
+                return metric;
+        }
+        
+        override evaluate(GraphStatistic g) {
+                var metric = calculateMetric(g);
+                var output = new ArrayList<String[]>();
+                
+                output.add(newArrayList('Typed Out Degree'));
+                for(key : metric.keySet){
+                        var samples = metric.get(key);
+                        var String[] outputForOnePair = newArrayOfSize(samples.size+1);
+                        outputForOnePair.set(0, key);
+                        for(var i = 0; i < samples.size; i++){
+                                outputForOnePair.set(i+1, samples.get(i)+'');
+                        }
+                        output.add(outputForOnePair);
+                }
+                
+                return output;
+        }
+        
+        override evaluateSamples(GraphStatistic g) {
+                return calculateMetric(g);
+        }
+        
+}
\ No newline at end of file
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
new file mode 100644
index 00000000..4f8e97e2
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
new file mode 100644
index 00000000..7c2b5752
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
new file mode 100644
index 00000000..3cf659b2
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png
new file mode 100644
index 00000000..50b882da
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png
new file mode 100644
index 00000000..4e9a68d5
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png
new file mode 100644
index 00000000..bfa4b537
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
new file mode 100644
index 00000000..33176821
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
new file mode 100644
index 00000000..53c46e6f
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
new file mode 100644
index 00000000..abf45ff1
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png
deleted file mode 100644
index cd2af5ce..00000000
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png
+++ /dev/null
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png
deleted file mode 100644
index 2ce3672b..00000000
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png
+++ /dev/null
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png
deleted file mode 100644
index d4d9afe1..00000000
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png
+++ /dev/null
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
new file mode 100644
index 00000000..07c97401
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
new file mode 100644
index 00000000..f2fb5229
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
new file mode 100644
index 00000000..d2677e99
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png
new file mode 100644
index 00000000..a375c676
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png
new file mode 100644
index 00000000..d69cd298
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png
new file mode 100644
index 00000000..0584ac99
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
new file mode 100644
index 00000000..016cc2a3
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
new file mode 100644
index 00000000..55d32444
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
new file mode 100644
index 00000000..99cbbae4
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
new file mode 100644
index 00000000..b8480ae0
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
new file mode 100644
index 00000000..82268167
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
new file mode 100644
index 00000000..41bcd510
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png
new file mode 100644
index 00000000..b19bb958
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png
new file mode 100644
index 00000000..cccabc4e
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png
new file mode 100644
index 00000000..947ebdd2
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png
new file mode 100644
index 00000000..0ff4ee89
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png
new file mode 100644
index 00000000..1f9e2e18
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png
new file mode 100644
index 00000000..2c63cc3a
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
index 8d76fed9..8d76fed9 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/MPC.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
index daa7929a..daa7929a 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/Node Activity.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
index e56b1b6e..e56b1b6e 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-/Out Degree.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png
index 8705cee2..8705cee2 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png
index bdab3741..bdab3741 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png
index e4269f6e..e4269f6e 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png
index e4b6b527..e4b6b527 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png
index e067ad66..e067ad66 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png
index 9b89e4f9..9b89e4f9 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png
new file mode 100644
index 00000000..820df5c7
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png
new file mode 100644
index 00000000..b6aa957a
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png
new file mode 100644
index 00000000..161041d9
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png
index 4f189578..4f189578 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/MPC.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png
index add3c0f8..add3c0f8 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/Node Activity.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png
index f4717a1a..f4717a1a 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/real vs viatra vs alloy/Out Degree.png
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py b/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py
index 2f39ca93..a66802d5 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py
@@ -8,17 +8,19 @@ import matplotlib.pyplot as plt
 from scipy import stats
 import numpy as np
 from GraphType import GraphCollection
+import DistributionMetrics as metrics
 
 def main():
     # read models
-    human = GraphCollection('../input/humanOutput/', 500, 'Human')
-    viatra30 = GraphCollection('../input/viatraOutput30/', 500, 'Viatra (30 nodes)')
+    # human = GraphCollection('../input/humanOutput/', 500, 'Human')
+    # viatra30 = GraphCollection('../input/viatraOutput30/', 500,'Viatra (30 nodes)')
     # viatra60 = GraphCollection('../input/viatraOutput60/', 500, 'Viatra (60 nodes)')
-    # viatra100 = GraphCollection('../input/viatraOutput100/', 500, 'Viatra (100 nodes)')
+    viatra100 = GraphCollection('../input/viatraOutput100/', 500, 'Viatra (100 nodes)')
     # random = GraphCollection('../input/randomOutput/', 500, 'Random')
     # alloy = GraphCollection('../input/alloyOutput/', 500, 'Alloy (30 nodes)')
-
-    models_to_compare = [human, viatra30]
+    realistic_viatra = GraphCollection('../input/viatra_output_consistent_100/', 50, 'Realistic Viatra With Some Constraints (100 nodes)')
+    human100 = GraphCollection('../input/human_output_100/', 304, 'Human')
+    models_to_compare = [human100, realistic_viatra, viatra100]
     
     # define output folder
     outputFolder = '../output/'
@@ -38,7 +40,7 @@ def calculateKSMatrix(dists):
     for i in range(len(dist)):
         matrix[i,i] = 0
         for j in range(i+1, len(dist)):
-            value, p = stats.ks_2samp(dist[i], dist[j])
+            value = metrics.euclidean_distance(dist[i], dist[j])
             matrix[i, j] = value
             matrix[j, i] = value
     return matrix
@@ -50,13 +52,14 @@ def calculateMDS(dissimilarities):
     return trans
 
 def plot(graphTypes, coords, title='',index = 0, savePath = ''):
-    half_length = int(coords.shape[0] / len(graphTypes))
     color = ['blue', 'red', 'green', 'yellow']
     plt.figure(index, figsize=(7, 4))
     plt.title(title)
+    index = 0
     for i in range(len(graphTypes)):
-        x = (coords[(i*half_length):((i+1)*half_length), 0].tolist())
-        y = (coords[(i*half_length):((i+1)*half_length), 1].tolist())
+        x = (coords[index:index+graphTypes[i].size, 0].tolist())
+        y = (coords[index:index+graphTypes[i].size, 1].tolist())
+        index += graphTypes[i].size
         plt.plot(x, y, color=color[i], marker='o', label = graphTypes[i].name, linestyle='', alpha=0.7)
     plt.legend(loc='upper right')
     plt.savefig(fname = savePath, dpi=150)
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model_evolve_comparison/src/representative_selector .ipynb b/Metrics/Metrics-Calculation/metrics_plot/model_evolve_comparison/src/representative_selector .ipynb
index 78f408fc..329a46f6 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/model_evolve_comparison/src/representative_selector .ipynb
+++ b/Metrics/Metrics-Calculation/metrics_plot/model_evolve_comparison/src/representative_selector .ipynb
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -30,7 +30,8 @@
     "import ipywidgets as widgets\n",
     "from pyclustering.cluster.kmedoids import kmedoids\n",
     "from pyclustering.utils.metric import distance_metric, type_metric\n",
-    "import random"
+    "import random\n",
+    "import numpy as np"
    ]
   },
   {
@@ -176,23 +177,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0.046150929558524685\n"
+      "average distance:  0.04615092955852465\n",
+      "std:  0.017305709419913242\n",
+      "max: 0.1411706837186424\n",
+      "min: 0.0\n"
      ]
     }
    ],
    "source": [
-    "total_distance = 0\n",
-    "count = 0\n",
+    "distances = []\n",
     "for model in models:\n",
-    "    total_distance += ks_value(od_rep_model.out_d, model.out_d)\n",
-    "print(total_distance / len(models))"
+    "    distances.append(ks_value(od_rep_model.out_d, model.out_d))\n",
+    "print('average distance: ', np.mean(distances))\n",
+    "print('std: ', np.std(distances))\n",
+    "print('max:', max(distances))\n",
+    "print('min:', min(distances))"
    ]
   },
   {
@@ -217,7 +223,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -245,16 +251,21 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0.04679429311806747\n"
+      "average distance:  0.046794293118067494\n",
+      "std:  0.02880119213919405\n",
+      "max: 0.18702970297029703\n",
+      "min: 0.0\n"
      ]
     }
    ],
    "source": [
-    "total_distance = 0\n",
-    "count = 0\n",
+    "distances = []\n",
     "for model in models:\n",
-    "    total_distance += ks_value(na_rep_model.na, model.na)\n",
-    "print(total_distance / len(models))"
+    "    distances.append(ks_value(na_rep_model.na, model.na))\n",
+    "print('average distance: ', np.mean(distances))\n",
+    "print('std: ', np.std(distances))\n",
+    "print('max:', max(distances))\n",
+    "print('min:', min(distances))"
    ]
   },
   {
@@ -279,7 +290,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -300,23 +311,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0.07028909225833631\n"
+      "average distance:  0.07028909225833632\n",
+      "std:  0.03728189051222417\n",
+      "max: 0.21961550993809065\n",
+      "min: 0.0\n"
      ]
     }
    ],
    "source": [
-    "total_distance = 0\n",
-    "count = 0\n",
+    "distances = []\n",
     "for model in models:\n",
-    "    total_distance += ks_value(mpc_rep_model.mpc, model.mpc)\n",
-    "print(total_distance / len(models))"
+    "    distances.append(ks_value(mpc_rep_model.mpc, model.mpc))\n",
+    "print('average distance: ', np.mean(distances))\n",
+    "print('std: ', np.std(distances))\n",
+    "print('max:', max(distances))\n",
+    "print('min:', min(distances))"
    ]
   },
   {
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/DistributionMetrics.py b/Metrics/Metrics-Calculation/metrics_plot/utils/DistributionMetrics.py
new file mode 100644
index 00000000..6e707108
--- /dev/null
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/DistributionMetrics.py
@@ -0,0 +1,43 @@
+from scipy import stats
+from scipy.spatial import distance
+
+def ks_distance(samples1, samples2):
+    value, p = stats.ks_2samp(samples1, samples2)
+    return (value, p)
+
+def js_distance(samples1, samples2):
+    map1 = fromSamples(samples1)
+    map2 = fromSamples(samples2)
+    allKeys = set(map1.keys()) | set(map2.keys())
+    dist1 = distributionFromMap(map1, allKeys)
+    dist2 = distributionFromMap(map2, allKeys)
+    return distance.jensenshannon(dist1, dist2, 2)
+
+def euclidean_distance(samples1, samples2):
+    map1 = fromSamples(samples1)
+    map2 = fromSamples(samples2)
+    allKeys = set(map1.keys()) | set(map2.keys())
+    dist1 = distributionFromMap(map1, allKeys)
+    dist2 = distributionFromMap(map2, allKeys)
+    distance = 0
+    for i in range(len(dist2)):
+        distance += pow(dist1[i] - dist2[i], 2)
+    return pow(distance, 0.5)
+
+def fromSamples(samples):
+    m = {}
+    length = len(samples)
+    for sample in samples:
+        value = m.get(sample, 0)
+        m[sample] = value + 1
+    for key in list(m.keys()):
+        m[key] /= length
+    return m
+
+def distributionFromMap(m, allKeys):
+    dist = []
+    for key in allKeys:
+        value = m.get(key, 0)
+        dist.append(value)
+    return dist
+
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
index 13754e80..827c2a5e 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
@@ -11,13 +11,13 @@ class GraphCollection:
         self.nas = []
         self.mpcs = []
         self.name = name
+        self.size = number
         models = reader.readmultiplefiles(path, number, shouldShuffle)
         for i in range(len(models)):
             contents, out_d, na, mpc = reader.getmetrics(models[i])
             self.out_ds.append(out_d)
             self.nas.append(na)
             self.mpcs.append(mpc)
-        print(len(self.out_ds))
 
 #Graph stat for one graph
 class GraphStat:
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
index e0402519..b27a0ffc 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
@@ -24,9 +24,12 @@ def readcsvfile(filename):
             # meta models are string
             elif(arr[0] == constants.METAMODEL):
                 contents[constants.METAMODEL] = arr[1:]
-            # all other contants are integer
+            # NA and OD are integers
             else:
-                contents[arr[0]] = list(map(int, arr[1:]))
+                try:
+                    contents[arr[0]] = list(map(int, arr[1:]))
+                except:
+                    print(arr[0], ' is not integer')
     f.close()
     return contents