Index: /reasoner/reasoner.tex
===================================================================
--- /reasoner/reasoner.tex	(revision 82)
+++ /reasoner/reasoner.tex	(revision 83)
@@ -910,26 +910,33 @@
 
 \begin{table*}[h]
-\begin{adjustbox}{angle=90}
+%\begin{adjustbox}{angle=90}
 \centering
-\begin{tabular}{|l|c||p{6cm}|p{5cm}|}
+\begin{tabular}{|p{4cm}|r||p{6cm}|p{3cm}|}
 \hline
 \textbf{IVML concept} & \textbf{Spec} & \textbf{Transformation Trace} & \textbf{Test}\\
 \hline
-Decision variable, default & 2.1.4 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}  & \\
+Decision variable & 2.1.4 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}  & \textit{all} \\
 Constraint & 2, 3 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTopLevelConstraints} & \\
-Constraint variable, default & 3.1.10 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLines{algTranslateDeclaration}{algTranslateDeclarationTranslateConstraintDefaultStart}{algTranslateDeclarationTranslateConstraintDefaultEnd}  & \\
-Annotation variable, default & 2.2.2 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLine{algTranslateDeclaration}{algTranslateConstraintsTopLevelAnnotationAssignments} & \\
-Annotation assignment & 2.2.2 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTopLevelAnnotationAssignments}\tabAlgFollow\tabAlg{algTranslateAnnotationAssignments} & \\
+Constraint variable & 3.1.10 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLines{algTranslateDeclaration}{algTranslateDeclarationTranslateConstraintDefaultStart}{algTranslateDeclarationTranslateConstraintDefaultEnd}  & \\
+Annotation variable & 2.2.2 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTranslationDeclaration}\tabAlgFollow\tabAlgLine{algTranslateDeclaration}{algTranslateConstraintsTopLevelAnnotationAssignments} & \\
+Assignment block & 2.2.2 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTopLevelAnnotationAssignments}\tabAlgFollow\tabAlg{algTranslateAnnotationAssignments} & \\
 Partial evaluation & 2.2.5.3 & \tabAlgLine{algTranslateConstraints}{algTranslateConstraintsTopLevelEvals} & \\
 \hline
- \multicolumn{4}{|c|}{Types}\\
+ \multicolumn{4}{|c|}{Types (typed decision variable, starting in \tabAlg{algTranslateDeclaration}}\\
 \hline
-Basic type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
-Enum type & 2.1.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
-Derived type & 2.1.3.4 & Alg. \ref{algTranslateDeclaration}, line \ref{algTranslateDeclarationDerivedDatatype} $\rightarrow$ Alg. \ref{algTranslateDerivedDatatypeConstraints} & \\
-Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
+Integer type & 2.1.3.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & \\
+Double type & 2.1.3.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers}  & \\
+Boolean type & 2.1.3.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers}  & B1, B2, B3 \\
+String type & 2.1.3.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers}  & \\
+Enum type & 2.1.3.2 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectotationOthers}  & \\
+Reference type & 2.2.3.2 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & \\
+\TBD{} Derived type & 2.1.3.4 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationDerivedDatatype}\tabAlgFollow\tabAlg{algTranslateDerivedDatatypeConstraints}, type specific translation, \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationConstraintVariableConstraint} or \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}
+& \\
 Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers}, constraint value in \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationConstraintVariableConstraint} & \\
 Compound type  & 2.1.3.5 & complex value: Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationTranslateCompound} $\rightarrow$ Alg.\ref{algTranslateCompoundDeclaration} & \\
-+ Basic type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
++ Integer type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
++ Double type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
++ Boolean type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & BCo1, BCo2, BCo3 \\
++ String type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
 + Enum type & 2.1.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
 + Derived type & 2.1.3.4 &  Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationDerivedDatatype} $\rightarrow$ Alg.\ref{algTranslateDerivedDatatypeConstraints} & \\
@@ -940,5 +947,5 @@
 \hline
 \end{tabular}
-\end{adjustbox}
+%\end{adjustbox}
 \caption{IVML concepts vs. reasoning constraint transformations.}
 \label{tab:IVMLReasoner}
@@ -947,7 +954,7 @@
 
 \begin{table*}[h]
-\begin{adjustbox}{angle=90}
+%\begin{adjustbox}{angle=90}
 \centering
-\begin{tabular}{|l|c||p{6cm}|p{5cm}|}
+\begin{tabular}{|p{4cm}|r||p{6cm}|p{3cm}|}
 \hline
 \textbf{IVML concept} & \textbf{Spec} & \textbf{Transformation Trace} & \textbf{Test}\\
@@ -967,5 +974,5 @@
 + Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \\
 + Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers} \TBD{constraint value} & \\
-+ Constraint Container& & & constraintSetDefault, constraintSetSetDefault \\
++ Constraint Container& & & CnCt1, CnCt2 \\
 + Derived Constraint Container& & & \\
 Annotation of & 2.2.2 & & \\
@@ -979,6 +986,30 @@
 \hline
 \end{tabular}
-\end{adjustbox}
+\caption{IVML concepts vs. reasoning constraint transformations (continued).}
+%\end{adjustbox}
 \end{table*}
+
+
+\begin{table*}[h]
+%\begin{adjustbox}{angle=90}
+\centering
+\begin{tabular}{|l|p{12cm}|}
+\hline
+\textbf{Id} & \textbf{Test model}\\
+\hline
+B1 & \class{booleanProblem/BooleanDefaultsTest.ivml}\\
+B2 & \class{booleanProblem/BooleanAssignTest.ivml}\\
+B3 & \class{booleanProblem/BooleanImpliesTest.ivml}\\
+BCo1 & \class{booleanProblem/BooleanCompoundAssignTest.ivml}\\
+BCo3 & \class{booleanProblem/BooleanCompoundDefaultsTest.ivml}\\
+BCo3 & \class{booleanProblem/BooleanCompoundImpliesTest.ivml}\\
+CnCt1 & \class{collectionConstraints/constraintSetDefault.ivml}\\
+CnCt2 & \class{collectionConstraints/constraintSetSetDefault.ivml}\\
+\hline
+\end{tabular}
+\caption{IVML reasoner test cases.}
+%\end{adjustbox}
+\end{table*}
+
 
 %-----------------------------------------------------------------------------------------------------------------