Implement containment circularity avoidance #20

author: ArenBabikian <aren.babikian@mail.mcgill.ca> 2019-04-05 03:32:48 -0400
committer: ArenBabikian <aren.babikian@mail.mcgill.ca> 2019-04-05 03:32:48 -0400
commit: 46995a62387aa07a6421a5546f466951f58c168c (patch)
tree: af284e3c21317784b2fc15334d19a292288c3e67
parent: test push (diff)
download: VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.tar.gz
VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.tar.zst
VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.zip
30 files changed, 838 insertions, 52 deletions
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.aird b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.aird
new file mode 100644
index 00000000..14cf13c6
--- /dev/null
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.aird
@@ -0,0 +1,644 @@
+<?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="_a7434FdxEemijrYgpDXTdg" selectedViews="_bkGucFdxEemijrYgpDXTdg _bkS7sFdxEemijrYgpDXTdg _bkUw4FdxEemijrYgpDXTdg _bkZpYFdxEemijrYgpDXTdg" version="14.1.0.201810161215">
+    <semanticResources>FamMetamodel.ecore</semanticResources>
+    <semanticResources>FamMetamodel.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_bkGucFdxEemijrYgpDXTdg">
+      <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="_cG1oEFdxEemijrYgpDXTdg" name="functionalarchitecture class diagram" repPath="#_cFj1sFdxEemijrYgpDXTdg">
+        <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="FamMetamodel.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_bkS7sFdxEemijrYgpDXTdg">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_bkUw4FdxEemijrYgpDXTdg">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_bkZpYFdxEemijrYgpDXTdg">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_cFj1sFdxEemijrYgpDXTdg" name="functionalarchitecture class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_cGvhcFdxEemijrYgpDXTdg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_cGwIgFdxEemijrYgpDXTdg">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_c7XcUFdxEemijrYgpDXTdg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_c7ibcFdxEemijrYgpDXTdg" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_c7ibcVdxEemijrYgpDXTdg" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_c7ibcldxEemijrYgpDXTdg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_c7pJIFdxEemijrYgpDXTdg" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_c7pJIVdxEemijrYgpDXTdg" 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="_c7pJIldxEemijrYgpDXTdg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_c7yTEFdxEemijrYgpDXTdg" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_c7yTEVdxEemijrYgpDXTdg" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_c7yTEldxEemijrYgpDXTdg" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_c70IQFdxEemijrYgpDXTdg" sourceArrow="InputArrow" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_c70IQVdxEemijrYgpDXTdg" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_c70IQldxEemijrYgpDXTdg" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_c71WYVdxEemijrYgpDXTdg" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_c71WYldxEemijrYgpDXTdg" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_c71WY1dxEemijrYgpDXTdg" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_cHZBsFdxEemijrYgpDXTdg" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_cHZBsVdxEemijrYgpDXTdg" type="Sirius" element="_cFj1sFdxEemijrYgpDXTdg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_c7_ucFdxEemijrYgpDXTdg" type="2003" element="_c6ggsFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8BjoFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8Em8FdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8Em8VdxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8Em8ldxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c7_ucVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c7_ucldxEemijrYgpDXTdg" x="420" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8FOAFdxEemijrYgpDXTdg" type="2003" element="_c6q4wFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8F1EFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8F1EVdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8F1EldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8F1E1dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8FOAVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8FOAldxEemijrYgpDXTdg" x="117" y="216"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8F1FFdxEemijrYgpDXTdg" type="2003" element="_c6tVAFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8GcIFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8GcIVdxEemijrYgpDXTdg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_c8O_AFdxEemijrYgpDXTdg" type="3010" element="_c7VAEFdxEemijrYgpDXTdg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_c8O_AVdxEemijrYgpDXTdg" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_c8O_AldxEemijrYgpDXTdg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8GcIldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8GcI1dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8F1FVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8F1FldxEemijrYgpDXTdg" x="384" y="552"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8HDMFdxEemijrYgpDXTdg" type="2003" element="_c6vKMFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8HDM1dxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8HDNFdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8HDNVdxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8HDNldxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8HDMVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8HDMldxEemijrYgpDXTdg" x="1380" y="252"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8HqQFdxEemijrYgpDXTdg" type="2003" element="_c6w_YFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8IRUFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8IRUVdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8IRUldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8IRU1dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8HqQVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8HqQldxEemijrYgpDXTdg" x="1080" y="565"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8IRVFdxEemijrYgpDXTdg" type="2003" element="_c6y0kFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8I4YFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8I4YVdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8I4YldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8I4Y1dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8IRVVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8IRVldxEemijrYgpDXTdg" x="744" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8I4ZFdxEemijrYgpDXTdg" type="2003" element="_c60CsFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8JfcFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8KGgFdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8KGgVdxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8KGgldxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8I4ZVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8I4ZldxEemijrYgpDXTdg" x="984" y="397"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8LUoFdxEemijrYgpDXTdg" type="2003" element="_c62e8FdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8L7sFdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8L7sVdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8L7sldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8L7s1dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8LUoVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8LUoldxEemijrYgpDXTdg" x="1188" y="397"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8MiwFdxEemijrYgpDXTdg" type="2003" element="_c64UIFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8NJ0FdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8NJ0VdxEemijrYgpDXTdg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8NJ0ldxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8NJ01dxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8MiwVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8MiwldxEemijrYgpDXTdg" x="1080" y="241"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c8NJ1FdxEemijrYgpDXTdg" type="2003" element="_c66wYFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8Nw4FdxEemijrYgpDXTdg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c8OX8FdxEemijrYgpDXTdg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_c8RbQFdxEemijrYgpDXTdg" type="3010" element="_c7afoVdxEemijrYgpDXTdg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_c8RbQVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_c8RbQldxEemijrYgpDXTdg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_c8SCUFdxEemijrYgpDXTdg" type="3010" element="_c7bGsFdxEemijrYgpDXTdg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_c8SCUVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_c8SCUldxEemijrYgpDXTdg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_c8SpYFdxEemijrYgpDXTdg" type="3010" element="_c7btwFdxEemijrYgpDXTdg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_c8SpYVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_c8SpYldxEemijrYgpDXTdg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c8OX8VdxEemijrYgpDXTdg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c8OX8ldxEemijrYgpDXTdg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c8NJ1VdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8NJ1ldxEemijrYgpDXTdg"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_cHZBsldxEemijrYgpDXTdg"/>
+        <edges xmi:type="notation:Edge" xmi:id="_c8alMFdxEemijrYgpDXTdg" type="4001" element="_c7gmQFdxEemijrYgpDXTdg" source="_c7_ucFdxEemijrYgpDXTdg" target="_c8FOAFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8bzUFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8bzUVdxEemijrYgpDXTdg" x="96" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8caYFdxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8caYVdxEemijrYgpDXTdg" x="87" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8ePkFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8ePkVdxEemijrYgpDXTdg" x="-3" y="26"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8alMVdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8alMldxEemijrYgpDXTdg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8alM1dxEemijrYgpDXTdg" points="[-59, -22, 218, 86]$[-313, -22, -36, 86]$[-313, -59, -36, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8rD4FdxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8rD4VdxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8rq8FdxEemijrYgpDXTdg" type="4001" element="_c7oiEFdxEemijrYgpDXTdg" source="_c8FOAFdxEemijrYgpDXTdg" target="_c7_ucFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8rq9FdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8rq9VdxEemijrYgpDXTdg" x="119" y="19"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8rq9ldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8rq91dxEemijrYgpDXTdg" x="5" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8sSAFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8sSAVdxEemijrYgpDXTdg" x="5"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8rq8VdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8rq8ldxEemijrYgpDXTdg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8rq81dxEemijrYgpDXTdg" points="[86, 23, -191, -85]$[242, 23, -35, -85]$[242, 59, -35, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8sSAldxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8sSA1dxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8sSBFdxEemijrYgpDXTdg" type="4001" element="_c7qXQFdxEemijrYgpDXTdg" source="_c8LUoFdxEemijrYgpDXTdg" target="_c8MiwFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8s5EFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8s5EVdxEemijrYgpDXTdg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8s5EldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8s5E1dxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8s5FFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8s5FVdxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8sSBVdxEemijrYgpDXTdg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8sSBldxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8sSB1dxEemijrYgpDXTdg" points="[12, 0, 120, 58]$[12, -13, 120, 45]$[-107, -13, 1, 45]$[-107, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8s5FldxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8s5F1dxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8tgIFdxEemijrYgpDXTdg" type="4001" element="_c7uosFdxEemijrYgpDXTdg" source="_c8I4ZFdxEemijrYgpDXTdg" target="_c8MiwFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8tgJFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8tgJVdxEemijrYgpDXTdg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8tgJldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8tgJ1dxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8tgKFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8tgKVdxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8tgIVdxEemijrYgpDXTdg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8tgIldxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8tgI1dxEemijrYgpDXTdg" points="[0, 0, -96, 58]$[0, -13, -96, 45]$[97, -13, 1, 45]$[97, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8uHMFdxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8uHMVdxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8uHMldxEemijrYgpDXTdg" type="4001" element="_c7v20FdxEemijrYgpDXTdg" source="_c8F1FFdxEemijrYgpDXTdg" target="_c7_ucFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8uHNldxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8uHN1dxEemijrYgpDXTdg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8uHOFdxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8uHOVdxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8uuQFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8uuQVdxEemijrYgpDXTdg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8uHM1dxEemijrYgpDXTdg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8uHNFdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8uHNVdxEemijrYgpDXTdg" points="[0, -98, -7, 228]$[0, -182, -7, 144]$[-1, -182, -8, 144]$[-1, -228, -8, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8uuQldxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8uuQ1dxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8uuRFdxEemijrYgpDXTdg" type="4001" element="_c7xE8FdxEemijrYgpDXTdg" source="_c8HqQFdxEemijrYgpDXTdg" target="_c8LUoFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8vVUFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8vVUVdxEemijrYgpDXTdg" x="16"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8vVUldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8vVU1dxEemijrYgpDXTdg" x="59" y="-7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8vVVFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8vVVVdxEemijrYgpDXTdg" x="4" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8uuRVdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8uuRldxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8uuR1dxEemijrYgpDXTdg" points="[59, 72, -49, 142]$[108, 72, 0, 142]$[108, -70, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8v8YFdxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8v8YVdxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8v8YldxEemijrYgpDXTdg" type="4001" element="_c7zhMFdxEemijrYgpDXTdg" source="_c8HqQFdxEemijrYgpDXTdg" target="_c8I4ZFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8wjc1dxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8wjdFdxEemijrYgpDXTdg" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8wjdVdxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8wjdldxEemijrYgpDXTdg" x="65" y="-18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8wjd1dxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8wjeFdxEemijrYgpDXTdg" x="12" y="-27"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8wjcFdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8wjcVdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8" bold="true"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8wjcldxEemijrYgpDXTdg" points="[-59, 72, 37, 142]$[-96, 72, 0, 142]$[-96, -70, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8xKgFdxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8xKgVdxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8xKgldxEemijrYgpDXTdg" type="4001" element="_c71WYFdxEemijrYgpDXTdg" source="_c8IRVFdxEemijrYgpDXTdg" target="_c8MiwFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8xKhldxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8xKh1dxEemijrYgpDXTdg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8xKiFdxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8xKiVdxEemijrYgpDXTdg" x="15" y="-18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8xKildxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8xKi1dxEemijrYgpDXTdg" x="-4" y="-18"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8xKg1dxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8xKhFdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8xKhVdxEemijrYgpDXTdg" points="[61, -48, -274, 35]$[276, -48, -59, 35]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8xxkFdxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8xxkVdxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8xxkldxEemijrYgpDXTdg" type="4001" element="_c719dldxEemijrYgpDXTdg" source="_c7_ucFdxEemijrYgpDXTdg" target="_c8F1FFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8yYoFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8yYoVdxEemijrYgpDXTdg" x="-21" y="7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8yYoldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8yYo1dxEemijrYgpDXTdg" x="26" y="12"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8yYpFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8yYpVdxEemijrYgpDXTdg" x="11" y="42"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8xxk1dxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8xxlFdxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8xxlVdxEemijrYgpDXTdg" points="[-59, 11, -52, -217]$[-131, 11, -124, -217]$[-131, 229, -124, 1]$[-95, 229, -88, 1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8yYpldxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8yYp1dxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8yYqFdxEemijrYgpDXTdg" type="4001" element="_c73Lk1dxEemijrYgpDXTdg" source="_c8HDMFdxEemijrYgpDXTdg" target="_c8MiwFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8y_sFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8y_sVdxEemijrYgpDXTdg" x="-32" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8y_sldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8y_s1dxEemijrYgpDXTdg" x="13" y="13"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8y_tFdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8y_tVdxEemijrYgpDXTdg" x="-12" y="-17"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8yYqVdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8yYqldxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8yYq1dxEemijrYgpDXTdg" points="[-59, 61, 241, -26]$[-241, 61, 59, -26]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8y_tldxEemijrYgpDXTdg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c8y_t1dxEemijrYgpDXTdg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c8y_uFdxEemijrYgpDXTdg" type="4001" element="_c75AwFdxEemijrYgpDXTdg" source="_c7_ucFdxEemijrYgpDXTdg" target="_c8IRVFdxEemijrYgpDXTdg">
+          <children xmi:type="notation:Node" xmi:id="_c8zmwFdxEemijrYgpDXTdg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8zmwVdxEemijrYgpDXTdg" x="44" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c8zmwldxEemijrYgpDXTdg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8zmw1dxEemijrYgpDXTdg" x="18" y="7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c80N0FdxEemijrYgpDXTdg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c80N0VdxEemijrYgpDXTdg" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c8y_uVdxEemijrYgpDXTdg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c8y_uldxEemijrYgpDXTdg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c8y_u1dxEemijrYgpDXTdg" points="[59, 11, -266, 11]$[265, 11, -60, 11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c80N0ldxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c80N01dxEemijrYgpDXTdg" id="(0.5,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c6ggsFdxEemijrYgpDXTdg" name="FunctionalElement" tooltipText="" outgoingEdges="_c7gmQFdxEemijrYgpDXTdg _c719dldxEemijrYgpDXTdg _c75AwFdxEemijrYgpDXTdg" incomingEdges="_c7oiEFdxEemijrYgpDXTdg _c7v20FdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalElement"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6lZMFdxEemijrYgpDXTdg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <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']/@conditionnalStyles.1/@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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c6q4wFdxEemijrYgpDXTdg" name="FunctionalArchitectureModel" tooltipText="" outgoingEdges="_c7oiEFdxEemijrYgpDXTdg" incomingEdges="_c7gmQFdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalArchitectureModel"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalArchitectureModel"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6rf0FdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c6tVAFdxEemijrYgpDXTdg" name="Function" tooltipText="" outgoingEdges="_c7v20FdxEemijrYgpDXTdg" incomingEdges="_c719dldxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//Function"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//Function"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6t8EFdxEemijrYgpDXTdg" 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="_c7VAEFdxEemijrYgpDXTdg" name="/type : FunctionType = Root" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="FamMetamodel.ecore#//Function/type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="FamMetamodel.ecore#//Function/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_c7ZRgFdxEemijrYgpDXTdg" labelColor="39,76,114" labelAlignment="LEFT" description="_c7XcUFdxEemijrYgpDXTdg">
+          <labelFormat>bold</labelFormat>
+        </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="_c6vKMFdxEemijrYgpDXTdg" name="FAMTerminator" tooltipText="" outgoingEdges="_c73Lk1dxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FAMTerminator"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FAMTerminator"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6vxQFdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c6w_YFdxEemijrYgpDXTdg" name="InformationLink" tooltipText="" outgoingEdges="_c7xE8FdxEemijrYgpDXTdg _c7zhMFdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//InformationLink"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//InformationLink"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6xmcFdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c6y0kFdxEemijrYgpDXTdg" name="FunctionalInterface" tooltipText="" outgoingEdges="_c71WYFdxEemijrYgpDXTdg" incomingEdges="_c75AwFdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInterface"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInterface"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c6zboFdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c60CsFdxEemijrYgpDXTdg" name="FunctionalInput" tooltipText="" outgoingEdges="_c7uosFdxEemijrYgpDXTdg" incomingEdges="_c7zhMFdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInput"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInput"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c60pwFdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c62e8FdxEemijrYgpDXTdg" name="FunctionalOutput" tooltipText="" outgoingEdges="_c7qXQFdxEemijrYgpDXTdg" incomingEdges="_c7xE8FdxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalOutput"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalOutput"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c63GAFdxEemijrYgpDXTdg" 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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c64UIFdxEemijrYgpDXTdg" name="FunctionalData" tooltipText="" incomingEdges="_c7qXQFdxEemijrYgpDXTdg _c7uosFdxEemijrYgpDXTdg _c71WYFdxEemijrYgpDXTdg _c73Lk1dxEemijrYgpDXTdg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalData"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalData"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c647MFdxEemijrYgpDXTdg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <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']/@conditionnalStyles.1/@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']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c66wYFdxEemijrYgpDXTdg" name="FunctionType" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="FamMetamodel.ecore#//FunctionType"/>
+      <semanticElements xmi:type="ecore:EEnum" href="FamMetamodel.ecore#//FunctionType"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_c66wYVdxEemijrYgpDXTdg" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
+        <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%20EEnum']/@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%20EEnum']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_c7afoVdxEemijrYgpDXTdg" name="Root" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Root"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Root"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_c7afoldxEemijrYgpDXTdg" 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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_c7bGsFdxEemijrYgpDXTdg" name="Intermediate" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Intermediate"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Intermediate"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_c7bGsVdxEemijrYgpDXTdg" 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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_c7btwFdxEemijrYgpDXTdg" name="Leaf" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Leaf"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="FamMetamodel.ecore#//FunctionType/Leaf"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_c7btwVdxEemijrYgpDXTdg" 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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@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%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c7gmQFdxEemijrYgpDXTdg" name="[1..1] /model" sourceNode="_c6ggsFdxEemijrYgpDXTdg" targetNode="_c6q4wFdxEemijrYgpDXTdg">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/model"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/model"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7lewFdxEemijrYgpDXTdg" description="_c7ibcFdxEemijrYgpDXTdg" routingStyle="manhattan" strokeColor="114,159,207">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_c7mF0VdxEemijrYgpDXTdg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c7mF0FdxEemijrYgpDXTdg" 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="_c7oiEFdxEemijrYgpDXTdg" name="[0..*] rootElements" sourceNode="_c6q4wFdxEemijrYgpDXTdg" targetNode="_c6ggsFdxEemijrYgpDXTdg">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalArchitectureModel/rootElements"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalArchitectureModel/rootElements"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7pJI1dxEemijrYgpDXTdg" description="_c7pJIFdxEemijrYgpDXTdg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_c7pJJVdxEemijrYgpDXTdg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c7pJJFdxEemijrYgpDXTdg" 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="_c7qXQFdxEemijrYgpDXTdg" sourceNode="_c62e8FdxEemijrYgpDXTdg" targetNode="_c64UIFdxEemijrYgpDXTdg">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalOutput"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalOutput"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7takFdxEemijrYgpDXTdg" targetArrow="InputClosedArrow" routingStyle="tree">
+        <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%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c7uBoFdxEemijrYgpDXTdg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_c7uBoVdxEemijrYgpDXTdg" 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='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c7uosFdxEemijrYgpDXTdg" sourceNode="_c60CsFdxEemijrYgpDXTdg" targetNode="_c64UIFdxEemijrYgpDXTdg">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInput"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//FunctionalInput"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7vPwFdxEemijrYgpDXTdg" targetArrow="InputClosedArrow" routingStyle="tree">
+        <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%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c7vPwVdxEemijrYgpDXTdg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_c7vPwldxEemijrYgpDXTdg" 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='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c7v20FdxEemijrYgpDXTdg" sourceNode="_c6tVAFdxEemijrYgpDXTdg" targetNode="_c6ggsFdxEemijrYgpDXTdg">
+      <target xmi:type="ecore:EClass" href="FamMetamodel.ecore#//Function"/>
+      <semanticElements xmi:type="ecore:EClass" href="FamMetamodel.ecore#//Function"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7wd4FdxEemijrYgpDXTdg" targetArrow="InputClosedArrow" routingStyle="tree">
+        <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%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c7wd4VdxEemijrYgpDXTdg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_c7wd4ldxEemijrYgpDXTdg" 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='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c7xE8FdxEemijrYgpDXTdg" sourceNode="_c6w_YFdxEemijrYgpDXTdg" targetNode="_c62e8FdxEemijrYgpDXTdg" beginLabel="[0..*] outgoingLinks" endLabel="[0..1] from">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//InformationLink/from"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//InformationLink/from"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalOutput/outgoingLinks"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c7y6IFdxEemijrYgpDXTdg" description="_c7yTEFdxEemijrYgpDXTdg" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c7y6IVdxEemijrYgpDXTdg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c7y6IldxEemijrYgpDXTdg" 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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c7zhMFdxEemijrYgpDXTdg" sourceNode="_c6w_YFdxEemijrYgpDXTdg" targetNode="_c60CsFdxEemijrYgpDXTdg" beginLabel="[0..*] IncomingLinks" endLabel="[1..1] to">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//InformationLink/to"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalInput/IncomingLinks"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//InformationLink/to"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c70IQ1dxEemijrYgpDXTdg" description="_c70IQFdxEemijrYgpDXTdg" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c70IRFdxEemijrYgpDXTdg" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </beginLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c70IRVdxEemijrYgpDXTdg" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </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='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c71WYFdxEemijrYgpDXTdg" sourceNode="_c6y0kFdxEemijrYgpDXTdg" targetNode="_c64UIFdxEemijrYgpDXTdg" beginLabel="[0..1] interface" endLabel="[0..*] data">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalInterface/data"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalInterface/data"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalData/interface"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c719cFdxEemijrYgpDXTdg" description="_c71WYVdxEemijrYgpDXTdg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c719cVdxEemijrYgpDXTdg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c719cldxEemijrYgpDXTdg" 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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c719dldxEemijrYgpDXTdg" sourceNode="_c6ggsFdxEemijrYgpDXTdg" targetNode="_c6tVAFdxEemijrYgpDXTdg" beginLabel="[0..*] subElements" endLabel="[0..1] parent">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/parent"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/parent"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//Function/subElements"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c72kgFdxEemijrYgpDXTdg" description="_c7yTEFdxEemijrYgpDXTdg" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c72kgVdxEemijrYgpDXTdg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c72kgldxEemijrYgpDXTdg" 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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c73Lk1dxEemijrYgpDXTdg" sourceNode="_c6vKMFdxEemijrYgpDXTdg" targetNode="_c64UIFdxEemijrYgpDXTdg" beginLabel="[0..1] terminator" endLabel="[0..1] data">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FAMTerminator/data"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FAMTerminator/data"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalData/terminator"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c74ZsFdxEemijrYgpDXTdg" description="_c7yTEFdxEemijrYgpDXTdg" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c74ZsVdxEemijrYgpDXTdg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c74ZsldxEemijrYgpDXTdg" 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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c75AwFdxEemijrYgpDXTdg" sourceNode="_c6ggsFdxEemijrYgpDXTdg" targetNode="_c6y0kFdxEemijrYgpDXTdg" beginLabel="[0..1] element" endLabel="[0..1] interface">
+      <target xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/interface"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalInterface/element"/>
+      <semanticElements xmi:type="ecore:EReference" href="FamMetamodel.ecore#//FunctionalElement/interface"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_c75n0FdxEemijrYgpDXTdg" description="_c71WYVdxEemijrYgpDXTdg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_c75n0VdxEemijrYgpDXTdg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_c75n0ldxEemijrYgpDXTdg" 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="_cF5z8FdxEemijrYgpDXTdg"/>
+    <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']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
+    <target xmi:type="ecore:EPackage" href="FamMetamodel.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/plugin.xml b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/plugin.xml
index 2381b84f..beaf5498 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/plugin.xml
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/plugin.xml
@@ -1 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.4"?><plugin/>
+<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.4"?><plugin>
+  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.VampireQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.VampireQueries" id="ca.mcgill.ecse.dslreasoner.vampire.queries.VampireQueries">
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation"/>
+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality"/>
+    </group>
+  </extension>
+</plugin>
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql
index 2bc22f9e..ef61e4d1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql
@@ -48,9 +48,9 @@ pattern VLSInequality(term: VLSInequality){
        VLSInequality(term);
 }
-pattern VLSFunctionFof(term: VLSFunctionFof){
+//pattern VLSFunctionFof(term: VLSFunctionFof){
-        VLSFunctionFof(term);
+//      VLSFunctionFof(term);
-}
+//}
 //pattern VLSFofTerm(term: VLSFofTerm){
 //      VLSFofTerm(term);
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireAnalyzerConfiguration.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireAnalyzerConfiguration.xtend
index 618980a3..98967181 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireAnalyzerConfiguration.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireAnalyzerConfiguration.xtend
@@ -4,7 +4,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration
 class VampireSolverConfiguration extends LogicSolverConfiguration {
        
-        //public var int symmetry = 0 // by default
+        public var int contCycleLevel = 0
+        public var boolean uniquenessDuplicates = false
        //choose needed backend solver
 //      public var VampireBackendSolver solver = VampireBackendSolver.SAT4J
 }
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
index b7ad8f3d..2be6c093 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
@@ -87,7 +87,7 @@ class Logic2VampireLanguageMapper {
                problem.relations.forEach[this.relationMapper.transformRelation(it, trace)]
                
                // CONTAINMENT MAPPER
-                containmentMapper.transformContainment(problem.containmentHierarchies, trace)
+                containmentMapper.transformContainment(config,problem.containmentHierarchies, trace)
                // CONSTANT MAPPER
                // only transforms definitions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
index 48ee8789..395b4305 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
@@ -1,6 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable
@@ -25,9 +25,9 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                this.base = base
        }
-        def public void transformContainment(List<ContainmentHierarchy> hierarchies,
+        def public void transformContainment(VampireSolverConfiguration config, List<ContainmentHierarchy> hierarchies,
                Logic2VampireLanguageMapperTrace trace) {
-                //TODO throw error is there exists a circular containment that does not involve hierarchy
+                // TODO throw error is there exists a circular containment that does not involve hierarchy
                // TODO CONSIDER CASE WHERE MULTIPLE CONTAINMMENT HIERARCHIES EXIST
                // TEMP
                val hierarchy = hierarchies.get(0)
@@ -94,7 +94,6 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
 //                      for (c : support.listSubtypes(toType)) {
 //                              addToMap(type2cont, toFunc, rel)
 //                      }
 //                      val listForAnd = newArrayList
 ////                    listForAnd.add(support.duplicate(fromType.lookup(trace.type2Predicate), varB))
 //                      listForAnd.add(support.duplicate((l as RelationDeclaration).lookup(trace.rel2Predicate), varList))
@@ -111,7 +110,7 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                        // STEP 3
                        // Ensure that an objct only has 1 parent
                        val relFormula = createVLSFofFormula => [
-                                it.name = support.toIDMultiple("noDupCont", rel.constant.toString)
+                                it.name = support.toIDMultiple("containment_noDup", rel.constant.toString)
                                it.fofRole = "axiom"
                                it.fofFormula = createVLSExistentialQuantifier => [
                                        it.variables += support.duplicate(varA)
@@ -133,7 +132,7 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                }
-// STEP  CONT'D
+// STEP 2 CONT'D
                for (e : type2cont.entrySet) {
                        val relFormula = createVLSFofFormula => [
                                it.name = support.toIDMultiple("containment", e.key.constant.toString)
@@ -159,8 +158,39 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                }
-        // STEP 4
+                // STEP 4
-        // Ensure that there are no cycles in the hierarchy (maybe same as for step3?)
+                // Ensure that there are no cycles in the hierarchy (maybe same as for step3?)
+                // Attempt 1: all possibilities, even the impossible one, based on MM constraints, are listed
+                
+                
+                val variables = newArrayList
+                val disjunctionList = newArrayList
+                val conjunctionList = newArrayList
+                for (var i = 1; i <= config.contCycleLevel; i++) {
+                        val ind = i
+                        variables.add(createVLSVariable => [it.name = ("V"+Integer.toString(ind))])
+                        for ( var j = 0; j < i;j++){
+                                for (l : relationsList) {
+                                        val rel = support.duplicate((l as RelationDeclaration).lookup(trace.rel2Predicate), newArrayList(variables.get(j), variables.get((j+1)%i)))
+                                        disjunctionList.add(rel)
+                                }
+                                conjunctionList.add(support.unfoldOr(disjunctionList))
+                                disjunctionList.clear
+                        }
+                        
+                        val contCycleForm = createVLSFofFormula => [
+                                it.name = support.toIDMultiple("containment_noCycle", Integer.toString(ind))
+                                it.fofRole = "axiom"
+                                it.fofFormula = createVLSUnaryNegation => [
+                                        it.operand = createVLSExistentialQuantifier => [
+                                                it.variables += support.duplicate(variables)
+                                                it.operand = support.unfoldAnd(conjunctionList)
+                                        ]
+                                ]
+                        ]
+                        trace.specification.formulas += contCycleForm
+                        conjunctionList.clear
+                }
        }
        protected def VLSTerm makeUnique(List<VLSFunction> list) {
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
index 0d0be576..0a8812e4 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -1,17 +1,15 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import java.util.ArrayList
+import java.util.HashMap
 import java.util.Map
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import java.util.HashMap
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
-import java.util.List
 class Logic2VampireLanguageMapper_ScopeMapper {
        private val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE
@@ -23,7 +21,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                this.base = base
        }
-        def dispatch public void transformScope(LogicSolverConfiguration config, Logic2VampireLanguageMapperTrace trace) {
+        def dispatch public void transformScope(VampireSolverConfiguration config, Logic2VampireLanguageMapperTrace trace) {
                val ABSOLUTE_MIN = 0
                val ABSOLUTE_MAX = Integer.MAX_VALUE
@@ -40,7 +38,6 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                // Handling Minimum_General
                if (GLOBAL_MIN != ABSOLUTE_MIN) {
-                        // *
                        getInstanceConstants(GLOBAL_MIN, 0, localInstances, trace, true, !consistant)
                        if (consistant) {
                                for (i : trace.uniqueInstances) {
@@ -94,7 +91,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
 // 3. Specify uniqueness of elements
                // TEMP
-                val DUPLICATES = false
+                val DUPLICATES = config.uniquenessDuplicates
                val numInst = trace.uniqueInstances.length
                var ind = 1
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
index dd88a53a..195b89bb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
@@ -77,6 +77,14 @@ class Logic2VampireLanguageMapper_Support {
                        it.terms += duplicate(v)
                ]
        }
+        
+        def protected List<VLSVariable> duplicate(List<VLSVariable> vars) {
+                        var newList = newArrayList
+                        for (v : vars) {
+                                newList.add(duplicate(v))
+                        }
+                        return newList
+        }
        def protected VLSConstant toConstant(VLSFunctionAsTerm term) {
                return createVLSConstant => [
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index b5e03979..7394b24e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index 0714f36d..d328dcf2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolverConfiguration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolverConfiguration.java
index 1f6b3d42..ac55ebd7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolverConfiguration.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolverConfiguration.java
@@ -4,4 +4,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration;
 @SuppressWarnings("all")
 public class VampireSolverConfiguration extends LogicSolverConfiguration {
+  public int contCycleLevel = 0;
+  
+  public boolean uniquenessDuplicates = false;
 }
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 2cc60591..968a2df8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index 01b0a351..48756fcc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index cf049bd5..44b06208 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index 7bc04e7b..4cab8309 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index a97c7186..ccddb430 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index a473c586..a069a62f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index 4e7796fe..46cd58fb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index 84d6c63a..1b5e4d0b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
Binary files differ
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java
index 36a727b2..f04bd7dc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java
@@ -123,7 +123,7 @@ public class Logic2VampireLanguageMapper {
      this.relationMapper.transformRelation(it, trace);
    };
    problem.getRelations().forEach(_function_3);
-    this.containmentMapper.transformContainment(problem.getContainmentHierarchies(), trace);
+    this.containmentMapper.transformContainment(config, problem.getContainmentHierarchies(), trace);
    trace.constantDefinitions = this.collectConstantDefinitions(problem);
    final Consumer<ConstantDefinition> _function_4 = (ConstantDefinition it) -> {
      this.constantMapper.transformConstantDefinitionSpecification(it, trace);
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
index 7bc70e9d..4cdc7e6a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
@@ -1,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support;
@@ -16,6 +17,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;
 import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
@@ -52,7 +54,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
    this.base = base;
  }
  
-  public void transformContainment(final List<ContainmentHierarchy> hierarchies, final Logic2VampireLanguageMapperTrace trace) {
+  public void transformContainment(final VampireSolverConfiguration config, final List<ContainmentHierarchy> hierarchies, final Logic2VampireLanguageMapperTrace trace) {
    final ContainmentHierarchy hierarchy = hierarchies.get(0);
    final EList<Type> containmentListCopy = hierarchy.getTypesOrderedInHierarchy();
    final EList<Relation> relationsList = hierarchy.getContainmentRelations();
@@ -135,7 +137,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
        }
        VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();
        final Procedure1<VLSFofFormula> _function_4 = (VLSFofFormula it) -> {
-          it.setName(this.support.toIDMultiple("noDupCont", rel.getConstant().toString()));
+          it.setName(this.support.toIDMultiple("containment_noDup", rel.getConstant().toString()));
          it.setFofRole("axiom");
          VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();
          final Procedure1<VLSExistentialQuantifier> _function_5 = (VLSExistentialQuantifier it_1) -> {
@@ -219,6 +221,57 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
        _formulas_1.add(relFormula);
      }
    }
+    final ArrayList<VLSVariable> variables = CollectionLiterals.<VLSVariable>newArrayList();
+    final ArrayList<VLSFunction> disjunctionList = CollectionLiterals.<VLSFunction>newArrayList();
+    final ArrayList<VLSTerm> conjunctionList = CollectionLiterals.<VLSTerm>newArrayList();
+    for (int i = 1; (i <= config.contCycleLevel); i++) {
+      {
+        final int ind = i;
+        VLSVariable _createVLSVariable_3 = this.factory.createVLSVariable();
+        final Procedure1<VLSVariable> _function_4 = (VLSVariable it) -> {
+          String _string = Integer.toString(ind);
+          String _plus = ("V" + _string);
+          it.setName(_plus);
+        };
+        VLSVariable _doubleArrow = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable_3, _function_4);
+        variables.add(_doubleArrow);
+        for (int j = 0; (j < i); j++) {
+          {
+            for (final Relation l_2 : relationsList) {
+              {
+                final VLSFunction rel = this.support.duplicate(CollectionsUtil.<RelationDeclaration, VLSFunction>lookup(((RelationDeclaration) l_2), trace.rel2Predicate), CollectionLiterals.<VLSVariable>newArrayList(variables.get(j), variables.get(((j + 1) % i))));
+                disjunctionList.add(rel);
+              }
+            }
+            conjunctionList.add(this.support.unfoldOr(disjunctionList));
+            disjunctionList.clear();
+          }
+        }
+        VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();
+        final Procedure1<VLSFofFormula> _function_5 = (VLSFofFormula it) -> {
+          it.setName(this.support.toIDMultiple("containment_noCycle", Integer.toString(ind)));
+          it.setFofRole("axiom");
+          VLSUnaryNegation _createVLSUnaryNegation = this.factory.createVLSUnaryNegation();
+          final Procedure1<VLSUnaryNegation> _function_6 = (VLSUnaryNegation it_1) -> {
+            VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();
+            final Procedure1<VLSExistentialQuantifier> _function_7 = (VLSExistentialQuantifier it_2) -> {
+              EList<VLSVariable> _variables = it_2.getVariables();
+              List<VLSVariable> _duplicate = this.support.duplicate(variables);
+              Iterables.<VLSVariable>addAll(_variables, _duplicate);
+              it_2.setOperand(this.support.unfoldAnd(conjunctionList));
+            };
+            VLSExistentialQuantifier _doubleArrow_1 = ObjectExtensions.<VLSExistentialQuantifier>operator_doubleArrow(_createVLSExistentialQuantifier, _function_7);
+            it_1.setOperand(_doubleArrow_1);
+          };
+          VLSUnaryNegation _doubleArrow_1 = ObjectExtensions.<VLSUnaryNegation>operator_doubleArrow(_createVLSUnaryNegation, _function_6);
+          it.setFofFormula(_doubleArrow_1);
+        };
+        final VLSFofFormula contCycleForm = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_5);
+        EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas();
+        _formulas_1.add(contCycleForm);
+        conjunctionList.clear();
+      }
+    }
  }
  
  protected VLSTerm makeUnique(final List<VLSFunction> list) {
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
index 83543c92..f5d35b28 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
@@ -1,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support;
@@ -13,7 +14,6 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
 import hu.bme.mit.inf.dslreasoner.util.CollectionsUtil;
 import java.util.ArrayList;
@@ -47,7 +47,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
    this.base = base;
  }
  
-  public void _transformScope(final LogicSolverConfiguration config, final Logic2VampireLanguageMapperTrace trace) {
+  public void _transformScope(final VampireSolverConfiguration config, final Logic2VampireLanguageMapperTrace trace) {
    final int ABSOLUTE_MIN = 0;
    final int ABSOLUTE_MAX = Integer.MAX_VALUE;
    final int GLOBAL_MIN = config.typeScopes.minNewElements;
@@ -105,7 +105,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
        }
      }
    }
-    final boolean DUPLICATES = false;
+    final boolean DUPLICATES = config.uniquenessDuplicates;
    final int numInst = ((Object[])Conversions.unwrapArray(trace.uniqueInstances, Object.class)).length;
    int ind = 1;
    if ((numInst != 0)) {
@@ -246,7 +246,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
    _formulas.add(cstDec);
  }
  
-  public void transformScope(final LogicSolverConfiguration config, final Logic2VampireLanguageMapperTrace trace) {
+  public void transformScope(final VampireSolverConfiguration config, final Logic2VampireLanguageMapperTrace trace) {
    _transformScope(config, trace);
    return;
  }
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
index 513618a9..89633ca1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
@@ -129,6 +129,14 @@ public class Logic2VampireLanguageMapper_Support {
    return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function);
  }
  
+  protected List<VLSVariable> duplicate(final List<VLSVariable> vars) {
+    ArrayList<VLSVariable> newList = CollectionLiterals.<VLSVariable>newArrayList();
+    for (final VLSVariable v : vars) {
+      newList.add(this.duplicate(v));
+    }
+    return newList;
+  }
+  
  protected VLSConstant toConstant(final VLSFunctionAsTerm term) {
    VLSConstant _createVLSConstant = this.factory.createVLSConstant();
    final Procedure1<VLSConstant> _function = (VLSConstant it) -> {
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
index 2f2d9718..b4bb6700 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
@@ -6,22 +6,39 @@ fof ( enumScope_FunctionType_Leaf , axiom , ! [ A ] : ( A = eo3 <=> e_Leaf_Funct
 fof ( notObjectHandler , axiom , ! [ A ] : ( ~ object ( A ) <=> ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionType ( A ) ) ) ) ) ) ) ) ) ) ) ) .
 fof ( inheritanceHierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
 fof ( typeScope_min_object , axiom , ! [ A ] : ( ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = eo1 | ( A = eo2 | A = eo3 ) ) ) ) ) ) => object ( A ) ) ) .
-fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = o5 | ( A = o6 | A = o7 ) ) ) ) ) ) ) ) ) ) ) .
+fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = o5 | ( A = o6 | ( A = o7 | ( A = o8 | ( A = o9 | ( A = o10 | ( A = o11 | ( A = o12 | ( A = o13 | ( A = o14 | ( A = o15 | ( A = o16 | ( A = o17 | ( A = o18 | ( A = o19 | ( A = o20 | ( A = o21 | ( A = o22 | ( A = o23 | ( A = o24 | A = o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
 fof ( typeScope_min_t_FunctionalInterface , axiom , ! [ A ] : ( ( A = o2 | A = o3 ) => ( t_FunctionalInterface ( A ) & object ( A ) ) ) ) .
 fof ( typeScope_min_t_Function , axiom , ! [ A ] : ( A = o4 => ( t_Function ( A ) & object ( A ) ) ) ) .
 fof ( typeScope_min_t_FunctionalOutput , axiom , ! [ A ] : ( ( A = o5 | ( A = o6 | A = o7 ) ) => ( t_FunctionalOutput ( A ) & object ( A ) ) ) ) .
-fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => A = o4 ) ) .
+fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => ( A = o4 | ( A = o8 | ( A = o9 | ( A = o10 | A = o11 ) ) ) ) ) ) .
-fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o5 | ( A = o6 | A = o7 ) ) ) ) .
+fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o5 | ( A = o6 | ( A = o7 | A = o8 ) ) ) ) ) .
-fof ( t_uniqueness_eo1 , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo1 != o1 & ( eo1 != o2 & ( eo1 != o3 & ( eo1 != o4 & ( eo1 != o5 & ( eo1 != o6 & eo1 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_eo1 , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo1 != o1 & ( eo1 != o2 & ( eo1 != o3 & ( eo1 != o4 & ( eo1 != o5 & ( eo1 != o6 & ( eo1 != o7 & ( eo1 != o8 & ( eo1 != o9 & ( eo1 != o10 & ( eo1 != o11 & ( eo1 != o12 & ( eo1 != o13 & ( eo1 != o14 & ( eo1 != o15 & ( eo1 != o16 & ( eo1 != o17 & ( eo1 != o18 & ( eo1 != o19 & ( eo1 != o20 & ( eo1 != o21 & ( eo1 != o22 & ( eo1 != o23 & ( eo1 != o24 & eo1 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_eo2 , axiom , eo2 != eo1 & ( eo2 != eo3 & ( eo2 != o1 & ( eo2 != o2 & ( eo2 != o3 & ( eo2 != o4 & ( eo2 != o5 & ( eo2 != o6 & eo2 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_eo2 , axiom , eo2 != eo3 & ( eo2 != o1 & ( eo2 != o2 & ( eo2 != o3 & ( eo2 != o4 & ( eo2 != o5 & ( eo2 != o6 & ( eo2 != o7 & ( eo2 != o8 & ( eo2 != o9 & ( eo2 != o10 & ( eo2 != o11 & ( eo2 != o12 & ( eo2 != o13 & ( eo2 != o14 & ( eo2 != o15 & ( eo2 != o16 & ( eo2 != o17 & ( eo2 != o18 & ( eo2 != o19 & ( eo2 != o20 & ( eo2 != o21 & ( eo2 != o22 & ( eo2 != o23 & ( eo2 != o24 & eo2 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_eo3 , axiom , eo3 != eo1 & ( eo3 != eo2 & ( eo3 != o1 & ( eo3 != o2 & ( eo3 != o3 & ( eo3 != o4 & ( eo3 != o5 & ( eo3 != o6 & eo3 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_eo3 , axiom , eo3 != o1 & ( eo3 != o2 & ( eo3 != o3 & ( eo3 != o4 & ( eo3 != o5 & ( eo3 != o6 & ( eo3 != o7 & ( eo3 != o8 & ( eo3 != o9 & ( eo3 != o10 & ( eo3 != o11 & ( eo3 != o12 & ( eo3 != o13 & ( eo3 != o14 & ( eo3 != o15 & ( eo3 != o16 & ( eo3 != o17 & ( eo3 != o18 & ( eo3 != o19 & ( eo3 != o20 & ( eo3 != o21 & ( eo3 != o22 & ( eo3 != o23 & ( eo3 != o24 & eo3 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o1 , axiom , o1 != eo1 & ( o1 != eo2 & ( o1 != eo3 & ( o1 != o2 & ( o1 != o3 & ( o1 != o4 & ( o1 != o5 & ( o1 != o6 & o1 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o1 , axiom , o1 != o2 & ( o1 != o3 & ( o1 != o4 & ( o1 != o5 & ( o1 != o6 & ( o1 != o7 & ( o1 != o8 & ( o1 != o9 & ( o1 != o10 & ( o1 != o11 & ( o1 != o12 & ( o1 != o13 & ( o1 != o14 & ( o1 != o15 & ( o1 != o16 & ( o1 != o17 & ( o1 != o18 & ( o1 != o19 & ( o1 != o20 & ( o1 != o21 & ( o1 != o22 & ( o1 != o23 & ( o1 != o24 & o1 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o2 , axiom , o2 != eo1 & ( o2 != eo2 & ( o2 != eo3 & ( o2 != o1 & ( o2 != o3 & ( o2 != o4 & ( o2 != o5 & ( o2 != o6 & o2 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o2 , axiom , o2 != o3 & ( o2 != o4 & ( o2 != o5 & ( o2 != o6 & ( o2 != o7 & ( o2 != o8 & ( o2 != o9 & ( o2 != o10 & ( o2 != o11 & ( o2 != o12 & ( o2 != o13 & ( o2 != o14 & ( o2 != o15 & ( o2 != o16 & ( o2 != o17 & ( o2 != o18 & ( o2 != o19 & ( o2 != o20 & ( o2 != o21 & ( o2 != o22 & ( o2 != o23 & ( o2 != o24 & o2 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o3 , axiom , o3 != eo1 & ( o3 != eo2 & ( o3 != eo3 & ( o3 != o1 & ( o3 != o2 & ( o3 != o4 & ( o3 != o5 & ( o3 != o6 & o3 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o3 , axiom , o3 != o4 & ( o3 != o5 & ( o3 != o6 & ( o3 != o7 & ( o3 != o8 & ( o3 != o9 & ( o3 != o10 & ( o3 != o11 & ( o3 != o12 & ( o3 != o13 & ( o3 != o14 & ( o3 != o15 & ( o3 != o16 & ( o3 != o17 & ( o3 != o18 & ( o3 != o19 & ( o3 != o20 & ( o3 != o21 & ( o3 != o22 & ( o3 != o23 & ( o3 != o24 & o3 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o4 , axiom , o4 != eo1 & ( o4 != eo2 & ( o4 != eo3 & ( o4 != o1 & ( o4 != o2 & ( o4 != o3 & ( o4 != o5 & ( o4 != o6 & o4 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o4 , axiom , o4 != o5 & ( o4 != o6 & ( o4 != o7 & ( o4 != o8 & ( o4 != o9 & ( o4 != o10 & ( o4 != o11 & ( o4 != o12 & ( o4 != o13 & ( o4 != o14 & ( o4 != o15 & ( o4 != o16 & ( o4 != o17 & ( o4 != o18 & ( o4 != o19 & ( o4 != o20 & ( o4 != o21 & ( o4 != o22 & ( o4 != o23 & ( o4 != o24 & o4 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o5 , axiom , o5 != eo1 & ( o5 != eo2 & ( o5 != eo3 & ( o5 != o1 & ( o5 != o2 & ( o5 != o3 & ( o5 != o4 & ( o5 != o6 & o5 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o5 , axiom , o5 != o6 & ( o5 != o7 & ( o5 != o8 & ( o5 != o9 & ( o5 != o10 & ( o5 != o11 & ( o5 != o12 & ( o5 != o13 & ( o5 != o14 & ( o5 != o15 & ( o5 != o16 & ( o5 != o17 & ( o5 != o18 & ( o5 != o19 & ( o5 != o20 & ( o5 != o21 & ( o5 != o22 & ( o5 != o23 & ( o5 != o24 & o5 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o6 , axiom , o6 != eo1 & ( o6 != eo2 & ( o6 != eo3 & ( o6 != o1 & ( o6 != o2 & ( o6 != o3 & ( o6 != o4 & ( o6 != o5 & o6 != o7 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o6 , axiom , o6 != o7 & ( o6 != o8 & ( o6 != o9 & ( o6 != o10 & ( o6 != o11 & ( o6 != o12 & ( o6 != o13 & ( o6 != o14 & ( o6 != o15 & ( o6 != o16 & ( o6 != o17 & ( o6 != o18 & ( o6 != o19 & ( o6 != o20 & ( o6 != o21 & ( o6 != o22 & ( o6 != o23 & ( o6 != o24 & o6 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
-fof ( t_uniqueness_o7 , axiom , o7 != eo1 & ( o7 != eo2 & ( o7 != eo3 & ( o7 != o1 & ( o7 != o2 & ( o7 != o3 & ( o7 != o4 & ( o7 != o5 & o7 != o6 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o7 , axiom , o7 != o8 & ( o7 != o9 & ( o7 != o10 & ( o7 != o11 & ( o7 != o12 & ( o7 != o13 & ( o7 != o14 & ( o7 != o15 & ( o7 != o16 & ( o7 != o17 & ( o7 != o18 & ( o7 != o19 & ( o7 != o20 & ( o7 != o21 & ( o7 != o22 & ( o7 != o23 & ( o7 != o24 & o7 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o8 , axiom , o8 != o9 & ( o8 != o10 & ( o8 != o11 & ( o8 != o12 & ( o8 != o13 & ( o8 != o14 & ( o8 != o15 & ( o8 != o16 & ( o8 != o17 & ( o8 != o18 & ( o8 != o19 & ( o8 != o20 & ( o8 != o21 & ( o8 != o22 & ( o8 != o23 & ( o8 != o24 & o8 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o9 , axiom , o9 != o10 & ( o9 != o11 & ( o9 != o12 & ( o9 != o13 & ( o9 != o14 & ( o9 != o15 & ( o9 != o16 & ( o9 != o17 & ( o9 != o18 & ( o9 != o19 & ( o9 != o20 & ( o9 != o21 & ( o9 != o22 & ( o9 != o23 & ( o9 != o24 & o9 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o10 , axiom , o10 != o11 & ( o10 != o12 & ( o10 != o13 & ( o10 != o14 & ( o10 != o15 & ( o10 != o16 & ( o10 != o17 & ( o10 != o18 & ( o10 != o19 & ( o10 != o20 & ( o10 != o21 & ( o10 != o22 & ( o10 != o23 & ( o10 != o24 & o10 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o11 , axiom , o11 != o12 & ( o11 != o13 & ( o11 != o14 & ( o11 != o15 & ( o11 != o16 & ( o11 != o17 & ( o11 != o18 & ( o11 != o19 & ( o11 != o20 & ( o11 != o21 & ( o11 != o22 & ( o11 != o23 & ( o11 != o24 & o11 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o12 , axiom , o12 != o13 & ( o12 != o14 & ( o12 != o15 & ( o12 != o16 & ( o12 != o17 & ( o12 != o18 & ( o12 != o19 & ( o12 != o20 & ( o12 != o21 & ( o12 != o22 & ( o12 != o23 & ( o12 != o24 & o12 != o25 ) ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o13 , axiom , o13 != o14 & ( o13 != o15 & ( o13 != o16 & ( o13 != o17 & ( o13 != o18 & ( o13 != o19 & ( o13 != o20 & ( o13 != o21 & ( o13 != o22 & ( o13 != o23 & ( o13 != o24 & o13 != o25 ) ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o14 , axiom , o14 != o15 & ( o14 != o16 & ( o14 != o17 & ( o14 != o18 & ( o14 != o19 & ( o14 != o20 & ( o14 != o21 & ( o14 != o22 & ( o14 != o23 & ( o14 != o24 & o14 != o25 ) ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o15 , axiom , o15 != o16 & ( o15 != o17 & ( o15 != o18 & ( o15 != o19 & ( o15 != o20 & ( o15 != o21 & ( o15 != o22 & ( o15 != o23 & ( o15 != o24 & o15 != o25 ) ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o16 , axiom , o16 != o17 & ( o16 != o18 & ( o16 != o19 & ( o16 != o20 & ( o16 != o21 & ( o16 != o22 & ( o16 != o23 & ( o16 != o24 & o16 != o25 ) ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o17 , axiom , o17 != o18 & ( o17 != o19 & ( o17 != o20 & ( o17 != o21 & ( o17 != o22 & ( o17 != o23 & ( o17 != o24 & o17 != o25 ) ) ) ) ) ) ) .
+fof ( t_uniqueness_o18 , axiom , o18 != o19 & ( o18 != o20 & ( o18 != o21 & ( o18 != o22 & ( o18 != o23 & ( o18 != o24 & o18 != o25 ) ) ) ) ) ) .
+fof ( t_uniqueness_o19 , axiom , o19 != o20 & ( o19 != o21 & ( o19 != o22 & ( o19 != o23 & ( o19 != o24 & o19 != o25 ) ) ) ) ) .
+fof ( t_uniqueness_o20 , axiom , o20 != o21 & ( o20 != o22 & ( o20 != o23 & ( o20 != o24 & o20 != o25 ) ) ) ) .
+fof ( t_uniqueness_o21 , axiom , o21 != o22 & ( o21 != o23 & ( o21 != o24 & o21 != o25 ) ) ) .
+fof ( t_uniqueness_o22 , axiom , o22 != o23 & ( o22 != o24 & o22 != o25 ) ) .
+fof ( t_uniqueness_o23 , axiom , o23 != o24 & o23 != o25 ) .
+fof ( t_uniqueness_o24 , axiom , o24 != o25 ) .
 fof ( compliance_interface_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .
 fof ( compliance_model_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_model_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalArchitectureModel ( V_1 ) ) ) ) .
 fof ( compliance_parent_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_parent_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_Function ( V_1 ) ) ) ) .
@@ -38,17 +55,22 @@ fof ( compliance_terminator_FunctionalData , axiom , ! [ V_0 , V_1 ] : ( r_termi
 fof ( compliance_interface_FunctionalData , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalData ( V_0 , V_1 ) => ( t_FunctionalData ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .
 fof ( compliance_type_Function , axiom , ! [ V_0 , V_1 ] : ( r_type_Function ( V_0 , V_1 ) => ( t_Function ( V_0 ) & t_FunctionType ( V_1 ) ) ) ) .
 fof ( containment_topLevel_t_FunctionalArchitectureModel , axiom , ! [ A ] : ( t_FunctionalArchitectureModel ( A ) <=> A = o1 ) ) .
-fof ( noDupCont_r_interface_FunctionalElement , axiom , ? [ A , B ] : ( r_interface_FunctionalElement ( A , B ) => ~ ? [ C , B ] : r_interface_FunctionalElement ( C , B ) ) ) .
+fof ( containment_noDup_r_interface_FunctionalElement , axiom , ? [ A , B ] : ( r_interface_FunctionalElement ( A , B ) => ~ ? [ C , B ] : r_interface_FunctionalElement ( C , B ) ) ) .
-fof ( noDupCont_r_rootElements_FunctionalArchitectureModel , axiom , ? [ A , B ] : ( r_rootElements_FunctionalArchitectureModel ( A , B ) => ~ ? [ C , B ] : r_rootElements_FunctionalArchitectureModel ( C , B ) ) ) .
+fof ( containment_noDup_r_rootElements_FunctionalArchitectureModel , axiom , ? [ A , B ] : ( r_rootElements_FunctionalArchitectureModel ( A , B ) => ~ ? [ C , B ] : r_rootElements_FunctionalArchitectureModel ( C , B ) ) ) .
-fof ( noDupCont_r_subElements_Function , axiom , ? [ A , B ] : ( r_subElements_Function ( A , B ) => ~ ? [ C , B ] : r_subElements_Function ( C , B ) ) ) .
+fof ( containment_noDup_r_subElements_Function , axiom , ? [ A , B ] : ( r_subElements_Function ( A , B ) => ~ ? [ C , B ] : r_subElements_Function ( C , B ) ) ) .
-fof ( noDupCont_r_data_FunctionalInterface , axiom , ? [ A , B ] : ( r_data_FunctionalInterface ( A , B ) => ~ ? [ C , B ] : r_data_FunctionalInterface ( C , B ) ) ) .
+fof ( containment_noDup_r_data_FunctionalInterface , axiom , ? [ A , B ] : ( r_data_FunctionalInterface ( A , B ) => ~ ? [ C , B ] : r_data_FunctionalInterface ( C , B ) ) ) .
-fof ( noDupCont_r_outgoingLinks_FunctionalOutput , axiom , ? [ A , B ] : ( r_outgoingLinks_FunctionalOutput ( A , B ) => ~ ? [ C , B ] : r_outgoingLinks_FunctionalOutput ( C , B ) ) ) .
+fof ( containment_noDup_r_outgoingLinks_FunctionalOutput , axiom , ? [ A , B ] : ( r_outgoingLinks_FunctionalOutput ( A , B ) => ~ ? [ C , B ] : r_outgoingLinks_FunctionalOutput ( C , B ) ) ) .
-fof ( noDupCont_r_terminator_FunctionalData , axiom , ? [ A , B ] : ( r_terminator_FunctionalData ( A , B ) => ~ ? [ C , B ] : r_terminator_FunctionalData ( C , B ) ) ) .
+fof ( containment_noDup_r_terminator_FunctionalData , axiom , ? [ A , B ] : ( r_terminator_FunctionalData ( A , B ) => ~ ? [ C , B ] : r_terminator_FunctionalData ( C , B ) ) ) .
-fof ( containment_t_InformationLink , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : r_outgoingLinks_FunctionalOutput ( B , A ) ) ) .
 fof ( containment_t_FunctionalElement , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : ( ( r_rootElements_FunctionalArchitectureModel ( B , A ) & ~ r_subElements_Function ( B , A ) ) | ( ~ r_rootElements_FunctionalArchitectureModel ( B , A ) & r_subElements_Function ( B , A ) ) ) ) ) .
+fof ( containment_t_FunctionalData , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : r_data_FunctionalInterface ( B , A ) ) ) .
+fof ( containment_t_InformationLink , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : r_outgoingLinks_FunctionalOutput ( B , A ) ) ) .
 fof ( containment_t_FAMTerminator , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : r_terminator_FunctionalData ( B , A ) ) ) .
 fof ( containment_t_FunctionalInterface , axiom , ! [ A ] : ( t_FunctionalInterface ( A ) => ? [ B ] : r_interface_FunctionalElement ( B , A ) ) ) .
-fof ( containment_t_FunctionalData , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : r_data_FunctionalInterface ( B , A ) ) ) .
+fof ( containment_noCycle_1 , axiom , ~ ? [ V1 ] : ( r_interface_FunctionalElement ( V1 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V1 ) | ( r_subElements_Function ( V1 , V1 ) | ( r_data_FunctionalInterface ( V1 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V1 ) | r_terminator_FunctionalData ( V1 , V1 ) ) ) ) ) ) ) .
+fof ( containment_noCycle_2 , axiom , ~ ? [ V1 , V2 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V2 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V1 ) | ( r_subElements_Function ( V2 , V1 ) | ( r_data_FunctionalInterface ( V2 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V1 ) | r_terminator_FunctionalData ( V2 , V1 ) ) ) ) ) ) ) ) .
+fof ( containment_noCycle_3 , axiom , ~ ? [ V1 , V2 , V3 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V3 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V1 ) | ( r_subElements_Function ( V3 , V1 ) | ( r_data_FunctionalInterface ( V3 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V1 ) | r_terminator_FunctionalData ( V3 , V1 ) ) ) ) ) ) ) ) ) .
+fof ( containment_noCycle_4 , axiom , ~ ? [ V1 , V2 , V3 , V4 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V3 , V4 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V4 ) | ( r_subElements_Function ( V3 , V4 ) | ( r_data_FunctionalInterface ( V3 , V4 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V4 ) | r_terminator_FunctionalData ( V3 , V4 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V4 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V4 , V1 ) | ( r_subElements_Function ( V4 , V1 ) | ( r_data_FunctionalInterface ( V4 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V4 , V1 ) | r_terminator_FunctionalData ( V4 , V1 ) ) ) ) ) ) ) ) ) ) .
+fof ( containment_noCycle_5 , axiom , ~ ? [ V1 , V2 , V3 , V4 , V5 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V3 , V4 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V4 ) | ( r_subElements_Function ( V3 , V4 ) | ( r_data_FunctionalInterface ( V3 , V4 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V4 ) | r_terminator_FunctionalData ( V3 , V4 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V4 , V5 ) | ( r_rootElements_FunctionalArchitectureModel ( V4 , V5 ) | ( r_subElements_Function ( V4 , V5 ) | ( r_data_FunctionalInterface ( V4 , V5 ) | ( r_outgoingLinks_FunctionalOutput ( V4 , V5 ) | r_terminator_FunctionalData ( V4 , V5 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V5 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V5 , V1 ) | ( r_subElements_Function ( V5 , V1 ) | ( r_data_FunctionalInterface ( V5 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V5 , V1 ) | r_terminator_FunctionalData ( V5 , V1 ) ) ) ) ) ) ) ) ) ) ) .
 fof ( upperMultiplicity_interface_FunctionalElement , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalElement ( V_src ) & ( t_FunctionalInterface ( V_trg_1 ) & t_FunctionalInterface ( V_trg_2 ) ) ) => ( ( r_interface_FunctionalElement ( V_src , V_trg_1 ) & r_interface_FunctionalElement ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .
 fof ( lowerMultiplicity_model_FunctionalElement , axiom , ! [ V_src ] : ( t_FunctionalElement ( V_src ) => ? [ V_trg_1 ] : ( t_FunctionalArchitectureModel ( V_trg_1 ) & r_model_FunctionalElement ( V_src , V_trg_1 ) ) ) ) .
 fof ( upperMultiplicity_model_FunctionalElement , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalElement ( V_src ) & ( t_FunctionalArchitectureModel ( V_trg_1 ) & t_FunctionalArchitectureModel ( V_trg_2 ) ) ) => ( ( r_model_FunctionalElement ( V_src , V_trg_1 ) & r_model_FunctionalElement ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
index 25ba546a..949abe87 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
@@ -93,9 +93,11 @@ class GeneralTest {
                        // add configuration things, in config file first
                        it.documentationLevel = DocumentationLevel::FULL
                        it.typeScopes.minNewElements = 4
-                        it.typeScopes.maxNewElements = 7
+                        it.typeScopes.maxNewElements = 25
                        it.typeScopes.minNewElementsByType = typeMapMin
                        it.typeScopes.maxNewElementsByType = typeMapMax
+                        it.contCycleLevel = 5
+                        it.uniquenessDuplicates = false
                ]
                solution = reasoner.solve(problem, vampireConfig, workspace)
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 834f3f02..7f92eba4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
Binary files differ
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index e0f9f3f3..2df2ba62 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
Binary files differ
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
index f3dce1b6..0150ef1d 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
@@ -109,9 +109,11 @@ public class GeneralTest {
        final Procedure1<VampireSolverConfiguration> _function_2 = (VampireSolverConfiguration it) -> {
          it.documentationLevel = DocumentationLevel.FULL;
          it.typeScopes.minNewElements = 4;
-          it.typeScopes.maxNewElements = 7;
+          it.typeScopes.maxNewElements = 25;
          it.typeScopes.minNewElementsByType = typeMapMin;
          it.typeScopes.maxNewElementsByType = typeMapMax;
+          it.contCycleLevel = 5;
+          it.uniquenessDuplicates = false;
        };
        final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function_2);
        solution = reasoner.solve(problem, vampireConfig, workspace);
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 1661d65f..c0481fd8 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
Binary files differ
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index c7de92d2..6c84f917 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
Binary files differ
author	ArenBabikian <aren.babikian@mail.mcgill.ca>	2019-04-05 03:32:48 -0400
committer	ArenBabikian <aren.babikian@mail.mcgill.ca>	2019-04-05 03:32:48 -0400
commit	46995a62387aa07a6421a5546f466951f58c168c (patch)
tree	af284e3c21317784b2fc15334d19a292288c3e67
parent	test push (diff)
download	VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.tar.gz VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.tar.zst VIATRA-Generator-46995a62387aa07a6421a5546f466951f58c168c.zip