From af2015bec128ebf1318db3195b6da058bfba647e Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 17 Jan 2024 15:39:33 +0100
Subject: [PATCH] Unite code and related hash values

---
 Doc/Sd1/CoreClasses/coreClasses.xml | 76 +++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 9 deletions(-)

diff --git a/Doc/Sd1/CoreClasses/coreClasses.xml b/Doc/Sd1/CoreClasses/coreClasses.xml
index de66a8e2e..a95f569b0 100644
--- a/Doc/Sd1/CoreClasses/coreClasses.xml
+++ b/Doc/Sd1/CoreClasses/coreClasses.xml
@@ -376,6 +376,14 @@ public boolean equals(Object anObject) {
 
       <informaltable border="1">
         <tr>
+          <td rowspan="6"><programlisting language="none">public class Rectangle {
+    int width, height;
+...
+    @Override public int hashCode() {
+        return <emphasis role="red">width + height</emphasis>;
+    }
+}</programlisting></td>
+
           <th>width</th>
 
           <th>height</th>
@@ -384,19 +392,19 @@ public boolean equals(Object anObject) {
         </tr>
 
         <tr>
-          <td valign="top">1</td>
+          <td valign="top"><emphasis role="red">1</emphasis></td>
 
-          <td valign="top">3</td>
+          <td valign="top"><emphasis role="red">3</emphasis></td>
 
-          <td valign="top">4</td>
+          <td valign="top"><emphasis role="red">4</emphasis></td>
         </tr>
 
         <tr>
-          <td valign="top">2</td>
+          <td valign="top"><emphasis role="red">2</emphasis></td>
 
-          <td valign="top">2</td>
+          <td valign="top"><emphasis role="red">2</emphasis></td>
 
-          <td valign="top">4</td>
+          <td valign="top"><emphasis role="red">4</emphasis></td>
         </tr>
 
         <tr>
@@ -429,13 +437,63 @@ public boolean equals(Object anObject) {
       <title><classname>Better </classname><methodname>hashCode()</methodname>
       method</title>
 
-      <programlisting language="java">public class Rectangle {
+      <informaltable border="1">
+        <tr>
+          <td rowspan="6"><programlisting language="none">public class Rectangle {
     int width, height;
 ...
     @Override public int hashCode() {
-        return width + <emphasis role="red">13 * height</emphasis>;
+        return <emphasis role="red">width + 13 * height</emphasis>;
     }
-}</programlisting>
+}</programlisting></td>
+
+          <th>width</th>
+
+          <th>height</th>
+
+          <th>hash value</th>
+        </tr>
+
+        <tr>
+          <td valign="top">1</td>
+
+          <td valign="top">3</td>
+
+          <td valign="top">40</td>
+        </tr>
+
+        <tr>
+          <td valign="top">2</td>
+
+          <td valign="top">2</td>
+
+          <td valign="top">28</td>
+        </tr>
+
+        <tr>
+          <td valign="top">5</td>
+
+          <td valign="top">5</td>
+
+          <td valign="top">70</td>
+        </tr>
+
+        <tr>
+          <td valign="top">2</td>
+
+          <td valign="top">7</td>
+
+          <td valign="top">93</td>
+        </tr>
+
+        <tr>
+          <td valign="top">4</td>
+
+          <td valign="top">9</td>
+
+          <td valign="top">121</td>
+        </tr>
+      </informaltable>
     </figure>
 
     <qandaset defaultlabel="qanda" xml:id="qanda_sw1TimeperiodHashing">
-- 
GitLab