From bd8cf2959fb73d45b3af06c1791651f4a849d0d4 Mon Sep 17 00:00:00 2001
From: sebastian <sebsatian_ritt@web.de>
Date: Fri, 21 Apr 2017 03:13:45 +0200
Subject: [PATCH] =?UTF-8?q?TypeExpr=20f=C3=BCr=20New=20sowie=20=20die=20Ge?=
 =?UTF-8?q?nerierung=20der=20Interfaces=20steht=20an?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 778 +++++++-----------
 .../strucTypes5/algo/Construct.java           |  98 +++
 src/de/dhbwstuttgart/strucTypes5/algo/TI.java |  18 +-
 .../dhbwstuttgart/strucTypes5/algo/Type.java  |  25 +-
 .../strucTypes5/algo/TypeExpr.java            |  57 +-
 .../assumptions/AssumptionClass.java          |  74 ++
 .../assumptions/AssumptionMakerGlobal.java    |  14 +
 .../assumptions/AssumptionMap.java            |  13 +-
 .../strucTypes5/ausgabe/Class2String.java     |  21 +-
 test/strucTypes5/Class2StringTest.java        |   5 +-
 test/strucTypes5/NewOperatorTest.jav          |  13 +
 test/strucTypes5/NewOperatorTest.java         |  86 ++
 test/strucTypes5/TypeExprTest.java            |   9 +-
 13 files changed, 699 insertions(+), 512 deletions(-)
 create mode 100644 src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
 create mode 100644 src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
 create mode 100644 test/strucTypes5/NewOperatorTest.jav
 create mode 100644 test/strucTypes5/NewOperatorTest.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd4eab77..33fa0d60 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5cf612a7-261d-49e6-bf7a-db4b05e41151" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintAbstract.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/control/Main.java" afterPath="$PROJECT_DIR$/src/control/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes3/StructuralTypesSimpleSkript.jav" afterPath="$PROJECT_DIR$/test/strucTypes3/StructuralTypesSimpleSkript.jav" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" afterPath="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" afterPath="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/bin/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -22,48 +25,23 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ConstraintSubTypeGeneric.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java">
+      <file leaf-file-name="Type.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="72" lean-forward="false" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
-              <folding>
-                <element signature="e#391#392#0" expanded="true" />
-                <element signature="e#421#422#0" expanded="true" />
-                <element signature="e#463#464#0" expanded="true" />
-                <element signature="e#501#502#0" expanded="true" />
-                <element signature="e#533#534#0" expanded="true" />
-                <element signature="e#565#566#0" expanded="true" />
-                <element signature="e#611#612#0" expanded="true" />
-                <element signature="e#653#654#0" expanded="true" />
-                <element signature="e#699#700#0" expanded="true" />
-                <element signature="e#790#791#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TypeExpr.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="549">
-              <caret line="79" column="13" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="13" />
+            <state relative-caret-position="369">
+              <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#3862#3863#0" expanded="true" />
-                <element signature="e#3902#3903#0" expanded="true" />
-                <element signature="e#3947#3948#0" expanded="true" />
-                <element signature="e#3982#3983#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Class2StringTest.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Class2StringTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="87">
-              <caret line="76" column="55" lean-forward="false" selection-start-line="76" selection-start-column="55" selection-end-line="76" selection-end-column="55" />
+            <state relative-caret-position="762">
+              <caret line="79" column="62" lean-forward="false" selection-start-line="79" selection-start-column="62" selection-end-line="79" selection-end-column="62" />
               <folding />
             </state>
           </provider>
@@ -72,18 +50,28 @@
       <file leaf-file-name="TypeExprTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="63" column="62" lean-forward="false" selection-start-line="63" selection-start-column="62" selection-end-line="63" selection-end-column="62" />
+            <state relative-caret-position="285">
+              <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ConstraintFactory.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java">
+      <file leaf-file-name="NewOperatorTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="46" column="114" lean-forward="false" selection-start-line="46" selection-start-column="114" selection-end-line="46" selection-end-column="114" />
+            <state relative-caret-position="71">
+              <caret line="32" column="23" lean-forward="true" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TI.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="20" column="50" lean-forward="false" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="50" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -91,21 +79,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TypeVarStore.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java">
+      <file leaf-file-name="Construct.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-60">
-              <caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ConstraintField.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintField.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="8" column="56" lean-forward="false" selection-start-line="8" selection-start-column="56" selection-end-line="8" selection-end-column="56" />
+            <state relative-caret-position="345">
+              <caret line="35" column="56" lean-forward="false" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -113,11 +91,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ConstraintMethod.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintMethod.java">
+      <file leaf-file-name="AssumptionMakerGlobal.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+            <state relative-caret-position="234">
+              <caret line="47" column="8" lean-forward="true" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -125,12 +103,46 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ConstraintAbstract.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintAbstract.java">
+      <file leaf-file-name="AssumptionClass.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="31" lean-forward="false" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
-              <folding />
+            <state relative-caret-position="465">
+              <caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1158#1159#0" expanded="true" />
+                <element signature="e#1183#1184#0" expanded="true" />
+                <element signature="e#1229#1230#0" expanded="true" />
+                <element signature="e#1257#1258#0" expanded="true" />
+                <element signature="e#1302#1303#0" expanded="true" />
+                <element signature="e#1337#1338#0" expanded="true" />
+                <element signature="e#1399#1400#0" expanded="true" />
+                <element signature="e#1447#1448#0" expanded="true" />
+                <element signature="e#1498#1499#0" expanded="true" />
+                <element signature="e#1536#1537#0" expanded="true" />
+                <element signature="e#1607#1608#0" expanded="true" />
+                <element signature="e#1661#1662#0" expanded="true" />
+                <element signature="e#1717#1718#0" expanded="true" />
+                <element signature="e#1751#1752#0" expanded="true" />
+                <element signature="e#1823#1824#0" expanded="true" />
+                <element signature="e#1869#1870#0" expanded="true" />
+                <element signature="e#1931#1932#0" expanded="true" />
+                <element signature="e#1973#1974#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AssumptionMap.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="219">
+              <caret line="79" column="39" lean-forward="false" selection-start-line="79" selection-start-column="39" selection-end-line="79" selection-end-column="39" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#2501#2502#0" expanded="true" />
+                <element signature="e#2547#2548#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -149,6 +161,8 @@
     <findStrings>
       <find>conca</find>
       <find>getTypeVa</find>
+      <find>Expres</find>
+      <find>Interface</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -190,19 +204,24 @@
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/SubTypeConstraint.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/ClassWithTPH2String.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2Code.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintField.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintMethod.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" />
-        <option value="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" />
         <option value="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java" />
       </list>
     </option>
   </component>
@@ -256,38 +275,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="JavaCompilerCore" />
@@ -338,7 +325,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="syntaxtree" />
+              <option name="myItemId" value="parser" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -360,203 +347,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemId" value="parser" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="typeVars" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="constraints" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ausgabe" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="assumptions" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes5" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="algo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes3" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JavaCompilerCore" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dhbwstuttgart" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="strucTypes2" />
+              <option name="myItemId" value="SyntaxTreeGenerator" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -588,37 +383,11 @@
       <recent name="strucTypes3" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5" />
       <recent name="$PROJECT_DIR$/test/strucTypes5" />
+      <recent name="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.Class2StringTest.run">
-    <configuration default="false" name="AssumptionTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="strucTypes5.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="JavaCompilerCore" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="strucTypes5" />
-      <option name="MAIN_CLASS_NAME" value="strucTypes5.AssumptionTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
+  <component name="RunManager" selected="JUnit.NewOperatorTest.run">
     <configuration default="false" name="AssumptionTest.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -723,6 +492,32 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="false" name="NewOperatorTest.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="strucTypes5.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="JavaCompilerCore" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="strucTypes5" />
+      <option name="MAIN_CLASS_NAME" value="strucTypes5.NewOperatorTest" />
+      <option name="METHOD_NAME" value="run" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -1104,25 +899,28 @@
       <method />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.AssumptionTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.AssumptionTest" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
       </list>
     </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="5cf612a7-261d-49e6-bf7a-db4b05e41151" name="Default" comment="" />
@@ -1131,48 +929,48 @@
       <option name="presentableId" value="Default" />
       <updated>1492600650522</updated>
       <workItem from="1492600653626" duration="3746000" />
-      <workItem from="1492623646935" duration="41112000" />
+      <workItem from="1492623646935" duration="53529000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="Class2StringTest - 2017.04.20 at 20h 29m 57s.xml">
-      <configuration name="Class2StringTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Class2StringTest - 2017.04.20 at 20h 32m 06s.xml">
-      <configuration name="Class2StringTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Class2StringTest_run - 2017.04.20 at 23h 02m 05s.xml">
+    <history-entry file="Class2StringTest_run - 2017.04.21 at 02h 08m 55s.xml">
       <configuration name="Class2StringTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 18m 36s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 09m 27s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 19m 09s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 10m 30s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 22m 01s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 15m 23s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 22m 25s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 15m 56s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 43m 56s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 18m 26s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 22h 57m 12s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 19m 39s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.20 at 23h 01m 45s.xml">
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 20m 42s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="NewOperatorTest_run - 2017.04.21 at 02h 09m 12s.xml">
+      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TypeExprTest_run - 2017.04.21 at 02h 08m 40s.xml">
       <configuration name="TypeExprTest.run" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44858000" />
+    <option name="totallyTimeSpent" value="57275000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1442" height="863" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1187,13 +985,13 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39921466" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15183246" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1227,8 +1025,14 @@
           <properties />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java</url>
+          <line>46</line>
+          <properties />
+          <option name="timeStamp" value="5" />
+        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="5" />
+      <option name="time" value="6" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1237,46 +1041,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/Method.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/MethodInterface.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/SourceFile.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/SyntaxNode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/AssumptionGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintAbstract.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -1476,19 +1240,7 @@
         <state relative-caret-position="609">
           <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-6">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1335#1336#0" expanded="true" />
-            <element signature="e#1380#1381#0" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1553,7 +1305,7 @@
         <state relative-caret-position="135">
           <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="37" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1574,40 +1326,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-82">
-          <caret line="86" column="8" lean-forward="false" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1901#1902#0" expanded="true" />
-            <element signature="e#1984#1985#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1080">
-          <caret line="75" column="5" lean-forward="true" selection-start-line="75" selection-start-column="5" selection-end-line="75" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1507#1508#0" expanded="true" />
-            <element signature="e#1560#1561#0" expanded="true" />
-            <element signature="e#2089#2090#0" expanded="true" />
-            <element signature="e#2139#2140#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintAbstract.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -1626,16 +1344,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="28" column="14" lean-forward="false" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -1665,6 +1373,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-60">
+          <caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="46" column="114" lean-forward="false" selection-start-line="46" selection-start-column="114" selection-end-line="46" selection-end-column="114" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -1684,18 +1410,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java">
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-60">
-          <caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
+        <state relative-caret-position="60">
+          <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="46" column="114" lean-forward="false" selection-start-line="46" selection-start-column="114" selection-end-line="46" selection-end-column="114" />
+        <state relative-caret-position="263">
+          <caret line="177" column="34" lean-forward="false" selection-start-line="177" selection-start-column="34" selection-end-line="177" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1704,34 +1430,130 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="549">
-          <caret line="79" column="13" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="13" />
+        <state relative-caret-position="450">
+          <caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#3862#3863#0" expanded="true" />
-            <element signature="e#3902#3903#0" expanded="true" />
-            <element signature="e#3947#3948#0" expanded="true" />
-            <element signature="e#3982#3983#0" expanded="true" />
+            <element signature="e#5071#5072#0" expanded="true" />
+            <element signature="e#5111#5112#0" expanded="true" />
+            <element signature="e#5156#5157#0" expanded="true" />
+            <element signature="e#5191#5192#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="63" column="62" lean-forward="false" selection-start-line="63" selection-start-column="62" selection-end-line="63" selection-end-column="62" />
-          <folding />
+        <state relative-caret-position="219">
+          <caret line="79" column="39" lean-forward="false" selection-start-line="79" selection-start-column="39" selection-end-line="79" selection-end-column="39" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#2501#2502#0" expanded="true" />
+            <element signature="e#2547#2548#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1158#1159#0" expanded="true" />
+            <element signature="e#1183#1184#0" expanded="true" />
+            <element signature="e#1229#1230#0" expanded="true" />
+            <element signature="e#1257#1258#0" expanded="true" />
+            <element signature="e#1302#1303#0" expanded="true" />
+            <element signature="e#1337#1338#0" expanded="true" />
+            <element signature="e#1399#1400#0" expanded="true" />
+            <element signature="e#1447#1448#0" expanded="true" />
+            <element signature="e#1498#1499#0" expanded="true" />
+            <element signature="e#1536#1537#0" expanded="true" />
+            <element signature="e#1607#1608#0" expanded="true" />
+            <element signature="e#1661#1662#0" expanded="true" />
+            <element signature="e#1717#1718#0" expanded="true" />
+            <element signature="e#1751#1752#0" expanded="true" />
+            <element signature="e#1823#1824#0" expanded="true" />
+            <element signature="e#1869#1870#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#1973#1974#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="47" column="8" lean-forward="true" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="76" column="55" lean-forward="false" selection-start-line="76" selection-start-column="55" selection-end-line="76" selection-end-column="55" />
+        <state relative-caret-position="762">
+          <caret line="79" column="62" lean-forward="false" selection-start-line="79" selection-start-column="62" selection-end-line="79" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="32" column="23" lean-forward="true" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="369">
+          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="20" column="50" lean-forward="false" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="46" column="27" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="35" column="56" lean-forward="false" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java b/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
new file mode 100644
index 00000000..62a2763e
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
@@ -0,0 +1,98 @@
+package de.dhbwstuttgart.strucTypes5.algo;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+
+
+import com.google.common.collect.Constraint;
+import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
+import de.dhbwstuttgart.strucTypes5.constraints.ConstraintMethod;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.statement.Receiver;
+
+import java.util.*;
+
+/**
+ * Takes a Typled Class and a Constraint Set for construct the Interfaces
+ * => typed class = cl + typVarStore + List with Constraints
+ */
+public class Construct {
+
+    List<ClassOrInterface> interfaceList = new ArrayList<>();
+    List<ConstraintAbstract> remainingConstraints = new ArrayList<>();
+
+
+    public Construct(ClassOrInterface classOrInterface, TypeVarStore typeVarStore , List<ConstraintAbstract> constraints) {
+        // Generate Interfaces for Field und MethodConstraints;
+        // First of all The Interfaces must be sortet
+        // Other Constraints must be remain in the class
+
+        // Sort the Constriants
+        Map<TypeVar, Set<ConstraintAbstract>> constraintSet =  sortConstriants(constraints);
+
+        // Generate a Interface for every StructuralType
+        for (TypeVar typeVar  : constraintSet.keySet()) {
+            interfaceList.add(generateInterface(constraintSet.get(typeVar)));
+        }
+
+    }
+
+
+
+
+
+    /**
+     *
+     * @param constraints
+     * @return
+     *
+     * Method sortet Constraints for ReceiverType for the Structural Type.
+     * Other Constraints as the Field or MethodsConstraints are copied to the global List remainungConstraints
+     *
+     */
+    private Map<TypeVar,Set<ConstraintAbstract>> sortConstriants(List<ConstraintAbstract> constraints) {
+        Map<TypeVar, Set<ConstraintAbstract>> sortetConstraints  = new HashMap<>();
+
+        for (ConstraintAbstract constraint : constraints) {
+            if (constraint instanceof ConstraintMethod) {
+                ConstraintMethod constraintMethod = (ConstraintMethod) constraint;
+
+                if (sortetConstraints.containsKey(constraintMethod.getReceiver())) {
+                    sortetConstraints.get(constraintMethod.getReceiver()).add(constraintMethod);
+                }
+                else {
+                    Set<ConstraintAbstract> constraintSet = new HashSet<>();
+                    sortetConstraints.put(constraintMethod.getReceiver() , constraintSet);
+                }
+
+            }
+            else {
+                remainingConstraints.add(constraint);
+            }
+        }
+        return sortetConstraints;
+    }
+
+
+    /**
+     * Method Generates Interfaces for the Structural Type.
+     * The Method also adds the new Constraints to the remainung Constraints List.
+     *
+     */
+    private ClassOrInterface generateInterface(Set<ConstraintAbstract> constraintSet) {
+
+
+
+
+
+    }
+
+
+
+
+
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/TI.java b/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
index bf9c7587..efa47825 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
@@ -1,5 +1,9 @@
 package de.dhbwstuttgart.strucTypes5.algo;
 
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+
 /**
  * Created by sebastian on 20.04.17.
  */
@@ -7,11 +11,23 @@ public class TI {
 
 
     // Start TypeInference Algorithm, need Assumptions and  a Class
-    public TI() {
+    public TI(AssumptionMap ass , ClassOrInterface cl) {
+
+        TypeVarStore typeVarStore = new TypeVarStore();
+        Type type = new Type(ass , cl, typeVarStore);
 
 
 
+        // Construct soll die Interfaces erstellen
+        // Construct
+        // Solve
+
 
 
     }
+
+
+
+
+
 }
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/Type.java b/src/de/dhbwstuttgart/strucTypes5/algo/Type.java
index a5d36922..3dbe8978 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/Type.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/Type.java
@@ -1,7 +1,10 @@
 package de.dhbwstuttgart.strucTypes5.algo;
 
-import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
+
+
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Method;
@@ -14,25 +17,17 @@ import java.util.List;
  */
 public class Type {
 
+    List<ConstraintAbstract> constraintList = new ArrayList<>();
+
     // Start Type Algorithm, need Assumption and class , and Typeinformations
-    public Type(List<AssumptionAbstract> assumptions, ClassOrInterface cl , TypeVarStore typeVarStore) {
+    public Type(AssumptionMap assumptions, ClassOrInterface cl , TypeVarStore typeVarStore) {
 
         for (Method m : cl.getMethods()) {
-
             // Erstelle Lokale Assumptions
             AssumptionMakerLocal assumptionMakerLocal = new AssumptionMakerLocal(m, typeVarStore);
-            List<AssumptionAbstract> newAssumptions = new ArrayList<>();
-            newAssumptions.addAll(assumptions);
-            newAssumptions.addAll(assumptionMakerLocal.getResultAssumptionList());
-
-            // Führe TypeExpression aus
-            //TypeExpr typeExpr = new TypeExpr();
-
-
+            assumptions.addAll(assumptionMakerLocal.getResultAssumptionList());
+            TypeExpr typeExpr = new TypeExpr(assumptions  , m, typeVarStore);
+            constraintList.addAll(typeExpr.getResultConstraints());
         }
-
-
     }
-
-
 }
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java b/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
index 46ae7f3c..03431c46 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
@@ -6,10 +6,13 @@ import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
 import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
 import de.dhbwstuttgart.strucTypes5.constraints.ConstraintFactory;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarFactory;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 
 
 import java.util.ArrayList;
@@ -25,7 +28,7 @@ public class TypeExpr {
     private List<ConstraintAbstract> resultConstraints;
 
 
-    public TypeExpr(List<AssumptionAbstract> assumptionAbstractList , Method method, TypeVarStore typeVarStore) {
+    public TypeExpr(AssumptionMap assumptionAbstractList , Method method, TypeVarStore typeVarStore) {
         this.typeVarStore = typeVarStore;
         this.assumptionMap = makeAllAssumptions(assumptionAbstractList,method);
 
@@ -40,11 +43,11 @@ public class TypeExpr {
     }
 
 
-    private AssumptionMap makeAllAssumptions(List<AssumptionAbstract> assumptionAbstractList , Method method) {
+    private AssumptionMap makeAllAssumptions(AssumptionMap assumptionsAll , Method method) {
 
         // Globale Assumptions
-        AssumptionMap assumptionMap = new AssumptionMap();
-        assumptionMap.addAll(assumptionAbstractList);
+        AssumptionMap assumptionMap = assumptionsAll;
+
 
         //Lokale Assumptions
         AssumptionMakerLocal assumptionMakerLocal = new AssumptionMakerLocal(method,typeVarStore);
@@ -73,21 +76,55 @@ public class TypeExpr {
         }
         else if (expression instanceof MethodCall) {
             MethodCall methodCall = (MethodCall) expression;
-            List<ConstraintAbstract> result = typeExpression(methodCall.get_Receiver());
 
-            // TypeExpr für die Argumente
-            for (Expression arg : methodCall.get_ArgList().getArguments()) {
-                result.addAll(typeExpression(arg));
+            // Call of non-Abstract Field do not add constraints
+            if (methodCall.get_Receiver().getType() instanceof RefType) {
+                List<ConstraintAbstract> result = typeExpression(methodCall.get_Receiver());
+                typeVarStore.storeTPH(methodCall.getType());
+                // TypeExpr für die Argumente
+                for (Expression arg : methodCall.get_ArgList().getArguments()) {
+                    result.addAll(typeExpression(arg));
+                }
+                return result;
+            }
+            else {
+                List<ConstraintAbstract> result = typeExpression(methodCall.get_Receiver());
+
+                // TypeExpr für die Argumente
+                for (Expression arg : methodCall.get_ArgList().getArguments()) {
+                    result.addAll(typeExpression(arg));
+                }
+
+                result.addAll(ConstraintFactory.generateConstraintMethod(methodCall, typeVarStore));
+                return result;
             }
 
-            result.addAll(ConstraintFactory.generateConstraintMethod(methodCall,typeVarStore));
-            return result;
+
+
         }
         else if (expression instanceof Receiver) {
             Receiver receiver = (Receiver) expression;
             List<ConstraintAbstract> result = typeExpression(receiver.get_Expression());
             return result;
         }
+        else if (expression instanceof NewClass) {
+            NewClass newClass = (NewClass) expression;
+
+            // Argumente
+            List<ConstraintAbstract> result = new ArrayList<>();
+
+            // TypeExpr für die Argumente
+            for (Expression arg : newClass.getArgumentList().getArguments()) {
+                result.addAll(typeExpression(arg));
+            }
+
+           //typeVarStore.addTuple(TypeVarFactory.makeTypeVar() , newClass.getType());
+
+
+
+            //
+            return result;
+        }
         else {
             System.err.println("Fehler unbekannt");
             System.out.println(expression);
diff --git a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
new file mode 100644
index 00000000..e6c7c7c1
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
@@ -0,0 +1,74 @@
+package de.dhbwstuttgart.strucTypes5.assumptions;
+
+import de.dhbwstuttgart.strucTypes2.Assumptions_Map;
+import de.dhbwstuttgart.strucTypes3.ConstraintAbstract;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+
+import java.util.List;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+public class AssumptionClass extends AssumptionAbstract  {
+
+    // Die Angaben entspreichen einer clT Klasse
+    private ClassOrInterface cl;
+    private TypeVarStore typeVarStore;
+    private Assumptions_Map assumptions_map;
+    private List<ConstraintAbstract> constraints;
+    private List<ClassOrInterface> generatedinterfaces;
+
+    public AssumptionClass(ClassOrInterface cl, TypeVarStore typeVarStore, Assumptions_Map assumptions_map, List<ConstraintAbstract> constraints, List<ClassOrInterface> generatedinterfaces) {
+        this.cl = cl;
+        this.typeVarStore = typeVarStore;
+        this.assumptions_map = assumptions_map;
+        this.constraints = constraints;
+        this.generatedinterfaces = generatedinterfaces;
+    }
+
+    public AssumptionClass () {
+
+    }
+
+    public ClassOrInterface getCl() {
+        return cl;
+    }
+
+    public void setCl(ClassOrInterface cl) {
+        this.cl = cl;
+    }
+
+    public TypeVarStore getTypeVarStore() {
+        return typeVarStore;
+    }
+
+    public void setTypeVarStore(TypeVarStore typeVarStore) {
+        this.typeVarStore = typeVarStore;
+    }
+
+    public Assumptions_Map getAssumptions_map() {
+        return assumptions_map;
+    }
+
+    public void setAssumptions_map(Assumptions_Map assumptions_map) {
+        this.assumptions_map = assumptions_map;
+    }
+
+    public List<ConstraintAbstract> getConstraints() {
+        return constraints;
+    }
+
+    public void setConstraints(List<ConstraintAbstract> constraints) {
+        this.constraints = constraints;
+    }
+
+    public List<ClassOrInterface> getGeneratedinterfaces() {
+        return generatedinterfaces;
+    }
+
+    public void setGeneratedinterfaces(List<ClassOrInterface> generatedinterfaces) {
+        this.generatedinterfaces = generatedinterfaces;
+    }
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java
index 28997041..43863561 100644
--- a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java
+++ b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java
@@ -14,11 +14,15 @@ import java.util.List;
 public class AssumptionMakerGlobal {
 
     List<AssumptionAbstract> assumptionAbstractList = new ArrayList<>();
+    AssumptionMap assumptionMapGlobal = new AssumptionMap();
 
 
     public AssumptionMakerGlobal(ClassOrInterface classOrInterface, TypeVarStore typeVarStore) {
         makeFieldAssumptions(classOrInterface.getFieldDecl() , typeVarStore);
         makeMethodAssumptions(classOrInterface.getMethods() , typeVarStore);
+        makeClassAssumption(classOrInterface,typeVarStore);
+
+
     }
 
 
@@ -38,6 +42,16 @@ public class AssumptionMakerGlobal {
         }
     }
 
+
+
+    // Erstelle ClassAssumption für diese Klasse
+    private void makeClassAssumption(ClassOrInterface cl , TypeVarStore tvs) {
+        AssumptionClass assumptionClass = new AssumptionClass();
+        assumptionClass.setCl(cl);
+        assumptionClass.setTypeVarStore(tvs);
+        assumptionAbstractList.add(assumptionClass);
+    }
+
     public List<AssumptionAbstract> getAssumptionAbstractList() {
         return assumptionAbstractList;
     }
diff --git a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java
index 0666d66b..0cb97cf4 100644
--- a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java
+++ b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java
@@ -16,6 +16,7 @@ public class AssumptionMap {
     private Map<String, AssumptionMethod> mAss = new HashMap<>();
     private Map<String, AssumptionField> fass = new HashMap<>();
     private Map<String, AssumptionArgument> argAss = new HashMap<>();
+    private Map<String, AssumptionClass> classAss = new HashMap<>();
 
 
     public void addAssumption(AssumptionAbstract ass) {
@@ -32,6 +33,10 @@ public class AssumptionMap {
             AssumptionArgument assumptionArgument = (AssumptionArgument) ass;
             argAss.put(assumptionArgument.getNameOfArgument(), assumptionArgument);
         }
+        else if (ass instanceof AssumptionClass) {
+            AssumptionClass assumptionClass = (AssumptionClass) ass;
+            classAss.put(assumptionClass.getCl().getClassName().toString() , assumptionClass);
+        }
         else {
             System.err.println("Fehler Ass nicht bekannt");
         }
@@ -70,9 +75,15 @@ public class AssumptionMap {
         return fass.get(name).getTypeVar();
     }
 
+
+    public AssumptionClass getClassAssumption(String className) {
+        return classAss.get(className);
+    }
+
+
     @Override
     public String toString() {
-        return String.format("AssMethod \n  AssField: %s \n AssArgument %s " , mAss.toString() , fass.toString() , argAss.toString());
+        return String.format("AssMethod \n  AssField: %s \n AssArgument %s  \n AssClass %s " , mAss.toString() , fass.toString() , argAss.toString() , classAss.toString());
     }
 }
 
diff --git a/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java b/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java
index fdc89947..ef321aa8 100644
--- a/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java
+++ b/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java
@@ -6,8 +6,10 @@ import de.dhbwstuttgart.syntaxtree.Field;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 
+import java.sql.Ref;
 import java.util.List;
 
 /**
@@ -137,7 +139,6 @@ public class Class2String {
             for (Expression arg : methodCall.get_ArgList().getArguments()) {
                 String expArg = generateExpressionString(arg);
                 arguments = arguments.concat(expArg + ",");
-
             }
             return String.format( "[%s.%s(%s) : %s ]  " , receiverString, methodCall.get_Name() , arguments , tS(methodCall.getType()));
         }
@@ -145,6 +146,16 @@ public class Class2String {
             Receiver receiver = (Receiver) expression;
             return generateExpressionString(receiver.get_Expression());
         }
+        else if (expression instanceof NewClass) {
+            NewClass newClass = (NewClass) expression;
+
+            String arguments = "";
+            for (Expression arg : newClass.getArgumentList().getArguments()) {
+                String expArg = generateExpressionString(arg);
+                arguments = arguments.concat(expArg + ",");
+            }
+            return String.format("[new %s( %s ): %s ]" , newClass.getType() , arguments , newClass.getType() );
+        }
         else {
             return "Expression nicht bekannt";
         }
@@ -159,6 +170,14 @@ public class Class2String {
             resultString = ref.toString();
         }
         else if (aktMode.equals(WITH_TYPEVARS)) {
+            // Typ Ist Bekannt
+            if (ref instanceof RefType) {
+                return ((RefType) ref).getName().toString();
+            }
+
+            System.out.println(ref);
+
+            // Typ ist nicht bekannt
             resultString = typeVarStore.getTypeVarByTPH(ref).toString();
             if (resultString == null) {
                 System.err.println("Fehler bei " +ref);
diff --git a/test/strucTypes5/Class2StringTest.java b/test/strucTypes5/Class2StringTest.java
index c02065cb..05dfcc6e 100644
--- a/test/strucTypes5/Class2StringTest.java
+++ b/test/strucTypes5/Class2StringTest.java
@@ -6,6 +6,7 @@ import de.dhbwstuttgart.strucTypes5.algo.TypeExpr;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerGlobal;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
 import de.dhbwstuttgart.strucTypes5.ausgabe.Class2String;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
@@ -74,7 +75,9 @@ public class Class2StringTest {
 				ArrayList<AssumptionAbstract> assAll = new ArrayList<>();
 				assAll.addAll(assumptionMakerLocal.getResultAssumptionList());
 				assAll.addAll(makerGlobal.getAssumptionAbstractList());
-				TypeExpr typeExpr = new TypeExpr(assAll , sf.getClasses().get(0).getMethods().get(0) , typeVarStore  );
+				AssumptionMap assumptionMap = new AssumptionMap();
+				assumptionMap.addAll(assAll);
+				TypeExpr typeExpr = new TypeExpr(assumptionMap , sf.getClasses().get(0).getMethods().get(0) , typeVarStore  );
 
 				// Teste TypeVars Problem Typevars werden benötigt
 				Class2String class2String3 = new Class2String();
diff --git a/test/strucTypes5/NewOperatorTest.jav b/test/strucTypes5/NewOperatorTest.jav
new file mode 100644
index 00000000..98541b00
--- /dev/null
+++ b/test/strucTypes5/NewOperatorTest.jav
@@ -0,0 +1,13 @@
+
+
+
+class Main {
+main () { return new A().mt(new Main() , new A() , new A() );  }
+}
+
+
+class A {
+
+}
+
+
diff --git a/test/strucTypes5/NewOperatorTest.java b/test/strucTypes5/NewOperatorTest.java
new file mode 100644
index 00000000..aa54964a
--- /dev/null
+++ b/test/strucTypes5/NewOperatorTest.java
@@ -0,0 +1,86 @@
+package strucTypes5;
+
+import de.dhbwstuttgart.parser.JavaTXParser;
+import de.dhbwstuttgart.strucTypes5.algo.TypeExpr;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerGlobal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.ausgabe.Class2String;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Dieser Test pr�ft nur, ob .java-Dateien fehlerfrei geparst werden. Der
+ * dabei erstellte Syntaxbaum wird nicht kontrolliert.
+ * 
+ * @author janulrich
+ *
+ */
+public class NewOperatorTest {
+	private static final String rootDirectory = System.getProperty("user.dir") + "/test/strucTypes5/";
+
+	@Test
+	public void run() {
+
+
+		List<String> filenames = new ArrayList<String>();
+		filenames.add("NewOperatorTest.jav");
+
+		JavaTXParser parser = new JavaTXParser();
+		try {
+			for (String filename : filenames) {
+
+				System.out.println("Teste: " + filename);
+
+				SourceFile sf = parser.parse(new File(rootDirectory + filename));
+
+				SourceFile sfdebug = sf;
+
+
+				Class2String class2String = new Class2String();
+				String s = class2String.generateStringTPH(sf.getClasses().get(0));
+				System.out.println(s);
+
+				ClassOrInterface classMain = sf.getClasses().get(0);
+
+
+				TypeVarStore tvs = new TypeVarStore();
+
+				AssumptionMakerGlobal assumptionMakerGlobal = new AssumptionMakerGlobal(classMain,tvs);
+				AssumptionMakerLocal assumptionMakerLocal = new AssumptionMakerLocal(classMain.getMethods().get(0), tvs);
+				List<AssumptionAbstract> assumptionAbstracts = new ArrayList<>();
+				AssumptionMap assumptionMap = new AssumptionMap();
+				assumptionMap.addAll(assumptionAbstracts);
+
+				TypeExpr typeExpr = new TypeExpr(assumptionMap,classMain.getMethods().get(0) ,tvs);
+				System.out.println(typeExpr.getResultConstraints());
+
+				Class2String class1String = new Class2String();
+				String s2 = class1String.generateStringTypeVars(sf.getClasses().get(0), tvs);
+				System.out.println(s2);
+
+
+
+
+
+
+
+			}
+
+		} catch (Exception exc) {
+			exc.printStackTrace();
+			fail();
+		}
+		assertTrue("Tests durchlaufen", filenames.size() > 0);
+	}
+}
diff --git a/test/strucTypes5/TypeExprTest.java b/test/strucTypes5/TypeExprTest.java
index 3d68b30a..e2464198 100644
--- a/test/strucTypes5/TypeExprTest.java
+++ b/test/strucTypes5/TypeExprTest.java
@@ -5,6 +5,7 @@ import de.dhbwstuttgart.strucTypes5.algo.TypeExpr;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerGlobal;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import org.junit.Test;
@@ -57,16 +58,14 @@ public class TypeExprTest {
 				List<AssumptionAbstract> assAll = new ArrayList<>();
 				assAll.addAll(assumptionMakerLocal.getResultAssumptionList());
 				assAll.addAll(makerGlobal.getAssumptionAbstractList());
+				AssumptionMap assumptionMap = new AssumptionMap();
+				assumptionMap.addAll(assAll);
 
 
-				TypeExpr typeExpr = new TypeExpr(assAll , sf.getClasses().get(0).getMethods().get(0) , typeVarStore );
+				TypeExpr typeExpr = new TypeExpr(assumptionMap , sf.getClasses().get(0).getMethods().get(0) , typeVarStore );
 				System.out.println(typeExpr.getResultConstraints());
 				System.out.println(typeExpr.getTypeVarStore());
 
-
-
-
-
 			}
 
 		} catch (Exception exc) {