diff --git a/1.RASD/RASD.lyx b/1.RASD/RASD.lyx index efd9cb1..cf0f802 100644 --- a/1.RASD/RASD.lyx +++ b/1.RASD/RASD.lyx @@ -519,14 +519,14 @@ Revision History \begin_layout Standard \align center \begin_inset Tabular - + - - - - - - + + + + + + \begin_inset Text \begin_layout Plain Layout @@ -535,7 +535,7 @@ Version \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -544,7 +544,7 @@ Date \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -553,7 +553,7 @@ Author(s) \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -563,8 +563,54 @@ Summary \end_inset - - + + +\begin_inset Text + +\begin_layout Plain Layout +1.3 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +22/01/2017 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Giancarlo Colaci +\begin_inset Newline newline +\end_inset + +Giulio De Pasquale +\begin_inset Newline newline +\end_inset + +Francesco Rinaldi +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Updated Alloy +\end_layout + +\end_inset + + + + \begin_inset Text \begin_layout Plain Layout @@ -573,7 +619,7 @@ Summary \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -582,16 +628,24 @@ Summary \end_inset - + \begin_inset Text \begin_layout Plain Layout -Giancarlo Colaci, Giulio De Pasquale, Francesco Rinaldi +Giancarlo Colaci +\begin_inset Newline newline +\end_inset + +Giulio De Pasquale +\begin_inset Newline newline +\end_inset + +Francesco Rinaldi \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -601,8 +655,8 @@ Name refactoring, updated Class Diagram \end_inset - - + + \begin_inset Text \begin_layout Plain Layout @@ -611,7 +665,7 @@ Name refactoring, updated Class Diagram \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -620,16 +674,24 @@ Name refactoring, updated Class Diagram \end_inset - + \begin_inset Text \begin_layout Plain Layout -Giancarlo Colaci, Giulio De Pasquale, Francesco Rinaldi +Giancarlo Colaci +\begin_inset Newline newline +\end_inset + +Giulio De Pasquale +\begin_inset Newline newline +\end_inset + +Francesco Rinaldi \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -639,8 +701,8 @@ Further details, new functional requirement \end_inset - - + + \begin_inset Text \begin_layout Plain Layout @@ -649,7 +711,7 @@ Further details, new functional requirement \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -658,16 +720,24 @@ Further details, new functional requirement \end_inset - + \begin_inset Text \begin_layout Plain Layout -Giancarlo Colaci, Giulio De Pasquale, Francesco Rinaldi +Giancarlo Colaci +\begin_inset Newline newline +\end_inset + +Giulio De Pasquale +\begin_inset Newline newline +\end_inset + +Francesco Rinaldi \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -682,28 +752,6 @@ Initial Release \end_inset -\end_layout - -\begin_layout Subsubsection -Version 1.1 Changelog -\end_layout - -\begin_layout Standard -While writing the Design Document, we found necessary to make some modifications - to the RASD. - This is why we wrote the second version of the document. - Here there are the updates we did: -\end_layout - -\begin_layout Itemize -In the previous RASD we didn't specify that the Customer Service is an outsource -d service, and so in this document and in the following documents we won't - implement it; -\end_layout - -\begin_layout Itemize -We introduced a new functional requirement: modify the profile information. - \end_layout \begin_layout Subsection @@ -5429,9 +5477,10 @@ Here are presented three generated worlds, according to the model specified \end_layout \begin_layout Standard -\begin_inset External - template PDFPages - filename res/img/alloy_mondo_1.pdf +\align center +\begin_inset Graphics + filename res/img/world1.png + height 100theight% rotateAngle 90 \end_inset @@ -5447,9 +5496,10 @@ Here are presented three generated worlds, according to the model specified \end_layout \begin_layout Standard -\begin_inset External - template PDFPages - filename res/img/alloy_mondo_3.pdf +\align center +\begin_inset Graphics + filename res/img/world2.png + height 100theight% rotateAngle 90 \end_inset @@ -5465,9 +5515,10 @@ Here are presented three generated worlds, according to the model specified \end_layout \begin_layout Standard -\begin_inset External - template PDFPages - filename res/img/alloy_mondo_2.pdf +\align center +\begin_inset Graphics + filename res/img/world3.png + height 100theight% rotateAngle 90 \end_inset diff --git a/1.RASD/res/alloy/AlloyPowerEnjoy.als b/1.RASD/res/alloy/AlloyPowerEnjoy.als index 043a87c..518c663 100644 --- a/1.RASD/res/alloy/AlloyPowerEnjoy.als +++ b/1.RASD/res/alloy/AlloyPowerEnjoy.als @@ -219,6 +219,7 @@ fact noEarlyRent { ren.startTime >= res.endTime ) } + // No Cities with the same ID fact noDuplicatedCities { no c1 , c2 : City | c1.id = c2.id and c1 != c2 diff --git a/1.RASD/res/img/alloy_PROVA.pdf b/1.RASD/res/img/alloy_PROVA.pdf deleted file mode 100644 index 18e61da..0000000 Binary files a/1.RASD/res/img/alloy_PROVA.pdf and /dev/null differ diff --git a/1.RASD/res/img/alloy_mondo_1.pdf b/1.RASD/res/img/alloy_mondo_1.pdf deleted file mode 100644 index c32d24f..0000000 Binary files a/1.RASD/res/img/alloy_mondo_1.pdf and /dev/null differ diff --git a/1.RASD/res/img/alloy_mondo_2.pdf b/1.RASD/res/img/alloy_mondo_2.pdf deleted file mode 100644 index 7676f9e..0000000 Binary files a/1.RASD/res/img/alloy_mondo_2.pdf and /dev/null differ diff --git a/1.RASD/res/img/alloy_mondo_3.pdf b/1.RASD/res/img/alloy_mondo_3.pdf deleted file mode 100644 index a0618b3..0000000 Binary files a/1.RASD/res/img/alloy_mondo_3.pdf and /dev/null differ