Index: /reasoner/reasoner.tex
===================================================================
--- /reasoner/reasoner.tex	(revision 49)
+++ /reasoner/reasoner.tex	(revision 50)
@@ -242,5 +242,5 @@
 $$allBase(t) = \begin{cases}\set{t}, & \text{if } isDerived(t) \wedge  base(t) = \undef \\  \set{t} \cup allBase(base(t)), & \text{if } isDerived(t) \wedge base(t) \neq \undef \\ \emptySet, & \text{else}\\ \end{cases}$$
 
-\subsection{Other IVML Elements}
+\subsection{Other IVML Elements}\label{sectNotationOthers}
 
 No specific functions are required for translating constraints for / reasoning on \emph{basic types} (Boolean, Integer, Real String). The available functions for these types, such as adding two integer values, are subject to the creation of the IVML model, e.g., through a parser, and are, therefore, if specified, already part of constraint expressions before reasoning.
@@ -308,11 +308,11 @@
      \tcp{start of model visitor}%>ConstraintTranslationVisitor
      \ForAll{$d \iterAssng varDeclarations(p)$}{ \label{algTranslateConstraintsTranslationStart} %translateDeclarationDefaults
-        $translateDeclarationDefaults(d, decision(cfg, d), \undef)$\;
-      }
-     $add(\topLevelConstraints, constraints(p), true)$\; \label{algTranslateConstraintsAdd} 
+        $translateDeclarationDefaults(d, decision(cfg, d), \undef)$\; \label{algTranslateConstraintsTranslationDeclarationDefaults}
+      }
+     $add(\topLevelConstraints, constraints(p), true)$\; \label{algTranslateConstraintsAdd} \label{algTranslateConstraintsTopLevelConstraints}
      \ForAll{a \iterAssng assignments(p)}{
-        $translateAnnotationAssignments(a, \undef, \undef)$\;
+        $translateAnnotationAssignments(a, \undef, \undef)$\; \label{algTranslateConstraintsTopLevelAnnotationAssignments}
      } \label{algTranslateConstraintsTranslationEnd}
-     $add(\topLevelConstraints,\seqWith{constraints(e)}{e\in evals(p)}$\;
+     $add(\topLevelConstraints,\seqWith{constraints(e)}{e\in evals(p)}$\;\label{algTranslateConstraintsTopLevelEvals}
      \tcp{end of model visitor}%<ConstraintTranslationVisitor
     $base \assng base \addSeq \defaultConstraints \addSeq \deferredDefaultConstraints \addSeq \topLevelConstraints \addSeq \otherConstraints$\; \label{algTranslateConstraintsCompose}
@@ -734,22 +734,47 @@
 \begin{tabular}{|l|c||l|c|}
 \hline
-\textbf{IVML concept} & \textbf{Spec} & \textbf{Reasoner transformation} & \textbf{Section}\\
+\textbf{IVML concept} & \textbf{Spec} & \textbf{Transformation} & \textbf{Comments}\\
 \hline
- \multicolumn{4}{|c|}{Default expressions}\\
+ \multicolumn{4}{|c|}{Top-level}\\
 \hline
-Basic variable & & & \\
-Derived type variable & & & \\
-Enum variable & & & \\
-Compound variable & & & \\
-Container variable & & & \ref{deflt_containers} \\
+Decision variable & & Alg. \ref{algTranslateConstraints} line \ref{algTranslateConstraintsTranslationDeclarationDefaults} & \TBD{check} \\
+Constraint & & Alg. \ref{algTranslateConstraints} line \ref{algTranslateConstraintsTopLevelConstraints} & \\
+Annotation assignment & & Alg. \ref{algTranslateConstraints} line \ref{algTranslateConstraintsTopLevelAnnotationAssignments} & \\
+Eval-block & & Alg. \ref{algTranslateConstraints} line \ref{algTranslateConstraintsTopLevelEvals} & \\
+\hline
+ \multicolumn{4}{|c|}{Types}\\
+\hline
+Basic types & & - & No translation needed, see Section \ref{sectNotationOthers}\\
+Derived types & & & \\
+Enum types & & & \\
+Compound types & & & \\
++ Basic types & & & \\
++ Derived variable & & & \\
++ Enum variable & & & \\
++ Compound variable & & & \\
++ Container variable & & & \\
++ Reference variable & & & \\
++ Constraint variable & & & \\
+Container variable & & &  \\
++ Basic variable & & & \\
++ Derived variable & & & \\
++ Enum variable & & & \\
++ Compound variable & & & \\
++ Container variable & & & \\
++ Reference variable & & & \\
++ Constraint variable & & & \\
++ Assignment Block & & & \\
++ Constraint & & & \\
+Annotation & & &  \\
++ Basic variable & & & \\
++ Derived variable & & & \\
++ Enum variable & & & \\
++ Compound variable & & & \\
++ Container variable & & & \\
++ Reference variable & & & \\
++ Constraint variable & & & \\
++ Constraint & & & \\
 Reference variable & & & \\
 Constraint variable & & & \\
-\hline
- \multicolumn{4}{|c|}{Constraints}\\
-\hline
-Top-Level constraint & & & \\
-Compound constraint & & & \\
-\hline
-Eval & & & \\
 \hline
 \end{tabular}