Merge pull request TheAlgorithms#1325 from mariaRoxana94/fix-error

StepfenShawn · web-flow · commit 88c6ad97877e · 2020-05-28T23:04:56.000+08:00
Fixed 8XCorrectness_Bugs + 10XBad_Practice_Bugs + 14XDodgy_Code_Bugs
diff --git a/Conversions/DecimalToBinary.java b/Conversions/DecimalToBinary.java
@@ -27,7 +27,7 @@ public static void main(String args[]) {
     public static void conventionalConversion() {
         int n, b = 0, c = 0, d;
         Scanner input = new Scanner(System.in);
-        System.out.printf("Conventional conversion.\n\tEnter the decimal number: ");
+        System.out.printf("Conventional conversion.%n Enter the decimal number: ");
         n = input.nextInt();
         while (n != 0) {
             d = n % 2;
@@ -46,7 +46,7 @@ public static void conventionalConversion() {
     public static void bitwiseConversion() {
         int n, b = 0, c = 0, d;
         Scanner input = new Scanner(System.in);
-        System.out.printf("Bitwise conversion.\n\tEnter the decimal number: ");
+        System.out.printf("Bitwise conversion.%n Enter the decimal number: ");
         n = input.nextInt();
         while (n != 0) {
             d = (n & 1);
diff --git a/Conversions/OctalToHexadecimal.java b/Conversions/OctalToHexadecimal.java
@@ -15,7 +15,7 @@ public class OctalToHexadecimal {
      * @param s The Octal Number
      * @return The Decimal number
      */
-    public static int OctToDec(String s) {
+    public static int octToDec(String s) {
         int i = 0;
         for (int j = 0; j < s.length(); j++) {
             char num = s.charAt(j);
@@ -32,7 +32,7 @@ public static int OctToDec(String s) {
      * @param d The Decimal Number
      * @return The Hexadecimal number
      */
-    public static String DecimalToHex(int d) {
+    public static String decimalToHex(int d) {
         String digits = "0123456789ABCDEF";
         if (d <= 0)
             return "0";
@@ -54,10 +54,10 @@ public static void main(String args[]) {
         String oct = input.next();
 
         // Pass the octal number to function and get converted deciaml form
-        int decimal = OctToDec(oct);
+        int decimal = octToDec(oct);
 
         // Pass the decimla number to function and get converted Hex form of the number
-        String hex = DecimalToHex(decimal);
+        String hex = decimalToHex(decimal);
         System.out.println("The Hexadecimal equivalant is: " + hex);
         input.close();
     }
diff --git a/DataStructures/DynamicArray/DynamicArray.java b/DataStructures/DynamicArray/DynamicArray.java
@@ -41,7 +41,7 @@ public void add(final E element) {
     }
 
     public void put(final int index, E element) {
-        Objects.checkIndex(index, this.size);
+//        Objects.checkIndex(index, this.size);
 
         this.elements[index] = element;
     }
@@ -79,7 +79,7 @@ private void fastRemove(final Object[] elements, final int index) {
     }
 
     private E getElement(final int index) {
-        Objects.checkIndex(index, this.size);
+//        Objects.checkIndex(index, this.size);
         return (E) this.elements[index];
     }
 
diff --git a/DataStructures/Graphs/BellmanFord.java b/DataStructures/Graphs/BellmanFord.java
@@ -23,7 +23,7 @@ class Edge
         * @param v End vertex
         * @param c Weight
         */
-        Edge(int a,int b,int c)
+        public Edge(int a,int b,int c)
         {
             u=a;
             v=b;
diff --git a/DataStructures/Graphs/MatrixGraphs.java b/DataStructures/Graphs/MatrixGraphs.java
@@ -127,8 +127,7 @@ public boolean removeEdge(int from, int to) {
      * @return returns a string describing this graph
      */
     public String toString() {
-        String s = new String();
-        s = "    ";
+        String s = "    ";
         for (int i = 0; i < this.numberOfVertices(); i++) {
             s = s + String.valueOf(i) + " ";
         }
diff --git a/DataStructures/Heaps/HeapElement.java b/DataStructures/Heaps/HeapElement.java
@@ -117,7 +117,21 @@ public String toString() {
      * @return true if the keys on both elements are identical and the additional info objects
      * are identical.
      */
-    public boolean equals(HeapElement otherHeapElement) {
-        return (this.key == otherHeapElement.key) && (this.additionalInfo.equals(otherHeapElement.additionalInfo));
+    @Override
+    public boolean equals(Object o) {
+        if (o != null) {
+            if (!(o instanceof HeapElement)) return false;
+            HeapElement otherHeapElement = (HeapElement) o;
+            return (this.key == otherHeapElement.key) && (this.additionalInfo.equals(otherHeapElement.additionalInfo));
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 0;
+        result = 31*result + (int) key;
+        result = 31*result + (additionalInfo != null ? additionalInfo.hashCode() : 0);
+        return result;
     }
 }
diff --git a/DataStructures/Heaps/MaxHeap.java b/DataStructures/Heaps/MaxHeap.java
@@ -49,9 +49,9 @@ private void swap(int index1, int index2) {
     // Toggle an element up to its right place as long as its key is lower than its parent's
     private void toggleUp(int elementIndex) {
         double key = maxHeap.get(elementIndex - 1).getKey();
-        while (getElementKey((int) Math.floor(elementIndex / 2)) < key) {
-            swap(elementIndex, (int) Math.floor(elementIndex / 2));
-            elementIndex = (int) Math.floor(elementIndex / 2);
+        while (getElementKey((int) Math.floor(elementIndex / 2.0)) < key) {
+            swap(elementIndex, (int) Math.floor(elementIndex / 2.0));
+            elementIndex = (int) Math.floor(elementIndex / 2.0);
         }
     }
 
@@ -101,7 +101,7 @@ public void deleteElement(int elementIndex) {
         maxHeap.set(elementIndex - 1, getElement(maxHeap.size()));
         maxHeap.remove(maxHeap.size());
         // Shall the new element be moved up...
-        if (getElementKey(elementIndex) > getElementKey((int) Math.floor(elementIndex / 2))) toggleUp(elementIndex);
+        if (getElementKey(elementIndex) > getElementKey((int) Math.floor(elementIndex / 2.0))) toggleUp(elementIndex);
             // ... or down ?
         else if (((2 * elementIndex <= maxHeap.size()) && (getElementKey(elementIndex) < getElementKey(elementIndex * 2))) ||
                 ((2 * elementIndex < maxHeap.size()) && (getElementKey(elementIndex) < getElementKey(elementIndex * 2))))
diff --git a/DataStructures/Heaps/MinHeap.java b/DataStructures/Heaps/MinHeap.java
@@ -44,9 +44,9 @@ private void swap(int index1, int index2) {
     // Toggle an element up to its right place as long as its key is lower than its parent's
     private void toggleUp(int elementIndex) {
         double key = minHeap.get(elementIndex - 1).getKey();
-        while (getElementKey((int) Math.floor(elementIndex / 2)) > key) {
-            swap(elementIndex, (int) Math.floor(elementIndex / 2));
-            elementIndex = (int) Math.floor(elementIndex / 2);
+        while (getElementKey((int) Math.floor(elementIndex / 2.0)) > key) {
+            swap(elementIndex, (int) Math.floor(elementIndex / 2.0));
+            elementIndex = (int) Math.floor(elementIndex / 2.0);
         }
     }
 
@@ -96,7 +96,7 @@ public void deleteElement(int elementIndex) {
         minHeap.set(elementIndex - 1, getElement(minHeap.size()));
         minHeap.remove(minHeap.size());
         // Shall the new element be moved up...
-        if (getElementKey(elementIndex) < getElementKey((int) Math.floor(elementIndex / 2))) toggleUp(elementIndex);
+        if (getElementKey(elementIndex) < getElementKey((int)Math.floor(elementIndex / 2.0))) toggleUp(elementIndex);
             // ... or down ?
         else if (((2 * elementIndex <= minHeap.size()) && (getElementKey(elementIndex) > getElementKey(elementIndex * 2))) ||
                 ((2 * elementIndex < minHeap.size()) && (getElementKey(elementIndex) > getElementKey(elementIndex * 2))))
diff --git a/DataStructures/Lists/CircleLinkedList.java b/DataStructures/Lists/CircleLinkedList.java
@@ -14,7 +14,7 @@ private Node(E value, Node<E> next) {
     //For better O.O design this should be private allows for better black box design
     private int size;
     //this will point to dummy node;
-    private Node<E> head;
+    private Node<E> head =  null;
 
     //constructer for class.. here we will make a dummy node for circly linked list implementation with reduced error catching as our list will never be empty;
     public CircleLinkedList() {
diff --git a/DataStructures/Lists/DoublyLinkedList.java b/DataStructures/Lists/DoublyLinkedList.java
@@ -86,9 +86,12 @@ public void insertTail(int x) {
     public Link deleteHead() {
         Link temp = head;
         head = head.next; // oldHead <--> 2ndElement(head)
-        head.previous = null; // oldHead --> 2ndElement(head) nothing pointing at old head so will be removed
-        if (head == null)
+
+        if (head == null) {
             tail = null;
+        } else {
+            head.previous = null; // oldHead --> 2ndElement(head) nothing pointing at old head so will be removed
+        }
         return temp;
     }
 
@@ -100,10 +103,13 @@ public Link deleteHead() {
     public Link deleteTail() {
         Link temp = tail;
         tail = tail.previous; // 2ndLast(tail) <--> oldTail --> null
-        tail.next = null; // 2ndLast(tail) --> null
+
         if (tail == null) {
             head = null;
+        } else{
+            tail.next = null; // 2ndLast(tail) --> null
         }
+
         return temp;
     }
 
diff --git a/DataStructures/Stacks/NodeStack.java b/DataStructures/Stacks/NodeStack.java
@@ -74,7 +74,7 @@ public void push(Item item) {
         } else {
         	newNs.setPrevious(NodeStack.head);
         	NodeStack.head.setNext(newNs);
-        	NodeStack.head = newNs;
+        	NodeStack.head.setHead(newNs);
         }
 
         NodeStack.setSize(NodeStack.getSize() + 1);
@@ -89,7 +89,7 @@ public Item pop() {
 
     	Item item = (Item) NodeStack.head.getData();
 
-    	NodeStack.head = NodeStack.head.getPrevious();
+        NodeStack.head.setHead(NodeStack.head.getPrevious());
     	NodeStack.head.setNext(null);
 
     	NodeStack.setSize(NodeStack.getSize() - 1);
diff --git a/DataStructures/Trees/LevelOrderTraversal.java b/DataStructures/Trees/LevelOrderTraversal.java
@@ -15,8 +15,8 @@ public Node(int item) {
     // Root of the Binary Tree
     Node root;
 
-    public LevelOrderTraversal() {
-        root = null;
+    public LevelOrderTraversal( Node root) {
+        this.root = root;
     }
 
     /* function to print level order traversal of tree*/
diff --git a/DataStructures/Trees/LevelOrderTraversalQueue.java b/DataStructures/Trees/LevelOrderTraversalQueue.java
@@ -19,11 +19,9 @@ public Node(int item) {
         }
     }
 
-    Node root;
-
     /* Given a binary tree. Print its nodes in level order
      using array for implementing queue  */
-    void printLevelOrder() {
+    void printLevelOrder(Node root) {
         Queue<Node> queue = new LinkedList<Node>();
         queue.add(root);
         while (!queue.isEmpty()) {
diff --git a/DataStructures/Trees/ValidBSTOrNot.java b/DataStructures/Trees/ValidBSTOrNot.java
@@ -13,14 +13,13 @@ public Node(int item) {
     }
 
     //Root of the Binary Tree
-    Node root;
  
     /* can give min and max value according to your code or
     can write a function to find min and max value of tree. */
 
     /* returns true if given search tree is binary
      search tree (efficient version) */
-    boolean isBST() {
+    boolean isBST(Node root) {
         return isBSTUtil(root, Integer.MIN_VALUE,
                 Integer.MAX_VALUE);
     }
diff --git a/DynamicProgramming/LongestIncreasingSubsequence.java b/DynamicProgramming/LongestIncreasingSubsequence.java
@@ -22,7 +22,7 @@ public static void main(String[] args) {
 
     private static int upperBound(int[] ar, int l, int r, int key) {
         while (l < r - 1) {
-            int m = (l + r) / 2;
+            int m = (l + r) >>> 1;
             if (ar[m] >= key)
                 r = m;
             else
diff --git a/DynamicProgramming/MatrixChainMultiplication.java b/DynamicProgramming/MatrixChainMultiplication.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
             count++;
         }
         for (Matrix m : mArray) {
-            System.out.format("A(%d)  =  %2d  x  %2d\n", m.count(), m.col(), m.row());
+            System.out.format("A(%d)  =  %2d  x  %2d%n", m.count(), m.col(), m.row());
         }
 
         size = mArray.size();
diff --git a/Maths/GCD.java b/Maths/GCD.java
@@ -52,6 +52,6 @@ public static void main(String[] args) {
 
         // call gcd function (input array)
         System.out.println(gcd(myIntArray)); // => 4
-        System.out.printf("gcd(40,24)=%d gcd(24,40)=%d\n", gcd(40, 24), gcd(24, 40)); // => 8
+        System.out.printf("gcd(40,24)=%d gcd(24,40)=%d%n", gcd(40, 24), gcd(24, 40)); // => 8
     }
 }
diff --git a/Others/Dijkstra.java b/Others/Dijkstra.java
diff --git a/Others/TopKWords.java b/Others/TopKWords.java
diff --git a/Others/TowerOfHanoi.java b/Others/TowerOfHanoi.java
diff --git a/Searches/IterativeBinarySearch.java b/Searches/IterativeBinarySearch.java
diff --git a/Sorts/QuickSort.java b/Sorts/QuickSort.java
diff --git a/ciphers/Caesar.java b/ciphers/Caesar.java
diff --git a/ciphers/ColumnarTranspositionCipher.java b/ciphers/ColumnarTranspositionCipher.java
diff --git a/divideconquer/ClosestPair.java b/divideconquer/ClosestPair.java

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void add(final E element) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void put(final int index, E element) {`
`44`		`- Objects.checkIndex(index, this.size);`
	`44`	`+// Objects.checkIndex(index, this.size);`
`45`	`45`
`46`	`46`	`this.elements[index] = element;`
`47`	`47`	`}`
`@@ -79,7 +79,7 @@ private void fastRemove(final Object[] elements, final int index) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`private E getElement(final int index) {`
`82`		`- Objects.checkIndex(index, this.size);`
	`82`	`+// Objects.checkIndex(index, this.size);`
`83`	`83`	`return (E) this.elements[index];`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Edge`
`23`	`23`	`* @param v End vertex`
`24`	`24`	`* @param c Weight`
`25`	`25`	`*/`
`26`		`- Edge(int a,int b,int c)`
	`26`	`+ public Edge(int a,int b,int c)`
`27`	`27`	`{`
`28`	`28`	`u=a;`
`29`	`29`	`v=b;`