From 22334fbf347a607cd7c11c00dae0d8498dcf1dbb Mon Sep 17 00:00:00 2001 From: Maxslide Date: Fri, 22 Mar 2019 09:26:11 +0530 Subject: [PATCH 1/2] FIxed Issue #415 --- src/lab/exp3/Theory.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lab/exp3/Theory.html b/src/lab/exp3/Theory.html index a64d47b..468de5e 100644 --- a/src/lab/exp3/Theory.html +++ b/src/lab/exp3/Theory.html @@ -151,12 +151,14 @@

1.1 Merge Sort


 
    
-
  1. 1.Procedure Merge(L,R,A) 1. i = 1, j = 1
    2. 
-
  2.  2. for k = 1 to l + r do 
    3. 
-
  3.  3.if L[i] < R[j] then
  4.  4. A[k] = L[i]; i = i + 1
    5. 
-
  5.  5.else 
    6. 
-
  6.  6.A[k] = R[j]; j = j + 1; 
    7. 
-
  7.  7.End 
    8. 
+	
  8. Procedure Merge(L,R,A)
    9. 
+	
  9. i = 1, j = 1
    10. 
+	
  10. for k = 1 to l + r do 
    11. 
+	
  11. 	if L[i] < R[j]
    12. 
+	
  12.  		 A[k] = L[i]; i = i + 1
    13. 
+	
  13. 	else 
    14. 
+	
  14. 		A[k] = R[j]; j = j + 1;
    15. 
+	
  15.  7.End 
    16.

From 25797a96eca0881a0ae1d03248876db5cdf01cbc Mon Sep 17 00:00:00 2001 From: Maxslide Date: Fri, 22 Mar 2019 09:35:20 +0530 Subject: [PATCH 2/2] FIxed Issue #282, Small error in the algorithm fixed --- src/lab/exp3/Theory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lab/exp3/Theory.html b/src/lab/exp3/Theory.html index 468de5e..9d5da11 100644 --- a/src/lab/exp3/Theory.html +++ b/src/lab/exp3/Theory.html @@ -154,7 +154,7 @@

1.1 Merge Sort

  • Procedure Merge(L,R,A)
  • i = 1, j = 1
  • for k = 1 to l + r do
    • -
  • if L[i] < R[j]
    • +
  • if L[i] < R[j] || j > sizeof R[]
  • A[k] = L[i]; i = i + 1
  • else
  • A[k] = R[j]; j = j + 1;