From 5a270cf719e9d5e24440d4e234f5897ef54fa511 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 29 Oct 2020 14:16:51 +0700
Subject: [PATCH] Add comments for CSVUtility.java

---
 Week9/Assignment9/bin/CSVUtility.class     | Bin 1498 -> 1347 bytes
 Week9/Assignment9/bin/CSVUtilityTest.class | Bin 1227 -> 1293 bytes
 Week9/Assignment9/src/CSVUtility.java      |  25 +++++++++------------
 Week9/Assignment9/src/CSVUtilityTest.java  |   4 ++++
 Week9/Assignment9/uneven.csv               |  10 +++++++++
 5 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 Week9/Assignment9/uneven.csv

diff --git a/Week9/Assignment9/bin/CSVUtility.class b/Week9/Assignment9/bin/CSVUtility.class
index 904cdf1adcbdcaf1039fe38e32678626c8e89818..1f8f917dde457465027b9c351fc23ccfd551807d 100644
GIT binary patch
delta 261
zcmXAjy-EX75QV?{=Y<U#h-`F;Ym+Wsjm8i)3o)9gm6iAe<_!c}8ymrHtCUu06+uLB
z8ym5+^$GMHBsyR-4CkEh%zTz!qv(D5TmW5;?xQ)ahIyi|^DkYu=Is0;|IiD@Gk91s
zH|ml%EHe_$8c%E;*T#4|!J1wu($Nd;u1z~`LN&3mOGhDgt;)_L*~yhtu?xlR?{{MF
z1UE!7m+>+Kj#bL6u}D+2b=jJ1vq4GR-v2ootiY)VnMk`Rfjaahqy-J^31Xz6&OQVA
fu|`TuG{>ee^VlC|J?*}lQdXX!sz}9wSenB>cV;MT

delta 416
zcmXAlPcH*u5XPU`-FKHQ73D=ED-lW4)>5>osDz?LQ4x)kh%9Z0R4<ywt(RUTF4B{u
zMA9Q7k;b7Haq$scUHA@Crd;OV`^;}<-WT)TWxh3^8vtV1d@$V#WvgE0B5YzF3kKo@
z_lZ+-LV2ff6iPeA;|?rhiJ+c3=LF$Tr2;7fNkZ@L)t#)~D#P6-KPB_I(_Ep*y2G>5
z<A-udW%5CT!GjKhbxfxRuVH94XzH9A)vTzfq2HEb$}{tX*@o2Wn2Tx^K~mU_o1ag+
zVP&QEii8pqR#dN{&nu*EWo@bdw`3|hNxh~0@``(&qQYc54i{S+0_8Duaq2+`1DHU7
zeHfE`<rI<}?XcfR<WIhhw$_>mVw8O=TE+_aTI^w!dlV*RkYa+$ye+J8q(Nec86j59
wV+89=75r7!Urk3i!XO{?Z*&@n#HopPBI^0!Wefv;;v%t05Ex0=V6}quFLrZAbpQYW

diff --git a/Week9/Assignment9/bin/CSVUtilityTest.class b/Week9/Assignment9/bin/CSVUtilityTest.class
index 608b8af0f39e08cf92562b5597c1c0fd1f486ae6..036f825c311087c255775974fcc2dacb8f446eab 100644
GIT binary patch
delta 146
zcmX@j*~`Us>ff$?3=9lb46Ylw4m0s^FgP$WaFynzmZj!RKFPF%vz38~ff1<S_2e?<
z6Z)GNgoTW^F-Qy9Gw)z9-N9f963~MQ*Z>7K0@X4xZ~@6O2HDBpEUDTT7~~jkGRQML
eWKdvu#h}Q*4V2@7n91PC-~{9`GB|^Exc~t1ULXbl

delta 83
zcmeC>I?c&->ff$?3=9lb49*+54l_-@%d~(qn1P9b5h!+YavSpr-i<&O69X5JOk<Fo
cT+5Ow%?)JpKvXc;GdKWwj0}!Il8M0y0FTWOlmGw#

diff --git a/Week9/Assignment9/src/CSVUtility.java b/Week9/Assignment9/src/CSVUtility.java
index a5fef88..73faa31 100644
--- a/Week9/Assignment9/src/CSVUtility.java
+++ b/Week9/Assignment9/src/CSVUtility.java
@@ -19,15 +19,15 @@ public class CSVUtility {
 		// ENTER CODE HERE
 		Scanner sc = new Scanner(new File(filename)); // Create a Scanner to take in the file at path filename
 		int length = 0; //Create a length variable and initialize it to zero
-		for (length = 0; sc.hasNext(); length++) 
-			sc.nextLine();
+		for (length = 0; sc.hasNext(); length++) //Find Line amount | Loop until there's no next line,each loop length++
+			sc.nextLine();// Go to the next line
 		sc.close(); //Close the Scanner to prevent resource leak
-		String[] filedata = new String[length];
+		String[] fileData = new String[length]; //create a 1D array to store file data
 		sc = new Scanner(new File(filename)); //Reinitialize the closed scanner
 		for (int i = 0; i < length; i++)
-			filedata[i] = sc.nextLine();
+			fileData[i] = sc.nextLine(); //Send line i to array fileData at index i-1 
 		sc.close(); //Close the Scanner to prevent resource leak
-		return filedata; //Return
+		return fileData; //Return array filled with file data
 	}
 
 	/**
@@ -41,15 +41,12 @@ public class CSVUtility {
 	 */
 	public static String[][] readCSV(String filename, boolean header) throws FileNotFoundException {
 		// ENTER CODE HERE
-		String[] data = readFile(filename);
-		int lineOffset = header ? 1 : 0;
-		int maxElement = 0;
-		for (int i = lineOffset; i < data.length; i++)
-			maxElement = Math.max(data[i].split(",").length, maxElement);
-		String[][] csv = new String[data.length - lineOffset][maxElement];
-		for (int i = lineOffset; i < data.length; i++)
-			csv[i - lineOffset] = data[i].split(",");
-		return csv;
+		String[] data = readFile(filename); //Read the file
+		int lineOffset = header ? 1 : 0; //do we have header? if yes, start at line 2
+		String[][] csv = new String[data.length - lineOffset][];
+		for (int i = lineOffset; i < data.length; i++) //Go through all rows
+			csv[i - lineOffset] = data[i].split(","); //Array.split(String delimiter) return a 1D array with each element seperated by the delimiter
+		return csv; //Send back the CSV file
 
 	}
 
diff --git a/Week9/Assignment9/src/CSVUtilityTest.java b/Week9/Assignment9/src/CSVUtilityTest.java
index d092883..342b695 100644
--- a/Week9/Assignment9/src/CSVUtilityTest.java
+++ b/Week9/Assignment9/src/CSVUtilityTest.java
@@ -26,6 +26,10 @@ public class CSVUtilityTest {
 		ArrayUtility.show(CSVUtilityGiven.readCSV("course-db.csv", true));
 		System.out.println("Your result:");
 		ArrayUtility.show(CSVUtility.readCSV("course-db.csv", true));
+		System.out.println("----------------------------------------");
+		ArrayUtility.show(CSVUtilityGiven.readCSV("uneven.csv", false));
+		System.out.println("Your result:");
+		ArrayUtility.show(CSVUtility.readCSV("uneven.csv", false));
 	}
 	
 }
diff --git a/Week9/Assignment9/uneven.csv b/Week9/Assignment9/uneven.csv
new file mode 100644
index 0000000..b7f5a4a
--- /dev/null
+++ b/Week9/Assignment9/uneven.csv
@@ -0,0 +1,10 @@
+uneven
+Player01,4,4,6,3,4,6,3,5,4,6,4,4,3,6
+Player02,4,4,4,5
+Player03,4,5,5,4,6,5,5,5,7,6,3,6,4,6,5,5,4,5
+Player04,5,6,4,3,5,4,7,4,6
+Player05,4,3,4,4,4,5,4,4,5,5,4,5,5,5,5,4,5,4
+Player06,3,4,4,3,3,4,4,4,5,5,3,4
+Player08,4,6,5,3,4,6,4,3,4,4,2,5,4,4,3,4
+Player09,5,5,8,4,5,4,5,3,6,6,5,4,5
+Player10,5,4,5,3,6,4,5,4,6,5,5