Index: /reasoner/reasoner.tex
===================================================================
--- /reasoner/reasoner.tex	(revision 27)
+++ /reasoner/reasoner.tex	(revision 28)
@@ -134,5 +134,5 @@
       %evaluator.setScopeAssignments(sAssng)\;
       $\variableMapping \assng \set{}$\; % clear
-      $base \assng translateDefaults(p, cfg, t)$\;
+      $base \assng translateDefaults(p, cfg, t, inc)$\;
       $base \assng base \addSeq translateConstraints(p, t, inc)$\;
       $evaluateConstraints(p, base)$\;
@@ -200,9 +200,9 @@
 \begin{algorithm}[H]
   \SetAlgoLined
-  \KwIn{project $p$, configuration $cfg$}
+  \KwIn{project $p$, configuration $cfg$, incremental $inc$}
   \KwData{constraint $base$, derived type constraints $\derivedTypeConstraints$, attribute constraints $\defaultAnnotationConstraints$}
   
   \ForAll{$d \iterAssng varDeclarations(p)$}{ %translateDeclarationDefaults
-      $translateDeclarationDefaults(d, decision(cfg, d), \undef)$\;
+      $translateDeclarationDefaults(d, decision(cfg, d), \undef, inc)$\;
   }
  \caption{Translating project default value expressions to constraints (\IVML{translateDefaults}).}\label{algTranslateDefaults}
@@ -223,5 +223,5 @@
 \begin{algorithm}[H]
   \SetAlgoLined
-  \KwIn{declaration $d$, variable $v$, access $ca$}
+  \KwIn{declaration $d$, variable $v$, access $ca$, incremental $inc$}
   \KwData{configuration $cfg$, constraint $base$, variable mapping $\variableMapping$, constraint variables $\constraintVariablesConstraints$, default (deferred) constraints $\defaultConstraints$ and $\deferredDefaultConstraints$}
   
@@ -233,5 +233,5 @@
             $translateCompoundDefaults(d, v, ca, t)$\;
             \lIf{$ dflt \neq \undef $}{$ dflt \assng deflt|_{\IVMLself{}=d, \variableMapping}$}
-        } \ElseIf{$ dflt \neq \undef $}{
+        } \uElseIf{$ dflt \neq \undef \wedge \neg inc$}{
           \uIf{$ isContainer(type(d)) $}{
               \ForAll{$u \iterAssng usedTypes(dflt)$}{
@@ -243,5 +243,5 @@
                $dflt \assng dflt|_{\IVMLself =ca, \variableMapping}$\;
            }
-      }
+      } \uElse{$ dflt \assng \undef $\;}
       $\collectionCompoundConstraints \assng \collectionCompoundConstraints \cup translateCollectionCompoundConstraints(d, v, \undef)$\;
       \If{$isContainer(t) \wedge isDerived(contained(t))$}{
@@ -499,9 +499,5 @@
   \KwData{constraint $base$ , variable mapping $\variableMapping$ \TBD{join, reorder, beautify, leave out non-incremental on-the-fly}}
 
-   $c_s \assng \set{}$\;  
-   \If{$\neg inc$} {
-       $c_s \assng c_s \addSeq \defaultConstraints \addSeq \deferredDefaultConstraints$\;
-  }
-  $c_s \assng c_s \addSeq \derivedTypeConstraints$\;
+  $c_s \assng c_s \addSeq \defaultConstraints \addSeq \deferredDefaultConstraints \addSeq \derivedTypeConstraints$\;
   $c_s \assng c_s \addSeq \seqWith{constraints(e)}{e\in evals(p)}$\;
   $c_s \assng c_s \addSeq \compoundEvalConstraints$\;