Index: /reasoner/reasoner.tex =================================================================== --- /reasoner/reasoner.tex (revision 92) +++ /reasoner/reasoner.tex (revision 93) @@ -944,15 +944,15 @@ 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{tests}\\ +Reference type & 2.2.3.2 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationTranslateDefault}, cf. Sect. \ref{sectNotationOthers} & BR1, ER1\\ Derived type & 2.1.3.4 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationDerivedDatatype}\tabAlgFollow\tabAlg{algTranslateDerivedDatatypeConstraints} & IT1, IT2 \\ -Constraint type & 3.10.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationConstraintVariableConstraint}\tabAlgFollow\tabAlg{algCreateConstraintVariableConstraint} & Cs1, Cs2 \TBD{chg}\\ +Constraint type & 3.10.1 & \tabAlgLine{algTranslateDeclaration}{algTranslateDeclarationConstraintVariableConstraint}\tabAlgFollow\tabAlg{algCreateConstraintVariableConstraint} & Cs1, Cs2\\ \hline \end{tabular} %\end{adjustbox} -\caption{Translations for top-level and non-compex types.} +\caption{Translations for top-level and non-complex types.} \label{tab:completenessTopLevelTypes} \end{table*} @@ -989,5 +989,5 @@ Reference type & 2.2.3.2 & \tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationTranslateSlotsStart}{algTranslateCompoundDeclarationTranslateSlotsEnd}\tabAlgFollow\tabAlg{algTranslateDeclaration} $\ldots$ & \TBD{tests} \\ -Constraint type & 3.10.1 & \tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationTranslateSlotsStart}{algTranslateCompoundDeclarationTranslateSlotsEnd}\tabAlgFollow\tabAlgLines{algTranslateDeclaration}{algTranslateDeclarationTranslateConstraintDefaultStart}{algTranslateDeclarationTranslateConstraintDefaultEnd} & CsCn1, CsCn2 \TBD{chg} \\ +Constraint type & 3.10.1 & \tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationTranslateSlotsStart}{algTranslateCompoundDeclarationTranslateSlotsEnd}\tabAlgFollow\tabAlgLines{algTranslateDeclaration}{algTranslateDeclarationTranslateConstraintDefaultStart}{algTranslateDeclarationTranslateConstraintDefaultEnd} & CsCn1, CsCn2 \\ Constraints & & \tabAlgLines{algTranslateCompoundDeclaration}{algTranslateCompoundDeclarationAllStart}{algTranslateCompoundDeclarationAllEnd}&\TBD{tests}\\ @@ -997,5 +997,5 @@ Assignment blocks & 2.2.2 & \tabAlgLine{algTranslateCompoundContent}{algTranslateCompoundDeclarationCompoundAssignments}\tabAlgFollow\tabAlg{algTranslateAnnotationAssignments} & \TBD{tests} \\ -Partial evaluation & 2.2.5.3 & \tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationEvalStart}{algTranslateCompoundDeclarationEvalEnd} & - \\ +Partial evaluation & 2.2.5.3 & \tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationEvalStart}{algTranslateCompoundDeclarationEvalEnd} & \TBD{tests} \\ \hline @@ -1033,9 +1033,9 @@ Compound type & 2.1.3.5 & \tabAlgLines{algTranslateContainerDeclaration}{algTranslateContainerDeclarationCompoundContainerStart}{algTranslateContainerDeclarationCompoundContainerEnd}\tabAlgFollow\tabAlgLines{algTranslateCompoundContainer}{algTranslateDefaultsCompoundContainerMapping}{algTranslateDefaultsCompoundContainerContent}\tabAlgFollow\tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationTranslateSlotsStart}{algTranslateCompoundDeclarationTranslateSlotsEnd}\tabAlgFollow\tabAlg{algTranslateDeclaration} $\ldots$ & \TBD{tests} \\ -Derived Compound Type & \TBD{??} & \tabAlgLine{algTranslateContainerDeclaration}{algTranslateContainerDeclarationDerivedTypes} \tabAlgFollow \tabAlg{algTranslateDerivedDatatypeConstraints} & ITCnCt1, ITCnCt2 \\ - -Container type & 2.1.3.3 & \TBD{??} & \TBD{tests} \\ - -Derived Container Type & \TBD{??} & \TBD{??} & \TBD{tests} \\ +Derived Compound Type & 2.1.3.3 & \tabAlgLine{algTranslateContainerDeclaration}{algTranslateContainerDeclarationDerivedTypes} \tabAlgFollow \tabAlg{algTranslateDerivedDatatypeConstraints} & ITCnCt1, ITCnCt2 \\ + +Container type & 2.1.3.3 & \tabAlgLines{algTranslateContainerDeclaration}{algTranslateContainerDeclarationCompoundContainerStart}{algTranslateContainerDeclarationCompoundContainerEnd}\tabAlgFollow\tabAlgLines{algTranslateCompoundContainer}{algTranslateDefaultsCompoundContainerMapping}{algTranslateDefaultsCompoundContainerContent}\tabAlgFollow\tabAlgLines{algTranslateCompoundContent}{algTranslateCompoundDeclarationTranslateSlotsStart}{algTranslateCompoundDeclarationTranslateSlotsEnd}\tabAlgFollow\tabAlg{algTranslateDeclaration} $\ldots$ & \TBD{tests} \\ + +Derived Container Type & 2.1.3.3 & \tabAlgLine{algTranslateContainerDeclaration}{algTranslateContainerDeclarationDerivedTypes}\tabAlgFollow\tabAlg{algTranslateDerivedDatatypeConstraints} & \TBD{tests} \\ Reference type & 2.2.3.2 & no specific constraints, cf. Section \ref{sectNotationOthers} & \TBD{tests} \\ @@ -1043,7 +1043,7 @@ Constraint type & 3.10.1 & no specific constraints, cf. Section \ref{sectNotationOthers} \TBD{constraint value} & \TBD{tests}\\ -Constraint Container& \TBD{??} & \TBD{??} & \TBD{CnCt1, CnCt2} \\ - -Derived Constraint Container& \TBD{??} & \TBD{??} & \TBD{tests} \\ +Constraint Container& 3.1.10 & \tabAlgLine{algTranslateContainerDeclaration}{algTranslateContainerDeclarationConstraintContainer}\TBD{??} & \TBD{CnCt1, CnCt2} \\ + +Derived Constraint Container& 3.1.10 & \TBD{??} & \TBD{tests} \\ Annotation & 2.2.2 & top-level only, see Table \ref{tab:completenessTopLevelTypes} & \TBD{tests}\\ @@ -1137,4 +1137,5 @@ \item QualiMaster full, incremental, runtime reasoning (full, no defaults, no frozen, reuse constraint base). Runtime vs. full reasoning seems to behave rather linearly, at around 23 constraints evaluated per ms. Compare to known results where available. \item All test cases involving reasoning as an overview map. + \item Eclipse 4.7/Java9 runs tests with asserts!!! \end{itemize} @@ -1159,5 +1160,5 @@ \section{Reasoner test cases}\label{appendixTestCases} -In this section, we list a subset of the implemented reasoner test cases, which aim at validating translation and reasoning for specific IVML concepts and combinations. In addition, the reasoner test cases defined as part of the test suite for the \class{ReasonerCore} bundle of EASy-Producer contain also more complex test cases taken from real scenarios, evaluation models as well as challenge test cases. +In this section, we list a representative subset of the implemented reasoner test cases, which aim at validating translation and reasoning for specific IVML concepts and combinations. Please note that reasoner test cases defined as part of the test suite for the \class{ReasonerCore} bundle of EASy-Producer contains more than 280 test cases are applied to the reasoner, many constructed in a similar way for different types, i.e., exhaustively listing all of them is neither possible her nor intended. Among them, there are also more complex test cases taken from real scenarios, evaluation models as well as challenge test cases. For referencing the test cases, we use identifiers composed for the main concepts to be validated. We use the abbreviations shown in Table \ref{tab:testCaseIdSchema} to compose identifiers. For example, test case nuber one on Integer (I) variables used as compound (Co) slots is identified by 'ICo1'. Table \ref{tab:reasonerTestCasesBasics} and Table \ref{tab:reasonerTestCasesAdvanced} list the test cases referenced in this document. Test case names ending with 'Valid' indicate that there is an associate test case testing also the failing of the constraint under test. @@ -1182,4 +1183,5 @@ E & Enum\protect\footnotemark\\ T & Typedef\\ +R & Refreence\\ \hline \end{tabular} @@ -1202,4 +1204,5 @@ B2 & \class{boolean/BooleanAssignTest.ivml}\\ B3 & \class{boolean/BooleanImpliesTest.ivml}\\ +BR1 & \class{boolean/BooleanRefAssignTest.ivml}\\ BCo1 & \class{boolean/BooleanInCompoundAssignTest.ivml}\\ BCo3 & \class{boolean/BooleanInCompoundDefaultsTest.ivml}\\ @@ -1229,6 +1232,7 @@ E1 & \class{enums/EnumDefaultsTest.ivml}\\ E2 & \class{enums/EnumAssignTest.ivml}\\ +ER1 & \class{enums/EnumRefAssignTest.ivml}\\ ECo1 & \class{enums/EnumInCompoundDefaultsTest.ivml}\\ -ECo2 & \class{enums/RnumInCompoundAssignTest.ivml}\\ +ECo2 & \class{enums/EnumInCompoundAssignTest.ivml}\\ ECt1 & \class{enums/EnumInContainerDefaultsTest.ivml}\\ ECt2 & \class{enums/EnumInContainerAssignTest.ivml}\\