Index: dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Design.uxf =================================================================== diff -u --- dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Design.uxf (revision 0) +++ dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Design.uxf (revision 177) @@ -0,0 +1,270 @@ + + + 10 + + Relation + + 780 + 240 + 30 + 80 + + lt=<- + 10.0;60.0;10.0;10.0 + + + UMLObject + + 630 + 100 + 480 + 690 + + Design +valign=top + + + + UMLState + + 740 + 380 + 110 + 40 + + Create geometry +bg=red + + + + UMLState + + 740 + 450 + 110 + 40 + + Create Waternet +bg=red + + + + UMLState + + 740 + 520 + 110 + 40 + + Calculate +with kernel +bg=red + + + + UMLSpecialState + + 770 + 590 + 40 + 40 + + bg=green +type=decision + + + + UMLSpecialState + + 770 + 300 + 40 + 40 + + bg=green +type=decision + + + + UMLSpecialState + + 780 + 160 + 20 + 20 + + type=initial + + + + Relation + + 780 + 330 + 110 + 70 + + lt=<- +location found + 10.0;50.0;10.0;10.0 + + + Relation + + 780 + 410 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 780 + 480 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 800 + 480 + 290 + 150 + + lt=<- +design criterium +is not met and +maximum number of +iterations is not reached + 120.0;10.0;120.0;130.0;10.0;130.0 + + + Relation + + 780 + 550 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + UMLState + + 740 + 210 + 110 + 40 + + Find next +location +bg=red + + + + UMLSpecialState + + 950 + 310 + 20 + 20 + + type=final + + + + Relation + + 800 + 300 + 170 + 40 + + lt=<- +no location found + 150.0;20.0;10.0;20.0 + + + UMLState + + 740 + 720 + 110 + 40 + + Add outcome +to results +bg=red + + + + Relation + + 780 + 620 + 170 + 120 + + lt=<- +design criterium is met +or maximum number of +iterations is reached + 10.0;100.0;10.0;10.0 + + + Relation + + 780 + 170 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + UMLState + + 870 + 450 + 110 + 40 + + Adapt +Surfaceline +bg=red + + + + Relation + + 840 + 380 + 100 + 90 + + lt=<- + + + 10.0;20.0;80.0;20.0;80.0;70.0 + + + Relation + + 680 + 220 + 80 + 540 + + lt=<- + 60.0;10.0;10.0;10.0;10.0;520.0;60.0;520.0 + + Index: dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessment.pdf =================================================================== diff -u --- dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessment.pdf (revision 0) +++ dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessment.pdf (revision 177) @@ -0,0 +1,63 @@ +%PDF-1.4 +%���� +6 0 obj +<>stream +x��YMo7���=t�$�_Ǵh�!��� Iv��$Ē���w���r +�R�B� +�7;��y;CR���;땋���ݏ�ݻ�s7(o��������c��{�m:��tF���>u������A-��W8�����vPz�v�y���u����+��v88Y����SI�u|��wQi ��׈"��j�� ���`�J��Rn������ɨ�#%|Of2Xtl< 4~3Ke��o3��t�WiP��}�\Ql �f���7�� +N���1���V]#?�a�&��E����Rm���z�����6�-~6�M8�|�je0��~��W��q�kM��/��Ӻ[�M��zF#���P���2��Wκ�lzC\�Bp=.�u�G��VR\� 4����"�Y`KԌE�cn�>�+�"@�a]� �������d�Xj�Fy�,�;�l{�I�>��41nQT��ҭHh��M�n��!� �n!�2+~9͑����1y���W��4��@�rI� +8)3 +JG �6O��5�6S��TM�s5���I�|\�1�|ͣ����l�m�f�&me�M�f�+��q�䒄\����wTN& �'o>n�j��c�"y�O[��c�vq����\�"i�7��N�FF�M�N�~u�tL�$��u �5.9F�t��+A�U�A��B�![�fY�L��'�Y�e�q�.�>Ӽ��y���ُ�ɛ�ј��M�o�n� r=N�SD�:_>K�䍨�:Wt�<�ο1p�R�c=�D)�dB�h�`�H>�0�S +m>� ���SB5��@�tc(��G n��OI>�a�OY�)7��-,/ǵ�K���s~��f\<�7�� �z3�:���q�A���߬�KU d�q�x��F ��2�@K �'Z���h�!��J (�C��2��€Ђ�Ђ�J e� +-��Aƿ�Nf��Q +�4Ӑ�~��W���vA�Z#����6V�Vd�Q�Z= mlBg��5���6���%�q +m���(c�mh���2�вTCˢL� -[>�ڗ��?bm���d�2�n�]���^���n7�A=13bOO?߉ͯ� -�˷rh���徎��1�$H�3~|���C�r�8���V��z��X�S��m1!�C�3фX۞��n���W�\!�����{㫒�tQ�g��&9غշ��?��=L�|6՝y^�f�~�Y��oh�|�Y�Txʦv�����Tr6[%Giu�}�,/H�2� e���$�Z�h�F�a��"LQ��0� +���+?΄� 񐳆�\a�{��.�T�a\�J��#�uՠ(�=�'��#�0F�}eBE�<͉�r� 3N�9'b�D�H!OR�8���V?'���O�ǡ�����|� ����O7�q�q2���'=���غ�ckg[#��#56����&g���O��>�\9!�.��� Ю̳&Ԭ �)c�5� +endstream +endobj +8 0 obj +<>/Font<>>>/Parent 7 0 R/MediaBox[0 0 410 620]>> +endobj +3 0 obj +<> +endobj +1 0 obj +<> +endobj +2 0 obj +<> +endobj +5 0 obj +<> +endobj +4 0 obj +<> +endobj +7 0 obj +<> +endobj +9 0 obj +<> +endobj +10 0 obj +<> +endobj +xref +0 11 +0000000000 65535 f +0000001833 00000 n +0000001863 00000 n +0000001745 00000 n +0000001913 00000 n +0000001888 00000 n +0000000015 00000 n +0000001938 00000 n +0000001534 00000 n +0000001989 00000 n +0000002034 00000 n +trailer +<]/Root 9 0 R/Size 11>> +%iText-5.4.1 +startxref +2188 +%%EOF Index: dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityDesign.pdf =================================================================== diff -u Binary files differ Index: dam engine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex =================================================================== diff -u -r176 -r177 --- dam engine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex (.../DAM Engine - Technical Design.tex) (revision 176) +++ dam engine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex (.../DAM Engine - Technical Design.tex) (revision 177) @@ -144,8 +144,9 @@ \label{fig-DAMEngineComponents} \end{figure} -\section{\ProgramName sequence diagrams} \label{sec:DAMEngineSequenceDiagrams} -In this section the sequence diagrams, showing the use of the submodules are shown. +\section{\ProgramName sequence and activity diagrams} \label{sec:DAMEngineSequenceActivityDiagrams} +In this section the sequence diagrams, showing the use of the submodules are shown. +For each sequence diagram a corresponding activity diagram is also shown \subsection{Assessment} \begin{figure}[H] @@ -156,26 +157,47 @@ \label{fig-DAMEngineSequenceAssessment} \end{figure} +\begin{figure}[H] + \begin{center} + \includegraphics[width=8cm]{pictures/DAMEngineActivityAssessment.pdf} + \end{center} + \caption{\small \ProgramName Assessment activity diagram.} + \label{fig-DAMEngineActivityAssessment} +\end{figure} + \subsection{Assessment Regional} \begin{figure}[H] \begin{center} \includegraphics[width=15cm]{pictures/DAMEngineSequenceAssessmentRegional.pdf} \end{center} - \caption{\small \ProgramName Regional assessment sequence diagram.} \label{fig-DAMEngineSequenceAssessmentRegional} \end{figure} +\begin{figure}[H] + \begin{center} + \includegraphics[width=8cm]{pictures/DAMEngineActivityAssessmentRegional.pdf} + \end{center} + \caption{\small \ProgramName Regionl assessment activity diagram.} + \label{fig-DAMEngineActivityAssessmentRegional} +\end{figure} + \subsection{Design} \begin{figure}[H] \begin{center} \includegraphics[width=15cm]{pictures/DAMEngineSequenceDesign.pdf} \end{center} - \caption{\small \ProgramName Design sequence diagram.} \label{fig-DAMEngineSequenceDesign} \end{figure} +\begin{figure}[H] + \begin{center} + \includegraphics[width=8cm]{pictures/DAMEngineActivityDesign.pdf} + \end{center} + \caption{\small \ProgramName Design activity diagram.} + \label{fig-DAMEngineDesignAssessment} +\end{figure} %------------------------------------------------------------------------------ \chapter{Architectural Choices} \label{chapterArchitecturalChoices} Index: dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment.uxf =================================================================== diff -u --- dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment.uxf (revision 0) +++ dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment.uxf (revision 177) @@ -0,0 +1,203 @@ + + + 10 + + Relation + + 800 + 240 + 30 + 80 + + lt=<- + 10.0;60.0;10.0;10.0 + + + UMLObject + + 650 + 100 + 370 + 580 + + Assessment +valign=top + + + + UMLState + + 760 + 380 + 110 + 40 + + Create geometry +bg=red + + + + UMLState + + 760 + 450 + 110 + 40 + + Create Waternet +bg=red + + + + UMLState + + 760 + 520 + 110 + 40 + + Calculate +with kernel +bg=red + + + + UMLSpecialState + + 790 + 300 + 40 + 40 + + bg=green +type=decision + + + + UMLSpecialState + + 800 + 160 + 20 + 20 + + type=initial + + + + Relation + + 800 + 330 + 110 + 70 + + lt=<- +location found + 10.0;50.0;10.0;10.0 + + + Relation + + 800 + 410 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 800 + 480 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 700 + 220 + 80 + 420 + + lt=<- + 60.0;10.0;10.0;10.0;10.0;400.0;60.0;400.0 + + + Relation + + 800 + 550 + 30 + 70 + + lt=<- + 10.0;50.0;10.0;10.0 + + + UMLState + + 760 + 210 + 110 + 40 + + Find next +location +bg=red + + + + UMLSpecialState + + 970 + 310 + 20 + 20 + + type=final + + + + Relation + + 820 + 300 + 170 + 40 + + lt=<- +no location found + 150.0;20.0;10.0;20.0 + + + UMLState + + 760 + 600 + 110 + 40 + + Add outcome +to results +bg=red + + + + Relation + + 800 + 170 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + Index: dam engine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.pdf =================================================================== diff -u -r176 -r177 Binary files differ Index: dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessmentRegional.pdf =================================================================== diff -u --- dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessmentRegional.pdf (revision 0) +++ dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineActivityAssessmentRegional.pdf (revision 177) @@ -0,0 +1,68 @@ +%PDF-1.4 +%���� +6 0 obj +<>stream +x��YKo7���=t�7�Ƕh衱�� Yq��%Ē��ߗ3��Õ"9)��l}�!g9���p�����`�ъ�������� �d��K�R̃��~�����a5(�i����à��u��)�S��6p\�=FMRx +�&4#r �VDZ���� %n6ɺJv�o-��WS����(\� �Y�&�f�y?���I����HK�,�ݝV�dyB3"�q�\�H�O�B_�d�i�&*�5K>RW�vt�PΎrJ�Jp�ߕX �)D��΍V��]�n#���)s�n�Zp7�E��h1����ǣ�CF���2�4�.`�4Q=�^ +*߿J�NA�]^�$MF��w $�\ ��t���.���@r +>���=����R*��f�\]�߮7���=���v_8^Q8�v�Q�7��%|��/��-%|����������(� %|G �S�7��-%�~��׎f{��ۿ�:퐳�nW�b��k{��p���wdc^/�����i� +�U�}a=u��=1^t�(�(�h9�)Q��h��ѡ��#Cυ� +-�s��zr4��S%�� ����X?l뻥8"��]�RZj4�]����aޞ+�CZ��3����|�H[Xm���I3gBZ���i�.�y��8�$����.8��Ϳc�ۣ�-A3ݘ�����H�X#!5��d���q=b�3����Gm���蠳- Ҍ!$I2��a Vy��n$�Eh�4��y����آ��[#�{��V���?;/N~�0��c��ё����9x���ik�ֱ��:r�֑c5��A�x��,��no�%޺$޺K�u�x�&��m���)^�kOɲ���,+�|�YV�8W��H�^� 9${�P��ʄiS �wY��X)��U��^����� (� +r{�4C1g5��G2ek($���d]�>͸� �bħ�~) ю�O�q�I+.:5�,?i[�GZ��#�j��5;�OO5p�&"�L&>*�-7����G� +mh+j_��r)r�ޯ#�����b0�z��O��1���Es��@�R[go��� Z���|�p^2���y���wΛ�~^3��� .x�8���T�,��;=��8���:��d�����;<�0i8����+ +�~W|Q��C�5@ /��u\+�h�;(htJehgM�ҡb�ᘝ�v����ͮ�U���7�9m�Т�soGU�C�ԇ +# Pn/5UGMeZj����PS���P�2��y����6���oQ&�M��βD�Ffm蕙��w:4̅I��*6Y����ebX[�B����K +�Q�����-԰g�&<�=v�=��N^�S�=�DZ�x�=���\k� �ЌH��� �;����X�n��~�Oe��'��j +]*�1�왌��� �/ڔ9+�Ƚ��]7{S;{n��ӎg/+�/��=<�R +endstream +endobj +8 0 obj +<>/Font<>>>/Parent 7 0 R/MediaBox[0 0 460 830]>> +endobj +3 0 obj +<> +endobj +5 0 obj +<> +endobj +1 0 obj +<> +endobj +4 0 obj +<> +endobj +2 0 obj +<> +endobj +7 0 obj +<> +endobj +9 0 obj +<> +endobj +10 0 obj +<> +endobj +xref +0 11 +0000000000 65535 f +0000002259 00000 n +0000002314 00000 n +0000002146 00000 n +0000002289 00000 n +0000002234 00000 n +0000000015 00000 n +0000002339 00000 n +0000001935 00000 n +0000002390 00000 n +0000002435 00000 n +trailer +<<6c7e448cee819e9cd0d423094f0b55f1>]/Root 9 0 R/Size 11>> +%iText-5.4.1 +startxref +2589 +%%EOF Index: dam engine/trunk/doc/Dam Engine - Technical Design/pictures/DAMEngineSequenceDesign.pdf =================================================================== diff -u -r172 -r177 Binary files differ Index: dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment Regional.uxf =================================================================== diff -u --- dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment Regional.uxf (revision 0) +++ dam engine/trunk/doc/UML Diagrams/DAM Engine Activity Assessment Regional.uxf (revision 177) @@ -0,0 +1,288 @@ + + + 10 + + Relation + + 820 + 570 + 30 + 70 + + lt=<- + 10.0;50.0;10.0;10.0 + + + UMLObject + + 650 + 60 + 420 + 790 + + Assessment Regional +valign=top + + + + UMLState + + 780 + 330 + 110 + 40 + + Create geometry +bg=red + + + + UMLState + + 780 + 400 + 110 + 40 + + Create Waternet +bg=red + + + + UMLState + + 780 + 690 + 110 + 40 + + Calculate +with kernel +bg=red + + + + UMLSpecialState + + 810 + 620 + 40 + 40 + + bg=green +type=decision + + + + UMLSpecialState + + 820 + 100 + 20 + 20 + + type=initial + + + + Relation + + 820 + 650 + 120 + 60 + + lt=<- +scenario found + 10.0;40.0;10.0;10.0 + + + Relation + + 820 + 360 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 820 + 430 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + + + Relation + + 880 + 550 + 120 + 260 + + lt=<- + 10.0;10.0;100.0;10.0;100.0;240.0;10.0;240.0 + + + Relation + + 820 + 720 + 30 + 70 + + lt=<- + 10.0;50.0;10.0;10.0 + + + UMLState + + 780 + 540 + 110 + 40 + + Find next +scenario +bg=red + + + + UMLSpecialState + + 990 + 260 + 20 + 20 + + type=final + + + + Relation + + 680 + 180 + 150 + 480 + + lt=<- +no scenario +found + 100.0;10.0;10.0;10.0;10.0;460.0;130.0;460.0 + + + UMLState + + 780 + 770 + 110 + 40 + + Add outcome +to results +bg=red + + + + Relation + + 820 + 110 + 30 + 80 + + lt=<- + 10.0;60.0;10.0;10.0 + + + UMLState + + 780 + 170 + 110 + 40 + + Find next +location +bg=red + + + + UMLState + + 780 + 470 + 110 + 40 + + Create +scenarios +bg=red + + + + Relation + + 820 + 200 + 30 + 70 + + lt=<- + 10.0;50.0;10.0;10.0 + + + UMLSpecialState + + 810 + 250 + 40 + 40 + + bg=green +type=decision + + + + Relation + + 840 + 250 + 170 + 40 + + lt=<- +no location found + 150.0;20.0;10.0;20.0 + + + Relation + + 820 + 280 + 110 + 70 + + lt=<- +location found + 10.0;50.0;10.0;10.0 + + + Relation + + 820 + 500 + 30 + 60 + + lt=<- + 10.0;40.0;10.0;10.0 + +