From 6369c7499bb9243d0443ccdb486d7c533f17e5ff Mon Sep 17 00:00:00 2001
From: Mukit <Mukit>
Date: Thu, 6 Jul 2017 23:11:20 +0600
Subject: [PATCH 1/4] Indentation Correction

---
 .../marathon/day3/TrappingTheRainWater.java   | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/jugbd/marathon/day3/TrappingTheRainWater.java b/src/main/java/org/jugbd/marathon/day3/TrappingTheRainWater.java
index 23b1303..c9c6473 100644
--- a/src/main/java/org/jugbd/marathon/day3/TrappingTheRainWater.java
+++ b/src/main/java/org/jugbd/marathon/day3/TrappingTheRainWater.java
@@ -2,34 +2,34 @@
 
 
 public class TrappingTheRainWater {
-    static int findWaterUnit(int[] arr) {
-    	
-    	int unitOfWater = 0, i, j, k;
-		 boolean checked[] = new boolean[arr.length];
-		 
-		 for(i=0;i<arr.length;i++) {
-			 
-			 checked[i] = false;
-		 }
-		 
-		 for(i=0;i<arr.length;i++) {
-			 
-			 if(checked[i] == false) { 
-			 
-				 for(j=i+1;j<arr.length;j++) {
-					 
-					 if(arr[i] <= arr[j] && checked[j] == false) {
-						 
-						 for(k=i+1;k<j;k++) {
-							 
-							 unitOfWater += (arr[i]-arr[k]);
-							 checked[k] = true;
-						 }
-						 break;
-					 }
-				 }
-			 } 
-		 }
-		 return unitOfWater;
-    }
+	static int findWaterUnit(int[] arr) {
+
+		int unitOfWater = 0, i, j, k;
+		boolean checked[] = new boolean[arr.length];
+
+		for(i=0;i<arr.length;i++) {
+
+			checked[i] = false;
+		}
+
+		for(i=0;i<arr.length;i++) {
+
+			if(checked[i] == false) { 
+
+				for(j=i+1;j<arr.length;j++) {
+
+					if(arr[i] <= arr[j] && checked[j] == false) {
+
+						for(k=i+1;k<j;k++) {
+
+							unitOfWater += (arr[i]-arr[k]);
+							checked[k] = true;
+						}
+						break;
+					}
+				}
+			} 
+		}
+		return unitOfWater;
+	}
 }

From ae301fd4a8d9cf1d2da45d9ef9d4045d85977695 Mon Sep 17 00:00:00 2001
From: Mukit <Mukit>
Date: Fri, 7 Jul 2017 00:07:42 +0600
Subject: [PATCH 2/4] Test Case Edited For BiggestNumberTest.java

---
 src/test/java/org/jugbd/marathon/day2/BiggestNumberTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jugbd/marathon/day2/BiggestNumberTest.java b/src/test/java/org/jugbd/marathon/day2/BiggestNumberTest.java
index e11dd53..0552be5 100644
--- a/src/test/java/org/jugbd/marathon/day2/BiggestNumberTest.java
+++ b/src/test/java/org/jugbd/marathon/day2/BiggestNumberTest.java
@@ -16,6 +16,6 @@ public void basicTests() {
         assertEquals(414, BiggestNumber.findTheNextBiggerNumber(144));
         assertEquals(-1, BiggestNumber.findTheNextBiggerNumber(111));
         assertEquals(-1, BiggestNumber.findTheNextBiggerNumber(531));
-        assertEquals(753772, BiggestNumber.findTheNextBiggerNumber(737752));
+        assertEquals(752377, BiggestNumber.findTheNextBiggerNumber(737752));
     }
 }
\ No newline at end of file

From 6b6872b86daa16f9610250ada1e34917176aa64b Mon Sep 17 00:00:00 2001
From: Mukit <Mukit>
Date: Sun, 9 Jul 2017 16:13:32 +0600
Subject: [PATCH 3/4] Directory.java modified

---
 .../org/jugbd/marathon/day4/Directory.java    | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jugbd/marathon/day4/Directory.java b/src/main/java/org/jugbd/marathon/day4/Directory.java
index 69953ea..9cfeb86 100644
--- a/src/main/java/org/jugbd/marathon/day4/Directory.java
+++ b/src/main/java/org/jugbd/marathon/day4/Directory.java
@@ -1,29 +1,61 @@
 package org.jugbd.marathon.day4;
 
 import java.util.Date;
+import java.util.ArrayList;
 
 public class Directory {
-    private String name;
+	
+	private String name;
     private Date createdDate;
+    private ArrayList<Directory> directoryList; 
+    private ArrayList<File> fileList; 
 
     public Directory(String root) {
+    	
+    	this.name = root;
+    	this.createdDate = new Date();
+    	this.directoryList = new ArrayList<>();
+    	this.fileList = new ArrayList<>();
+    }
+    
+    public void add(Directory directory) {
 
+    	this.directoryList.add(directory);
     }
 
     public void add(File file) {
 
+    	this.fileList.add(file);
+    }
+    
+    public int getAllFileCounts(Directory dir) {
+    	
+    	if(dir.directoryList.size() == 0)
+    		return dir.fileList.size();
+    	
+    	int length = dir.directoryList.size();
+    	int sumOfFiles = 0;
+    	
+    	for(int i = 0; i < length; i++) {
+    		
+    		sumOfFiles += getAllFileCounts(dir.directoryList.get(i));
+    	}
+    	return sumOfFiles + dir.fileList.size();
     }
 
     public int numberOfFiles() {
 
-        return 0;
+        return getAllFileCounts(this);
     }
 
-    public Object getName() {
+    public String getName() {
+    	
         return name;
     }
 
     public Date getCreatedDate() {
+    	
         return createdDate;
     }
+
 }

From 4c0043435719062c746c3792c395b6881982f7c3 Mon Sep 17 00:00:00 2001
From: Mukit <Mukit>
Date: Sun, 9 Jul 2017 16:15:02 +0600
Subject: [PATCH 4/4] File.java

---
 src/main/java/org/jugbd/marathon/day4/File.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jugbd/marathon/day4/File.java b/src/main/java/org/jugbd/marathon/day4/File.java
index 3ec3cd3..7e94a76 100644
--- a/src/main/java/org/jugbd/marathon/day4/File.java
+++ b/src/main/java/org/jugbd/marathon/day4/File.java
@@ -2,13 +2,16 @@
 
 
 public class File {
-    private String name;
+	
+	private String name;
 
     public File(String name) {
 
+    	this.name = name;
     }
 
     public String getName() {
+    	
         return name;
     }
 }