Index: /reasoner/reasoner.tex =================================================================== --- /reasoner/reasoner.tex (revision 85) +++ /reasoner/reasoner.tex (revision 86) @@ -930,26 +930,26 @@ String type & 2.1.3.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & S1, S2\\ Enum type & 2.1.3.2 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & E1, E2\\ -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} & \\ -\hline - \multicolumn{4}{|c|}{Compound types (typed decision variable, starting with \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateCompound}\tabAlgFollow\tabAlg{algTranslateCompoundDeclaration})}\\ -\hline -Integer type & 2.1.3.1 & \tabAlgLine{algRegisterCompoundMapping}{algRegisterCompoundMappingVarMapping}, \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow +Reference type & 2.2.3.2 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & \TBD{tests}\\ +Derived type & 2.1.3.4 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationDerivedDatatype}\tabAlgFollow\tabAlg{algTranslateDerivedDatatypeConstraints} +& \TBD{tests} \\ +Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers}, constraint value in \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationConstraintVariableConstraint} & \TBD{tests} \\ +\hline + \multicolumn{4}{|c|}{Compound types (typed decision variable, starting with \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateCompound}\tabAlgFollow\tabAlg{algTranslateCompoundDeclaration}, mapping in \tabAlg{algRegisterCompoundMapping})}\\ +\hline +Integer type & 2.1.3.1 & \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow \tabAlg{algTranslateDeclaration} & ICo1, ICo2\\ -Real type & 2.1.3.1 & \tabAlgLine{algRegisterCompoundMapping}{algRegisterCompoundMappingVarMapping}, \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow +Real type & 2.1.3.1 & \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow \tabAlg{algTranslateDeclaration} & RCo1, RCo2\\ -Boolean type & 2.1.3.1 & \tabAlgLine{algRegisterCompoundMapping}{algRegisterCompoundMappingVarMapping}, \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow +Boolean type & 2.1.3.1 & \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow \tabAlg{algTranslateDeclaration} & BCo1, BCo2, BCo3 \\ -String type & 2.1.3.1 & \tabAlgLine{algRegisterCompoundMapping}{algRegisterCompoundMappingVarMapping}, \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow +String type & 2.1.3.1 & \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow \tabAlg{algTranslateDeclaration} & SCo1, SCo2\\ -Enum type & 2.1.3.2 & \tabAlgLine{algRegisterCompoundMapping}{algRegisterCompoundMappingVarMapping}, \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow +Enum type & 2.1.3.2 & \tabAlgLine{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationTranslateSlotsV}\tabAlgFollow \tabAlg{algTranslateDeclaration} & ECo1, ECo2\\ -Derived type & 2.1.3.4 & Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationDerivedDatatype} $\rightarrow$ Alg.\ref{algTranslateDerivedDatatypeConstraints} & \\ -Compound type & 2.1.3.5 & Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationTranslateCompound} $\rightarrow$ Alg.\ref{algTranslateCompoundDeclaration} & \\ -Container type & 2.1.3.3 & & \\ -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}, constraint value in \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationConstraintVariableConstraint} via compound access line \ref{algTranslateDeclarationTranslateInCompound} & \\ +Derived type & 2.1.3.4 & Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationDerivedDatatype} $\rightarrow$ Alg.\ref{algTranslateDerivedDatatypeConstraints} & \TBD{tests} \\ +Compound type & 2.1.3.5 & Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationTranslateCompound} $\rightarrow$ Alg.\ref{algTranslateCompoundDeclaration} & \TBD{tests} \\ +Container type & 2.1.3.3 & & \TBD{tests} \\ +Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests} \\ +Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers}, constraint value in \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationConstraintVariableConstraint} via compound access line \ref{algTranslateDeclarationTranslateInCompound} & \TBD{tests} \\ \hline \end{tabular} @@ -967,28 +967,30 @@ \textbf{IVML concept} & \textbf{Spec} & \textbf{Transformation Trace} & \textbf{Test}\\ \hline -+ Constraint & 2.1.3.5 & & \\ -+ Refined compounds & 2.2.3.1 & & \\ -+ Partial evaluation & 2.2.5.3 & & \\ -+ Assignment-block & 2.2.2 & & \\ -Container type & 2.1.3.3 & complex value: Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationTranslateContainer} $\rightarrow$ Alg. \ref{algTranslateContainerDeclaration} & \\ -+ 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} & \\ -+ Compound type & 2.1.3.5 & & \\ -+ Container type & 2.1.3.3 & & \\ -+ Derived Compound Type & & & \\ -+ Derived Container Type & & & \\ -+ 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& & & CnCt1, CnCt2 \\ -+ Derived Constraint Container& & & \\ -Annotation of & 2.2.2 & & \\ -+ 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 & & \\ -+ Compound type & 2.1.3.5& & \\ -+ Container type & 2.1.3.3 & & \\ -+ 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}& \\ + \multicolumn{4}{|c|}{Container type, starting with \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateContainer}\tabAlgFollow \tabAlg{algTranslateContainerDeclaration}}\\ +\hline +Integer type & 2.1.3.1 & no action in \tabAlg{algTranslateContainerDeclaration}, cf. Sect. \ref{sectNotationOthers} & ICt1, ICt2\\ +Real type & 2.1.3.1 & no action in \tabAlg{algTranslateContainerDeclaration}, cf. Sect. \ref{sectNotationOthers} & RCt1, RCt2\\ +Boolean type & 2.1.3.1 & no action in \tabAlg{algTranslateContainerDeclaration}, cf. Sect. \ref{sectNotationOthers} & BCt1, BCt2 \\ +String type & 2.1.3.1 & no action in \tabAlg{algTranslateContainerDeclaration}, cf. Sect. \ref{sectNotationOthers} & SCt1, SCt2\\ +Enum type & 2.1.3.2 & no action in \tabAlg{algTranslateContainerDeclaration}, cf. Sect. \ref{sectNotationOthers} & ECt1, ECt2 \\ +Derived type & 2.1.3.4 & Alg. \ref{algTranslateDeclaration} line \ref{algTranslateDeclarationDerivedDatatype} $\rightarrow$ Alg.\ref{algTranslateDerivedDatatypeConstraints} & \TBD{tests} \\ +Compound type & 2.1.3.5 & & \TBD{tests} \\ +Container type & 2.1.3.3 & & \TBD{tests} \\ +Derived Compound Type & & & \TBD{tests} \\ +Derived Container Type & & & \TBD{tests} \\ +Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests} \\ +Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers} \TBD{constraint value} & \TBD{tests} \\ +Constraint Container& & & \TBD{CnCt1, CnCt2} \\ +Derived Constraint Container& & & \TBD{tests} \\ +\hline + \multicolumn{4}{|c|}{Annotation of \TBD{path}} \\ +\hline +Basic type & 2.1.3.1 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests} \\ +Enum type & 2.1.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests}\\ +Derived type & 2.1.3.4 & & \TBD{tests} \\ +Compound type & 2.1.3.5& & \TBD{tests} \\ +Container type & 2.1.3.3 & & \TBD{tests} \\ +Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests} \\ +Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers}& \TBD{tests} \\ \hline \end{tabular} @@ -998,5 +1000,6 @@ % B=Boolean -%Co = Container +%Co = Compound +%Cr = Container %Cn = Constraint %A=Annotation, AssignmentBlock @@ -1014,26 +1017,36 @@ \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}\\ +B1 & \class{boolean/BooleanDefaultsTest.ivml}\\ +B2 & \class{boolean/BooleanAssignTest.ivml}\\ +B3 & \class{boolean/BooleanImpliesTest.ivml}\\ +BCo1 & \class{boolean/BooleanInCompoundAssignTest.ivml}\\ +BCo3 & \class{boolean/BooleanInCompoundDefaultsTest.ivml}\\ +BCo3 & \class{boolean/BooleanInCompoundImpliesTest.ivml}\\ +BCt1 & \class{boolean/BooleanInContainerAssignTest.ivml}\\ +BCt2 & \class{boolean/BooleanInContainerDefaultsTest.ivml}\\ I1 & \class{integer/IntegerDefaultsTest.ivml}\\ I2 & \class{integer/IntegerAssignTest.ivml}\\ ICo1 & \class{integer/IntegerInCompoundDefaultsTest.ivml}\\ ICo2 & \class{integer/IntegerInCompoundAssignTest.ivml}\\ +ICt1 & \class{integer/IntegerInContainerAssignTest.ivml}\\ +ICt2 & \class{integer/IntegerInContainerDefaultsTest.ivml}\\ R1 & \class{real/RealDefaultsTest.ivml}\\ R2 & \class{real/RealAssignTest.ivml}\\ RCo1 & \class{real/RealInCompoundDefaultsTest.ivml}\\ RCo2 & \class{real/RealInCompoundAssignTest.ivml}\\ +RCt1 & \class{real/RealInContainerAssignTest.ivml}\\ +RCt2 & \class{real/RealInContainerDefaultsTest.ivml}\\ S1 & \class{string/StringDefaultsTest.ivml}\\ S2 & \class{string/StringAssignTest.ivml}\\ SCo1 & \class{string/StringInCompoundDefaultsTest.ivml}\\ SCo2 & \class{string/StringInCompoundAssignTest.ivml}\\ +SCt1 & \class{string/StringInContainerAssignTest.ivml}\\ +SCt2 & \class{string/StringInContainerDefaultsTest.ivml}\\ E1 & \class{enums/EnumDefaultsTest.ivml}\footnote{similar tests for ordered enums are in place}\\ E2 & \class{enums/EnumAssignTest.ivml}\\ -ECo1 & \class{enums/EnumCompoundDefaultsTest.ivml}\\ -ECo2 & \class{enums/enumCompoundAssignTest.ivml}\\ +ECo1 & \class{enums/EnumInCompoundDefaultsTest.ivml}\\ +ECo2 & \class{enums/RnumInCompoundAssignTest.ivml}\\ +ECt1 & \class{enums/EnumInContainerDefaultsTest.ivml}\\ +ECt2 & \class{enums/EnumInContainerAssignTest.ivml}\\ CnCt1 & \class{collectionConstraints/constraintSetDefault.ivml}\\ CnCt2 & \class{collectionConstraints/constraintSetSetDefault.ivml}\\