Merge branch 'master' into patch-7

siriak · web-flow · commit 6945ebea3d40 · 2021-11-03T20:48:30.000+02:00
diff --git a/Maths/Area.java b/Maths/Area.java
@@ -74,10 +74,11 @@ private static double surfaceAreaRectangle(double length, double width) {
   }
   
   /**
-   * Calculate surface of a cylinder
+   * Calculate surface area of a cylinder
    *
    * @param radius radius of the floor
    * @param height height of the cylinder.
+   * @return volume of given cylinder
    */
   private static double surfaceAreaCylinder(double radius, double height) {
     return 2 * (Math.PI * radius * radius + Math.PI * radius * height);
diff --git a/Sorts/BubbleSort.java b/Sorts/BubbleSort.java
@@ -18,9 +18,9 @@ class BubbleSort implements SortAlgorithm {
    */
   @Override
   public <T extends Comparable<T>> T[] sort(T[] array) {
-    for (int i = 0, size = array.length; i < size - 1; ++i) {
+    for (int i = 1, size = array.length; i < size; ++i) {
       boolean swapped = false;
-      for (int j = 0; j < size - 1 - i; ++j) {
+      for (int j = 0; j < size - i; ++j) {
         if (greater(array[j], array[j + 1])) {
           swap(array, j, j + 1);
           swapped = true;

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,11 @@ private static double surfaceAreaRectangle(double length, double width) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
`77`		`- * Calculate surface of a cylinder`
	`77`	`+ * Calculate surface area of a cylinder`
`78`	`78`	`*`
`79`	`79`	`* @param radius radius of the floor`
`80`	`80`	`* @param height height of the cylinder.`
	`81`	`+ * @return volume of given cylinder`
`81`	`82`	`*/`
`82`	`83`	`private static double surfaceAreaCylinder(double radius, double height) {`
`83`	`84`	`return 2 * (Math.PI * radius * radius + Math.PI * radius * height);`