Merge branch 'master' of gitlab.mi.hdm-stuttgart.de:goik/GoikLectures

Doc/Sd1/Inheritance/inheritance.xml

@@ -399,8 +399,8 @@ public <link
     if (o instanceof Rectangle <emphasis role="red">r</emphasis>) {
       return super.equals(o) <co linkends="sda_inherit_fig_RectangleEquals-1"
           xml:id="sda_inherit_fig_RectangleEquals-1-co"/> &amp;&amp;
-             width == <emphasis role="red">r</emphasis> &amp;&amp; height == <emphasis
-          role="red">r</emphasis> <co
+             width == <emphasis role="red">r</emphasis>.width &amp;&amp; height == <emphasis
+          role="red">r</emphasis>.height <co
           linkends="sda_inherit_fig_RectangleEquals-2"
           xml:id="sda_inherit_fig_RectangleEquals-2-co"/>;
     } else {

Klausuren/Sd1/2020winter_1/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_2_DigitExpressions.java

@@ -11,7 +11,7 @@ public class _2_DigitExpressions {
      * <p>A single digit value <code>d</code> may be 0, 1, 2, 3, 4, 5, 6, 7, 8 or 9. Starting from an arbitrary digit
      * value \( d \) this method computes \(d + d^2 + d^3 \). Example:</p>
      *
-     * <p>A digit value of 2 will return \(2 + 2 \cdot 2 + 2 \cdot 3 \cdot 3 = 14 \).</p>
+     * <p>A digit value of 2 will return \(2 + 2 \cdot 2 + 2 \cdot 2 \cdot 2 = 14 \).</p>
      *
      * @param digit A single digit value ranging from 0 to 9.
      * @return \( \texttt{digit} + \texttt{digit}^2 + \texttt{digit}^3 \).
@@ -37,12 +37,12 @@ public class _2_DigitExpressions {
      *         <tr>
      *             <td>5</td>
      *             <td style="color:red;">2</td>
-     *             <td>\( 5 + 5^\color{red}{2} = 5 + 25 = 30 \)</td>
+     *             <td>\( 5 + 5^{\color{red}{2}} = 5 + 25 = 30 \)</td>
      *         </tr>
      *         <tr>
      *             <td>2</td>
      *             <td style="color:red;">4</td>
-     *             <td> \( 2 + 2^2 + 2^3 + 2^\color{red}{4} = 2 + 4 + 8 + 16 = 30 \)</td>
+     *             <td> \( 2 + 2^2 + 2^3 + 2^{\color{red}{4}} = 2 + 4 + 8 + 16 = 30 \)</td>
      *         </tr>
      *
      *     </tbody>

Klausuren/Sd1/2020winter_1/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_2_DigitExpressions.java

@@ -11,7 +11,7 @@ public class _2_DigitExpressions {
      * <p>A single digit value <code>d</code> may be 0, 1, 2, 3, 4, 5, 6, 7, 8 or 9. Starting from an arbitrary digit
      * value \( d \) this method computes \(d + d^2 + d^3 \). Example:</p>
      *
-     * <p>A digit value of 2 will return \(2 + 2 \cdot 2 + 2 \cdot 3 \cdot 3 = 14 \).</p>
+     * <p>A digit value of 2 will return \(2 + 2 \cdot 2 + 2 \cdot 2 \cdot 2 = 14 \).</p>
      *
      * @param digit A single digit value ranging from 0 to 9.
      * @return \( \texttt{digit} + \texttt{digit}^2 + \texttt{digit}^3 \).
@@ -37,12 +37,12 @@ public class _2_DigitExpressions {
      *         <tr>
      *             <td>5</td>
      *             <td style="color:red;">2</td>
-     *             <td>\( 5 + 5^\color{red}{2} = 5 + 25 = 30 \)</td>
+     *             <td>\( 5 + 5^{\color{red}{2}} = 5 + 25 = 30 \)</td>
      *         </tr>
      *         <tr>
      *             <td>2</td>
      *             <td style="color:red;">4</td>
-     *             <td> \( 2 + 2^2 + 2^3 + 2^\color{red}{4} = 2 + 4 + 8 + 16 = 30 \)</td>
+     *             <td> \( 2 + 2^2 + 2^3 + 2^{\color{red}{4}} = 2 + 4 + 8 + 16 = 30 \)</td>
      *         </tr>
      *
      *     </tbody>